summaryrefslogtreecommitdiffstats
path: root/l10n/de/core.po
diff options
context:
space:
mode:
Diffstat (limited to 'l10n/de/core.po')
-rw-r--r--l10n/de/core.po68
1 files changed, 54 insertions, 14 deletions
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 46627cf2e0f..0f23d0cd3fb 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-18 11:47-0400\n"
-"PO-Revision-Date: 2013-09-17 13:05+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -198,55 +198,55 @@ msgstr "Dezember"
msgid "Settings"
msgstr "Einstellungen"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "Gerade eben"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Vor %n Minute"
msgstr[1] "Vor %n Minuten"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Vor %n Stunde"
msgstr[1] "Vor %n Stunden"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "Heute"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "Gestern"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Vor %n Tag"
msgstr[1] "Vor %n Tagen"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "Letzten Monat"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Vor %n Monat"
msgstr[1] "Vor %n Monaten"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "Vor Monaten"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "Letztes Jahr"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "Vor Jahren"
@@ -274,6 +274,46 @@ msgstr "OK"
msgid "Error loading message template: {error}"
msgstr "Fehler beim Laden der Nachrichtenvorlage: {error}"
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."