release: merge back stable branch into default

pkgs/python-packages.nix

@@ -1,4 +1,4 @@
-# Generated by pip2nix 0.4.0.dev1
+# Generated by pip2nix 0.4.0
 # See https://github.com/johbo/pip2nix
 
 {
@@ -1381,13 +1381,13 @@
     };
   };
   python-editor = super.buildPythonPackage {
-    name = "python-editor-1.0.1";
+    name = "python-editor-1.0.3";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/2b/c0/df7b87d5cf016f82eab3b05cd35f53287c1178ad8c42bfb6fa61b89b22f6/python-editor-1.0.1.tar.gz";
-      md5 = "e1fa63535b40e022fa4fd646fd8b511a";
+      url = "https://pypi.python.org/packages/65/1e/adf6e000ea5dc909aa420352d6ba37f16434c8a3c2fa030445411a1ed545/python-editor-1.0.3.tar.gz";
+      md5 = "0aca5f2ef176ce68e98a5b7e31372835";
     };
     meta = {
       license = [ pkgs.lib.licenses.asl20 { fullName = "Apache"; } ];

rhodecode/public/js/rhodecode/i18n/ja.js

@@ -8,42 +8,42 @@ var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
     'Add another comment': '別のコメントを追加',
     'Close': 'Close',
-    'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
+    'Comment text will be set automatically based on currently selected status ({0}) ...': '選択したステータス ({0}) を元にコメントが自動的に設定されます...',
     'Delete this comment?': 'Delete this comment?',
     'Follow': 'フォロー',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
     'Loading ...': '読み込み中...',
-    'Loading failed': 'Loading failed',
-    'Loading more results...': 'Loading more results...',
-    'No bookmarks available yet.': 'No bookmarks available yet.',
-    'No branches available yet.': 'No branches available yet.',
-    'No gists available yet.': 'No gists available yet.',
+    'Loading failed': '読み込み失敗',
+    'Loading more results...': '結果を読み込み中...',
+    'No bookmarks available yet.': 'まだブックマークがありません。',
+    'No branches available yet.': 'まだブランチがありません。',
+    'No gists available yet.': 'まだ Gist がありません。',
     'No matches found': '一致するものが見つかりません',
     'No matching files': 'マッチするファイルはありません',
-    'No pull requests available yet.': 'No pull requests available yet.',
-    'No repositories available yet.': 'No repositories available yet.',
-    'No repository groups available yet.': 'No repository groups available yet.',
-    'No results': 'No results',
-    'No tags available yet.': 'No tags available yet.',
-    'No user groups available yet.': 'No user groups available yet.',
-    'No users available yet.': 'No users available yet.',
-    'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
+    'No pull requests available yet.': 'まだプルリクエストがありません。',
+    'No repositories available yet.': 'まだリポジトリがありません。',
+    'No repository groups available yet.': 'まだリポジトリグループがありません。',
+    'No results': '結果がありません',
+    'No tags available yet.': 'まだタグがありません。',
+    'No user groups available yet.': 'まだユーザーグループがありません。',
+    'No users available yet.': 'まだユーザーがいません。',
+    'One result is available, press enter to select it.': '1 件の結果があります。 Enter で選択できます。',
     'Open new pull request': '新しいプルリクエストを作成',
-    'Open new pull request for selected commit': 'Open new pull request for selected commit',
-    'Please delete {0} character': 'Please delete {0} character',
-    'Please delete {0} characters': 'Please delete {0} characters',
-    'Please enter {0} or more character': 'Please enter {0} or more character',
-    'Please enter {0} or more characters': 'Please enter {0} or more characters',
-    'Searching...': 'Searching...',
+    'Open new pull request for selected commit': '選択したコミットから新しいプルリクエストを作成',
+    'Please delete {0} character': '{0} 文字削除してください',
+    'Please delete {0} characters': '{0} 文字削除してください',
+    'Please enter {0} or more character': '{0} 文字以上入力してください',
+    'Please enter {0} or more characters': '{0} 文字以上入力してください',
+    'Searching...': '検索中...',
     'Selection link': 'セレクション・リンク',
     'Send': '送信',
-    'Set status to Approved': 'Set status to Approved',
-    'Set status to Rejected': 'Set status to Rejected',
+    'Set status to Approved': 'ステータスを承認にする',
+    'Set status to Rejected': 'ステータスを拒否にする',
     'Show more': 'もっと表示',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
     'Start following this repository': 'このリポジトリのフォローする',
-    'Status Review': 'Status Review',
+    'Status Review': 'ステータスレビュー',
     'Stop following this repository': 'このリポジトリのフォローをやめる',
     'Submitting...': '送信中...',
     'Switch to chat': 'Switch to chat',
@@ -51,34 +51,34 @@ var _TM = {
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Unfollow': 'アンフォロー',
     'Updating...': 'Updating...',
-    'You can only select {0} item': 'You can only select {0} item',
-    'You can only select {0} items': 'You can only select {0} items',
+    'You can only select {0} item': '{0} 件のみ選択できます',
+    'You can only select {0} items': '{0} 件のみ選択できます',
     'added manually by "{0}"': 'added manually by "{0}"',
     'disabled': '無効',
     'enabled': '有効',
-    'file': 'file',
+    'file': 'ファイル',
     'files': 'ファイル',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     'just now': 'たったいま',
     'specify commit': 'specify commit',
-    'truncated result': 'truncated result',
-    'truncated results': 'truncated results',
+    'truncated result': '省略された結果',
+    'truncated results': '省略された結果',
     '{0} active out of {1} users': '{0} active out of {1} users',
-    '{0} ago': '{0} ago',
+    '{0} ago': '{0} 前',
     '{0} and {1}': '{0} and {1}',
     '{0} and {1} ago': '{0} and {1} ago',
-    '{0} day': '{0} day',
+    '{0} day': '{0} 日',
     '{0} days': '{0} days',
-    '{0} hour': '{0} hour',
+    '{0} hour': '{0} 時間',
     '{0} hours': '{0} hours',
-    '{0} min': '{0} min',
-    '{0} month': '{0} month',
+    '{0} min': '{0} 分',
+    '{0} month': '{0} ヶ月',
     '{0} months': '{0} months',
-    '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
-    '{0} sec': '{0} sec',
-    '{0} year': '{0} year',
+    '{0} results are available, use up and down arrow keys to navigate.': '{0} 件の結果があります。矢印キーの上下で選択できます。',
+    '{0} sec': '{0} 秒',
+    '{0} year': '{0} 年',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
 };