[meld] [i18n] Updated German translation

From: Mario Blättermann <mariobl src gnome org>
To: commits-list gnome org
Cc:
Subject: [meld] [i18n] Updated German translation
Date: Sat, 19 Jun 2010 21:10:53 +0000 (UTC)
commit 86e5309de5119fef61cfafe4366ee54355a082ba
Author: Mario BlÃ¤ttermann <mariobl gnome org>
Date:   Sat Jun 19 23:10:34 2010 +0200

    [i18n] Updated German translation

 po/de.po |  112 +++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 64 insertions(+), 48 deletions(-)
---
diff --git a/po/de.po b/po/de.po
index c796df9..9a6332f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=meld&component=general\n"
-"POT-Creation-Date: 2010-06-13 01:09+0000\n"
-"PO-Revision-Date: 2010-06-13 13:51+0100\n"
+"POT-Creation-Date: 2010-06-19 02:36+0000\n"
+"PO-Revision-Date: 2010-06-19 23:05+0100\n"
 "Last-Translator: Mario BlÃ¤ttermann <mariobl gnome org>\n"
 "Language-Team: German <gnome-de gnome org>\n"
 "MIME-Version: 1.0\n"
@@ -57,7 +57,7 @@ msgstr ""
 msgid "Copy to Clipboard"
 msgstr "In die Zwischenablage kopieren"
 
-#: ../data/ui/filediff.glade.h:4 ../meld/filediff.py:179
+#: ../data/ui/filediff.glade.h:4 ../meld/filediff.py:180
 msgid "Create Patch"
 msgstr "Patch erstellen"
 
@@ -174,7 +174,6 @@ msgid "<b>Display</b>"
 msgstr "<b>Anzeige</b>"
 
 #: ../data/ui/preferences.glade.h:2
-#| msgid "Internal editor"
 msgid "<b>External editor</b>"
 msgstr "<b>Externer Editor</b>"
 
@@ -191,7 +190,6 @@ msgid "Do not _split words over two lines"
 msgstr "Nur am _Wortende umbrechen"
 
 #: ../data/ui/preferences.glade.h:6
-#| msgid "_Editor font:"
 msgid "Edito_r command:"
 msgstr "Edito_r-Befehl:"
 
@@ -232,7 +230,6 @@ msgid "Text Filters"
 msgstr "Textfilter"
 
 #: ../data/ui/preferences.glade.h:16
-#| msgid "Gnome default editor"
 msgid "Use _default system editor"
 msgstr "_Den vom System vorgegebenen Editor verwenden"
 
@@ -339,7 +336,7 @@ msgstr "Markiertes vergleichen"
 msgid "Left"
 msgstr "Links"
 
-#: ../meld/dirdiff.py:185 ../meld/filediff.py:186
+#: ../meld/dirdiff.py:185
 msgid "Copy To Left"
 msgstr "Nach links kopieren"
 
@@ -347,7 +344,7 @@ msgstr "Nach links kopieren"
 msgid "Right"
 msgstr "Rechts"
 
-#: ../meld/dirdiff.py:186 ../meld/filediff.py:187
+#: ../meld/dirdiff.py:186
 msgid "Copy To Right"
 msgstr "Nach rechts kopieren"
 
@@ -355,7 +352,7 @@ msgstr "Nach rechts kopieren"
 msgid "Delete selected"
 msgstr "Auswahl lÃ¶schen"
 
-#: ../meld/dirdiff.py:188 ../meld/filediff.py:793
+#: ../meld/dirdiff.py:188 ../meld/filediff.py:842
 msgid "Hide"
 msgstr "Verbergen"
 
@@ -363,7 +360,7 @@ msgstr "Verbergen"
 msgid "Hide selected"
 msgstr "Markiertes verstecken"
 
