Merge branch 'master' into mimetype-defaults

Conflicts:
	apps/files/ajax/newfile.php

6 files changed, 87 insertions, 109 deletions

diff --git a/l10n/ka/core.po b/l10n/ka/core.po
index a6e96b91fef..a553cde32b6 100644
--- a/l10n/ka/core.po
+++ b/l10n/ka/core.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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+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: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,55 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:293
+#: js/js.js:355
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:753
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "წამის წინ"
 
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 წუთის წინ"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 საათის წინ"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr ""
-
-#: js/js.js:758
+#: js/js.js:818
 msgid "today"
 msgstr "დღეს"
 
-#: js/js.js:759
+#: js/js.js:819
 msgid "yesterday"
 msgstr "გუშინ"
 
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: js/js.js:761
+#: js/js.js:821
 msgid "last month"
 msgstr ""
 
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: js/js.js:763
+#: js/js.js:823
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:764
+#: js/js.js:824
 msgid "last year"
 msgstr ""
 
-#: js/js.js:765
+#: js/js.js:825
 msgid "years ago"
 msgstr ""
 
@@ -377,8 +373,9 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
 msgstr ""
 
 #: lostpassword/templates/email.php:2
@@ -578,6 +575,10 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
diff --git a/l10n/ka/files.po b/l10n/ka/files.po
index 8f64ae7fb1a..dc14167acc5 100644
--- a/l10n/ka/files.po
+++ b/l10n/ka/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-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: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -128,7 +128,7 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr ""
 
@@ -160,11 +160,12 @@ msgstr ""
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -212,21 +213,15 @@ msgstr ""
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:763
-msgid "1 folder"
-msgstr ""
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr ""
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/files.js:773
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr ""
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
 #: lib/app.php:73
 #, php-format
diff --git a/l10n/ka/files_encryption.po b/l10n/ka/files_encryption.po
index c2da2724657..581f6b03001 100644
--- a/l10n/ka/files_encryption.po
+++ b/l10n/ka/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+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: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,9 @@ 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
diff --git a/l10n/ka/files_sharing.po b/l10n/ka/files_sharing.po
index c66af7f1368..5bc5f41fc52 100644
--- a/l10n/ka/files_sharing.po
+++ b/l10n/ka/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+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: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ka/files_trashbin.po b/l10n/ka/files_trashbin.po
index 90098bc62cc..36d83d1478b 100644
--- a/l10n/ka/files_trashbin.po
+++ b/l10n/ka/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: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -51,21 +51,15 @@ msgstr ""
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:192
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/trash.js:202
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
 #: lib/trash.php:819 lib/trash.php:821
 msgid "restored"
diff --git a/l10n/ka/lib.po b/l10n/ka/lib.po
index 9c181af82e1..32eb5dd2cd0 100644
--- a/l10n/ka/lib.po
+++ b/l10n/ka/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+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: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -34,14 +34,10 @@ msgid "Users"
 msgstr "მომხმარებლები"
 
 #: app.php:409
-msgid "Apps"
-msgstr ""
-
-#: app.php:417
 msgid "Admin"
 msgstr "ადმინისტრატორი"
 
-#: app.php:844
+#: app.php:836
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -210,50 +206,42 @@ msgid "seconds ago"
 msgstr "წამის წინ"
 
 #: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 წუთის წინ"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
 #: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d წუთის წინ"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
 #: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 საათის წინ"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr ""
-
-#: template/functions.php:85
 msgid "today"
 msgstr "დღეს"
 
-#: template/functions.php:86
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "გუშინ"
 
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d დღის წინ"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: template/functions.php:88
+#: template/functions.php:86
 msgid "last month"
 msgstr ""
 
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: template/functions.php:90
+#: template/functions.php:88
 msgid "last year"
 msgstr ""
 
-#: template/functions.php:91
+#: template/functions.php:89
 msgid "years ago"
 msgstr ""