summaryrefslogtreecommitdiffstats
path: root/l10n/en_GB/files.po
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2013-11-26 00:03:54 +0100
committerBjoern Schiessle <schiessle@owncloud.com>2013-11-26 00:03:54 +0100
commit46dff0677d3eff1aa4da94865e82698229dd71e0 (patch)
tree91b96385b6a5725592bf68169f9d862b007bf14c /l10n/en_GB/files.po
parentacf74b24f24e1c2ea9e454a1c09f6bcf404f6627 (diff)
parent5310a5924b18849c85b482819c350d72a6d0c67c (diff)
downloadnextcloud-server-46dff0677d3eff1aa4da94865e82698229dd71e0.tar.gz
nextcloud-server-46dff0677d3eff1aa4da94865e82698229dd71e0.zip
Merge branch 'master' into calc_version_size
Diffstat (limited to 'l10n/en_GB/files.po')
-rw-r--r--l10n/en_GB/files.po28
1 files changed, 16 insertions, 12 deletions
diff --git a/l10n/en_GB/files.po b/l10n/en_GB/files.po
index e98b5de92f9..8309d35dd6c 100644
--- a/l10n/en_GB/files.po
+++ b/l10n/en_GB/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-11 05:45-0500\n"
-"PO-Revision-Date: 2013-11-09 07:01+0000\n"
+"POT-Creation-Date: 2013-11-21 21:05-0500\n"
+"PO-Revision-Date: 2013-11-21 15:22+0000\n"
"Last-Translator: mnestis <transifex@mnestis.net>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
@@ -156,11 +156,11 @@ msgstr "File upload is in progress. Leaving the page now will cancel the upload.
msgid "URL cannot be empty"
msgstr "URL cannot be empty"
-#: js/file-upload.js:523 js/filelist.js:371
+#: js/file-upload.js:523 js/filelist.js:377
msgid "In the home folder 'Shared' is a reserved filename"
msgstr "In the home folder 'Shared' is a reserved file name"
-#: js/file-upload.js:525 js/filelist.js:373
+#: js/file-upload.js:525 js/filelist.js:379
msgid "{new_name} already exists"
msgstr "{new_name} already exists"
@@ -184,39 +184,43 @@ msgstr "Delete permanently"
msgid "Rename"
msgstr "Rename"
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:857
+#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:873
msgid "Pending"
msgstr "Pending"
-#: js/filelist.js:399
+#: js/filelist.js:405
msgid "Could not rename file"
msgstr "Could not rename file"
-#: js/filelist.js:518
+#: js/filelist.js:524
msgid "replaced {new_name} with {old_name}"
msgstr "replaced {new_name} with {old_name}"
-#: js/filelist.js:518
+#: js/filelist.js:524
msgid "undo"
msgstr "undo"
-#: js/filelist.js:578 js/filelist.js:652 js/files.js:631
+#: js/filelist.js:576
+msgid "Error deleting file."
+msgstr "Error deleting file."
+
+#: js/filelist.js:594 js/filelist.js:668 js/files.js:631
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n folder"
msgstr[1] "%n folders"
-#: js/filelist.js:579 js/filelist.js:653 js/files.js:637
+#: js/filelist.js:595 js/filelist.js:669 js/files.js:637
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n file"
msgstr[1] "%n files"
-#: js/filelist.js:586
+#: js/filelist.js:602
msgid "{dirs} and {files}"
msgstr "{dirs} and {files}"
-#: js/filelist.js:796 js/filelist.js:834
+#: js/filelist.js:812 js/filelist.js:850
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Uploading %n file"