-#: ../meld/dirdiff.py:190 ../meld/filediff.py:178 ../meld/vcview.py:126
+#: ../meld/dirdiff.py:190 ../meld/filediff.py:179 ../meld/vcview.py:126
 msgid "Open selected"
 msgstr "Markierte Ã¶ffnen"
 
@@ -534,75 +531,91 @@ msgid_plural "%i years"
 msgstr[0] "%i Jahr"
 msgstr[1] "%i Jahre"
 
-#: ../meld/filediff.py:179
+#: ../meld/filediff.py:180
 msgid "Create a patch"
 msgstr "Patch erstellen"
 
-#: ../meld/filediff.py:180
+#: ../meld/filediff.py:181
 msgid "Push to left"
 msgstr "Nach links schieben"
 
-#: ../meld/filediff.py:180
+#: ../meld/filediff.py:181
 msgid "Push current change to the left"
 msgstr "Aktuelle Ã?nderung nach links schieben"
 
-#: ../meld/filediff.py:181
+#: ../meld/filediff.py:182
 msgid "Push to right"
 msgstr "Nach rechts schieben"
 
-#: ../meld/filediff.py:181
+#: ../meld/filediff.py:182
 msgid "Push current change to the right"
 msgstr "Aktuelle Ã?nderung nach rechts schieben"
 
 #. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
-#: ../meld/filediff.py:183
+#: ../meld/filediff.py:184
 msgid "Pull from left"
 msgstr "Von links ziehen"
 
-#: ../meld/filediff.py:183
+#: ../meld/filediff.py:184
 msgid "Pull change from the left"
 msgstr "Ã?nderung von links ziehen"
 
-#: ../meld/filediff.py:184
+#: ../meld/filediff.py:185
 msgid "Pull from right"
 msgstr "Von rechts ziehen"
 
-#: ../meld/filediff.py:184
+#: ../meld/filediff.py:185
 msgid "Pull change from the right"
 msgstr "Ã?nderung von rechts ziehen"
 
-#: ../meld/filediff.py:185
+#: ../meld/filediff.py:186
 msgid "Delete"
 msgstr "LÃ¶schen"
 
-#: ../meld/filediff.py:185
+#: ../meld/filediff.py:186
 msgid "Delete change"
 msgstr "Ã?nderung lÃ¶schen"
 
-#: ../meld/filediff.py:186
-msgid "Copy all changes from right pane to left pane"
-msgstr "Alle Ã?nderungen von rechts nach links kopieren"
+#: ../meld/filediff.py:187
+msgid "Merge all changes from left"
+msgstr "Alle Ã?nderungen von links zusammenfÃ¼hren"
 
 #: ../meld/filediff.py:187
-msgid "Copy all changes from left pane to right pane"
-msgstr "Alle Ã?nderungen von links nach rechts kopieren"
+msgid "Merge all non-conflicting changes from the left"
+msgstr "Alle konfliktlosen Ã?nderungen von links zusammenfÃ¼hren"
+
+#: ../meld/filediff.py:188
+msgid "Merge all changes from right"
+msgstr "Alle Ã?nderungen von rechts zusammenfÃ¼hren"
+
+#: ../meld/filediff.py:188
+msgid "Merge all non-conflicting changes from the right"
+msgstr "Alle konfliktlosen Ã?nderungen von rechts zusammenfÃ¼hren"
+
+#: ../meld/filediff.py:189
+msgid "Merge all non-conflicting"
+msgstr "Alle konfliktlosen Ã?nderungen zusammenfÃ¼hren"
+
+#: ../meld/filediff.py:189
+msgid "Merge all non-conflicting changes from left and right panes"
+msgstr "Alle konfliktlosen Ã?nderungen von links nach rechts zusammenfÃ¼hren"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:255
+#: ../meld/filediff.py:257
 msgid "INS"
 msgstr "EINF"
 
-#: ../meld/filediff.py:255
+#: ../meld/filediff.py:257
 msgid "OVR"
 msgstr "Ã?BR"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:257
