--- a/i18n/eric5_de.ts Fri Dec 23 15:29:00 2011 +0100 +++ b/i18n/eric5_de.ts Fri Dec 23 17:48:33 2011 +0100 @@ -16915,95 +16915,105 @@ <translation>Unterschiede</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="32"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="35"/> <source><b>Mercurial Diff</b><p>This shows the output of the hg diff command.</p></source> <translation><b>Mercurial Diff</b><p>Die zeigt die Ausgabe des hg diff Befehls.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="60"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="63"/> <source>Errors</source> <translation>Fehler</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="85"/> <source>Input</source> <translation>Eingabe</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="104"/> - <source>Press to send the input to the hg process</source> - <translation>Drücken um die Eingabe an den hg Prozess zu senden</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="107"/> - <source>&Send</source> - <translation>Sen&den</translation> + <source>Press to send the input to the hg process</source> + <translation>Drücken um die Eingabe an den hg Prozess zu senden</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="110"/> + <source>&Send</source> + <translation>Sen&den</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="113"/> <source>Alt+S</source> <translation>Alt+D</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="117"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="120"/> <source>Enter data to be sent to the hg process</source> <translation>Gib die Daten ein, die an den hg Prozess geschickt werden sollen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="124"/> - <source>Select to switch the input field to password mode</source> - <translation>Anwählen, um den Kennwort Modus für das Eingabefeld auszuwählen</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="127"/> - <source>&Password Mode</source> - <translation>&Kennwort Modus</translation> + <source>Select to switch the input field to password mode</source> + <translation>Anwählen, um den Kennwort Modus für das Eingabefeld auszuwählen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="130"/> + <source>&Password Mode</source> + <translation>&Kennwort Modus</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="133"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="190"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="190"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="215"/> <source>There is no difference.</source> <translation>Es gibt keinen Unterschied.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="427"/> <source>Save Diff</source> <translation>Diff speichern</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="395"/> <source>Patch Files (*.diff)</source> <translation>Patchdateien (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="427"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>Die Patchdatei <b>{0}</b> konnte nicht gespeichert werden.<br>Grund: {1}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="333"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="412"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Patchdatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="113"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="115"/> <source>Patch Contents</source> <translation>Patchinhalt</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="228"/> + <source><Start></source> + <translation><Anfang></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="229"/> + <source><End></source> + <translation><Ende></translation> + </message> </context> <context> <name>HgExportDialog</name> @@ -36678,27 +36688,27 @@ <context> <name>SvnDiffDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="152"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="158"/> <source>Subversion Diff</source> <translation>Subversion Diff</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="250"/> <source>There is no difference.</source> <translation>Es gibt keinen Unterschied.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="393"/> <source>Patch Files (*.diff)</source> <translation>Patchdateien (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="350"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="425"/> <source>Save Diff</source> <translation>Diff speichern</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="350"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="425"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>Die Patchdatei <b>{0}</b> konnte nicht gespeichert werden.<br>Grund: {1}</p></translation> </message> @@ -36708,82 +36718,92 @@ <translation>Unterschiede</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.ui" line="32"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.ui" line="35"/> <source><b>Subversion Diff</b><p>This shows the output of the svn diff command.</p></source> <translation><b>Subversion Diff</b><p>Die zeigt die Ausgabe des svn diff Befehls.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.ui" line="60"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.ui" line="63"/> <source>Errors</source> <translation>Fehler</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="82"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="85"/> <source>Input</source> <translation>Eingabe</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="104"/> - <source>Press to send the input to the subversion process</source> - <translation>Drücken um die Eingabe an den Subversion Prozess zu senden</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="107"/> - <source>&Send</source> - <translation>Sen&den</translation> + <source>Press to send the input to the subversion process</source> + <translation>Drücken um die Eingabe an den Subversion Prozess zu senden</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="110"/> + <source>&Send</source> + <translation>Sen&den</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="113"/> <source>Alt+S</source> <translation>Alt+D</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="117"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="120"/> <source>Enter data to be sent to the subversion process</source> <translation>Gib die Daten ein, die an den Subversion Prozess geschickt werden sollen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="124"/> - <source>Select to switch the input field to password mode</source> - <translation>Anwählen, um den Kennwort Modus für das Eingabefeld auszuwählen</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="127"/> - <source>&Password Mode</source> - <translation>&Kennwort Modus</translation> + <source>Select to switch the input field to password mode</source> + <translation>Anwählen, um den Kennwort Modus für das Eingabefeld auszuwählen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="130"/> + <source>&Password Mode</source> + <translation>&Kennwort Modus</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="133"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="166"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="172"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="152"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="158"/> <source>There is no temporary directory available.</source> <translation>Es steht kein temporäres Verzeichnis zur verfügung.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="200"/> <source>Processing file '{0}'... </source> <translation>Bearbeite Datei '{0}'... </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="166"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="172"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="335"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="410"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Patchdatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="317"/> + <source><Start></source> + <translation><Anfang></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="318"/> + <source><End></source> + <translation><Ende></translation> + </message> </context> <context> <name>SvnInfoDialog</name>