diff options
Diffstat (limited to 'l10n/templates/core.pot')
| -rw-r--r-- | l10n/templates/core.pot | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index dc2a86bb6c8..e20208b113b 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-04-07 01:55-0400\n" +"POT-Creation-Date: 2014-04-08 01:56-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" @@ -230,32 +230,40 @@ msgid "One file conflict" msgstr "" #: js/oc-dialogs.js:367 -msgid "Which files do you want to keep?" +msgid "New Files" msgstr "" #: js/oc-dialogs.js:368 +msgid "Already existing files" +msgstr "" + +#: js/oc-dialogs.js:370 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:371 msgid "" "If you select both versions, the copied file will have a number added to its " "name." msgstr "" -#: js/oc-dialogs.js:376 +#: js/oc-dialogs.js:379 msgid "Cancel" msgstr "" -#: js/oc-dialogs.js:386 +#: js/oc-dialogs.js:389 msgid "Continue" msgstr "" -#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 msgid "(all selected)" msgstr "" -#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +#: js/oc-dialogs.js:439 js/oc-dialogs.js:452 msgid "({count} selected)" msgstr "" -#: js/oc-dialogs.js:457 +#: js/oc-dialogs.js:460 msgid "Error loading file exists template" msgstr "" |