[tx-robot] updated from transifex

3 files changed, 42 insertions, 33 deletions

diff --git a/l10n/en_GB/files.po b/l10n/en_GB/files.po
index 64bb1853ab9..05fbd0c384d 100644
--- a/l10n/en_GB/files.po
+++ b/l10n/en_GB/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-08-14 01:54-0400\n"
-"PO-Revision-Date: 2014-08-13 16:02+0000\n"
-"Last-Translator: Darren Richardson <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2014-08-15 01:54-0400\n"
+"PO-Revision-Date: 2014-08-15 05:54+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"
@@ -56,11 +56,11 @@ msgid ""
 msgstr "Invalid name: '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed."
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:159
-#: lib/app.php:77
+#: lib/app.php:87
 msgid "The target folder has been moved or deleted."
 msgstr "The target folder has been moved or deleted."
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:96
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -165,49 +165,49 @@ msgstr "Files"
 msgid "All files"
 msgstr "All files"
 
-#: js/file-upload.js:268
+#: js/file-upload.js:269
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Unable to upload {filename} as it is a directory or has 0 bytes"
 
-#: js/file-upload.js:281
+#: js/file-upload.js:284
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr "Total file size {size1} exceeds upload limit {size2}"
 
-#: js/file-upload.js:292
+#: js/file-upload.js:295
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr "Not enough free space, you are uploading {size1} but only {size2} is left"
 
-#: js/file-upload.js:369
+#: js/file-upload.js:372
 msgid "Upload cancelled."
 msgstr "Upload cancelled."
 
-#: js/file-upload.js:415
+#: js/file-upload.js:418
 msgid "Could not get result from server."
 msgstr "Could not get result from server."
 
-#: js/file-upload.js:499
+#: js/file-upload.js:502
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "File upload is in progress. Leaving the page now will cancel the upload."
 
-#: js/file-upload.js:564
+#: js/file-upload.js:567
 msgid "URL cannot be empty"
 msgstr "URL cannot be empty"
 
-#: js/file-upload.js:568 js/filelist.js:1275
+#: js/file-upload.js:571 js/filelist.js:1275
 msgid "{new_name} already exists"
 msgstr "{new_name} already exists"
 
-#: js/file-upload.js:623
+#: js/file-upload.js:626
 msgid "Could not create file"
 msgstr "Could not create file"
 
-#: js/file-upload.js:639
+#: js/file-upload.js:642
 msgid "Could not create folder"
 msgstr "Could not create folder"
 
-#: js/file-upload.js:686
+#: js/file-upload.js:689
 msgid "Error fetching URL"
 msgstr "Error fetching URL"
 
@@ -241,7 +241,7 @@ msgid ""
 "big."
 msgstr "Your download is being prepared. This might take some time if the files are big."
 
-#: js/filelist.js:680 js/filelist.js:1799
+#: js/filelist.js:680 js/filelist.js:1803
 msgid "Pending"
 msgstr "Pending"
 
@@ -261,35 +261,35 @@ msgstr "Error"
 msgid "Could not rename file"
 msgstr "Could not rename file"
 
-#: js/filelist.js:1441
+#: js/filelist.js:1445
 msgid "Error deleting file."
 msgstr "Error deleting file."
 
-#: js/filelist.js:1544 templates/list.php:61
+#: js/filelist.js:1548 templates/list.php:61
 msgid "Name"
 msgstr "Name"
 
-#: js/filelist.js:1545 templates/list.php:72
+#: js/filelist.js:1549 templates/list.php:72
 msgid "Size"
 msgstr "Size"
 
-#: js/filelist.js:1546 templates/list.php:75
+#: js/filelist.js:1550 templates/list.php:75
 msgid "Modified"
 msgstr "Modified"
 
-#: js/filelist.js:1556 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1560 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n folder"
 msgstr[1] "%n folders"
 
-#: js/filelist.js:1562 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1566 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n file"
 msgstr[1] "%n files"
 
-#: js/filelist.js:1692 js/filelist.js:1731
+#: js/filelist.js:1696 js/filelist.js:1735
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Uploading %n file"
@@ -330,7 +330,12 @@ msgstr "Encryption was disabled but your files are still encrypted. Please go to
 msgid "{dirs} and {files}"
 msgstr "{dirs} and {files}"
 
-#: lib/app.php:103
+#: lib/app.php:80
+#, php-format
+msgid "%s could not be renamed as it has been deleted"
+msgstr ""
+
+#: lib/app.php:113
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s could not be renamed"
diff --git a/l10n/en_GB/files_sharing.po b/l10n/en_GB/files_sharing.po
index 3447605f3ce..891c8828ec0 100644
--- a/l10n/en_GB/files_sharing.po
+++ b/l10n/en_GB/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-08-14 01:54-0400\n"
-"PO-Revision-Date: 2014-08-13 16:02+0000\n"
+"POT-Creation-Date: 2014-08-15 01:54-0400\n"
+"PO-Revision-Date: 2014-08-15 05:54+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"
@@ -22,7 +22,11 @@ msgstr ""
 msgid "Server to server sharing is not enabled on this server"
 msgstr "Server to server sharing is not enabled on this server"
 
-#: ajax/external.php:47
+#: ajax/external.php:38
+msgid "Invalid or untrusted ssl certificate"
+msgstr ""
+
+#: ajax/external.php:52
 msgid "Couldn't add remote share"
 msgstr "Couldn't add remote share"
 
diff --git a/l10n/en_GB/settings.po b/l10n/en_GB/settings.po
index 8c6f4b31067..7bdb69c7f23 100644
--- a/l10n/en_GB/settings.po
+++ b/l10n/en_GB/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-08-14 01:54-0400\n"
-"PO-Revision-Date: 2014-08-13 11:31+0000\n"
-"Last-Translator: Darren Richardson <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2014-08-15 01:54-0400\n"
+"PO-Revision-Date: 2014-08-15 05:54+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"
@@ -499,10 +499,10 @@ msgstr "PHP charset is not set to UTF-8"
 
 #: templates/admin.php:150
 msgid ""
-"PHP charset is not set to UTF-8. This can cause major issues with non-acsii "
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII "
 "characters in file names. We highly recommend to change the value of "
 "'default_charset' php.ini to 'UTF-8'."
-msgstr "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'."
+msgstr ""
 
 #: templates/admin.php:161
 msgid "Locale not working"