summaryrefslogtreecommitdiffstats
path: root/l10n/templates/core.pot
diff options
context:
space:
mode:
Diffstat (limited to 'l10n/templates/core.pot')
-rw-r--r--l10n/templates/core.pot36
1 files changed, 18 insertions, 18 deletions
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 567d3d8c860..ad2b28892b0 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-20 01:54-0400\n"
+"POT-Creation-Date: 2014-06-21 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -247,75 +247,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its "
"name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""