diff options
Diffstat (limited to 'l10n/en_GB/core.po')
| -rw-r--r-- | l10n/en_GB/core.po | 66 |
1 files changed, 37 insertions, 29 deletions
diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po index b6c1fd256b2..1dd7f065f01 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-03-24 01:55-0400\n" -"PO-Revision-Date: 2014-03-23 15:01+0000\n" -"Last-Translator: mnestis <transifex@mnestis.net>\n" +"POT-Creation-Date: 2014-04-08 01:56-0400\n" +"PO-Revision-Date: 2014-04-08 05:56+0000\n" +"Last-Translator: I Robot\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" @@ -18,24 +18,24 @@ msgstr "" "Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ajax/share.php:88 +#: ajax/share.php:87 msgid "Expiration date is in the past." msgstr "Expiration date is in the past." -#: ajax/share.php:120 ajax/share.php:162 +#: ajax/share.php:119 ajax/share.php:161 #, php-format msgid "Couldn't send mail to following users: %s " msgstr "Couldn't send mail to following users: %s " -#: ajax/update.php:11 +#: ajax/update.php:10 msgid "Turned on maintenance mode" msgstr "Turned on maintenance mode" -#: ajax/update.php:14 +#: ajax/update.php:13 msgid "Turned off maintenance mode" msgstr "Turned off maintenance mode" -#: ajax/update.php:17 +#: ajax/update.php:16 msgid "Updated database" msgstr "Updated database" @@ -135,63 +135,63 @@ msgstr "November" msgid "December" msgstr "December" -#: js/js.js:458 +#: js/js.js:479 msgid "Settings" msgstr "Settings" -#: js/js.js:496 +#: js/js.js:564 msgid "Saving..." msgstr "Saving..." -#: js/js.js:995 +#: js/js.js:1124 msgid "seconds ago" msgstr "seconds ago" -#: js/js.js:996 +#: js/js.js:1125 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minute ago" msgstr[1] "%n minutes ago" -#: js/js.js:997 +#: js/js.js:1126 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n hour ago" msgstr[1] "%n hours ago" -#: js/js.js:998 +#: js/js.js:1127 msgid "today" msgstr "today" -#: js/js.js:999 +#: js/js.js:1128 msgid "yesterday" msgstr "yesterday" -#: js/js.js:1000 +#: js/js.js:1129 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n day ago" msgstr[1] "%n days ago" -#: js/js.js:1001 +#: js/js.js:1130 msgid "last month" msgstr "last month" -#: js/js.js:1002 +#: js/js.js:1131 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n month ago" msgstr[1] "%n months ago" -#: js/js.js:1003 +#: js/js.js:1132 msgid "months ago" msgstr "months ago" -#: js/js.js:1004 +#: js/js.js:1133 msgid "last year" msgstr "last year" -#: js/js.js:1005 +#: js/js.js:1134 msgid "years ago" msgstr "years ago" @@ -230,32 +230,40 @@ msgid "One file conflict" msgstr "One file conflict" #: js/oc-dialogs.js:367 +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 "Which files do you wish to keep?" -#: js/oc-dialogs.js:368 +#: js/oc-dialogs.js:371 msgid "" "If you select both versions, the copied file will have a number added to its" " name." msgstr "If you select both versions, the copied file will have a number added to its name." -#: js/oc-dialogs.js:376 +#: js/oc-dialogs.js:379 msgid "Cancel" msgstr "Cancel" -#: js/oc-dialogs.js:386 +#: js/oc-dialogs.js:389 msgid "Continue" msgstr "Continue" -#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 msgid "(all selected)" msgstr "(all selected)" -#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +#: js/oc-dialogs.js:439 js/oc-dialogs.js:452 msgid "({count} selected)" msgstr "({count} selected)" -#: js/oc-dialogs.js:457 +#: js/oc-dialogs.js:460 msgid "Error loading file exists template" msgstr "Error loading file exists template" @@ -534,14 +542,14 @@ msgstr "New password" msgid "Reset password" msgstr "Reset password" -#: setup/controller.php:138 +#: setup/controller.php:140 #, php-format msgid "" "Mac OS X is not supported and %s will not work properly on this platform. " "Use it at your own risk! " msgstr "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " -#: setup/controller.php:142 +#: setup/controller.php:144 msgid "" "For the best results, please consider using a GNU/Linux server instead." msgstr "For the best results, please consider using a GNU/Linux server instead." |