--- a/i18n/eric5_de.ts Thu Aug 09 19:13:46 2012 +0200 +++ b/i18n/eric5_de.ts Sun Aug 12 12:50:29 2012 +0200 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="de"> +<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> <context> <name>AboutDialog</name> <message> @@ -290,45 +289,50 @@ <context> <name>AdBlockSubscription</name> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="245"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="252"/> <source>Load subscription rules</source> <translation>Abonnementregeln laden</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="237"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="244"/> <source>Unable to open adblock file '{0}' for reading.</source> <translation>Adblock Datei '{0}' konnte nicht zum Lesen geöffnet werden.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="245"/> - <source>Adblock file '{0}' does not start with [Adblock.</source> - <translation>Adblock Datei '{0}' startet nicht mit [Adblock.</translation> - </message> - <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="322"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="382"/> <source>Downloading subscription rules</source> <translation>Lade Abonnementregeln herunter</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="304"/> - <source><p>Subscription rules could not be downloaded.</p><p>Error: {0}</p></source> - <translation><p>Abonnementregeln konnten nicht heruntergeladen werden.</p><p>Fehler: {0}</p></translation> - </message> - <message> <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="314"/> + <source><p>Subscription rules could not be downloaded.</p><p>Error: {0}</p></source> + <translation><p>Abonnementregeln konnten nicht heruntergeladen werden.</p><p>Fehler: {0}</p></translation> + </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="324"/> <source>Got empty subscription rules.</source> <translation>Habe leere Abonnementregeln erhalten.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="342"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="402"/> <source>Unable to open adblock file '{0}' for writing.</source> <translation>Adblock Datei '{0}' konnte nicht zum Schreiben geöffnet werden.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="342"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="402"/> <source>Saving subscription rules</source> <translation>Speichern der Abonnementregeln</translation> </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="252"/> + <source>AdBlock file '{0}' does not start with [Adblock.</source> + <translation>AdBlock Datei '{0}' startet nicht mit [Adblock.</translation> + </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="382"/> + <source><p>AdBlock subscription <b>{0}</b> has a wrong checksum.<br/>Found: {1}<br/>Calculated: {2}<br/>Use it anyway?</p></source> + <translation><p>AdBlock Abonnement <b>{0}</b> hat eine falsche Prüfsumme.<br/>Gefunden: {1}<br/>Berechnet: {2}<br/>Trotzdem verwenden?</p></translation> + </message> </context> <context> <name>AdBlockTreeWidget</name> @@ -1929,7 +1933,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="142"/> - <source>Open in New &Tab Ctrl+LMB</source> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> </context> @@ -2166,7 +2170,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="90"/> - <source>Open in New &Tab Ctrl+LMB</source> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> </context> @@ -14008,7 +14012,7 @@ </message> <message> <location filename="Helpviewer/HelpBrowserWV.py" line="977"/> - <source>Open Link in New Tab Ctrl+LMB</source> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> <translation>Link in neuem Fenster öffnen\tStrg+LMK</translation> </message> <message> @@ -46581,50 +46585,55 @@ <context> <name>TransplantProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="112"/> <source>Transplant Changesets</source> <translation>Änderungssätze transplantieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="38"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="52"/> <source>Transplant changesets from another branch</source> <translation>Änderungssätze aus einem anderen Zweig transplantieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="41"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="55"/> <source><b>Transplant Changesets</b><p>This transplants changesets from another branch on top of the current working directory with the log of the original changeset.</p></source> <translation><b>Änderungssätze transplantieren</b><p>Dies transplantier Änderungssätze aus einem anderen Zweig mit der Originaländerungsmeldung in das Arbeitsverzeichnis.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="53"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="67"/> <source>Continue the last transplant session after repair</source> <translation>Setzt die letzte Transplantationssitzung nach Reparatur fort</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="85"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="103"/> <source>Transplant</source> <translation>Transplantation</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="126"/> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="126"/> <source>Transplant Changesets (Continue)</source> <translation>Änderungssätze transplantieren (Fortsetzung)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="49"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="63"/> <source>Continue Transplant Session</source> <translation>Transplantationssitzung fortsetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="56"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="70"/> <source><b>Continue Transplant Session</b><p>This continues the last transplant session after repair.</p></source> <translation><b>Transplantationssitzung fortsetzen</b><p>Dies setzt die letzte Transplantationssitzung nach Reparatur fort.</p></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="88"/> + <source>Transplant is deprecated</source> + <translation>Transplant ist überholt</translation> + </message> </context> <context> <name>TrayStarter</name>