diff options
Diffstat (limited to 'rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po')
| -rw-r--r-- | rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po | 399 |
1 files changed, 222 insertions, 177 deletions
diff --git a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po index 5f29145b..4864c19f 100644 --- a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode 1.2.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-12-03 03:21+0100\n" +"POT-Creation-Date: 2012-12-14 04:02+0100\n" "PO-Revision-Date: 2012-10-27 15:06+0900\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: ja <LL@li.org>\n" @@ -26,33 +26,33 @@ msgstr "" msgid "All Branches" msgstr "すべてのブランチ" -#: rhodecode/controllers/changeset.py:84 +#: rhodecode/controllers/changeset.py:83 msgid "show white space" msgstr "空白を表示" -#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98 +#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 msgid "ignore white space" msgstr "空白を無視" -#: rhodecode/controllers/changeset.py:164 +#: rhodecode/controllers/changeset.py:163 #, python-format msgid "%s line context" msgstr "" -#: rhodecode/controllers/changeset.py:315 -#: rhodecode/controllers/pullrequests.py:411 +#: rhodecode/controllers/changeset.py:314 +#: rhodecode/controllers/pullrequests.py:417 #, fuzzy, python-format msgid "Status change -> %s" msgstr "" -#: rhodecode/controllers/changeset.py:346 +#: rhodecode/controllers/changeset.py:345 msgid "" "Changing status on a changeset associated witha closed pull request is " "not allowed" msgstr "" #: rhodecode/controllers/compare.py:75 -#: rhodecode/controllers/pullrequests.py:117 +#: rhodecode/controllers/pullrequests.py:121 #: rhodecode/controllers/shortlog.py:100 msgid "There are no changesets yet" msgstr "まだ変更がありません" @@ -94,8 +94,8 @@ msgid "%s %s feed" msgstr "%s %s フィード" #: rhodecode/controllers/feed.py:86 -#: rhodecode/templates/changeset/changeset.html:126 -#: rhodecode/templates/changeset/changeset.html:138 +#: rhodecode/templates/changeset/changeset.html:137 +#: rhodecode/templates/changeset/changeset.html:149 #: rhodecode/templates/compare/compare_diff.html:62 #: rhodecode/templates/compare/compare_diff.html:73 #: rhodecode/templates/pullrequests/pullrequest_show.html:94 @@ -175,17 +175,18 @@ msgstr "未知のアーカイブ種別です" msgid "Changesets" msgstr "チェンジセット" -#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:76 +#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:74 #: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550 msgid "Branches" msgstr "ブランチ" -#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:80 +#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:78 #: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561 msgid "Tags" msgstr "タグ" -#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:92 +#: rhodecode/controllers/forks.py:74 rhodecode/controllers/settings.py:80 +#: rhodecode/controllers/admin/repos.py:92 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -195,7 +196,7 @@ msgstr "" "%s " "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。" -#: rhodecode/controllers/forks.py:134 rhodecode/controllers/settings.py:73 +#: rhodecode/controllers/forks.py:134 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -215,12 +216,13 @@ msgstr "リポジトリ %s を %s としてフォーク" msgid "An error occurred during repository forking %s" msgstr "リポジトリ %s のフォーク中にエラーが発生しました" -#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 +#: rhodecode/controllers/journal.py:218 rhodecode/controllers/journal.py:261 msgid "public journal" msgstr "公開ジャーナル" -#: rhodecode/controllers/journal.py:210 rhodecode/controllers/journal.py:247 +#: rhodecode/controllers/journal.py:222 rhodecode/controllers/journal.py:265 #: rhodecode/templates/base/base.html:232 +#: rhodecode/templates/journal/journal.html:12 msgid "journal" msgstr "ジャーナル" @@ -238,30 +240,34 @@ msgid "" "email" msgstr "パスワードをリセットしました。新しいパスワードをあなたのメールアドレスに送りました" -#: rhodecode/controllers/pullrequests.py:78 rhodecode/model/scm.py:556 +#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:556 msgid "Bookmarks" msgstr "ブックマーク" -#: rhodecode/controllers/pullrequests.py:186 +#: rhodecode/controllers/pullrequests.py:190 msgid "Pull request requires a title with min. 3 chars" msgstr "プルリクエストには3文字以上のタイトルが必要です" -#: rhodecode/controllers/pullrequests.py:188 +#: rhodecode/controllers/pullrequests.py:192 msgid "error during creation of pull request" msgstr "プルリクエストの作成中にエラーが発生しました" -#: rhodecode/controllers/pullrequests.py:220 +#: rhodecode/controllers/pullrequests.py:224 msgid "Successfully opened new pull request" msgstr "新しいプルリクエストを作成しました" -#: rhodecode/controllers/pullrequests.py:223 +#: rhodecode/controllers/pullrequests.py:227 msgid "Error occurred during sending pull request" msgstr "プルリクエストの作成中にエラーが発生しました" -#: rhodecode/controllers/pullrequests.py:256 +#: rhodecode/controllers/pullrequests.py:260 msgid "Successfully deleted pull request" msgstr "プルリクエストを削除しました" +#: rhodecode/controllers/pullrequests.py:452 +msgid "Closing pull request on other statuses than rejected or approved forbidden" +msgstr "" + #: rhodecode/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "無効な検索クエリーです。\\\"で囲んで下さい" @@ -274,20 +280,20 @@ msgstr "検索するためのインデックスがありません。whooshでイ msgid "An error occurred during this search operation" msgstr "検索を実行する際にエラーがおきました" -#: rhodecode/controllers/settings.py:108 -#: rhodecode/controllers/admin/repos.py:268 +#: rhodecode/controllers/settings.py:124 +#: rhodecode/controllers/admin/repos.py:277 #, python-format msgid "Repository %s updated successfully" msgstr "リポジトリ %s の更新に成功しました" -#: rhodecode/controllers/settings.py:126 -#: rhodecode/controllers/admin/repos.py:286 +#: rhodecode/controllers/settings.py:142 +#: rhodecode/controllers/admin/repos.py:295 #, python-format msgid "error occurred during update of repository %s" msgstr "リポジトリ %s の更新中にエラーが発生しました" -#: rhodecode/controllers/settings.py:144 -#: rhodecode/controllers/admin/repos.py:304 +#: rhodecode/controllers/settings.py:160 +#: rhodecode/controllers/admin/repos.py:313 #, python-format msgid "" "%s repository is not mapped to db perhaps it was moved or renamed from " @@ -297,36 +303,36 @@ msgstr "" "%s " "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。" -#: rhodecode/controllers/settings.py:156 -#: rhodecode/controllers/admin/repos.py:316 +#: rhodecode/controllers/settings.py:172 +#: rhodecode/controllers/admin/repos.py:325 #, python-format msgid "deleted repository %s" msgstr "リポジトリ %s を削除しました" -#: rhodecode/controllers/settings.py:160 -#: rhodecode/controllers/admin/repos.py:326 -#: rhodecode/controllers/admin/repos.py:332 +#: rhodecode/controllers/settings.py:176 +#: rhodecode/controllers/admin/repos.py:335 +#: rhodecode/controllers/admin/repos.py:341 #, python-format msgid "An error occurred during deletion of %s" msgstr "リポジトリ %s の削除中にエラーが発生しました" -#: rhodecode/controllers/settings.py:179 +#: rhodecode/controllers/settings.py:195 #, fuzzy msgid "unlocked" msgstr "変更可能にする" -#: rhodecode/controllers/settings.py:182 +#: rhodecode/controllers/settings.py:198 #, fuzzy msgid "locked" msgstr "変更可能にする" -#: rhodecode/controllers/settings.py:184 +#: rhodecode/controllers/settings.py:200 #, fuzzy, python-format msgid "Repository has been %s" msgstr "" -#: rhodecode/controllers/settings.py:188 -#: rhodecode/controllers/admin/repos.py:424 +#: rhodecode/controllers/settings.py:204 +#: rhodecode/controllers/admin/repos.py:433 msgid "An error occurred during unlocking" msgstr "アンロック時にエラーが発生しました" @@ -477,76 +483,76 @@ msgstr "デフォルトの権限を更新しました" msgid "error occurred during update of permissions" msgstr "権限の更新中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:125 +#: rhodecode/controllers/admin/repos.py:126 msgid "--REMOVE FORK--" msgstr "--フォーク元を削除--" -#: rhodecode/controllers/admin/repos.py:194 +#: rhodecode/controllers/admin/repos.py:195 #, python-format msgid "created repository %s from %s" msgstr "リポジトリ %s を %s から作成" -#: rhodecode/controllers/admin/repos.py:198 +#: rhodecode/controllers/admin/repos.py:199 #, python-format msgid "created repository %s" msgstr "リポジトリ %s を作成しました" -#: rhodecode/controllers/admin/repos.py:229 +#: rhodecode/controllers/admin/repos.py:230 #, python-format msgid "error occurred during creation of repository %s" msgstr "リポジトリ %s を作成中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:321 +#: rhodecode/controllers/admin/repos.py:330 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:350 +#: rhodecode/controllers/admin/repos.py:359 msgid "An error occurred during deletion of repository user" msgstr "リポジトリユーザーの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:369 +#: rhodecode/controllers/admin/repos.py:378 msgid "An error occurred during deletion of repository users groups" msgstr "リポジトリユーザーグループの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:387 +#: rhodecode/controllers/admin/repos.py:396 msgid "An error occurred during deletion of repository stats" msgstr "リポジトリステートの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:404 +#: rhodecode/controllers/admin/repos.py:413 msgid "An error occurred during cache invalidation" msgstr "キャッシュの無効化時にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:444 +#: rhodecode/controllers/admin/repos.py:453 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:448 +#: rhodecode/controllers/admin/repos.py:457 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:453 rhodecode/model/validators.py:300 +#: rhodecode/controllers/admin/repos.py:462 rhodecode/model/validators.py:300 msgid "Token mismatch" msgstr "トークンが合いません" -#: rhodecode/controllers/admin/repos.py:466 +#: rhodecode/controllers/admin/repos.py:475 msgid "Pulled from remote location" msgstr "リモートから取得" -#: rhodecode/controllers/admin/repos.py:468 +#: rhodecode/controllers/admin/repos.py:477 msgid "An error occurred during pull from remote location" msgstr "リモートから取得中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:484 +#: rhodecode/controllers/admin/repos.py:493 msgid "Nothing" msgstr "ありません" -#: rhodecode/controllers/admin/repos.py:486 +#: rhodecode/controllers/admin/repos.py:495 #, python-format msgid "Marked repo %s as fork of %s" msgstr "%s リポジトリを %s のフォークとして印をつける" -#: rhodecode/controllers/admin/repos.py:490 +#: rhodecode/controllers/admin/repos.py:499 msgid "An error occurred during this operation" msgstr "操作中にエラーが発生しました" @@ -782,149 +788,149 @@ msgstr "" msgid "No changes detected" msgstr "検出された変更はありません" -#: rhodecode/lib/helpers.py:373 +#: rhodecode/lib/helpers.py:374 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "%a, %d %b %Y %H:%M:%S" -#: rhodecode/lib/helpers.py:485 +#: rhodecode/lib/helpers.py:486 msgid "True" msgstr "True" -#: rhodecode/lib/helpers.py:489 +#: rhodecode/lib/helpers.py:490 msgid "False" msgstr "False" -#: rhodecode/lib/helpers.py:529 +#: rhodecode/lib/helpers.py:530 #, fuzzy, python-format msgid "Deleted branch: %s" msgstr "リポジトリ %s を削除しました" -#: rhodecode/lib/helpers.py:532 +#: rhodecode/lib/helpers.py:533 #, fuzzy, python-format msgid "Created tag: %s" msgstr "ユーザー %s を作成しました" -#: rhodecode/lib/helpers.py:545 +#: rhodecode/lib/helpers.py:546 msgid "Changeset not found" msgstr "リビジョンが見つかりません" -#: rhodecode/lib/helpers.py:588 +#: rhodecode/lib/helpers.py:589 #, python-format msgid "Show all combined changesets %s->%s" msgstr "%s から %s までのすべてのチェンジセットを表示" -#: rhodecode/lib/helpers.py:594 +#: rhodecode/lib/helpers.py:595 msgid "compare view" msgstr "比較の表示" -#: rhodecode/lib/helpers.py:614 +#: rhodecode/lib/helpers.py:615 msgid "and" msgstr "" -#: rhodecode/lib/helpers.py:615 +#: rhodecode/lib/helpers.py:616 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:616 rhodecode/templates/changelog/changelog.html:51 +#: rhodecode/lib/helpers.py:617 rhodecode/templates/changelog/changelog.html:51 msgid "revisions" msgstr "リビジョン" -#: rhodecode/lib/helpers.py:640 +#: rhodecode/lib/helpers.py:641 #, fuzzy, python-format msgid "fork name %s" msgstr "" -#: rhodecode/lib/helpers.py:653 +#: rhodecode/lib/helpers.py:658 #: rhodecode/templates/pullrequests/pullrequest_show.html:4 #: rhodecode/templates/pullrequests/pullrequest_show.html:12 #, python-format msgid "Pull request #%s" msgstr "プルリクエスト #%s" -#: rhodecode/lib/helpers.py:659 +#: rhodecode/lib/helpers.py:664 msgid "[deleted] repository" msgstr "リポジトリを[削除]" -#: rhodecode/lib/helpers.py:661 rhodecode/lib/helpers.py:671 +#: rhodecode/lib/helpers.py:666 rhodecode/lib/helpers.py:676 msgid "[created] repository" msgstr "リポジトリを[作成]" -#: rhodecode/lib/helpers.py:663 +#: rhodecode/lib/helpers.py:668 msgid "[created] repository as fork" msgstr "フォークしてリポジトリを[作成]" -#: rhodecode/lib/helpers.py:665 rhodecode/lib/helpers.py:673 +#: rhodecode/lib/helpers.py:670 rhodecode/lib/helpers.py:678 msgid "[forked] repository" msgstr "リポジトリを[フォーク]" -#: rhodecode/lib/helpers.py:667 rhodecode/lib/helpers.py:675 +#: rhodecode/lib/helpers.py:672 rhodecode/lib/helpers.py:680 msgid "[updated] repository" msgstr "リポジトリを[更新]" -#: rhodecode/lib/helpers.py:669 +#: rhodecode/lib/helpers.py:674 msgid "[delete] repository" msgstr "リポジトリを[削除]" -#: rhodecode/lib/helpers.py:677 +#: rhodecode/lib/helpers.py:682 msgid "[created] user" msgstr "ユーザーを[作成]" -#: rhodecode/lib/helpers.py:679 +#: rhodecode/lib/helpers.py:684 msgid "[updated] user" msgstr "ユーザーを[更新]" -#: rhodecode/lib/helpers.py:681 +#: rhodecode/lib/helpers.py:686 msgid "[created] users group" msgstr "ユーザーグループを[作成]" -#: rhodecode/lib/helpers.py:683 +#: rhodecode/lib/helpers.py:688 msgid "[updated] users group" msgstr "ユーザーグループを[更新]" -#: rhodecode/lib/helpers.py:685 +#: rhodecode/lib/helpers.py:690 msgid "[commented] on revision in repository" msgstr "リポジトリのリビジョンに[コメント]" -#: rhodecode/lib/helpers.py:687 +#: rhodecode/lib/helpers.py:692 msgid "[commented] on pull request for" msgstr "プルリクエストに[コメント]" -#: rhodecode/lib/helpers.py:689 +#: rhodecode/lib/helpers.py:694 msgid "[closed] pull request for" msgstr "プルリクエストを[クローズ]" -#: rhodecode/lib/helpers.py:691 +#: rhodecode/lib/helpers.py:696 msgid "[pushed] into" msgstr "[プッシュ]" -#: rhodecode/lib/helpers.py:693 +#: rhodecode/lib/helpers.py:698 msgid "[committed via RhodeCode] into repository" msgstr "リポジトリに[RhodeCode経由でコミット]" -#: rhodecode/lib/helpers.py:695 +#: rhodecode/lib/helpers.py:700 msgid "[pulled from remote] into repository" msgstr "リポジトリに[リモートからプル]" -#: rhodecode/lib/helpers.py:697 +#: rhodecode/lib/helpers.py:702 msgid "[pulled] from" msgstr "[プル]" -#: rhodecode/lib/helpers.py:699 +#: rhodecode/lib/helpers.py:704 msgid "[started following] repository" msgstr "リポジトリの[フォローを開始]" -#: rhodecode/lib/helpers.py:701 +#: rhodecode/lib/helpers.py:706 msgid "[stopped following] repository" msgstr "リポジトリの[フォローを停止]" -#: rhodecode/lib/helpers.py:877 +#: rhodecode/lib/helpers.py:883 #, python-format msgid " and %s more" msgstr " と %s 以上" -#: rhodecode/lib/helpers.py:881 +#: rhodecode/lib/helpers.py:887 msgid "No Files" msgstr "ファイルなし" @@ -992,83 +998,83 @@ msgstr "ちょうどいま" msgid "password reset link" msgstr "パスワードリセットのリンク" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1180 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1183 msgid "Repository no access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1181 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1184 msgid "Repository read access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1182 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1185 msgid "Repository write access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1183 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1186 msgid "Repository admin access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1188 msgid "Repositories Group no access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1189 msgid "Repositories Group read access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1190 msgid "Repositories Group write access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1191 msgid "Repositories Group admin access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1190 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1193 msgid "RhodeCode Administrator" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1191 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1194 msgid "Repository creation disabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1192 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1195 msgid "Repository creation enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1193 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1196 msgid "Repository forking disabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1194 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1197 msgid "Repository forking enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1198 msgid "Register disabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1199 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1199 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1202 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1640 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1643 msgid "Not Reviewed" msgstr "未レビュー" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1641 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1644 msgid "Approved" msgstr "承認" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1642 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1645 msgid "Rejected" msgstr "却下" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1643 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1646 msgid "Under Review" msgstr "レビュー中" @@ -1138,20 +1144,20 @@ msgstr "" msgid "latest tip" msgstr "最新のtip" -#: rhodecode/model/user.py:230 +#: rhodecode/model/user.py:232 msgid "new user registration" msgstr "新規ユーザー登録" -#: rhodecode/model/user.py:255 rhodecode/model/user.py:279 -#: rhodecode/model/user.py:301 +#: rhodecode/model/user.py:257 rhodecode/model/user.py:281 +#: rhodecode/model/user.py:303 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:325 +#: rhodecode/model/user.py:327 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:331 +#: rhodecode/model/user.py:333 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1275,26 +1281,26 @@ msgstr "このページを見る権限がありません" msgid "This username or users group name is not valid" msgstr "ユーザー名かユーザーグループが不正です" -#: rhodecode/model/validators.py:582 +#: rhodecode/model/validators.py:591 msgid "This is not a valid path" msgstr "不正なパスです" -#: rhodecode/model/validators.py:597 +#: rhodecode/model/validators.py:606 msgid "This e-mail address is already taken" msgstr "このメールアドレスはすでに取得されています" -#: rhodecode/model/validators.py:617 +#: rhodecode/model/validators.py:626 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "メールアドレス \"%(email)s\" は存在しません" -#: rhodecode/model/validators.py:654 +#: rhodecode/model/validators.py:663 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "LDAPのこのCNに対するログイン属性は必須です。 - これは \"ユーザー名\" と同じです" -#: rhodecode/model/validators.py:673 +#: rhodecode/model/validators.py:682 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" @@ -1310,7 +1316,8 @@ msgstr "ダッシュボード" #: rhodecode/templates/admin/users/users.html:9 #: rhodecode/templates/bookmarks/bookmarks.html:10 #: rhodecode/templates/branches/branches.html:9 -#: rhodecode/templates/journal/journal.html:40 +#: rhodecode/templates/journal/journal.html:9 +#: rhodecode/templates/journal/journal.html:48 #: rhodecode/templates/tags/tags.html:10 msgid "quick filter..." msgstr "クイックフィルタ..." @@ -1376,8 +1383,8 @@ msgstr "リポジトリグループ" #: rhodecode/templates/branches/branches.html:50 #: rhodecode/templates/branches/branches_data.html:6 #: rhodecode/templates/files/files_browser.html:47 -#: rhodecode/templates/journal/journal.html:62 -#: rhodecode/templates/journal/journal.html:168 +#: rhodecode/templates/journal/journal.html:70 +#: rhodecode/templates/journal/journal.html:196 #: rhodecode/templates/journal/journal_page_repos.html:7 #: rhodecode/templates/settings/repo_settings.html:31 #: rhodecode/templates/summary/summary.html:43 @@ -1394,7 +1401,7 @@ msgstr "最後の変更時刻" #: rhodecode/templates/index_base.html:74 #: rhodecode/templates/index_base.html:179 #: rhodecode/templates/admin/users/user_edit_my_account.html:182 -#: rhodecode/templates/journal/journal.html:170 +#: rhodecode/templates/journal/journal.html:198 msgid "Tip" msgstr "Tip" @@ -1424,7 +1431,7 @@ msgstr "Atom" #: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:60 #: rhodecode/templates/branches/branches.html:76 -#: rhodecode/templates/journal/journal.html:193 +#: rhodecode/templates/journal/journal.html:221 #: rhodecode/templates/tags/tags.html:77 msgid "Click to sort ascending" msgstr "昇順で並び換え" @@ -1437,7 +1444,7 @@ msgstr "昇順で並び換え" #: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:61 #: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:194 +#: rhodecode/templates/journal/journal.html:222 #: rhodecode/templates/tags/tags.html:78 msgid "Click to sort descending" msgstr "降順で並び替え" @@ -1454,7 +1461,7 @@ msgstr "最後の変更点" #: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:62 #: rhodecode/templates/branches/branches.html:78 -#: rhodecode/templates/journal/journal.html:195 +#: rhodecode/templates/journal/journal.html:223 #: rhodecode/templates/tags/tags.html:79 msgid "No records found." msgstr "レコードが見つかりません" @@ -1466,7 +1473,7 @@ msgstr "レコードが見つかりません" #: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:79 -#: rhodecode/templates/journal/journal.html:196 +#: rhodecode/templates/journal/journal.html:224 #: rhodecode/templates/tags/tags.html:80 msgid "Data error." msgstr "データエラー" @@ -1478,8 +1485,8 @@ msgstr "データエラー" #: rhodecode/templates/admin/users/users.html:111 #: rhodecode/templates/bookmarks/bookmarks.html:64 #: rhodecode/templates/branches/branches.html:80 -#: rhodecode/templates/journal/journal.html:54 -#: rhodecode/templates/journal/journal.html:197 +#: rhodecode/templates/journal/journal.html:62 +#: rhodecode/templates/journal/journal.html:225 #: rhodecode/templates/tags/tags.html:81 msgid "Loading..." msgstr "読み込み中..." @@ -1627,10 +1634,28 @@ msgid "There are no bookmarks yet" msgstr "まだブックマークがありません" #: rhodecode/templates/admin/admin.html:5 -#: rhodecode/templates/admin/admin.html:9 +#: rhodecode/templates/admin/admin.html:13 msgid "Admin journal" msgstr "管理者ジャーナル" +#: rhodecode/templates/admin/admin.html:10 +#, fuzzy +msgid "journal filter..." +msgstr "クイックフィルタ..." + +#: rhodecode/templates/admin/admin.html:12 +#: rhodecode/templates/journal/journal.html:11 +#, fuzzy +msgid "filter" +msgstr "ファイル" + +#: rhodecode/templates/admin/admin.html:13 +#: rhodecode/templates/journal/journal.html:12 +#, python-format +msgid "%s entry" +msgid_plural "%s entries" +msgstr[0] "" + #: rhodecode/templates/admin/admin_log.html:6 #: rhodecode/templates/admin/repos/repos.html:74 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8 @@ -1659,7 +1684,7 @@ msgstr "日時" msgid "From IP" msgstr "アクセス元IPアドレス" -#: rhodecode/templates/admin/admin_log.html:57 +#: rhodecode/templates/admin/admin_log.html:63 msgid "No actions yet" msgstr "まだアクションがありません" @@ -1730,7 +1755,7 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit.html:178 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135 -#: rhodecode/templates/settings/repo_settings.html:93 +#: rhodecode/templates/settings/repo_settings.html:94 msgid "Save" msgstr "保存" @@ -2017,7 +2042,7 @@ msgstr "リポジトリの所有者を変更" #: rhodecode/templates/files/files_add.html:82 #: rhodecode/templates/files/files_edit.html:68 #: rhodecode/templates/pullrequests/pullrequest.html:124 -#: rhodecode/templates/settings/repo_settings.html:94 +#: rhodecode/templates/settings/repo_settings.html:95 msgid "Reset" msgstr "リセット" @@ -2159,19 +2184,22 @@ msgid "Delete" msgstr "削除" #: rhodecode/templates/admin/repos/repo_edit.html:278 +#: rhodecode/templates/settings/repo_settings.html:115 msgid "Remove this repository" msgstr "このリポジトリを削除" #: rhodecode/templates/admin/repos/repo_edit.html:278 +#: rhodecode/templates/settings/repo_settings.html:115 msgid "Confirm to delete this repository" msgstr "このリポジトリを削除しますか？" #: rhodecode/templates/admin/repos/repo_edit.html:282 +#: rhodecode/templates/settings/repo_settings.html:119 +#, fuzzy msgid "" "This repository will be renamed in a special way in order to be " -"unaccesible for RhodeCode and VCS systems.\n" -" If you need fully delete it from filesystem " -"please do it manually" +"unaccesible for RhodeCode and VCS systems. If you need fully delete it " +"from file system please do it manually" msgstr "" "このリポジトリはRhodeCodeとVCSシステムからアクセスされないような名前に、特別な方法で変更されます。\n" "もし、ファイルシステムから完全に削除したい場合、手動で行ってください" @@ -2205,7 +2233,7 @@ msgstr "メンバー" #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 #: rhodecode/templates/data_table/_dt_elements.html:67 -#: rhodecode/templates/journal/journal.html:87 +#: rhodecode/templates/journal/journal.html:95 #: rhodecode/templates/summary/summary.html:85 msgid "private repository" msgstr "非公開リポジトリ" @@ -2710,7 +2738,7 @@ msgid "My permissions" msgstr "権限" #: rhodecode/templates/admin/users/user_edit_my_account.html:38 -#: rhodecode/templates/journal/journal.html:41 +#: rhodecode/templates/journal/journal.html:49 msgid "My repos" msgstr "リポジトリ" @@ -2924,7 +2952,6 @@ msgstr "受信箱" #: rhodecode/templates/base/base.html:324 #: rhodecode/templates/base/base.html:326 #: rhodecode/templates/journal/journal.html:4 -#: rhodecode/templates/journal/journal.html:21 #: rhodecode/templates/journal/public_journal.html:4 msgid "Journal" msgstr "ジャーナル" @@ -3059,7 +3086,7 @@ msgid "add another comment" msgstr "別のコメントを追加" #: rhodecode/templates/base/root.html:43 -#: rhodecode/templates/journal/journal.html:75 +#: rhodecode/templates/journal/journal.html:83 #: rhodecode/templates/summary/summary.html:57 msgid "Stop following this repository" msgstr "このリポジトリのフォローをやめる" @@ -3167,7 +3194,7 @@ msgid "Affected number of files, click to show more details" msgstr "" #: rhodecode/templates/changelog/changelog.html:91 -#: rhodecode/templates/changeset/changeset.html:44 +#: rhodecode/templates/changeset/changeset.html:65 #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:46 msgid "Changeset status" @@ -3179,23 +3206,22 @@ msgid "Click to open associated pull request" msgstr "関連するプルリクエストを開く" #: rhodecode/templates/changelog/changelog.html:104 -#: rhodecode/templates/changeset/changeset.html:85 msgid "Parent" msgstr "親リビジョン" #: rhodecode/templates/changelog/changelog.html:110 -#: rhodecode/templates/changeset/changeset.html:91 +#: rhodecode/templates/changeset/changeset.html:42 msgid "No parents" msgstr "親リビジョンはありません" #: rhodecode/templates/changelog/changelog.html:115 -#: rhodecode/templates/changeset/changeset.html:95 +#: rhodecode/templates/changeset/changeset.html:106 #: rhodecode/templates/changeset/changeset_range.html:79 msgid "merge" msgstr "マージ" #: rhodecode/templates/changelog/changelog.html:118 -#: rhodecode/templates/changeset/changeset.html:98 +#: rhodecode/templates/changeset/changeset.html:109 #: rhodecode/templates/changeset/changeset_range.html:82 #: rhodecode/templates/files/files.html:29 #: rhodecode/templates/files/files_add.html:33 @@ -3210,7 +3236,7 @@ msgid "bookmark" msgstr "ブックマーク" #: rhodecode/templates/changelog/changelog.html:130 -#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset.html:114 #: rhodecode/templates/changeset/changeset_range.html:94 msgid "tag" msgstr "タグ" @@ -3220,26 +3246,26 @@ msgid "There are no changes yet" msgstr "まだ変更がありません" #: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:73 +#: rhodecode/templates/changeset/changeset.html:94 msgid "removed" msgstr "削除" #: rhodecode/templates/changelog/changelog_details.html:5 -#: rhodecode/templates/changeset/changeset.html:74 +#: rhodecode/templates/changeset/changeset.html:95 msgid "changed" msgstr "変更" #: rhodecode/templates/changelog/changelog_details.html:6 -#: rhodecode/templates/changeset/changeset.html:75 +#: rhodecode/templates/changeset/changeset.html:96 msgid "added" msgstr "追加" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 #: rhodecode/templates/changelog/changelog_details.html:10 -#: rhodecode/templates/changeset/changeset.html:77 -#: rhodecode/templates/changeset/changeset.html:78 -#: rhodecode/templates/changeset/changeset.html:79 +#: rhodecode/templates/changeset/changeset.html:98 +#: rhodecode/templates/changeset/changeset.html:99 +#: rhodecode/templates/changeset/changeset.html:100 #, python-format msgid "affected %s files" msgstr "%s ファイルに影響" @@ -3253,36 +3279,40 @@ msgstr "%s チェンジセット" msgid "Changeset" msgstr "チェンジセット" -#: rhodecode/templates/changeset/changeset.html:49 +#: rhodecode/templates/changeset/changeset.html:52 +msgid "No children" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:70 #: rhodecode/templates/changeset/diff_block.html:20 msgid "raw diff" msgstr "差分を表示" -#: rhodecode/templates/changeset/changeset.html:50 +#: rhodecode/templates/changeset/changeset.html:71 #, fuzzy msgid "patch diff" msgstr "差分を表示" -#: rhodecode/templates/changeset/changeset.html:51 +#: rhodecode/templates/changeset/changeset.html:72 #: rhodecode/templates/changeset/diff_block.html:21 msgid "download diff" msgstr "差分をダウンロード" -#: rhodecode/templates/changeset/changeset.html:55 +#: rhodecode/templates/changeset/changeset.html:76 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d コメント" -#: rhodecode/templates/changeset/changeset.html:55 +#: rhodecode/templates/changeset/changeset.html:76 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "(%d inline)" msgid_plural "(%d inline)" msgstr[0] "(%d インライン)" -#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/changeset/changeset.html:122 #: rhodecode/templates/compare/compare_diff.html:44 #: rhodecode/templates/pullrequests/pullrequest_show.html:76 #, fuzzy, python-format @@ -3290,7 +3320,7 @@ msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "" -#: rhodecode/templates/changeset/changeset.html:113 +#: rhodecode/templates/changeset/changeset.html:124 #: rhodecode/templates/compare/compare_diff.html:46 #: rhodecode/templates/pullrequests/pullrequest_show.html:78 #, fuzzy, python-format @@ -3318,7 +3348,7 @@ msgid "Use @username inside this text to send notification to this RhodeCode use msgstr "テキスト内で @username を使うと、この RhodeCode のユーザーに通知を送信します" #: rhodecode/templates/changeset/changeset_file_comment.html:59 -#: rhodecode/templates/changeset/changeset_file_comment.html:138 +#: rhodecode/templates/changeset/changeset_file_comment.html:143 msgid "Comment" msgstr "コメント" @@ -3339,15 +3369,15 @@ msgstr "今すぐログインする" msgid "Leave a comment" msgstr "コメントを残す" -#: rhodecode/templates/changeset/changeset_file_comment.html:124 +#: rhodecode/templates/changeset/changeset_file_comment.html:125 msgid "Check this to change current status of code-review for this changeset" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:124 +#: rhodecode/templates/changeset/changeset_file_comment.html:125 msgid "change status" msgstr "ステータスを変更する" -#: rhodecode/templates/changeset/changeset_file_comment.html:140 +#: rhodecode/templates/changeset/changeset_file_comment.html:145 msgid "Comment and close" msgstr "コメントしてクローズ" @@ -3402,19 +3432,19 @@ msgid "Fork" msgstr "フォーク" #: rhodecode/templates/data_table/_dt_elements.html:60 -#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/journal/journal.html:89 #: rhodecode/templates/summary/summary.html:77 msgid "Mercurial repository" msgstr "Mercurialリポジトリ" #: rhodecode/templates/data_table/_dt_elements.html:62 -#: rhodecode/templates/journal/journal.html:83 +#: rhodecode/templates/journal/journal.html:91 #: rhodecode/templates/summary/summary.html:80 msgid "Git repository" msgstr "Gitリポジトリ" #: rhodecode/templates/data_table/_dt_elements.html:69 -#: rhodecode/templates/journal/journal.html:89 +#: rhodecode/templates/journal/journal.html:97 #: rhodecode/templates/summary/summary.html:87 msgid "public repository" msgstr "公開リポジトリ" @@ -3792,50 +3822,50 @@ msgstr "フォークしました" msgid "There are no forks yet" msgstr "まだフォークがありません" -#: rhodecode/templates/journal/journal.html:13 +#: rhodecode/templates/journal/journal.html:21 msgid "ATOM journal feed" msgstr "ATOM ジャーナルフィード" -#: rhodecode/templates/journal/journal.html:14 +#: rhodecode/templates/journal/journal.html:22 msgid "RSS journal feed" msgstr "RSS ジャーナルフィード" -#: rhodecode/templates/journal/journal.html:24 +#: rhodecode/templates/journal/journal.html:32 #: rhodecode/templates/pullrequests/pullrequest.html:55 msgid "Refresh" msgstr "更新" -#: rhodecode/templates/journal/journal.html:27 +#: rhodecode/templates/journal/journal.html:35 #: rhodecode/templates/journal/public_journal.html:24 msgid "RSS feed" msgstr "RSSフィード" -#: rhodecode/templates/journal/journal.html:30 +#: rhodecode/templates/journal/journal.html:38 #: rhodecode/templates/journal/public_journal.html:27 msgid "ATOM feed" msgstr "ATOMフィード" -#: rhodecode/templates/journal/journal.html:41 +#: rhodecode/templates/journal/journal.html:49 msgid "Watched" msgstr "ウォッチ" -#: rhodecode/templates/journal/journal.html:46 +#: rhodecode/templates/journal/journal.html:54 msgid "ADD" msgstr "追加" -#: rhodecode/templates/journal/journal.html:69 +#: rhodecode/templates/journal/journal.html:77 msgid "following user" msgstr "フォローしているユーザー" -#: rhodecode/templates/journal/journal.html:69 +#: rhodecode/templates/journal/journal.html:77 msgid "user" msgstr "ユーザー" -#: rhodecode/templates/journal/journal.html:102 +#: rhodecode/templates/journal/journal.html:110 msgid "You are not following any users or repositories" msgstr "まだどのユーザーもリポジトリもフォローしていません" -#: rhodecode/templates/journal/journal_data.html:51 +#: rhodecode/templates/journal/journal_data.html:55 msgid "No entries yet" msgstr "まだエントリがありません" @@ -3934,6 +3964,11 @@ msgstr "作成日" msgid "Compare view" msgstr "比較ビュー" +#: rhodecode/templates/pullrequests/pullrequest_show.html:112 +#, fuzzy +msgid "reviewer" +msgstr "%d レビュアー" + #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 msgid "all pull requests" msgstr "すべてのプルリクエスト" @@ -3998,6 +4033,16 @@ msgstr "権限がありません" msgid "%s Settings" msgstr "%s 設定" +#: rhodecode/templates/settings/repo_settings.html:102 +#, fuzzy +msgid "Delete repository" +msgstr "リポジトリを[削除]" + +#: rhodecode/templates/settings/repo_settings.html:109 +#, fuzzy +msgid "Remove repo" +msgstr "削除" + #: rhodecode/templates/shortlog/shortlog.html:5 #, python-format msgid "%s Shortlog" |