+#: ../meld/filediff.py:259
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Zeile %i, Spalte %i"
 
-#: ../meld/filediff.py:392
+#: ../meld/filediff.py:432
 #, python-format
 msgid ""
 "Regular expression '%s' changed the number of lines in the file. Comparison "
@@ -613,54 +626,54 @@ msgstr ""
 "Benutzerhandbuch zu finden."
 
 #. TRANSLATORS: this is the name of a new file which has not yet been saved
-#: ../meld/filediff.py:489
+#: ../meld/filediff.py:529
 msgid "<unnamed>"
 msgstr "<unbenannt>"
 
-#: ../meld/filediff.py:674
+#: ../meld/filediff.py:709
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Setzen der Spaltenanzahl"
 
-#: ../meld/filediff.py:680
+#: ../meld/filediff.py:715
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Dateien werden geÃ¶ffnet"
 
-#: ../meld/filediff.py:686 ../meld/filediff.py:797
+#: ../meld/filediff.py:721 ../meld/filediff.py:846
 msgid "Hi_de"
 msgstr "Ver_bergen"
 
-#: ../meld/filediff.py:707 ../meld/filediff.py:718 ../meld/filediff.py:731
-#: ../meld/filediff.py:737
+#: ../meld/filediff.py:742 ../meld/filediff.py:753 ../meld/filediff.py:766
+#: ../meld/filediff.py:772
 msgid "Could not read file"
 msgstr "Datei konnte nicht gelesen werden"
 
-#: ../meld/filediff.py:710
+#: ../meld/filediff.py:745
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Dateien werden gelesen"
 
-#: ../meld/filediff.py:719
+#: ../meld/filediff.py:754
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s scheint eine BinÃ¤rdatei zu sein."
 
-#: ../meld/filediff.py:732
+#: ../meld/filediff.py:767
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s ist nicht in Kodierungen enthalten: %s"
 
-#: ../meld/filediff.py:757 ../meld/filemerge.py:70
+#: ../meld/filediff.py:792 ../meld/filemerge.py:70
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Unterschiede werden berechnet"
 
-#: ../meld/filediff.py:791
+#: ../meld/filediff.py:840
 msgid "Files are identical"
 msgstr "Dateien sind identisch"
 
-#: ../meld/filediff.py:925
+#: ../meld/filediff.py:974
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -669,7 +682,7 @@ msgstr ""
 "Â»%sÂ« ist vorhanden!\n"
 "Ersetzen?"
 
-#: ../meld/filediff.py:938
+#: ../meld/filediff.py:987
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -680,12 +693,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:947
+#: ../meld/filediff.py:996
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "WÃ¤hlen Sie einen Namen fÃ¼r den Zwischenspeicher %i."
 
-#: ../meld/filediff.py:961
+#: ../meld/filediff.py:1010
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -696,7 +709,7 @@ msgstr ""
 "\n"
 "Welches Format mÃ¶chten Sie verwenden?"
 
-#: ../meld/filediff.py:977
+#: ../meld/filediff.py:1026
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -706,11 +719,11 @@ msgstr ""
 "MÃ¶chten Sie im UTF-8-Format speichern?"
 
 #. save as
-#: ../meld/filediff.py:1015
+#: ../meld/filediff.py:1064
 msgid "Save patch as..."
 msgstr "Patch speichern unter â?¦"
 
-#: ../meld/filediff.py:1073
+#: ../meld/filediff.py:1111
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -1303,6 +1316,9 @@ msgstr ""
 "Das Muster war Â»%sÂ«\n"
 "Der Fehler lautet Â»%sÂ«"
 
+#~ msgid "Copy all changes from right pane to left pane"
+#~ msgstr "Alle Ã?nderungen von rechts nach links kopieren"
+
 #~ msgid "<b>Edit Menu</b>"
 #~ msgstr "<b>MenÃ¼ bearbeiten</b>"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]