diff options
Diffstat (limited to 'l10n/en_GB/core.po')
| -rw-r--r-- | l10n/en_GB/core.po | 70 |
1 files changed, 55 insertions, 15 deletions
diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po index e6d3d657379..7e5c1ed0791 100644 --- a/l10n/en_GB/core.po +++ b/l10n/en_GB/core.po @@ -8,9 +8,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-18 13:30+0000\n" -"Last-Translator: mnestis <transifex@mnestis.net>\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: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -191,55 +191,55 @@ msgstr "December" msgid "Settings" msgstr "Settings" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "seconds ago" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minute ago" msgstr[1] "%n minutes ago" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n hour ago" msgstr[1] "%n hours ago" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "today" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "yesterday" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n day ago" msgstr[1] "%n days ago" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "last month" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n month ago" msgstr[1] "%n months ago" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "months ago" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "last year" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "years ago" @@ -267,6 +267,46 @@ msgstr "OK" msgid "Error loading message template: {error}" msgstr "Error loading message template: {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." @@ -449,7 +489,7 @@ msgstr "Request failed!<br>Did you make sure your email/username was correct?" #: lostpassword/templates/lostpassword.php:15 msgid "You will receive a link to reset your password via Email." -msgstr "You will receive a link to reset your password via Email." +msgstr "You will receive a link to reset your password via email." #: lostpassword/templates/lostpassword.php:18 templates/installation.php:51 #: templates/login.php:19 |