--- a/i18n/eric5_de.ts Tue Mar 18 19:23:35 2014 +0100 +++ b/i18n/eric5_de.ts Wed Mar 19 18:42:09 2014 +0100 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.1" language="de"> +<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> <context> <name>AboutDialog</name> <message> @@ -1939,8 +1938,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="142"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>In neuem &Register öffnen Strg+LMK</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> </context> <context> @@ -2176,8 +2175,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="90"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>In neuem &Register öffnen Strg+LMK</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> </context> <context> @@ -7140,39 +7139,6 @@ </message> </context> <context> - <name>DownloadDialog</name> - <message> - <location filename="../Helpviewer/DownloadDialog.ui" line="22"/> - <source>Icon</source> - <translation type="obsolete">Icon</translation> - </message> - <message> - <location filename="../Helpviewer/DownloadDialog.ui" line="31"/> - <source>Filename</source> - <translation type="obsolete">Dateiname</translation> - </message> - <message> - <location filename="../Helpviewer/DownloadDialog.ui" line="41"/> - <source>Info</source> - <translation type="obsolete">Info</translation> - </message> - <message> - <location filename="../Helpviewer/DownloadDialog.ui" line="52"/> - <source>Select to keep the dialog open when finished</source> - <translation type="obsolete">Auswählen, um den Dialog nach Beendigung geöffnet zu lassen</translation> - </message> - <message> - <location filename="../Helpviewer/DownloadDialog.ui" line="55"/> - <source>Keep open when finished</source> - <translation type="obsolete">Offen lassen nach Fertigstellung</translation> - </message> - <message> - <location filename="../Helpviewer/DownloadDialog.ui" line="14"/> - <source>Eric5 Download</source> - <translation type="obsolete">Eric5 Download</translation> - </message> -</context> -<context> <name>DownloadItem</name> <message> <location filename="../Helpviewer/Download/DownloadItem.ui" line="26"/> @@ -15973,8 +15939,8 @@ </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1083"/> - <source>Open Link in New Tab Ctrl+LMB</source> - <translation>Link in neuem Fenster öffnen Strg+LMK</translation> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1156"/> @@ -19158,16 +19124,6 @@ <translation>Löse Dateien/Verzeichnisse auf</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> - <source>Create Branch</source> - <translation type="obsolete">Zweig erzeugen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> - <source>Enter branch name</source> - <translation type="obsolete">Gib den Zweignamen ein</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2148"/> <source>Creating branch in the Mercurial repository</source> <translation>Erzeuge Zweig im Mercurial-Repository</translation> @@ -23678,17 +23634,17 @@ <translation>Änderungsbeschreibung</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="101"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="101"/> <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/QueuesExtension/HgQueuesHeaderDialog.py" line="192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="189"/> <source>Error: </source> <translation>Fehler:</translation> </message> @@ -23798,42 +23754,42 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="189"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="189"/> <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/QueuesExtension/HgQueuesListDialog.py" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="224"/> <source>no patches found</source> <translation>keine Patches gefunden</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="50"/> + <source>applied</source> + <translation>angewandt</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> + <source>not applied</source> + <translation>nicht angewandt</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/> - <source>applied</source> - <translation>angewandt</translation> + <source>guarded</source> + <translation>geschützt</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="53"/> - <source>not applied</source> - <translation>nicht angewandt</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="54"/> - <source>guarded</source> - <translation>geschützt</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="55"/> <source>missing</source> <translation>fehlt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="298"/> <source>unknown</source> <translation>unbekannt</translation> </message> @@ -24839,7 +24795,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="251"/> <source>Mercurial Status</source> <translation>Mercurial-Status</translation> </message> @@ -24921,102 +24877,97 @@ <translation>Änderungen einpflegen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="87"/> <source>Add to repository</source> <translation>Zum Repository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="113"/> <source>Adjust column sizes</source> <translation>Spaltengrößen anpassen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="152"/> <source>added</source> <translation>hinzugefügt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="155"/> <source>modified</source> <translation>modifiziert</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="156"/> <source>removed</source> <translation>gelöscht</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="157"/> <source>not tracked</source> <translation>nicht versioniert</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="153"/> <source>normal</source> <translation>normal</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="154"/> <source>ignored</source> <translation>ignoriert</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="158"/> <source>missing</source> <translation>fehlt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="307"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="307"/> <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/HgStatusDialog.py" line="628"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="647"/> <source>Commit</source> <translation>Einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="813"/> <source>There are no uncommitted changes available/selected.</source> <translation>Es sind keine nicht eingepflegten Änderungen vorhanden/ausgewählt.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="711"/> <source>Add</source> <translation>Hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="711"/> <source>There are no unversioned entries available/selected.</source> <translation>Es sind keine unversionierten Einträge vorhanden/ausgewählt.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="775"/> <source>Revert</source> <translation>Rückgängig machen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> - <source>Remove from repository</source> - <translation>Vom Repository löschen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="734"/> <source>Remove</source> <translation>Entfernen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="775"/> <source>There are no missing entries available/selected.</source> <translation>Es sind keine fehlenden Einträge vorhanden/ausgewählt.</translation> </message> @@ -25091,42 +25042,42 @@ <translation>&Wiederherstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="97"/> <source>Show differences</source> <translation>Unterschiede anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="109"/> <source>Restore missing</source> <translation>Fehlende wiederherstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="515"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="522"/> <source>all</source> <translation>alle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="774"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="793"/> <source>Differences</source> <translation>Unterschiede</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="628"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="647"/> <source>There are no entries selected to be committed.</source> <translation>Es sind keine Einträge zum Einpflegen ausgewählt.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="80"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="81"/> <source>Select all for commit</source> <translation>Alle zum Einpflegen auswählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="82"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="83"/> <source>Deselect all from commit</source> <translation>Alle vom Einpflegen abwählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="241"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="248"/> <source>Mercurial Queue Repository Status</source> <translation>Mercurial Status des Queue-Repositories</translation> </message> @@ -25141,30 +25092,35 @@ <translation>Unterschiede &nebeneinander</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="820"/> <source>Side-by-Side Diff</source> <translation>Unterschiede nebeneinander</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="820"/> <source>Only one file with uncommitted changes must be selected.</source> <translation>Es darf nur eine Datei ausgewählt werden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> <source>Show differences side-by-side</source> <translation>Unterschiede nebeneinander anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="128"/> <source>Add as Large File</source> <translation>Als Binärriese hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="131"/> <source>Add as Normal File</source> <translation>Als Normale Datei hinzufügen</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> + <source>Forget missing</source> + <translation>Fehlende vergessen</translation> + </message> </context> <context> <name>HgStatusMonitorThread</name> @@ -51670,12 +51626,12 @@ <translation>Symbole</translation> </message> <message> - <location filename="../UI/SymbolsWidget.ui" line="85"/> + <location filename="../UI/SymbolsWidget.ui" line="82"/> <source>Symbol code:</source> <translation>Symbolcode:</translation> </message> <message> - <location filename="../UI/SymbolsWidget.ui" line="92"/> + <location filename="../UI/SymbolsWidget.ui" line="89"/> <source>Enter the symbol code</source> <translation>Gib den Symbolcode ein</translation> </message>