Merge branch 'master' into mimetype-defaults

Conflicts:
	apps/files/ajax/newfile.php

1 files changed, 25 insertions, 37 deletions

diff --git a/l10n/ja_JP/lib.po b/l10n/ja_JP/lib.po
index 3946f049c5a..b0374271597 100644
--- a/l10n/ja_JP/lib.po
+++ b/l10n/ja_JP/lib.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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+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: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -35,17 +35,13 @@ 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 ""
+msgstr "\"%s\" へのアップグレードに失敗しました。"
 
 #: defaults.php:35
 msgid "web services under your control"
@@ -54,7 +50,7 @@ msgstr "管理下のウェブサービス"
 #: files.php:66 files.php:98
 #, php-format
 msgid "cannot open \"%s\""
-msgstr ""
+msgstr "\"%s\" が開けません"
 
 #: files.php:226
 msgid "ZIP download is turned off."
@@ -76,7 +72,7 @@ msgstr "選択したファイルはZIPファイルの生成には大きすぎま
 msgid ""
 "Download the files in smaller chunks, seperately or kindly ask your "
 "administrator."
-msgstr ""
+msgstr "ファイルは、小さいファイルに分割されてダウンロードされます。もしくは、管理者にお尋ねください。"
 
 #: helper.php:235
 msgid "couldn't be determined"
@@ -211,56 +207,48 @@ 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 "%d 時間前"
-
-#: 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 "%d 分前"
+#: 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 "年前"
 
 #: template.php:297
 msgid "Caused by:"
-msgstr ""
+msgstr "原因は以下:"
 
 #: vcategories.php:188 vcategories.php:249
 #, php-format