Merge branch 'master' into stable

* master: (75 commits)
  release preparations
  Romanian language update
  removed 'view original' button from new media manager again (was added in b8a84c03) and made a link around the image instead, as that is a more minor change (as it should be during the RC phase) and is what was originally planned
  corrected old mediaupload introduction text
  Removed obsolete Opera fix that now causes harm FS#2429
  don't limit download sizes in plugin manager
  Disable E_STRICT error reporting
  Make Sitemapper functions static as they were used as static functions
  Make this dummy file empty like all others
  Update copyright year
  Remove testing md5 hash from installer
  Slovak language update
  localization: removed strings from old flashuploader
  Polish language update
  readded missing "view original" button to the new media manager
  always show full filename as tooltip in mediamanager
  Fix sorting in media manager search (FS#2423)
  make the installer check for new media dirs
  do not rely on tmpfile() in the AJAX uploader backend FS#2417
  Galician language update
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/plugins/plugin/lang/ja/lang.php b/lib/plugins/plugin/lang/ja/lang.php
index 56a827b7e..a96dcc9be 100644
--- a/lib/plugins/plugin/lang/ja/lang.php
+++ b/lib/plugins/plugin/lang/ja/lang.php
@@ -53,4 +53,4 @@ $lang['enabled']               = 'プラグイン %s が有効です。';
 $lang['notenabled']            = 'プラグイン %s を有効にすることができません。権限を確認してください。';
 $lang['disabled']              = 'プラグイン %s が無効です。';
 $lang['notdisabled']           = 'プラグイン %s を無効にすることができません。権限を確認してください。';
-$lang['packageinstalled']      = 'プラグインパッケージ（%d plugin%s: %s）は正しくインストールされました。';
+$lang['packageinstalled']      = 'プラグインパッケージ（%d plugin(s): %s）は正しくインストールされました。';