Merge branch 'master' into fix_jslint_kondou

Conflicts:
	apps/files/js/file-upload.js

8 files changed, 144 insertions, 127 deletions

diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po
index fdf6b56cf73..eda31fda907 100644
--- a/l10n/cy_GB/core.po
+++ b/l10n/cy_GB/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-31 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 12:13+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -138,59 +138,67 @@ msgstr "Tachwedd"
 msgid "December"
 msgstr "Rhagfyr"
 
-#: js/js.js:293
+#: js/js.js:355
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: js/js.js:715
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "eiliad yn ôl"
 
-#: js/js.js:716
-msgid "1 minute ago"
-msgstr "1 munud yn ôl"
-
-#: js/js.js:717
-msgid "{minutes} minutes ago"
-msgstr "{minutes} munud yn ôl"
-
-#: js/js.js:718
-msgid "1 hour ago"
-msgstr "1 awr yn ôl"
-
-#: js/js.js:719
-msgid "{hours} hours ago"
-msgstr "{hours} awr yn ôl"
-
-#: js/js.js:720
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/js.js:818
 msgid "today"
 msgstr "heddiw"
 
-#: js/js.js:721
+#: js/js.js:819
 msgid "yesterday"
 msgstr "ddoe"
 
-#: js/js.js:722
-msgid "{days} days ago"
-msgstr "{days} diwrnod yn ôl"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: js/js.js:723
+#: js/js.js:821
 msgid "last month"
 msgstr "mis diwethaf"
 
-#: js/js.js:724
-msgid "{months} months ago"
-msgstr "{months} mis yn ôl"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: js/js.js:725
+#: js/js.js:823
 msgid "months ago"
 msgstr "misoedd yn ôl"
 
-#: js/js.js:726
+#: js/js.js:824
 msgid "last year"
 msgstr "y llynedd"
 
-#: js/js.js:727
+#: js/js.js:825
 msgid "years ago"
 msgstr "blwyddyn yn ôl"
 
@@ -378,9 +386,10 @@ msgstr "Methodd y diweddariad. Adroddwch y mater hwn i <a href=\"https://github.
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ailosod cyfrinair ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -579,6 +588,10 @@ msgstr "%s ar gael. Mwy o wybodaeth am sut i ddiweddaru."
 msgid "Log out"
 msgstr "Allgofnodi"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Gwrthodwyd mewngofnodi awtomatig!"
diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po
index 13f8ec20f67..24e30b40187 100644
--- a/l10n/cy_GB/files.po
+++ b/l10n/cy_GB/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-31 01:55-0400\n"
-"PO-Revision-Date: 2013-07-31 05:41+0000\n"
+"POT-Creation-Date: 2013-08-16 01:29-0400\n"
+"PO-Revision-Date: 2013-08-16 05:29+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -120,15 +120,11 @@ msgstr "Rhannu"
 msgid "Delete permanently"
 msgstr "Dileu'n barhaol"
 
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Dileu"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
 msgid "Rename"
 msgstr "Ailenwi"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "I ddod"
 
@@ -156,15 +152,15 @@ msgstr "newidiwyd {new_name} yn lle {old_name}"
 msgid "undo"
 msgstr "dadwneud"
 
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "cyflawni gweithred dileu"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 ffeil yn llwytho i fyny"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
 msgid "files uploading"
 msgstr "ffeiliau'n llwytho i fyny"
 
@@ -212,21 +208,21 @@ msgstr "Maint"
 msgid "Modified"
 msgstr "Addaswyd"
 
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 blygell"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} plygell"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 ffeil"
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} ffeil"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
 #: lib/app.php:73
 #, php-format
@@ -309,6 +305,10 @@ msgstr "Llwytho i lawr"
 msgid "Unshare"
 msgstr "Dad-rannu"
 
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Dileu"
+
 #: templates/index.php:105
 msgid "Upload too large"
 msgstr "Maint llwytho i fyny'n rhy fawr"
diff --git a/l10n/cy_GB/files_encryption.po b/l10n/cy_GB/files_encryption.po
index 580563b10a4..0b6627605f1 100644
--- a/l10n/cy_GB/files_encryption.po
+++ b/l10n/cy_GB/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -68,9 +68,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/cy_GB/files_sharing.po b/l10n/cy_GB/files_sharing.po
index c9edfb2a4b9..6c8d5f69531 100644
--- a/l10n/cy_GB/files_sharing.po
+++ b/l10n/cy_GB/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-31 01:55-0400\n"
-"PO-Revision-Date: 2013-07-31 05:56+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/files_trashbin.po b/l10n/cy_GB/files_trashbin.po
index c28b0ab60ff..b9b366cf636 100644
--- a/l10n/cy_GB/files_trashbin.po
+++ b/l10n/cy_GB/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -51,21 +51,21 @@ msgstr "Enw"
 msgid "Deleted"
 msgstr "Wedi dileu"
 
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 blygell"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} plygell"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 ffeil"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} ffeil"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
 #: lib/trash.php:819 lib/trash.php:821
 msgid "restored"
diff --git a/l10n/cy_GB/lib.po b/l10n/cy_GB/lib.po
index 580ccc29020..f53ef9f6f27 100644
--- a/l10n/cy_GB/lib.po
+++ b/l10n/cy_GB/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-31 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 12:13+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -34,14 +34,10 @@ msgid "Users"
 msgstr "Defnyddwyr"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Pecynnau"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Gweinyddu"
 
-#: app.php:844
+#: app.php:836
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -210,50 +206,54 @@ msgid "seconds ago"
 msgstr "eiliad yn ôl"
 
 #: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 munud yn ôl"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
 #: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d munud yn ôl"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
 #: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 awr yn ôl"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d awr yn ôl"
-
-#: template/functions.php:85
 msgid "today"
 msgstr "heddiw"
 
-#: template/functions.php:86
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "ddoe"
 
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d diwrnod yn ôl"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: template/functions.php:88
+#: template/functions.php:86
 msgid "last month"
 msgstr "mis diwethaf"
 
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d mis yn ôl"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: template/functions.php:90
+#: template/functions.php:88
 msgid "last year"
 msgstr "y llynedd"
 
-#: template/functions.php:91
+#: template/functions.php:89
 msgid "years ago"
 msgstr "blwyddyn yn ôl"
 
diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po
index 25820b1996d..bf5e3f365c6 100644
--- a/l10n/cy_GB/settings.po
+++ b/l10n/cy_GB/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-25 05:57+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/user_ldap.po b/l10n/cy_GB/user_ldap.po
index d71262f1e3b..99af3545bfa 100644
--- a/l10n/cy_GB/user_ldap.po
+++ b/l10n/cy_GB/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-31 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 12:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"