diff --git a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po --- 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-09-02 20:30+0200\n" +"POT-Creation-Date: 2012-11-27 20:56+0100\n" "PO-Revision-Date: 2012-10-27 15:06+0900\n" "Last-Translator: FULL NAME \n" "Language-Team: ja \n" @@ -22,35 +22,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: rhodecode/controllers/changelog.py:94 +#: rhodecode/controllers/changelog.py:95 msgid "All Branches" msgstr "すべてのブランチ" -#: rhodecode/controllers/changeset.py:83 +#: rhodecode/controllers/changeset.py:84 msgid "show white space" msgstr "空白を表示" -#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 +#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98 msgid "ignore white space" msgstr "空白を無視" -#: rhodecode/controllers/changeset.py:157 +#: rhodecode/controllers/changeset.py:164 #, python-format msgid "%s line context" msgstr "" -#: rhodecode/controllers/changeset.py:333 -#: rhodecode/controllers/changeset.py:348 rhodecode/lib/diffs.py:70 -msgid "binary file" -msgstr "バイナリファイル" - -#: rhodecode/controllers/changeset.py:408 +#: rhodecode/controllers/changeset.py:315 +#: rhodecode/controllers/pullrequests.py:411 +#, fuzzy, python-format +msgid "Status change -> %s" +msgstr "最後の変更時刻" + +#: rhodecode/controllers/changeset.py:346 msgid "" "Changing status on a changeset associated witha closed pull request is " "not allowed" msgstr "" -#: rhodecode/controllers/compare.py:69 +#: rhodecode/controllers/compare.py:75 +#: rhodecode/controllers/pullrequests.py:117 msgid "There are no changesets yet" msgstr "まだ変更がありません" @@ -80,99 +82,109 @@ msgid "" "fulfilling the request." msgstr "" -#: rhodecode/controllers/feed.py:49 +#: rhodecode/controllers/feed.py:52 #, python-format msgid "Changes on %s repository" msgstr "%s リポジトリでの変更" -#: rhodecode/controllers/feed.py:50 +#: rhodecode/controllers/feed.py:53 #, python-format msgid "%s %s feed" msgstr "%s %s フィード" -#: rhodecode/controllers/feed.py:75 +#: rhodecode/controllers/feed.py:86 +#: rhodecode/templates/changeset/changeset.html:126 +#: rhodecode/templates/changeset/changeset.html:138 +#: rhodecode/templates/compare/compare_diff.html:62 +#: rhodecode/templates/compare/compare_diff.html:73 +#: rhodecode/templates/pullrequests/pullrequest_show.html:94 +#: rhodecode/templates/pullrequests/pullrequest_show.html:153 +msgid "Changeset was too big and was cut off..." +msgstr "チェンジセットが大きすぎるため、省略しました" + +#: rhodecode/controllers/feed.py:92 msgid "commited on" msgstr "コミット" -#: rhodecode/controllers/files.py:84 +#: rhodecode/controllers/files.py:86 msgid "click here to add new file" msgstr "新しいファイルを追加" -#: rhodecode/controllers/files.py:85 +#: rhodecode/controllers/files.py:87 #, python-format msgid "There are no files yet %s" msgstr "まだファイルがありません %s" -#: rhodecode/controllers/files.py:239 rhodecode/controllers/files.py:299 +#: rhodecode/controllers/files.py:265 rhodecode/controllers/files.py:325 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "このリポジトリは %s によって %s にロックされました" -#: rhodecode/controllers/files.py:266 +#: rhodecode/controllers/files.py:292 #, python-format msgid "Edited %s via RhodeCode" msgstr "RhodeCode経由で %s を変更" -#: rhodecode/controllers/files.py:271 +#: rhodecode/controllers/files.py:297 msgid "No changes" msgstr "変更点なし" -#: rhodecode/controllers/files.py:282 rhodecode/controllers/files.py:346 +#: rhodecode/controllers/files.py:308 rhodecode/controllers/files.py:372 #, python-format msgid "Successfully committed to %s" msgstr "%s へのコミットが成功しました" -#: rhodecode/controllers/files.py:287 rhodecode/controllers/files.py:352 +#: rhodecode/controllers/files.py:313 rhodecode/controllers/files.py:378 msgid "Error occurred during commit" msgstr "コミット中にエラーが発生しました" -#: rhodecode/controllers/files.py:318 +#: rhodecode/controllers/files.py:344 #, python-format msgid "Added %s via RhodeCode" msgstr "RhodeCode経由で %s を追加" -#: rhodecode/controllers/files.py:332 +#: rhodecode/controllers/files.py:358 msgid "No content" msgstr "内容がありません" -#: rhodecode/controllers/files.py:336 +#: rhodecode/controllers/files.py:362 msgid "No filename" msgstr "ファイル名がありません" -#: rhodecode/controllers/files.py:378 +#: rhodecode/controllers/files.py:404 msgid "downloads disabled" msgstr "ダウンロードは無効化されています" -#: rhodecode/controllers/files.py:389 +#: rhodecode/controllers/files.py:415 #, python-format msgid "Unknown revision %s" msgstr "%s は未知のリビジョンです" -#: rhodecode/controllers/files.py:391 +#: rhodecode/controllers/files.py:417 msgid "Empty repository" msgstr "空のリポジトリ" -#: rhodecode/controllers/files.py:393 +#: rhodecode/controllers/files.py:419 msgid "Unknown archive type" msgstr "未知のアーカイブ種別です" -#: rhodecode/controllers/files.py:494 +#: rhodecode/controllers/files.py:564 #: rhodecode/templates/changeset/changeset_range.html:13 #: rhodecode/templates/changeset/changeset_range.html:31 msgid "Changesets" msgstr "チェンジセット" -#: rhodecode/controllers/files.py:495 rhodecode/controllers/pullrequests.py:72 -#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:543 +#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:76 +#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550 msgid "Branches" msgstr "ブランチ" -#: rhodecode/controllers/files.py:496 rhodecode/controllers/pullrequests.py:76 -#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:554 +#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:80 +#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561 msgid "Tags" msgstr "タグ" -#: rhodecode/controllers/forks.py:73 rhodecode/controllers/admin/repos.py:90 +#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:91 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -182,7 +194,7 @@ msgstr "" "%s " "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。" -#: rhodecode/controllers/forks.py:133 rhodecode/controllers/settings.py:72 +#: rhodecode/controllers/forks.py:134 rhodecode/controllers/settings.py:73 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -192,22 +204,22 @@ msgstr "" "%s " "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。" -#: rhodecode/controllers/forks.py:167 +#: rhodecode/controllers/forks.py:168 #, python-format msgid "forked %s repository as %s" msgstr "リポジトリ %s を %s としてフォーク" -#: rhodecode/controllers/forks.py:181 +#: rhodecode/controllers/forks.py:182 #, python-format msgid "An error occurred during repository forking %s" msgstr "リポジトリ %s のフォーク中にエラーが発生しました" -#: rhodecode/controllers/journal.py:202 rhodecode/controllers/journal.py:239 +#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 msgid "public journal" msgstr "公開ジャーナル" -#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 -#: rhodecode/templates/base/base.html:220 +#: rhodecode/controllers/journal.py:210 rhodecode/controllers/journal.py:247 +#: rhodecode/templates/base/base.html:232 msgid "journal" msgstr "ジャーナル" @@ -225,56 +237,56 @@ msgid "" "email" msgstr "パスワードをリセットしました。新しいパスワードをあなたのメールアドレスに送りました" -#: rhodecode/controllers/pullrequests.py:74 rhodecode/model/scm.py:549 +#: rhodecode/controllers/pullrequests.py:78 rhodecode/model/scm.py:556 msgid "Bookmarks" msgstr "ブックマーク" -#: rhodecode/controllers/pullrequests.py:158 +#: rhodecode/controllers/pullrequests.py:186 msgid "Pull request requires a title with min. 3 chars" msgstr "プルリクエストには3文字以上のタイトルが必要です" -#: rhodecode/controllers/pullrequests.py:160 +#: rhodecode/controllers/pullrequests.py:188 msgid "error during creation of pull request" msgstr "プルリクエストの作成中にエラーが発生しました" -#: rhodecode/controllers/pullrequests.py:181 +#: rhodecode/controllers/pullrequests.py:220 msgid "Successfully opened new pull request" msgstr "新しいプルリクエストを作成しました" -#: rhodecode/controllers/pullrequests.py:184 +#: rhodecode/controllers/pullrequests.py:223 msgid "Error occurred during sending pull request" msgstr "プルリクエストの作成中にエラーが発生しました" -#: rhodecode/controllers/pullrequests.py:217 +#: rhodecode/controllers/pullrequests.py:256 msgid "Successfully deleted pull request" msgstr "プルリクエストを削除しました" -#: rhodecode/controllers/search.py:131 +#: rhodecode/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "無効な検索クエリーです。\\\"で囲んで下さい" -#: rhodecode/controllers/search.py:136 +#: rhodecode/controllers/search.py:139 msgid "There is no index to search in. Please run whoosh indexer" msgstr "検索するためのインデックスがありません。whooshでインデックスを作成して下さい" -#: rhodecode/controllers/search.py:140 +#: rhodecode/controllers/search.py:143 msgid "An error occurred during this search operation" msgstr "検索を実行する際にエラーがおきました" -#: rhodecode/controllers/settings.py:107 -#: rhodecode/controllers/admin/repos.py:266 +#: rhodecode/controllers/settings.py:108 +#: rhodecode/controllers/admin/repos.py:267 #, python-format msgid "Repository %s updated successfully" msgstr "リポジトリ %s の更新に成功しました" -#: rhodecode/controllers/settings.py:125 -#: rhodecode/controllers/admin/repos.py:284 +#: rhodecode/controllers/settings.py:126 +#: rhodecode/controllers/admin/repos.py:285 #, python-format msgid "error occurred during update of repository %s" msgstr "リポジトリ %s の更新中にエラーが発生しました" -#: rhodecode/controllers/settings.py:143 -#: rhodecode/controllers/admin/repos.py:302 +#: rhodecode/controllers/settings.py:144 +#: rhodecode/controllers/admin/repos.py:303 #, python-format msgid "" "%s repository is not mapped to db perhaps it was moved or renamed from " @@ -284,25 +296,45 @@ msgstr "" "%s " "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。" -#: rhodecode/controllers/settings.py:155 -#: rhodecode/controllers/admin/repos.py:314 +#: rhodecode/controllers/settings.py:156 +#: rhodecode/controllers/admin/repos.py:315 #, python-format msgid "deleted repository %s" msgstr "リポジトリ %s を削除しました" -#: rhodecode/controllers/settings.py:159 -#: rhodecode/controllers/admin/repos.py:324 -#: rhodecode/controllers/admin/repos.py:330 +#: rhodecode/controllers/settings.py:160 +#: rhodecode/controllers/admin/repos.py:325 +#: rhodecode/controllers/admin/repos.py:331 #, python-format msgid "An error occurred during deletion of %s" msgstr "リポジトリ %s の削除中にエラーが発生しました" -#: rhodecode/controllers/summary.py:138 +#: rhodecode/controllers/settings.py:179 +#, fuzzy +msgid "unlocked" +msgstr "変更可能にする" + +#: rhodecode/controllers/settings.py:182 +#, fuzzy +msgid "locked" +msgstr "変更可能にする" + +#: rhodecode/controllers/settings.py:184 +#, fuzzy, python-format +msgid "Repository has been %s" +msgstr "リポジトリ %s を %s としてフォーク" + +#: rhodecode/controllers/settings.py:188 +#: rhodecode/controllers/admin/repos.py:423 +msgid "An error occurred during unlocking" +msgstr "アンロック時にエラーが発生しました" + +#: rhodecode/controllers/summary.py:140 msgid "No data loaded yet" msgstr "まだデータが読み込まれていません" -#: rhodecode/controllers/summary.py:142 -#: rhodecode/templates/summary/summary.html:148 +#: rhodecode/controllers/summary.py:144 +#: rhodecode/templates/summary/summary.html:157 msgid "Statistics are disabled for this repository" msgstr "このリポジトリの統計は無効化されています" @@ -387,15 +419,15 @@ msgstr "書込" #: rhodecode/templates/admin/settings/settings.html:9 #: rhodecode/templates/admin/users/user_add.html:8 #: rhodecode/templates/admin/users/user_edit.html:9 -#: rhodecode/templates/admin/users/user_edit.html:122 +#: rhodecode/templates/admin/users/user_edit.html:126 #: rhodecode/templates/admin/users/users.html:9 #: rhodecode/templates/admin/users_groups/users_group_add.html:8 #: rhodecode/templates/admin/users_groups/users_group_edit.html:9 #: rhodecode/templates/admin/users_groups/users_groups.html:9 #: rhodecode/templates/base/base.html:197 -#: rhodecode/templates/base/base.html:337 -#: rhodecode/templates/base/base.html:339 -#: rhodecode/templates/base/base.html:341 +#: rhodecode/templates/base/base.html:349 +#: rhodecode/templates/base/base.html:351 +#: rhodecode/templates/base/base.html:353 msgid "Admin" msgstr "管理" @@ -429,187 +461,183 @@ msgstr "デフォルトの権限を更新しました" msgid "error occurred during update of permissions" msgstr "権限の更新中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:123 +#: rhodecode/controllers/admin/repos.py:124 msgid "--REMOVE FORK--" msgstr "--フォーク元を削除--" -#: rhodecode/controllers/admin/repos.py:192 +#: rhodecode/controllers/admin/repos.py:193 #, python-format msgid "created repository %s from %s" msgstr "リポジトリ %s を %s から作成" -#: rhodecode/controllers/admin/repos.py:196 +#: rhodecode/controllers/admin/repos.py:197 #, python-format msgid "created repository %s" msgstr "リポジトリ %s を作成しました" -#: rhodecode/controllers/admin/repos.py:227 +#: rhodecode/controllers/admin/repos.py:228 #, python-format msgid "error occurred during creation of repository %s" msgstr "リポジトリ %s を作成中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:319 +#: rhodecode/controllers/admin/repos.py:320 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:348 +#: rhodecode/controllers/admin/repos.py:349 msgid "An error occurred during deletion of repository user" msgstr "リポジトリユーザーの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:367 +#: rhodecode/controllers/admin/repos.py:368 msgid "An error occurred during deletion of repository users groups" msgstr "リポジトリユーザーグループの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:385 +#: rhodecode/controllers/admin/repos.py:386 msgid "An error occurred during deletion of repository stats" msgstr "リポジトリステートの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:402 +#: rhodecode/controllers/admin/repos.py:403 msgid "An error occurred during cache invalidation" msgstr "キャッシュの無効化時にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:422 -msgid "An error occurred during unlocking" -msgstr "アンロック時にエラーが発生しました" - -#: rhodecode/controllers/admin/repos.py:442 +#: rhodecode/controllers/admin/repos.py:443 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:446 +#: rhodecode/controllers/admin/repos.py:447 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:451 rhodecode/model/validators.py:299 +#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300 msgid "Token mismatch" msgstr "トークンが合いません" -#: rhodecode/controllers/admin/repos.py:464 +#: rhodecode/controllers/admin/repos.py:465 msgid "Pulled from remote location" msgstr "リモートから取得" -#: rhodecode/controllers/admin/repos.py:466 +#: rhodecode/controllers/admin/repos.py:467 msgid "An error occurred during pull from remote location" msgstr "リモートから取得中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:482 +#: rhodecode/controllers/admin/repos.py:483 msgid "Nothing" msgstr "ありません" -#: rhodecode/controllers/admin/repos.py:484 +#: rhodecode/controllers/admin/repos.py:485 #, python-format msgid "Marked repo %s as fork of %s" msgstr "%s リポジトリを %s のフォークとして印をつける" -#: rhodecode/controllers/admin/repos.py:488 +#: rhodecode/controllers/admin/repos.py:489 msgid "An error occurred during this operation" msgstr "操作中にエラーが発生しました" -#: rhodecode/controllers/admin/repos_groups.py:116 +#: rhodecode/controllers/admin/repos_groups.py:120 #, python-format msgid "created repos group %s" msgstr "リポジトリグループ %s を作成しました" -#: rhodecode/controllers/admin/repos_groups.py:129 +#: rhodecode/controllers/admin/repos_groups.py:133 #, python-format msgid "error occurred during creation of repos group %s" msgstr "リポジトリグループ %s を作成中にエラーが発生しました" -#: rhodecode/controllers/admin/repos_groups.py:163 +#: rhodecode/controllers/admin/repos_groups.py:167 #, python-format msgid "updated repos group %s" msgstr "リポジトリグループ %s を更新しました" -#: rhodecode/controllers/admin/repos_groups.py:176 +#: rhodecode/controllers/admin/repos_groups.py:180 #, python-format msgid "error occurred during update of repos group %s" msgstr "リポジトリグループ %s を更新中にエラーが発生しました" -#: rhodecode/controllers/admin/repos_groups.py:194 +#: rhodecode/controllers/admin/repos_groups.py:198 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "このグループは %s リポジトリを含んでいるため削除出来ません" -#: rhodecode/controllers/admin/repos_groups.py:202 +#: rhodecode/controllers/admin/repos_groups.py:206 #, python-format msgid "removed repos group %s" msgstr "リポジトリグループ %s を削除しました" -#: rhodecode/controllers/admin/repos_groups.py:208 +#: rhodecode/controllers/admin/repos_groups.py:212 msgid "Cannot delete this group it still contains subgroups" msgstr "サブグループを含んでいるため、このグループを削除できません" -#: rhodecode/controllers/admin/repos_groups.py:213 -#: rhodecode/controllers/admin/repos_groups.py:218 +#: rhodecode/controllers/admin/repos_groups.py:217 +#: rhodecode/controllers/admin/repos_groups.py:222 #, python-format msgid "error occurred during deletion of repos group %s" msgstr "リポジトリグループ %s の削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos_groups.py:238 +#: rhodecode/controllers/admin/repos_groups.py:243 msgid "An error occurred during deletion of group user" msgstr "グループユーザーを削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos_groups.py:258 +#: rhodecode/controllers/admin/repos_groups.py:264 msgid "An error occurred during deletion of group users groups" msgstr "グループユーザーのグループを削除中にエラーが発生しました" -#: rhodecode/controllers/admin/settings.py:121 +#: rhodecode/controllers/admin/settings.py:123 #, python-format msgid "Repositories successfully rescanned added: %s,removed: %s" msgstr "リポジトリを再度スキャンしました。 追加: %s 削除: %s" -#: rhodecode/controllers/admin/settings.py:129 +#: rhodecode/controllers/admin/settings.py:131 msgid "Whoosh reindex task scheduled" msgstr "Whooshの再インデックスタスクを予定に入れました" -#: rhodecode/controllers/admin/settings.py:160 +#: rhodecode/controllers/admin/settings.py:162 msgid "Updated application settings" msgstr "アプリケーション設定を更新しました" -#: rhodecode/controllers/admin/settings.py:164 -#: rhodecode/controllers/admin/settings.py:275 +#: rhodecode/controllers/admin/settings.py:166 +#: rhodecode/controllers/admin/settings.py:299 msgid "error occurred during updating application settings" msgstr "アプリケーション設定を更新中にエラーが発生しました" -#: rhodecode/controllers/admin/settings.py:200 +#: rhodecode/controllers/admin/settings.py:207 msgid "Updated visualisation settings" msgstr "表示の設定を更新しました" -#: rhodecode/controllers/admin/settings.py:205 +#: rhodecode/controllers/admin/settings.py:212 msgid "error occurred during updating visualisation settings" msgstr "表示の設定を更新中にエラーが発生しました" -#: rhodecode/controllers/admin/settings.py:271 +#: rhodecode/controllers/admin/settings.py:295 msgid "Updated VCS settings" msgstr "VCSの設定を更新しました" -#: rhodecode/controllers/admin/settings.py:285 +#: rhodecode/controllers/admin/settings.py:309 msgid "Added new hook" msgstr "新しいフックを追加しました" -#: rhodecode/controllers/admin/settings.py:297 +#: rhodecode/controllers/admin/settings.py:321 msgid "Updated hooks" msgstr "フックを更新しました" -#: rhodecode/controllers/admin/settings.py:301 +#: rhodecode/controllers/admin/settings.py:325 msgid "error occurred during hook creation" msgstr "フックの作成時にエラーが発生しました" -#: rhodecode/controllers/admin/settings.py:320 +#: rhodecode/controllers/admin/settings.py:344 msgid "Email task created" msgstr "メールのタスクを作成しました" -#: rhodecode/controllers/admin/settings.py:375 +#: rhodecode/controllers/admin/settings.py:399 msgid "You can't edit this user since it's crucial for entire application" msgstr "このユーザーを編集出来ません。このユーザーはアプリケーションにとって必要不可欠です。" -#: rhodecode/controllers/admin/settings.py:406 +#: rhodecode/controllers/admin/settings.py:430 msgid "Your account was updated successfully" msgstr "アカウントを更新しました" -#: rhodecode/controllers/admin/settings.py:421 -#: rhodecode/controllers/admin/users.py:191 +#: rhodecode/controllers/admin/settings.py:445 +#: rhodecode/controllers/admin/users.py:196 #, python-format msgid "error occurred during update of user %s" msgstr "ユーザー %s の更新中にエラーが発生しました" @@ -624,97 +652,97 @@ msgstr "ユーザー %s を作成しました" msgid "error occurred during creation of user %s" msgstr "ユーザー %s の作成中にエラーが発生しました" -#: rhodecode/controllers/admin/users.py:171 +#: rhodecode/controllers/admin/users.py:176 msgid "User updated successfully" msgstr "ユーザーの更新に成功しました" -#: rhodecode/controllers/admin/users.py:207 -msgid "successfully deleted user" -msgstr "ユーザーの削除に成功しました" - #: rhodecode/controllers/admin/users.py:212 +msgid "successfully deleted user" +msgstr "ユーザーの削除に成功しました" + +#: rhodecode/controllers/admin/users.py:217 msgid "An error occurred during deletion of user" msgstr "ユーザーの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/users.py:226 +#: rhodecode/controllers/admin/users.py:231 msgid "You can't edit this user" msgstr "このユーザーは編集できません" -#: rhodecode/controllers/admin/users.py:266 +#: rhodecode/controllers/admin/users.py:272 msgid "Granted 'repository create' permission to user" msgstr "ユーザーに 'リポジトリ作成' 権限を与えました" -#: rhodecode/controllers/admin/users.py:271 +#: rhodecode/controllers/admin/users.py:277 msgid "Revoked 'repository create' permission to user" msgstr "ユーザーの 'リポジトリ作成' 権限を取り消しました" -#: rhodecode/controllers/admin/users.py:277 +#: rhodecode/controllers/admin/users.py:283 msgid "Granted 'repository fork' permission to user" msgstr "ユーザーに 'リポジトリフォーク' 権限を与えました" -#: rhodecode/controllers/admin/users.py:282 +#: rhodecode/controllers/admin/users.py:288 msgid "Revoked 'repository fork' permission to user" msgstr "ユーザーの 'リポジトリフォーク' 権限を取り消しました" -#: rhodecode/controllers/admin/users.py:288 -#: rhodecode/controllers/admin/users_groups.py:255 +#: rhodecode/controllers/admin/users.py:294 +#: rhodecode/controllers/admin/users_groups.py:279 msgid "An error occurred during permissions saving" msgstr "権限の保存時にエラーが発生しました" -#: rhodecode/controllers/admin/users.py:303 +#: rhodecode/controllers/admin/users.py:309 #, python-format msgid "Added email %s to user" msgstr "ユーザーにメール %s を追加しました" -#: rhodecode/controllers/admin/users.py:309 +#: rhodecode/controllers/admin/users.py:315 msgid "An error occurred during email saving" msgstr "メールの保存時にエラーが発生しました" -#: rhodecode/controllers/admin/users.py:319 +#: rhodecode/controllers/admin/users.py:325 msgid "Removed email from user" msgstr "ユーザーからメールを削除しました" -#: rhodecode/controllers/admin/users_groups.py:84 +#: rhodecode/controllers/admin/users_groups.py:86 #, python-format msgid "created users group %s" msgstr "ユーザーグループ %s を作成しました" -#: rhodecode/controllers/admin/users_groups.py:95 +#: rhodecode/controllers/admin/users_groups.py:97 #, python-format msgid "error occurred during creation of users group %s" msgstr "ユーザーグループ %s の作成中にエラーが発生しました" -#: rhodecode/controllers/admin/users_groups.py:135 +#: rhodecode/controllers/admin/users_groups.py:164 #, python-format msgid "updated users group %s" msgstr "ユーザーグループ %s を更新しました" -#: rhodecode/controllers/admin/users_groups.py:157 +#: rhodecode/controllers/admin/users_groups.py:186 #, python-format msgid "error occurred during update of users group %s" msgstr "ユーザーグループ %s の更新中にエラーが発生しました" -#: rhodecode/controllers/admin/users_groups.py:174 +#: rhodecode/controllers/admin/users_groups.py:203 msgid "successfully deleted users group" msgstr "ユーザーグループ" -#: rhodecode/controllers/admin/users_groups.py:179 +#: rhodecode/controllers/admin/users_groups.py:208 msgid "An error occurred during deletion of users group" msgstr "ユーザーグループの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/users_groups.py:233 +#: rhodecode/controllers/admin/users_groups.py:257 msgid "Granted 'repository create' permission to users group" msgstr "ユーザーグループに 'リポジトリ作成' 権限を与えました" -#: rhodecode/controllers/admin/users_groups.py:238 +#: rhodecode/controllers/admin/users_groups.py:262 msgid "Revoked 'repository create' permission to users group" msgstr "ユーザーグループの 'リポジトリ作成' 権限を取り消しました" -#: rhodecode/controllers/admin/users_groups.py:244 +#: rhodecode/controllers/admin/users_groups.py:268 msgid "Granted 'repository fork' permission to users group" msgstr "ユーザーグループに 'リポジトリフォーク' 権限を与えました" -#: rhodecode/controllers/admin/users_groups.py:249 +#: rhodecode/controllers/admin/users_groups.py:273 msgid "Revoked 'repository fork' permission to users group" msgstr "ユーザーグループの 'リポジトリフォーク' 権限を取り消しました" @@ -726,200 +754,225 @@ msgstr "このアクションを実行するためには登録ユーザーである必要があります" msgid "You need to be a signed in to view this page" msgstr "このページを閲覧するためにはサインインが必要です" -#: rhodecode/lib/diffs.py:86 +#: rhodecode/lib/diffs.py:74 +msgid "binary file" +msgstr "バイナリファイル" + +#: rhodecode/lib/diffs.py:90 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: rhodecode/lib/diffs.py:96 +#: rhodecode/lib/diffs.py:100 msgid "No changes detected" msgstr "検出された変更はありません" -#: rhodecode/lib/helpers.py:372 +#: rhodecode/lib/helpers.py:373 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "%a, %d %b %Y %H:%M:%S" -#: rhodecode/lib/helpers.py:484 +#: rhodecode/lib/helpers.py:485 msgid "True" msgstr "True" -#: rhodecode/lib/helpers.py:488 +#: rhodecode/lib/helpers.py:489 msgid "False" msgstr "False" +#: rhodecode/lib/helpers.py:529 +#, fuzzy, python-format +msgid "Deleted branch: %s" +msgstr "リポジトリ %s を削除しました" + #: rhodecode/lib/helpers.py:532 +#, fuzzy, python-format +msgid "Created tag: %s" +msgstr "ユーザー %s を作成しました" + +#: rhodecode/lib/helpers.py:545 msgid "Changeset not found" msgstr "リビジョンが見つかりません" -#: rhodecode/lib/helpers.py:555 +#: rhodecode/lib/helpers.py:588 #, python-format msgid "Show all combined changesets %s->%s" msgstr "%s から %s までのすべてのチェンジセットを表示" -#: rhodecode/lib/helpers.py:561 +#: rhodecode/lib/helpers.py:594 msgid "compare view" msgstr "比較の表示" -#: rhodecode/lib/helpers.py:581 +#: rhodecode/lib/helpers.py:614 msgid "and" msgstr "" -#: rhodecode/lib/helpers.py:582 +#: rhodecode/lib/helpers.py:615 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:583 rhodecode/templates/changelog/changelog.html:48 +#: rhodecode/lib/helpers.py:616 rhodecode/templates/changelog/changelog.html:51 msgid "revisions" msgstr "リビジョン" -#: rhodecode/lib/helpers.py:606 -msgid "fork name " +#: rhodecode/lib/helpers.py:640 +#, fuzzy, python-format +msgid "fork name %s" msgstr "フォーク名 " -#: rhodecode/lib/helpers.py:620 +#: rhodecode/lib/helpers.py:653 #: 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:626 +#: rhodecode/lib/helpers.py:659 msgid "[deleted] repository" msgstr "リポジトリを[削除]" -#: rhodecode/lib/helpers.py:628 rhodecode/lib/helpers.py:638 +#: rhodecode/lib/helpers.py:661 rhodecode/lib/helpers.py:671 msgid "[created] repository" msgstr "リポジトリを[作成]" -#: rhodecode/lib/helpers.py:630 +#: rhodecode/lib/helpers.py:663 msgid "[created] repository as fork" msgstr "フォークしてリポジトリを[作成]" -#: rhodecode/lib/helpers.py:632 rhodecode/lib/helpers.py:640 +#: rhodecode/lib/helpers.py:665 rhodecode/lib/helpers.py:673 msgid "[forked] repository" msgstr "リポジトリを[フォーク]" -#: rhodecode/lib/helpers.py:634 rhodecode/lib/helpers.py:642 +#: rhodecode/lib/helpers.py:667 rhodecode/lib/helpers.py:675 msgid "[updated] repository" msgstr "リポジトリを[更新]" -#: rhodecode/lib/helpers.py:636 +#: rhodecode/lib/helpers.py:669 msgid "[delete] repository" msgstr "リポジトリを[削除]" -#: rhodecode/lib/helpers.py:644 +#: rhodecode/lib/helpers.py:677 msgid "[created] user" msgstr "ユーザーを[作成]" -#: rhodecode/lib/helpers.py:646 +#: rhodecode/lib/helpers.py:679 msgid "[updated] user" msgstr "ユーザーを[更新]" -#: rhodecode/lib/helpers.py:648 +#: rhodecode/lib/helpers.py:681 msgid "[created] users group" msgstr "ユーザーグループを[作成]" -#: rhodecode/lib/helpers.py:650 +#: rhodecode/lib/helpers.py:683 msgid "[updated] users group" msgstr "ユーザーグループを[更新]" -#: rhodecode/lib/helpers.py:652 +#: rhodecode/lib/helpers.py:685 msgid "[commented] on revision in repository" msgstr "リポジトリのリビジョンに[コメント]" -#: rhodecode/lib/helpers.py:654 +#: rhodecode/lib/helpers.py:687 msgid "[commented] on pull request for" msgstr "プルリクエストに[コメント]" -#: rhodecode/lib/helpers.py:656 +#: rhodecode/lib/helpers.py:689 msgid "[closed] pull request for" msgstr "プルリクエストを[クローズ]" -#: rhodecode/lib/helpers.py:658 +#: rhodecode/lib/helpers.py:691 msgid "[pushed] into" msgstr "[プッシュ]" -#: rhodecode/lib/helpers.py:660 +#: rhodecode/lib/helpers.py:693 msgid "[committed via RhodeCode] into repository" msgstr "リポジトリに[RhodeCode経由でコミット]" -#: rhodecode/lib/helpers.py:662 +#: rhodecode/lib/helpers.py:695 msgid "[pulled from remote] into repository" msgstr "リポジトリに[リモートからプル]" -#: rhodecode/lib/helpers.py:664 +#: rhodecode/lib/helpers.py:697 msgid "[pulled] from" msgstr "[プル]" -#: rhodecode/lib/helpers.py:666 +#: rhodecode/lib/helpers.py:699 msgid "[started following] repository" msgstr "リポジトリの[フォローを開始]" -#: rhodecode/lib/helpers.py:668 +#: rhodecode/lib/helpers.py:701 msgid "[stopped following] repository" msgstr "リポジトリの[フォローを停止]" -#: rhodecode/lib/helpers.py:840 +#: rhodecode/lib/helpers.py:877 #, python-format msgid " and %s more" msgstr " と %s 以上" -#: rhodecode/lib/helpers.py:844 +#: rhodecode/lib/helpers.py:881 msgid "No Files" msgstr "ファイルなし" -#: rhodecode/lib/utils2.py:335 +#: rhodecode/lib/utils2.py:403 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d 年" -#: rhodecode/lib/utils2.py:336 +#: rhodecode/lib/utils2.py:404 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d ヶ月" -#: rhodecode/lib/utils2.py:337 +#: rhodecode/lib/utils2.py:405 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d 日" -#: rhodecode/lib/utils2.py:338 +#: rhodecode/lib/utils2.py:406 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d 時間" -#: rhodecode/lib/utils2.py:339 +#: rhodecode/lib/utils2.py:407 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d 分" -#: rhodecode/lib/utils2.py:340 +#: rhodecode/lib/utils2.py:408 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d 秒" -#: rhodecode/lib/utils2.py:355 +#: rhodecode/lib/utils2.py:424 +#, python-format +msgid "in %s" +msgstr "" + +#: rhodecode/lib/utils2.py:426 #, python-format msgid "%s ago" msgstr "%s 前" -#: rhodecode/lib/utils2.py:357 +#: rhodecode/lib/utils2.py:428 +#, fuzzy, python-format +msgid "in %s and %s" +msgstr "%s と %s 前" + +#: rhodecode/lib/utils2.py:431 #, python-format msgid "%s and %s ago" msgstr "%s と %s 前" -#: rhodecode/lib/utils2.py:360 +#: rhodecode/lib/utils2.py:434 msgid "just now" msgstr "ちょうどいま" -#: rhodecode/lib/celerylib/tasks.py:269 +#: rhodecode/lib/celerylib/tasks.py:270 msgid "password reset link" msgstr "パスワードリセットのリンク" @@ -928,87 +981,87 @@ msgstr "パスワードリセットのリンク" msgid "on line %s" msgstr "" -#: rhodecode/model/comment.py:157 +#: rhodecode/model/comment.py:173 msgid "[Mention]" msgstr "[Mention]" -#: rhodecode/model/db.py:1140 +#: rhodecode/model/db.py:1163 msgid "Repository no access" msgstr "" -#: rhodecode/model/db.py:1141 +#: rhodecode/model/db.py:1164 msgid "Repository read access" msgstr "" -#: rhodecode/model/db.py:1142 +#: rhodecode/model/db.py:1165 msgid "Repository write access" msgstr "" -#: rhodecode/model/db.py:1143 +#: rhodecode/model/db.py:1166 msgid "Repository admin access" msgstr "" -#: rhodecode/model/db.py:1145 +#: rhodecode/model/db.py:1168 msgid "Repositories Group no access" msgstr "" -#: rhodecode/model/db.py:1146 +#: rhodecode/model/db.py:1169 msgid "Repositories Group read access" msgstr "" -#: rhodecode/model/db.py:1147 +#: rhodecode/model/db.py:1170 msgid "Repositories Group write access" msgstr "" -#: rhodecode/model/db.py:1148 +#: rhodecode/model/db.py:1171 msgid "Repositories Group admin access" msgstr "" -#: rhodecode/model/db.py:1150 +#: rhodecode/model/db.py:1173 msgid "RhodeCode Administrator" msgstr "" -#: rhodecode/model/db.py:1151 +#: rhodecode/model/db.py:1174 msgid "Repository creation disabled" msgstr "" -#: rhodecode/model/db.py:1152 +#: rhodecode/model/db.py:1175 msgid "Repository creation enabled" msgstr "" -#: rhodecode/model/db.py:1153 +#: rhodecode/model/db.py:1176 msgid "Repository forking disabled" msgstr "" -#: rhodecode/model/db.py:1154 +#: rhodecode/model/db.py:1177 msgid "Repository forking enabled" msgstr "" -#: rhodecode/model/db.py:1155 +#: rhodecode/model/db.py:1178 msgid "Register disabled" msgstr "" -#: rhodecode/model/db.py:1156 +#: rhodecode/model/db.py:1179 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/model/db.py:1159 +#: rhodecode/model/db.py:1182 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/model/db.py:1579 +#: rhodecode/model/db.py:1623 msgid "Not Reviewed" msgstr "未レビュー" -#: rhodecode/model/db.py:1580 +#: rhodecode/model/db.py:1624 msgid "Approved" msgstr "承認" -#: rhodecode/model/db.py:1581 +#: rhodecode/model/db.py:1625 msgid "Rejected" msgstr "却下" -#: rhodecode/model/db.py:1582 +#: rhodecode/model/db.py:1626 msgid "Under Review" msgstr "レビュー中" @@ -1031,35 +1084,41 @@ msgid "Enter %(min)i characters or more" msgstr "%(min)i 文字以上必要です" #: rhodecode/model/notification.py:220 -msgid "commented on commit" +#, fuzzy, python-format +msgid "commented on commit at %(when)s" msgstr "コミットに対するコメント" #: rhodecode/model/notification.py:221 -msgid "sent message" +#, python-format +msgid "sent message at %(when)s" msgstr "" #: rhodecode/model/notification.py:222 -msgid "mentioned you" +#, python-format +msgid "mentioned you at %(when)s" msgstr "" #: rhodecode/model/notification.py:223 -msgid "registered in RhodeCode" +#, python-format +msgid "registered in RhodeCode at %(when)s" msgstr "" #: rhodecode/model/notification.py:224 -msgid "opened new pull request" -msgstr "" +#, fuzzy, python-format +msgid "opened new pull request at %(when)s" +msgstr "新しいプルリクエストを作成" #: rhodecode/model/notification.py:225 -msgid "commented on pull request" -msgstr "" - -#: rhodecode/model/pull_request.py:84 +#, fuzzy, python-format +msgid "commented on pull request at %(when)s" +msgstr "プルリクエストに[コメント]" + +#: rhodecode/model/pull_request.py:90 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s" msgstr "" -#: rhodecode/model/scm.py:535 +#: rhodecode/model/scm.py:542 msgid "latest tip" msgstr "最新のtip" @@ -1067,57 +1126,57 @@ msgstr "最新のtip" msgid "new user registration" msgstr "新規ユーザー登録" -#: rhodecode/model/user.py:255 rhodecode/model/user.py:277 -#: rhodecode/model/user.py:299 +#: rhodecode/model/user.py:255 rhodecode/model/user.py:279 +#: rhodecode/model/user.py:301 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:323 +#: rhodecode/model/user.py:325 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:329 +#: rhodecode/model/user.py:331 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories. %s" msgstr "" -#: rhodecode/model/validators.py:35 rhodecode/model/validators.py:36 +#: rhodecode/model/validators.py:36 rhodecode/model/validators.py:37 msgid "Value cannot be an empty list" msgstr "" -#: rhodecode/model/validators.py:82 +#: rhodecode/model/validators.py:83 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "ユーザー名 \"%(username)s\" はすでに使われています" -#: rhodecode/model/validators.py:84 +#: rhodecode/model/validators.py:85 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "ユーザー名 \"%(username)s\" は許可されていません" -#: rhodecode/model/validators.py:86 +#: rhodecode/model/validators.py:87 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character" msgstr "ユーザー名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットから始まる必要があります" -#: rhodecode/model/validators.py:114 +#: rhodecode/model/validators.py:115 #, python-format msgid "Username %(username)s is not valid" msgstr "ユーザー名 %(username)s は不正です" -#: rhodecode/model/validators.py:133 +#: rhodecode/model/validators.py:134 msgid "Invalid users group name" msgstr "不正なユーザーグループ名です" -#: rhodecode/model/validators.py:134 +#: rhodecode/model/validators.py:135 #, python-format msgid "Users group \"%(usersgroup)s\" already exists" msgstr "ユーザーグループ \"%(usersgroup)s\" はすでに存在します" -#: rhodecode/model/validators.py:136 +#: rhodecode/model/validators.py:137 msgid "" "users group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -1125,96 +1184,101 @@ msgstr "" "ユーザーグループ名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットから始まる必要があります" " " -#: rhodecode/model/validators.py:174 +#: rhodecode/model/validators.py:175 msgid "Cannot assign this group as parent" msgstr "このグループは親にできません" -#: rhodecode/model/validators.py:175 +#: rhodecode/model/validators.py:176 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "グループ \"%(group_name)s\" はすでに存在します" -#: rhodecode/model/validators.py:177 +#: rhodecode/model/validators.py:178 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "グループ名 \"%(group_name)s\" を持つリポジトリはすでに存在します" -#: rhodecode/model/validators.py:235 +#: rhodecode/model/validators.py:236 msgid "Invalid characters (non-ascii) in password" msgstr "パスワードに利用出来ない文字列(non-ascii)です" -#: rhodecode/model/validators.py:250 +#: rhodecode/model/validators.py:251 msgid "Passwords do not match" msgstr "パスワードが一致しません" -#: rhodecode/model/validators.py:267 +#: rhodecode/model/validators.py:268 msgid "invalid password" msgstr "不正なパスワードです" -#: rhodecode/model/validators.py:268 +#: rhodecode/model/validators.py:269 msgid "invalid user name" msgstr "不正なユーザー名です" -#: rhodecode/model/validators.py:269 +#: rhodecode/model/validators.py:270 msgid "Your account is disabled" msgstr "アカウントは無効です" -#: rhodecode/model/validators.py:313 +#: rhodecode/model/validators.py:314 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "リポジトリ名 %(repo)s は許可されていません" -#: rhodecode/model/validators.py:315 +#: rhodecode/model/validators.py:316 #, python-format msgid "Repository named %(repo)s already exists" msgstr "リポジトリ %(repo)s はすでに存在します" -#: rhodecode/model/validators.py:316 +#: rhodecode/model/validators.py:317 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "リポジトリ \"%(repo)s\" は グループ \"%(group)s\" にすでに存在します" -#: rhodecode/model/validators.py:318 +#: rhodecode/model/validators.py:319 #, python-format msgid "Repositories group with name \"%(repo)s\" already exists" msgstr "リポジトリグループ名 \"%(repo)s\" はすでに存在します" -#: rhodecode/model/validators.py:431 +#: rhodecode/model/validators.py:432 msgid "invalid clone url" msgstr "無効なクローンURIです" -#: rhodecode/model/validators.py:432 +#: rhodecode/model/validators.py:433 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" msgstr "" -#: rhodecode/model/validators.py:457 +#: rhodecode/model/validators.py:458 msgid "Fork have to be the same type as parent" msgstr "フォークは親と同じタイプの必要があります" -#: rhodecode/model/validators.py:478 +#: rhodecode/model/validators.py:473 +#, fuzzy +msgid "You don't have permissions to create repository in this group" +msgstr "このページを見る権限がありません" + +#: rhodecode/model/validators.py:498 msgid "This username or users group name is not valid" msgstr "ユーザー名かユーザーグループが不正です" -#: rhodecode/model/validators.py:562 +#: rhodecode/model/validators.py:582 msgid "This is not a valid path" msgstr "不正なパスです" -#: rhodecode/model/validators.py:577 +#: rhodecode/model/validators.py:597 msgid "This e-mail address is already taken" msgstr "このメールアドレスはすでに取得されています" -#: rhodecode/model/validators.py:597 +#: rhodecode/model/validators.py:617 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "メールアドレス \"%(email)s\" は存在しません" -#: rhodecode/model/validators.py:634 +#: rhodecode/model/validators.py:654 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:653 +#: rhodecode/model/validators.py:673 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" @@ -1237,7 +1301,7 @@ msgstr "クイックフィルタ..." #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/base/base.html:221 +#: rhodecode/templates/base/base.html:233 msgid "repositories" msgstr "リポジトリ" @@ -1248,6 +1312,7 @@ msgid "ADD REPOSITORY" msgstr "リポジトリの追加" #: rhodecode/templates/index_base.html:29 +#: rhodecode/templates/index_base.html:136 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:32 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33 @@ -1257,9 +1322,10 @@ msgid "Group name" msgstr "グループ名" #: rhodecode/templates/index_base.html:30 -#: rhodecode/templates/index_base.html:71 -#: rhodecode/templates/index_base.html:142 -#: rhodecode/templates/index_base.html:168 +#: rhodecode/templates/index_base.html:72 +#: rhodecode/templates/index_base.html:138 +#: rhodecode/templates/index_base.html:176 +#: rhodecode/templates/index_base.html:266 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 #: rhodecode/templates/admin/repos/repos.html:72 @@ -1268,142 +1334,137 @@ msgstr "グループ名" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34 #: rhodecode/templates/forks/fork.html:59 #: rhodecode/templates/settings/repo_settings.html:66 -#: rhodecode/templates/summary/summary.html:105 +#: rhodecode/templates/summary/summary.html:114 msgid "Description" msgstr "説明" #: rhodecode/templates/index_base.html:40 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47 msgid "Repositories group" msgstr "リポジトリグループ" -#: rhodecode/templates/index_base.html:70 -#: rhodecode/templates/index_base.html:166 +#: rhodecode/templates/index_base.html:71 +#: rhodecode/templates/index_base.html:174 +#: rhodecode/templates/index_base.html:264 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 #: rhodecode/templates/admin/repos/repos.html:70 -#: rhodecode/templates/admin/users/user_edit.html:192 +#: rhodecode/templates/admin/users/user_edit.html:196 #: rhodecode/templates/admin/users/user_edit_my_account.html:59 -#: rhodecode/templates/admin/users/user_edit_my_account.html:157 -#: rhodecode/templates/admin/users/user_edit_my_account.html:193 +#: rhodecode/templates/admin/users/user_edit_my_account.html:180 +#: rhodecode/templates/admin/users/user_edit_my_account.html:216 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:184 #: rhodecode/templates/bookmarks/bookmarks.html:36 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 -#: rhodecode/templates/branches/branches.html:51 +#: 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:59 -#: rhodecode/templates/journal/journal.html:107 -#: rhodecode/templates/journal/journal.html:186 +#: rhodecode/templates/journal/journal.html:62 +#: rhodecode/templates/journal/journal.html:168 +#: rhodecode/templates/journal/journal_page_repos.html:7 #: rhodecode/templates/settings/repo_settings.html:31 #: rhodecode/templates/summary/summary.html:43 -#: rhodecode/templates/summary/summary.html:123 -#: rhodecode/templates/tags/tags.html:36 +#: rhodecode/templates/summary/summary.html:132 +#: rhodecode/templates/tags/tags.html:51 #: rhodecode/templates/tags/tags_data.html:6 msgid "Name" msgstr "名前" -#: rhodecode/templates/index_base.html:72 +#: rhodecode/templates/index_base.html:73 msgid "Last change" msgstr "最後の変更時刻" -#: rhodecode/templates/index_base.html:73 -#: rhodecode/templates/index_base.html:171 -#: rhodecode/templates/admin/users/user_edit_my_account.html:159 -#: rhodecode/templates/journal/journal.html:188 +#: 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 msgid "Tip" msgstr "Tip" -#: rhodecode/templates/index_base.html:74 -#: rhodecode/templates/index_base.html:173 +#: rhodecode/templates/index_base.html:75 +#: rhodecode/templates/index_base.html:181 +#: rhodecode/templates/index_base.html:269 #: rhodecode/templates/admin/repos/repo_edit.html:121 #: rhodecode/templates/admin/repos/repos.html:73 msgid "Owner" msgstr "所有者" -#: rhodecode/templates/index_base.html:75 +#: rhodecode/templates/index_base.html:76 #: rhodecode/templates/summary/summary.html:48 #: rhodecode/templates/summary/summary.html:51 msgid "RSS" msgstr "RSS" -#: rhodecode/templates/index_base.html:76 +#: rhodecode/templates/index_base.html:77 msgid "Atom" msgstr "Atom" -#: rhodecode/templates/index_base.html:110 -#: rhodecode/templates/index_base.html:112 -#, python-format -msgid "Subscribe to %s rss feed" -msgstr "%s の RSS フィードを購読" - -#: rhodecode/templates/index_base.html:117 -#: rhodecode/templates/index_base.html:119 -#, python-format -msgid "Subscribe to %s atom feed" -msgstr "%s の ATOM フィードを購読" - -#: rhodecode/templates/index_base.html:140 -msgid "Group Name" -msgstr "グループ名" - -#: rhodecode/templates/index_base.html:158 -#: rhodecode/templates/index_base.html:198 +#: rhodecode/templates/index_base.html:167 +#: rhodecode/templates/index_base.html:207 +#: rhodecode/templates/index_base.html:291 #: rhodecode/templates/admin/repos/repos.html:94 -#: rhodecode/templates/admin/users/user_edit_my_account.html:179 +#: rhodecode/templates/admin/users/user_edit_my_account.html:202 #: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:60 -#: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:211 -#: rhodecode/templates/tags/tags.html:60 +#: rhodecode/templates/branches/branches.html:76 +#: rhodecode/templates/journal/journal.html:193 +#: rhodecode/templates/tags/tags.html:77 msgid "Click to sort ascending" msgstr "昇順で並び換え" -#: rhodecode/templates/index_base.html:159 -#: rhodecode/templates/index_base.html:199 +#: rhodecode/templates/index_base.html:168 +#: rhodecode/templates/index_base.html:208 +#: rhodecode/templates/index_base.html:292 #: rhodecode/templates/admin/repos/repos.html:95 -#: rhodecode/templates/admin/users/user_edit_my_account.html:180 +#: rhodecode/templates/admin/users/user_edit_my_account.html:203 #: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:61 -#: rhodecode/templates/branches/branches.html:78 -#: rhodecode/templates/journal/journal.html:212 -#: rhodecode/templates/tags/tags.html:61 +#: rhodecode/templates/branches/branches.html:77 +#: rhodecode/templates/journal/journal.html:194 +#: rhodecode/templates/tags/tags.html:78 msgid "Click to sort descending" msgstr "降順で並び替え" -#: rhodecode/templates/index_base.html:169 +#: rhodecode/templates/index_base.html:177 +#: rhodecode/templates/index_base.html:267 msgid "Last Change" msgstr "最後の変更点" -#: rhodecode/templates/index_base.html:200 +#: rhodecode/templates/index_base.html:209 +#: rhodecode/templates/index_base.html:293 #: rhodecode/templates/admin/repos/repos.html:96 -#: rhodecode/templates/admin/users/user_edit_my_account.html:181 +#: rhodecode/templates/admin/users/user_edit_my_account.html:204 #: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:62 -#: rhodecode/templates/branches/branches.html:79 -#: rhodecode/templates/journal/journal.html:213 -#: rhodecode/templates/tags/tags.html:62 +#: rhodecode/templates/branches/branches.html:78 +#: rhodecode/templates/journal/journal.html:195 +#: rhodecode/templates/tags/tags.html:79 msgid "No records found." msgstr "レコードが見つかりません" -#: rhodecode/templates/index_base.html:201 +#: rhodecode/templates/index_base.html:210 +#: rhodecode/templates/index_base.html:294 #: rhodecode/templates/admin/repos/repos.html:97 -#: rhodecode/templates/admin/users/user_edit_my_account.html:182 +#: rhodecode/templates/admin/users/user_edit_my_account.html:205 #: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:63 -#: rhodecode/templates/branches/branches.html:80 -#: rhodecode/templates/journal/journal.html:214 -#: rhodecode/templates/tags/tags.html:63 +#: rhodecode/templates/branches/branches.html:79 +#: rhodecode/templates/journal/journal.html:196 +#: rhodecode/templates/tags/tags.html:80 msgid "Data error." msgstr "データエラー" -#: rhodecode/templates/index_base.html:202 +#: rhodecode/templates/index_base.html:211 +#: rhodecode/templates/index_base.html:295 #: rhodecode/templates/admin/repos/repos.html:98 -#: rhodecode/templates/admin/users/user_edit_my_account.html:183 +#: rhodecode/templates/admin/users/user_edit_my_account.html:206 #: rhodecode/templates/admin/users/users.html:111 #: rhodecode/templates/bookmarks/bookmarks.html:64 -#: rhodecode/templates/branches/branches.html:81 -#: rhodecode/templates/journal/journal.html:215 -#: rhodecode/templates/tags/tags.html:64 +#: rhodecode/templates/branches/branches.html:80 +#: rhodecode/templates/journal/journal.html:54 +#: rhodecode/templates/journal/journal.html:197 +#: rhodecode/templates/tags/tags.html:81 msgid "Loading..." msgstr "読み込み中..." @@ -1421,7 +1482,7 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit.html:50 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26 #: rhodecode/templates/base/base.html:83 -#: rhodecode/templates/summary/summary.html:122 +#: rhodecode/templates/summary/summary.html:131 msgid "Username" msgstr "ユーザー名" @@ -1478,23 +1539,23 @@ msgstr "パスワード再入力" #: rhodecode/templates/register.html:47 #: rhodecode/templates/admin/users/user_add.html:59 -#: rhodecode/templates/admin/users/user_edit.html:86 +#: rhodecode/templates/admin/users/user_edit.html:90 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:53 msgid "First Name" msgstr "名前" #: rhodecode/templates/register.html:56 #: rhodecode/templates/admin/users/user_add.html:68 -#: rhodecode/templates/admin/users/user_edit.html:95 +#: rhodecode/templates/admin/users/user_edit.html:99 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:62 msgid "Last Name" msgstr "名字" #: rhodecode/templates/register.html:65 #: rhodecode/templates/admin/users/user_add.html:77 -#: rhodecode/templates/admin/users/user_edit.html:104 +#: rhodecode/templates/admin/users/user_edit.html:108 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71 -#: rhodecode/templates/summary/summary.html:124 +#: rhodecode/templates/summary/summary.html:133 msgid "Email" msgstr "メールアドレス" @@ -1534,7 +1595,7 @@ msgid "tags" msgstr "タグ" #: rhodecode/templates/switch_to_list.html:22 -#: rhodecode/templates/tags/tags_data.html:33 +#: rhodecode/templates/tags/tags_data.html:38 msgid "There are no tags yet" msgstr "まだタグがありません" @@ -1557,8 +1618,8 @@ msgstr "管理者ジャーナル" #: rhodecode/templates/admin/repos/repos.html:74 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:9 -#: rhodecode/templates/journal/journal.html:61 -#: rhodecode/templates/journal/journal.html:62 +#: rhodecode/templates/journal/journal_page_repos.html:9 +#: rhodecode/templates/journal/journal_page_repos.html:10 msgid "Action" msgstr "アクション" @@ -1569,8 +1630,9 @@ msgstr "リポジトリ" #: rhodecode/templates/admin/admin_log.html:8 #: rhodecode/templates/bookmarks/bookmarks.html:37 #: rhodecode/templates/bookmarks/bookmarks_data.html:7 -#: rhodecode/templates/branches/branches.html:52 -#: rhodecode/templates/tags/tags.html:37 +#: rhodecode/templates/branches/branches.html:51 +#: rhodecode/templates/branches/branches_data.html:7 +#: rhodecode/templates/tags/tags.html:52 #: rhodecode/templates/tags/tags_data.html:7 msgid "Date" msgstr "日時" @@ -1579,7 +1641,7 @@ msgstr "日時" msgid "From IP" msgstr "アクセス元IPアドレス" -#: rhodecode/templates/admin/admin_log.html:53 +#: rhodecode/templates/admin/admin_log.html:57 msgid "No actions yet" msgstr "まだアクションがありません" @@ -1659,8 +1721,8 @@ msgstr "メールアドレス属性" #: rhodecode/templates/admin/repos/repo_edit.html:141 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74 #: rhodecode/templates/admin/settings/hooks.html:73 -#: rhodecode/templates/admin/users/user_edit.html:129 -#: rhodecode/templates/admin/users/user_edit.html:174 +#: rhodecode/templates/admin/users/user_edit.html:133 +#: 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 @@ -1681,8 +1743,8 @@ msgid "Comments" msgstr "コメント" #: rhodecode/templates/admin/notifications/notifications.html:31 -#: rhodecode/templates/base/base.html:254 -#: rhodecode/templates/base/base.html:256 +#: rhodecode/templates/base/base.html:266 +#: rhodecode/templates/base/base.html:268 msgid "Pull requests" msgstr "プルリクエスト" @@ -1710,7 +1772,7 @@ msgstr "権限管理" #: rhodecode/templates/admin/permissions/permissions.html:11 #: rhodecode/templates/admin/repos/repo_edit.html:134 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58 -#: rhodecode/templates/admin/users/user_edit.html:139 +#: rhodecode/templates/admin/users/user_edit.html:143 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100 #: rhodecode/templates/settings/repo_settings.html:86 msgid "Permissions" @@ -1752,7 +1814,7 @@ msgid "Repository forking" msgstr "リポジトリフォーク" #: rhodecode/templates/admin/permissions/permissions.html:78 -#: rhodecode/templates/admin/repos/repo_edit.html:241 +#: rhodecode/templates/admin/repos/repo_edit.html:264 msgid "set" msgstr "保存" @@ -1772,8 +1834,8 @@ msgid "add new" msgstr "新規追加" #: rhodecode/templates/admin/repos/repo_add_base.html:20 -#: rhodecode/templates/summary/summary.html:95 -#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:104 +#: rhodecode/templates/summary/summary.html:105 msgid "Clone from" msgstr "クローン元" @@ -1849,12 +1911,14 @@ msgstr "リポジトリを編集" #: rhodecode/templates/admin/repos/repo_edit.html:13 #: rhodecode/templates/admin/users/user_edit.html:13 -#: rhodecode/templates/admin/users/user_edit.html:224 -#: rhodecode/templates/admin/users/user_edit.html:226 +#: rhodecode/templates/admin/users/user_edit.html:228 +#: rhodecode/templates/admin/users/user_edit.html:230 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13 -#: rhodecode/templates/files/files_source.html:44 -#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:207 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:209 +#: rhodecode/templates/files/files_source.html:29 +#: rhodecode/templates/journal/journal_page_repos.html:29 msgid "edit" msgstr "編集" @@ -1900,11 +1964,11 @@ msgstr "リポジトリの所有者を変更" #: rhodecode/templates/admin/repos/repo_edit.html:142 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75 #: rhodecode/templates/admin/settings/settings.html:113 -#: rhodecode/templates/admin/settings/settings.html:168 -#: rhodecode/templates/admin/settings/settings.html:258 -#: rhodecode/templates/admin/users/user_edit.html:130 -#: rhodecode/templates/admin/users/user_edit.html:175 -#: rhodecode/templates/admin/users/user_edit.html:278 +#: rhodecode/templates/admin/settings/settings.html:179 +#: rhodecode/templates/admin/settings/settings.html:269 +#: rhodecode/templates/admin/users/user_edit.html:134 +#: rhodecode/templates/admin/users/user_edit.html:179 +#: rhodecode/templates/admin/users/user_edit.html:282 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80 #: rhodecode/templates/admin/users_groups/users_group_edit.html:136 #: rhodecode/templates/files/files_add.html:82 @@ -1962,78 +2026,104 @@ msgstr "リポジトリのキャッシュを無効化" msgid "Confirm to invalidate repository cache" msgstr "リポジトリのキャッシュを無効化してもよろしいですか？" -#: rhodecode/templates/admin/repos/repo_edit.html:195 -#: rhodecode/templates/base/base.html:318 -#: rhodecode/templates/base/base.html:320 -#: rhodecode/templates/base/base.html:322 -msgid "Public journal" -msgstr "公開ジャーナル" +#: rhodecode/templates/admin/repos/repo_edit.html:193 +msgid "" +"Manually invalidate cache for this repository. On first access repository" +" will be cached again" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:198 +msgid "List of cached values" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:201 -msgid "Remove from public journal" -msgstr "公開ジャーナルから削除する" +msgid "Prefix" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:202 +#, fuzzy +msgid "Key" +msgstr "APIキー" #: rhodecode/templates/admin/repos/repo_edit.html:203 +#: rhodecode/templates/admin/users/user_add.html:86 +#: rhodecode/templates/admin/users/user_edit.html:117 +#: rhodecode/templates/admin/users_groups/users_group_add.html:41 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:42 +msgid "Active" +msgstr "アクティブ" + +#: rhodecode/templates/admin/repos/repo_edit.html:218 +#: rhodecode/templates/base/base.html:330 +#: rhodecode/templates/base/base.html:332 +#: rhodecode/templates/base/base.html:334 +msgid "Public journal" +msgstr "公開ジャーナル" + +#: rhodecode/templates/admin/repos/repo_edit.html:224 +msgid "Remove from public journal" +msgstr "公開ジャーナルから削除する" + +#: rhodecode/templates/admin/repos/repo_edit.html:226 msgid "Add to public journal" msgstr "公開ジャーナルに追加する" -#: rhodecode/templates/admin/repos/repo_edit.html:208 +#: rhodecode/templates/admin/repos/repo_edit.html:231 msgid "" "All actions made on this repository will be accessible to everyone in " "public journal" msgstr "公開ジャーナルでは、このリポジトリに対して行った操作のすべてが公開されます" -#: rhodecode/templates/admin/repos/repo_edit.html:215 +#: rhodecode/templates/admin/repos/repo_edit.html:238 msgid "Locking" msgstr "ロック" -#: rhodecode/templates/admin/repos/repo_edit.html:220 +#: rhodecode/templates/admin/repos/repo_edit.html:243 msgid "Unlock locked repo" msgstr "リポジトリのアンロック" -#: rhodecode/templates/admin/repos/repo_edit.html:220 +#: rhodecode/templates/admin/repos/repo_edit.html:243 msgid "Confirm to unlock repository" msgstr "このリポジトリのロックを外しますか？" -#: rhodecode/templates/admin/repos/repo_edit.html:223 +#: rhodecode/templates/admin/repos/repo_edit.html:246 msgid "lock repo" msgstr "リポジトリのロック" -#: rhodecode/templates/admin/repos/repo_edit.html:223 +#: rhodecode/templates/admin/repos/repo_edit.html:246 msgid "Confirm to lock repository" msgstr "このリポジトリをロックしますか？" -#: rhodecode/templates/admin/repos/repo_edit.html:224 +#: rhodecode/templates/admin/repos/repo_edit.html:247 msgid "Repository is not locked" msgstr "リポジトリはロックされていません" -#: rhodecode/templates/admin/repos/repo_edit.html:229 +#: rhodecode/templates/admin/repos/repo_edit.html:252 msgid "Force locking on repository. Works only when anonymous access is disabled" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:236 +#: rhodecode/templates/admin/repos/repo_edit.html:259 msgid "Set as fork of" msgstr "フォーク元の設定" -#: rhodecode/templates/admin/repos/repo_edit.html:245 +#: rhodecode/templates/admin/repos/repo_edit.html:268 msgid "Manually set this repository as a fork of another from the list" msgstr "このリポジトリをリスト中の他のリポジトリのフォークとして、手動で設定します" -#: rhodecode/templates/admin/repos/repo_edit.html:251 +#: rhodecode/templates/admin/repos/repo_edit.html:274 #: rhodecode/templates/changeset/changeset_file_comment.html:26 msgid "Delete" msgstr "削除" -#: rhodecode/templates/admin/repos/repo_edit.html:255 +#: rhodecode/templates/admin/repos/repo_edit.html:278 msgid "Remove this repository" msgstr "このリポジトリを削除" -#: rhodecode/templates/admin/repos/repo_edit.html:255 -#: rhodecode/templates/journal/journal.html:84 +#: rhodecode/templates/admin/repos/repo_edit.html:278 msgid "Confirm to delete this repository" msgstr "このリポジトリを削除しますか？" -#: rhodecode/templates/admin/repos/repo_edit.html:259 +#: rhodecode/templates/admin/repos/repo_edit.html:282 msgid "" "This repository will be renamed in a special way in order to be " "unaccesible for RhodeCode and VCS systems.\n" @@ -2061,7 +2151,7 @@ msgstr "書込" #: rhodecode/templates/admin/repos/repo_edit_perms.html:6 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6 #: rhodecode/templates/admin/users/users.html:85 -#: rhodecode/templates/base/base.html:217 +#: rhodecode/templates/base/base.html:229 msgid "admin" msgstr "管理" @@ -2072,8 +2162,8 @@ msgstr "メンバー" #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 #: rhodecode/templates/data_table/_dt_elements.html:67 -#: rhodecode/templates/journal/journal.html:132 -#: rhodecode/templates/summary/summary.html:76 +#: rhodecode/templates/journal/journal.html:87 +#: rhodecode/templates/summary/summary.html:85 msgid "private repository" msgstr "非公開リポジトリ" @@ -2096,12 +2186,12 @@ msgid "Add another member" msgstr "別のメンバーを追加" #: rhodecode/templates/admin/repos/repo_edit_perms.html:97 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 msgid "Failed to remove user" msgstr "ユーザーの削除に失敗しました" #: rhodecode/templates/admin/repos/repo_edit_perms.html:112 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:96 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:103 msgid "Failed to remove users group" msgstr "ユーザーグループの削除に失敗しました" @@ -2109,11 +2199,44 @@ msgstr "ユーザーグループの削除に失敗しました" msgid "Repositories administration" msgstr "リポジトリ管理" -#: rhodecode/templates/admin/repos_groups/repos_groups.html:8 -msgid "Groups" -msgstr "グループ" - -#: rhodecode/templates/admin/repos_groups/repos_groups.html:12 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:73 +msgid "apply to children" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74 +msgid "" +"Set or revoke permission to all children of that group, including " +"repositories and other groups" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups.html:9 +#: rhodecode/templates/base/base.html:122 +#: rhodecode/templates/base/base.html:312 +#: rhodecode/templates/base/base.html:314 +#: rhodecode/templates/base/base.html:316 +#: rhodecode/templates/bookmarks/bookmarks.html:11 +#: rhodecode/templates/branches/branches.html:10 +#: rhodecode/templates/changelog/changelog.html:10 +#: rhodecode/templates/changeset/changeset.html:10 +#: rhodecode/templates/changeset/changeset_range.html:9 +#: rhodecode/templates/compare/compare_diff.html:9 +#: rhodecode/templates/files/file_diff.html:8 +#: rhodecode/templates/files/files.html:8 +#: rhodecode/templates/files/files_add.html:15 +#: rhodecode/templates/files/files_edit.html:15 +#: rhodecode/templates/followers/followers.html:9 +#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9 +#: rhodecode/templates/pullrequests/pullrequest.html:8 +#: rhodecode/templates/pullrequests/pullrequest_show.html:8 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 +#: rhodecode/templates/settings/repo_settings.html:9 +#: rhodecode/templates/shortlog/shortlog.html:10 +#: rhodecode/templates/summary/summary.html:8 +#: rhodecode/templates/tags/tags.html:11 +msgid "Home" +msgstr "ホーム" + +#: rhodecode/templates/admin/repos_groups/repos_groups.html:13 msgid "with" msgstr "と" @@ -2139,7 +2262,7 @@ msgstr "親グループ" #: rhodecode/templates/admin/users/user_add.html:94 #: rhodecode/templates/admin/users_groups/users_group_add.html:49 #: rhodecode/templates/admin/users_groups/users_group_edit.html:90 -#: rhodecode/templates/pullrequests/pullrequest_show.html:113 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 msgid "save" msgstr "保存" @@ -2175,20 +2298,21 @@ msgstr "トップレベルリポジトリの数" msgid "action" msgstr "アクション" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -#: rhodecode/templates/admin/users/user_edit.html:255 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55 +#: rhodecode/templates/admin/users/user_edit.html:259 #: rhodecode/templates/admin/users_groups/users_groups.html:44 #: rhodecode/templates/data_table/_dt_elements.html:7 -#: rhodecode/templates/data_table/_dt_elements.html:103 +#: rhodecode/templates/data_table/_dt_elements.html:121 msgid "delete" msgstr "削除" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -#, python-format -msgid "Confirm to delete this group: %s" -msgstr "グループ %s を削除してもよろしいですか？" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:62 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55 +#, fuzzy, python-format +msgid "Confirm to delete this group: %s with %s repository" +msgid_plural "Confirm to delete this group: %s with %s repositories" +msgstr[0] "このリポジトリを削除しますか？" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:63 msgid "There are no repositories groups yet" msgstr "まだリポジトリグループがありません" @@ -2281,8 +2405,8 @@ msgid "GA code" msgstr "GAコード" #: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:167 -#: rhodecode/templates/admin/settings/settings.html:257 +#: rhodecode/templates/admin/settings/settings.html:178 +#: rhodecode/templates/admin/settings/settings.html:268 msgid "Save settings" msgstr "設定を保存" @@ -2290,126 +2414,134 @@ msgstr "設定を保存" msgid "Visualisation settings" msgstr "表示の設定" -#: rhodecode/templates/admin/settings/settings.html:128 +#: rhodecode/templates/admin/settings/settings.html:127 +#, fuzzy +msgid "General" +msgstr "有効にする" + +#: rhodecode/templates/admin/settings/settings.html:132 +msgid "Use lightweight dashboard" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:139 msgid "Icons" msgstr "アイコン" -#: rhodecode/templates/admin/settings/settings.html:133 +#: rhodecode/templates/admin/settings/settings.html:144 msgid "Show public repo icon on repositories" msgstr "公開リポジトリのアイコンを表示" -#: rhodecode/templates/admin/settings/settings.html:137 +#: rhodecode/templates/admin/settings/settings.html:148 msgid "Show private repo icon on repositories" msgstr "非公開リポジトリのアイコンを表示" -#: rhodecode/templates/admin/settings/settings.html:144 +#: rhodecode/templates/admin/settings/settings.html:155 msgid "Meta-Tagging" msgstr "メタタグ" -#: rhodecode/templates/admin/settings/settings.html:149 +#: rhodecode/templates/admin/settings/settings.html:160 msgid "Stylify recognised metatags:" msgstr "次のメタタグを変換する" -#: rhodecode/templates/admin/settings/settings.html:176 +#: rhodecode/templates/admin/settings/settings.html:187 msgid "VCS settings" msgstr "VCSの設定" -#: rhodecode/templates/admin/settings/settings.html:185 +#: rhodecode/templates/admin/settings/settings.html:196 msgid "Web" msgstr "Web" -#: rhodecode/templates/admin/settings/settings.html:190 +#: rhodecode/templates/admin/settings/settings.html:201 msgid "require ssl for vcs operations" msgstr "VCSの操作にSSLを必須とする" -#: rhodecode/templates/admin/settings/settings.html:192 +#: rhodecode/templates/admin/settings/settings.html:203 msgid "" "RhodeCode will require SSL for pushing or pulling. If SSL is missing it " "will return HTTP Error 406: Not Acceptable" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:198 +#: rhodecode/templates/admin/settings/settings.html:209 msgid "Hooks" msgstr "フック" -#: rhodecode/templates/admin/settings/settings.html:203 +#: rhodecode/templates/admin/settings/settings.html:214 msgid "Update repository after push (hg update)" msgstr "プッシュ後にリポジトリをを更新する (hg update)" -#: rhodecode/templates/admin/settings/settings.html:207 +#: rhodecode/templates/admin/settings/settings.html:218 msgid "Show repository size after push" msgstr "プッシュ後にリポジトリのサイズを表示する" -#: rhodecode/templates/admin/settings/settings.html:211 +#: rhodecode/templates/admin/settings/settings.html:222 msgid "Log user push commands" msgstr "ユーザーのプッシュコマンドを記録する" -#: rhodecode/templates/admin/settings/settings.html:215 +#: rhodecode/templates/admin/settings/settings.html:226 msgid "Log user pull commands" msgstr "ユーザーのプルコマンドを記録する" -#: rhodecode/templates/admin/settings/settings.html:219 +#: rhodecode/templates/admin/settings/settings.html:230 msgid "advanced setup" msgstr "高度な設定" -#: rhodecode/templates/admin/settings/settings.html:224 +#: rhodecode/templates/admin/settings/settings.html:235 msgid "Mercurial Extensions" msgstr "Mercurialエクステンション" -#: rhodecode/templates/admin/settings/settings.html:229 +#: rhodecode/templates/admin/settings/settings.html:240 msgid "largefiles extensions" msgstr "largefilesエクステンション" -#: rhodecode/templates/admin/settings/settings.html:233 +#: rhodecode/templates/admin/settings/settings.html:244 msgid "hgsubversion extensions" msgstr "hgsubversionエクステンション" -#: rhodecode/templates/admin/settings/settings.html:235 +#: rhodecode/templates/admin/settings/settings.html:246 msgid "" "Requires hgsubversion library installed. Allows clonning from svn remote " "locations" -msgstr "" -"hgsubversion のインストールが必要です。" -"リモートロケーションのsvnからクローン出来るようになります" - -#: rhodecode/templates/admin/settings/settings.html:245 +msgstr "hgsubversion のインストールが必要です。リモートロケーションのsvnからクローン出来るようになります" + +#: rhodecode/templates/admin/settings/settings.html:256 msgid "Repositories location" msgstr "リポジトリロケーション" -#: rhodecode/templates/admin/settings/settings.html:250 +#: rhodecode/templates/admin/settings/settings.html:261 msgid "" "This a crucial application setting. If you are really sure you need to " "change this, you must restart application in order to make this setting " "take effect. Click this label to unlock." msgstr "これはアプリケーションの重要な設定です。本当に変更が必要でしょうか。もし、変更した場合、変更を反映さ競るためにアプリケーションを再起動する必要があります。変更可能にするにはこのラベルをクリックして下さい" -#: rhodecode/templates/admin/settings/settings.html:251 +#: rhodecode/templates/admin/settings/settings.html:262 +#: rhodecode/templates/base/base.html:221 msgid "unlock" msgstr "変更可能にする" -#: rhodecode/templates/admin/settings/settings.html:252 +#: rhodecode/templates/admin/settings/settings.html:263 msgid "" "Location where repositories are stored. After changing this value a " "restart, and rescan is required" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:272 +#: rhodecode/templates/admin/settings/settings.html:283 msgid "Test Email" msgstr "テストメール" -#: rhodecode/templates/admin/settings/settings.html:280 +#: rhodecode/templates/admin/settings/settings.html:291 msgid "Email to" msgstr "送信先" -#: rhodecode/templates/admin/settings/settings.html:288 +#: rhodecode/templates/admin/settings/settings.html:299 msgid "Send" msgstr "送る" -#: rhodecode/templates/admin/settings/settings.html:294 +#: rhodecode/templates/admin/settings/settings.html:305 msgid "System Info and Packages" msgstr "システム情報とパッケージ" -#: rhodecode/templates/admin/settings/settings.html:297 +#: rhodecode/templates/admin/settings/settings.html:308 msgid "show" msgstr "表示" @@ -2430,13 +2562,6 @@ msgstr "新しいユーザーを追加" msgid "Password confirmation" msgstr "パスワード再入力" -#: rhodecode/templates/admin/users/user_add.html:86 -#: rhodecode/templates/admin/users/user_edit.html:113 -#: rhodecode/templates/admin/users_groups/users_group_add.html:41 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:42 -msgid "Active" -msgstr "アクティブ" - #: rhodecode/templates/admin/users/user_edit.html:5 msgid "Edit user" msgstr "ユーザー編集" @@ -2456,26 +2581,26 @@ msgstr "メールアドレス:" msgid "API key" msgstr "APIキー" -#: rhodecode/templates/admin/users/user_edit.html:59 +#: rhodecode/templates/admin/users/user_edit.html:63 msgid "LDAP DN" msgstr "LDAP DN" -#: rhodecode/templates/admin/users/user_edit.html:68 +#: rhodecode/templates/admin/users/user_edit.html:72 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:35 msgid "New password" msgstr "新しいパスワード" -#: rhodecode/templates/admin/users/user_edit.html:77 +#: rhodecode/templates/admin/users/user_edit.html:81 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:44 msgid "New password confirmation" msgstr "新しいパスワード 再入力" -#: rhodecode/templates/admin/users/user_edit.html:147 +#: rhodecode/templates/admin/users/user_edit.html:151 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108 msgid "Inherit default permissions" msgstr "デフォルトの権限を継承する" -#: rhodecode/templates/admin/users/user_edit.html:152 +#: rhodecode/templates/admin/users/user_edit.html:156 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113 #, python-format msgid "" @@ -2483,46 +2608,48 @@ msgid "" "options does not have any action" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:158 +#: rhodecode/templates/admin/users/user_edit.html:162 #: rhodecode/templates/admin/users_groups/users_group_edit.html:119 msgid "Create repositories" msgstr "リポジトリを作成する" -#: rhodecode/templates/admin/users/user_edit.html:166 +#: rhodecode/templates/admin/users/user_edit.html:170 #: rhodecode/templates/admin/users_groups/users_group_edit.html:127 msgid "Fork repositories" msgstr "リポジトリをフォークする" -#: rhodecode/templates/admin/users/user_edit.html:186 +#: rhodecode/templates/admin/users/user_edit.html:190 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39 msgid "Nothing here yet" msgstr "まだありません" -#: rhodecode/templates/admin/users/user_edit.html:193 +#: rhodecode/templates/admin/users/user_edit.html:197 #: rhodecode/templates/admin/users/user_edit_my_account.html:60 -#: rhodecode/templates/admin/users/user_edit_my_account.html:194 +#: rhodecode/templates/admin/users/user_edit_my_account.html:217 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:185 msgid "Permission" msgstr "権限" -#: rhodecode/templates/admin/users/user_edit.html:194 +#: rhodecode/templates/admin/users/user_edit.html:198 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:186 msgid "Edit Permission" msgstr "権限の編集" -#: rhodecode/templates/admin/users/user_edit.html:243 +#: rhodecode/templates/admin/users/user_edit.html:247 msgid "Email addresses" msgstr "メールアドレス" -#: rhodecode/templates/admin/users/user_edit.html:256 +#: rhodecode/templates/admin/users/user_edit.html:260 #, python-format msgid "Confirm to delete this email: %s" msgstr "このメールを削除してよろしいですか: %s" -#: rhodecode/templates/admin/users/user_edit.html:270 +#: rhodecode/templates/admin/users/user_edit.html:274 msgid "New email address" msgstr "新しいメールアドレス" -#: rhodecode/templates/admin/users/user_edit.html:277 +#: rhodecode/templates/admin/users/user_edit.html:281 msgid "Add" msgstr "追加" @@ -2578,31 +2705,33 @@ msgstr "プルリクエスト #%s %s によって %s に作成" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7 #: rhodecode/templates/bookmarks/bookmarks.html:40 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 -#: rhodecode/templates/branches/branches.html:55 -#: rhodecode/templates/journal/journal.html:60 -#: rhodecode/templates/tags/tags.html:40 +#: rhodecode/templates/branches/branches.html:54 +#: rhodecode/templates/branches/branches_data.html:9 +#: rhodecode/templates/journal/journal_page_repos.html:8 +#: rhodecode/templates/tags/tags.html:55 #: rhodecode/templates/tags/tags_data.html:9 msgid "Revision" msgstr "リビジョン" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 -#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/journal/journal_page_repos.html:29 msgid "private" msgstr "非公開" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31 #: rhodecode/templates/data_table/_dt_elements.html:7 +#: rhodecode/templates/journal/journal_page_repos.html:32 #, python-format msgid "Confirm to delete this repository: %s" msgstr "このリポジトリを削除しますか？ : %s" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38 -#: rhodecode/templates/journal/journal.html:94 +#: rhodecode/templates/journal/journal_page_repos.html:42 msgid "No repositories yet" msgstr "まだリポジトリがありません" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40 -#: rhodecode/templates/journal/journal.html:96 +#: rhodecode/templates/journal/journal_page_repos.html:44 msgid "create one now" msgstr "今すぐ作成する" @@ -2611,7 +2740,7 @@ msgid "Users administration" msgstr "ユーザー管理" #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/base/base.html:223 +#: rhodecode/templates/base/base.html:235 msgid "users" msgstr "ユーザー" @@ -2641,7 +2770,7 @@ msgid "active" msgstr "アクティブ" #: rhodecode/templates/admin/users/users.html:86 -#: rhodecode/templates/base/base.html:226 +#: rhodecode/templates/base/base.html:238 msgid "ldap" msgstr "LDAP" @@ -2690,6 +2819,21 @@ msgstr "全ての要素を追加" msgid "Group members" msgstr "グループメンバー" +#: rhodecode/templates/admin/users_groups/users_group_edit.html:163 +#, fuzzy +msgid "No members yet" +msgstr "メンバー" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:171 +#, fuzzy +msgid "Permissions defined for this group" +msgstr "権限管理" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:178 +#, fuzzy +msgid "No permissions set yet" +msgstr "権限のコピー" + #: rhodecode/templates/admin/users_groups/users_groups.html:5 msgid "Users groups administration" msgstr "ユーザーグループ管理" @@ -2732,36 +2876,10 @@ msgstr "ログイン" msgid "Inbox" msgstr "受信箱" -#: rhodecode/templates/base/base.html:122 -#: rhodecode/templates/base/base.html:300 -#: rhodecode/templates/base/base.html:302 -#: rhodecode/templates/base/base.html:304 -#: rhodecode/templates/bookmarks/bookmarks.html:11 -#: rhodecode/templates/branches/branches.html:10 -#: rhodecode/templates/changelog/changelog.html:10 -#: rhodecode/templates/changeset/changeset.html:10 -#: rhodecode/templates/changeset/changeset_range.html:9 -#: rhodecode/templates/compare/compare_diff.html:9 -#: rhodecode/templates/files/file_diff.html:8 -#: rhodecode/templates/files/files.html:8 -#: rhodecode/templates/files/files_add.html:15 -#: rhodecode/templates/files/files_edit.html:15 -#: rhodecode/templates/followers/followers.html:9 -#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9 -#: rhodecode/templates/pullrequests/pullrequest.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 -#: rhodecode/templates/settings/repo_settings.html:9 -#: rhodecode/templates/shortlog/shortlog.html:10 -#: rhodecode/templates/summary/summary.html:8 -#: rhodecode/templates/tags/tags.html:11 -msgid "Home" -msgstr "ホーム" - #: rhodecode/templates/base/base.html:123 -#: rhodecode/templates/base/base.html:309 -#: rhodecode/templates/base/base.html:311 -#: rhodecode/templates/base/base.html:313 +#: rhodecode/templates/base/base.html:321 +#: rhodecode/templates/base/base.html:323 +#: rhodecode/templates/base/base.html:325 #: rhodecode/templates/journal/journal.html:4 #: rhodecode/templates/journal/journal.html:21 #: rhodecode/templates/journal/public_journal.html:4 @@ -2781,7 +2899,7 @@ msgid "Products" msgstr "" #: rhodecode/templates/base/base.html:152 -#: rhodecode/templates/base/base.html:182 +#: rhodecode/templates/base/base.html:182 rhodecode/templates/base/root.html:47 msgid "loading..." msgstr "読み込み中..." @@ -2826,50 +2944,64 @@ msgstr "オプション" #: rhodecode/templates/base/base.html:204 #: rhodecode/templates/base/base.html:206 -#: rhodecode/templates/base/base.html:227 -msgid "settings" -msgstr "設定" - -#: rhodecode/templates/base/base.html:209 +#, fuzzy +msgid "repository settings" +msgstr "リポジトリ作成" + +#: rhodecode/templates/base/base.html:210 #: rhodecode/templates/data_table/_dt_elements.html:80 #: rhodecode/templates/forks/fork.html:13 msgid "fork" msgstr "フォーク" -#: rhodecode/templates/base/base.html:211 -#: rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/templates/base/base.html:212 rhodecode/templates/base/root.html:50 +#: rhodecode/templates/changelog/changelog.html:43 msgid "Open new pull request" msgstr "新しいプルリクエストを作成" -#: rhodecode/templates/base/base.html:213 +#: rhodecode/templates/base/base.html:215 +#: rhodecode/templates/forks/forks_data.html:21 +msgid "Compare fork" +msgstr "フォークを比較" + +#: rhodecode/templates/base/base.html:217 msgid "search" msgstr "検索" -#: rhodecode/templates/base/base.html:222 +#: rhodecode/templates/base/base.html:223 +#, fuzzy +msgid "lock" +msgstr "変更可能にする" + +#: rhodecode/templates/base/base.html:234 msgid "repositories groups" msgstr "リポジトリグループ" -#: rhodecode/templates/base/base.html:224 +#: rhodecode/templates/base/base.html:236 msgid "users groups" msgstr "ユーザーグループ" -#: rhodecode/templates/base/base.html:225 +#: rhodecode/templates/base/base.html:237 msgid "permissions" msgstr "権限" -#: rhodecode/templates/base/base.html:238 -#: rhodecode/templates/base/base.html:240 +#: rhodecode/templates/base/base.html:239 +msgid "settings" +msgstr "設定" + +#: rhodecode/templates/base/base.html:250 +#: rhodecode/templates/base/base.html:252 msgid "Followers" msgstr "フォロワー" -#: rhodecode/templates/base/base.html:246 -#: rhodecode/templates/base/base.html:248 +#: rhodecode/templates/base/base.html:258 +#: rhodecode/templates/base/base.html:260 msgid "Forks" msgstr "フォーク" -#: rhodecode/templates/base/base.html:327 -#: rhodecode/templates/base/base.html:329 -#: rhodecode/templates/base/base.html:331 +#: rhodecode/templates/base/base.html:339 +#: rhodecode/templates/base/base.html:341 +#: rhodecode/templates/base/base.html:343 #: rhodecode/templates/search/search.html:52 msgid "Search" msgstr "検索" @@ -2879,7 +3011,7 @@ msgid "add another comment" msgstr "別のコメントを追加" #: rhodecode/templates/base/root.html:43 -#: rhodecode/templates/journal/journal.html:120 +#: rhodecode/templates/journal/journal.html:75 #: rhodecode/templates/summary/summary.html:57 msgid "Stop following this repository" msgstr "このリポジトリのフォローをやめる" @@ -2893,14 +3025,27 @@ msgstr "このリポジトリのフォローする" msgid "Group" msgstr "グループ" -#: rhodecode/templates/base/root.html:47 +#: rhodecode/templates/base/root.html:48 msgid "search truncated" msgstr "検索結果は省略されています" -#: rhodecode/templates/base/root.html:48 +#: rhodecode/templates/base/root.html:49 msgid "no matching files" msgstr "マッチするファイルはありません" +#: rhodecode/templates/base/root.html:51 +#, fuzzy +msgid "Open new pull request for selected changesets" +msgstr "新しいプルリクエストを作成" + +#: rhodecode/templates/base/root.html:52 +msgid "Show selected changes __S -> __E" +msgstr "" + +#: rhodecode/templates/base/root.html:53 +msgid "Selection link" +msgstr "" + #: rhodecode/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" @@ -2908,8 +3053,9 @@ msgstr "%s ブックマーク" #: rhodecode/templates/bookmarks/bookmarks.html:39 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 -#: rhodecode/templates/branches/branches.html:54 -#: rhodecode/templates/tags/tags.html:39 +#: rhodecode/templates/branches/branches.html:53 +#: rhodecode/templates/branches/branches_data.html:8 +#: rhodecode/templates/tags/tags.html:54 #: rhodecode/templates/tags/tags_data.html:8 msgid "Author" msgstr "作成者" @@ -2923,34 +3069,15 @@ msgstr "%s ブランチ" msgid "Compare branches" msgstr "ブランチの比較" -#: rhodecode/templates/branches/branches.html:57 +#: rhodecode/templates/branches/branches.html:56 +#: rhodecode/templates/branches/branches_data.html:10 #: rhodecode/templates/compare/compare_diff.html:5 #: rhodecode/templates/compare/compare_diff.html:13 +#: rhodecode/templates/tags/tags.html:57 +#: rhodecode/templates/tags/tags_data.html:10 msgid "Compare" msgstr "比較" -#: rhodecode/templates/branches/branches_data.html:6 -msgid "name" -msgstr "名前" - -#: rhodecode/templates/branches/branches_data.html:7 -msgid "date" -msgstr "日付" - -#: rhodecode/templates/branches/branches_data.html:8 -#: rhodecode/templates/shortlog/shortlog_data.html:8 -msgid "author" -msgstr "作成者" - -#: rhodecode/templates/branches/branches_data.html:9 -#: rhodecode/templates/shortlog/shortlog_data.html:5 -msgid "revision" -msgstr "リビジョン" - -#: rhodecode/templates/branches/branches_data.html:10 -msgid "compare" -msgstr "比較" - #: rhodecode/templates/changelog/changelog.html:6 #, python-format msgid "%s Changelog" @@ -2963,57 +3090,65 @@ msgid_plural "showing %d out of %d revis msgstr[0] "" #: rhodecode/templates/changelog/changelog.html:37 +#, fuzzy +msgid "Clear selection" +msgstr "検索設定" + +#: rhodecode/templates/changelog/changelog.html:40 #: rhodecode/templates/forks/forks_data.html:19 #, python-format msgid "compare fork with %s" msgstr "%s とフォークを比較" -#: rhodecode/templates/changelog/changelog.html:37 -#: rhodecode/templates/forks/forks_data.html:21 -msgid "Compare fork" -msgstr "フォークを比較" - -#: rhodecode/templates/changelog/changelog.html:46 +#: rhodecode/templates/changelog/changelog.html:40 +#, fuzzy +msgid "Compare fork with parent" +msgstr "%s とフォークを比較" + +#: rhodecode/templates/changelog/changelog.html:49 msgid "Show" msgstr "表示" -#: rhodecode/templates/changelog/changelog.html:72 -#: rhodecode/templates/summary/summary.html:364 +#: rhodecode/templates/changelog/changelog.html:74 +#: rhodecode/templates/summary/summary.html:375 msgid "show more" msgstr "もっと表示" -#: rhodecode/templates/changelog/changelog.html:76 +#: rhodecode/templates/changelog/changelog.html:78 msgid "Affected number of files, click to show more details" msgstr "" -#: rhodecode/templates/changelog/changelog.html:89 -#: rhodecode/templates/changeset/changeset.html:38 +#: rhodecode/templates/changelog/changelog.html:91 +#: rhodecode/templates/changeset/changeset.html:44 #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:46 msgid "Changeset status" msgstr "リビジョンステータス" -#: rhodecode/templates/changelog/changelog.html:92 +#: rhodecode/templates/changelog/changelog.html:94 +#: rhodecode/templates/shortlog/shortlog_data.html:20 msgid "Click to open associated pull request" msgstr "関連するプルリクエストを開く" -#: rhodecode/templates/changelog/changelog.html:102 -#: rhodecode/templates/changeset/changeset.html:78 +#: rhodecode/templates/changelog/changelog.html:104 +#: rhodecode/templates/changeset/changeset.html:85 msgid "Parent" msgstr "親リビジョン" -#: rhodecode/templates/changelog/changelog.html:108 -#: rhodecode/templates/changeset/changeset.html:84 +#: rhodecode/templates/changelog/changelog.html:110 +#: rhodecode/templates/changeset/changeset.html:91 msgid "No parents" msgstr "親リビジョンはありません" -#: rhodecode/templates/changelog/changelog.html:113 -#: rhodecode/templates/changeset/changeset.html:88 +#: rhodecode/templates/changelog/changelog.html:115 +#: rhodecode/templates/changeset/changeset.html:95 +#: rhodecode/templates/changeset/changeset_range.html:79 msgid "merge" msgstr "マージ" -#: rhodecode/templates/changelog/changelog.html:116 -#: rhodecode/templates/changeset/changeset.html:91 +#: rhodecode/templates/changelog/changelog.html:118 +#: rhodecode/templates/changeset/changeset.html:98 +#: rhodecode/templates/changeset/changeset_range.html:82 #: rhodecode/templates/files/files.html:29 #: rhodecode/templates/files/files_add.html:33 #: rhodecode/templates/files/files_edit.html:33 @@ -3021,44 +3156,42 @@ msgstr "マージ" msgid "branch" msgstr "ブランチ" -#: rhodecode/templates/changelog/changelog.html:122 +#: rhodecode/templates/changelog/changelog.html:124 +#: rhodecode/templates/changeset/changeset_range.html:88 msgid "bookmark" msgstr "ブックマーク" -#: rhodecode/templates/changelog/changelog.html:128 -#: rhodecode/templates/changeset/changeset.html:96 +#: rhodecode/templates/changelog/changelog.html:130 +#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset_range.html:94 msgid "tag" msgstr "タグ" -#: rhodecode/templates/changelog/changelog.html:164 -msgid "Show selected changes __S -> __E" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:255 +#: rhodecode/templates/changelog/changelog.html:301 msgid "There are no changes yet" msgstr "まだ変更がありません" #: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:66 +#: rhodecode/templates/changeset/changeset.html:73 msgid "removed" msgstr "削除" #: rhodecode/templates/changelog/changelog_details.html:5 -#: rhodecode/templates/changeset/changeset.html:67 +#: rhodecode/templates/changeset/changeset.html:74 msgid "changed" msgstr "変更" #: rhodecode/templates/changelog/changelog_details.html:6 -#: rhodecode/templates/changeset/changeset.html:68 +#: rhodecode/templates/changeset/changeset.html:75 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:70 -#: rhodecode/templates/changeset/changeset.html:71 -#: rhodecode/templates/changeset/changeset.html:72 +#: rhodecode/templates/changeset/changeset.html:77 +#: rhodecode/templates/changeset/changeset.html:78 +#: rhodecode/templates/changeset/changeset.html:79 #, python-format msgid "affected %s files" msgstr "%s ファイルに影響" @@ -3072,38 +3205,50 @@ msgstr "%s チェンジセット" msgid "Changeset" msgstr "チェンジセット" -#: rhodecode/templates/changeset/changeset.html:43 +#: rhodecode/templates/changeset/changeset.html:49 #: rhodecode/templates/changeset/diff_block.html:20 msgid "raw diff" msgstr "差分を表示" -#: rhodecode/templates/changeset/changeset.html:44 +#: rhodecode/templates/changeset/changeset.html:50 +#, fuzzy +msgid "patch diff" +msgstr "差分を表示" + +#: rhodecode/templates/changeset/changeset.html:51 #: rhodecode/templates/changeset/diff_block.html:21 msgid "download diff" msgstr "差分をダウンロード" -#: rhodecode/templates/changeset/changeset.html:48 +#: rhodecode/templates/changeset/changeset.html:55 #: 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:48 +#: rhodecode/templates/changeset/changeset.html:55 #: 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:103 -#, python-format -msgid "%s files affected with %s insertions and %s deletions:" -msgstr "%s ファイルに影響。 %s 個の追加と %s 個の削除:" - -#: rhodecode/templates/changeset/changeset.html:119 -msgid "Changeset was too big and was cut off..." -msgstr "チェンジセットが大きすぎるため、省略しました" +#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/compare/compare_diff.html:44 +#: rhodecode/templates/pullrequests/pullrequest_show.html:76 +#, fuzzy, python-format +msgid "%s file changed" +msgid_plural "%s files changed" +msgstr[0] "変更されたファイル" + +#: rhodecode/templates/changeset/changeset.html:113 +#: rhodecode/templates/compare/compare_diff.html:46 +#: rhodecode/templates/pullrequests/pullrequest_show.html:78 +#, fuzzy, python-format +msgid "%s file changed with %s insertions and %s deletions" +msgid_plural "%s files changed with %s insertions and %s deletions" +msgstr[0] "%s ファイルに影響。 %s 個の追加と %s 個の削除:" #: rhodecode/templates/changeset/changeset_file_comment.html:42 msgid "Submitting..." @@ -3168,15 +3313,18 @@ msgstr "%s チェンジセット" msgid "Compare View" msgstr "比較ビュー" +#: rhodecode/templates/changeset/changeset_range.html:29 +#, fuzzy +msgid "Show combined compare" +msgstr "インラインコメントを表示" + #: rhodecode/templates/changeset/changeset_range.html:54 -#: rhodecode/templates/compare/compare_diff.html:41 -#: rhodecode/templates/pullrequests/pullrequest_show.html:69 msgid "Files affected" msgstr "影響のあるファイル" #: rhodecode/templates/changeset/diff_block.html:19 -msgid "diff" -msgstr "差分" +msgid "show full diff for this file" +msgstr "" #: rhodecode/templates/changeset/diff_block.html:27 msgid "show inline comments" @@ -3187,8 +3335,17 @@ msgid "No changesets" msgstr "チェンジセットはありません" #: rhodecode/templates/compare/compare_diff.html:37 -msgid "Outgoing changesets" -msgstr "送信可能なチェンジセット" +#: rhodecode/templates/pullrequests/pullrequest_show.html:69 +#, fuzzy, python-format +msgid "Showing %s commit" +msgid_plural "Showing %s commits" +msgstr[0] "インラインコメントを表示" + +#: rhodecode/templates/compare/compare_diff.html:52 +#: rhodecode/templates/pullrequests/pullrequest_show.html:84 +#, fuzzy +msgid "No files" +msgstr "ファイル" #: rhodecode/templates/data_table/_dt_elements.html:39 #: rhodecode/templates/data_table/_dt_elements.html:41 @@ -3197,40 +3354,53 @@ msgid "Fork" msgstr "フォーク" #: rhodecode/templates/data_table/_dt_elements.html:60 -#: rhodecode/templates/journal/journal.html:126 -#: rhodecode/templates/summary/summary.html:68 +#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/summary/summary.html:77 msgid "Mercurial repository" msgstr "Mercurialリポジトリ" #: rhodecode/templates/data_table/_dt_elements.html:62 -#: rhodecode/templates/journal/journal.html:128 -#: rhodecode/templates/summary/summary.html:71 +#: rhodecode/templates/journal/journal.html:83 +#: rhodecode/templates/summary/summary.html:80 msgid "Git repository" msgstr "Gitリポジトリ" #: rhodecode/templates/data_table/_dt_elements.html:69 -#: rhodecode/templates/journal/journal.html:134 -#: rhodecode/templates/summary/summary.html:78 +#: rhodecode/templates/journal/journal.html:89 +#: rhodecode/templates/summary/summary.html:87 msgid "public repository" msgstr "公開リポジトリ" #: rhodecode/templates/data_table/_dt_elements.html:80 -#: rhodecode/templates/summary/summary.html:87 -#: rhodecode/templates/summary/summary.html:88 +#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:97 msgid "Fork of" msgstr "フォーク元: " -#: rhodecode/templates/data_table/_dt_elements.html:92 +#: rhodecode/templates/data_table/_dt_elements.html:94 msgid "No changesets yet" msgstr "まだチェンジセットがありません" -#: rhodecode/templates/data_table/_dt_elements.html:104 +#: rhodecode/templates/data_table/_dt_elements.html:101 +#: rhodecode/templates/data_table/_dt_elements.html:103 +#, python-format +msgid "Subscribe to %s rss feed" +msgstr "%s の RSS フィードを購読" + +#: rhodecode/templates/data_table/_dt_elements.html:109 +#: rhodecode/templates/data_table/_dt_elements.html:111 +#, python-format +msgid "Subscribe to %s atom feed" +msgstr "%s の ATOM フィードを購読" + +#: rhodecode/templates/data_table/_dt_elements.html:122 #, python-format msgid "Confirm to delete this user: %s" msgstr "このユーザーを本当に削除してよろしいですか？: %s" #: rhodecode/templates/email_templates/main.html:8 -msgid "This is an notification from RhodeCode." +#, fuzzy +msgid "This is a notification from RhodeCode." msgstr "RhodeCodeからの通知があります" #: rhodecode/templates/errors/error_document.html:46 @@ -3248,13 +3418,13 @@ msgid "File diff" msgstr "ファイル差分" #: rhodecode/templates/files/files.html:4 -#: rhodecode/templates/files/files.html:72 +#: rhodecode/templates/files/files.html:74 #, python-format msgid "%s files" msgstr "%s ファイル" #: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:340 +#: rhodecode/templates/summary/summary.html:351 msgid "files" msgstr "ファイル" @@ -3332,7 +3502,7 @@ msgid "search file list" msgstr "ファイル一覧を検索" #: rhodecode/templates/files/files_browser.html:31 -#: rhodecode/templates/shortlog/shortlog_data.html:65 +#: rhodecode/templates/shortlog/shortlog_data.html:80 msgid "add new file" msgstr "新しいファイルを追加" @@ -3365,18 +3535,18 @@ msgid "edit file" msgstr "ファイルを編集" #: rhodecode/templates/files/files_edit.html:49 -#: rhodecode/templates/files/files_source.html:38 +#: rhodecode/templates/files/files_source.html:23 msgid "show annotation" msgstr "アノテーションを表示" #: rhodecode/templates/files/files_edit.html:50 -#: rhodecode/templates/files/files_source.html:40 -#: rhodecode/templates/files/files_source.html:68 +#: rhodecode/templates/files/files_source.html:25 +#: rhodecode/templates/files/files_source.html:53 msgid "show as raw" msgstr "元のファイルを表示" #: rhodecode/templates/files/files_edit.html:51 -#: rhodecode/templates/files/files_source.html:41 +#: rhodecode/templates/files/files_source.html:26 msgid "download as raw" msgstr "元のファイルをダウンロード" @@ -3388,41 +3558,42 @@ msgstr "ソース" msgid "Editing file" msgstr "ファイルを編集" -#: rhodecode/templates/files/files_source.html:2 +#: rhodecode/templates/files/files_history_box.html:2 msgid "History" msgstr "変更履歴" -#: rhodecode/templates/files/files_source.html:9 +#: rhodecode/templates/files/files_history_box.html:9 msgid "diff to revision" msgstr "このリビジョンの差分を見る" -#: rhodecode/templates/files/files_source.html:10 +#: rhodecode/templates/files/files_history_box.html:10 msgid "show at revision" msgstr "このリビジョンを見る" -#: rhodecode/templates/files/files_source.html:14 +#: rhodecode/templates/files/files_history_box.html:15 #, python-format msgid "%s author" msgid_plural "%s authors" msgstr[0] "%s 作成者" -#: rhodecode/templates/files/files_source.html:36 +#: rhodecode/templates/files/files_source.html:6 +#, fuzzy +msgid "Load file history" +msgstr "ファイル一覧を読み込み中..." + +#: rhodecode/templates/files/files_source.html:21 msgid "show source" msgstr "ソースを表示" -#: rhodecode/templates/files/files_source.html:59 +#: rhodecode/templates/files/files_source.html:44 #, python-format msgid "Binary file (%s)" msgstr "バイナリファイル (%s)" -#: rhodecode/templates/files/files_source.html:68 +#: rhodecode/templates/files/files_source.html:53 msgid "File is too big to display" msgstr "表示するには大きすぎるファイルです" -#: rhodecode/templates/files/files_source.html:124 -msgid "Selection link" -msgstr "" - #: rhodecode/templates/files/files_ypjax.html:5 msgid "annotation" msgstr "アノテーション" @@ -3494,7 +3665,7 @@ msgstr "フォーク" msgid "forked" msgstr "フォークしました" -#: rhodecode/templates/forks/forks_data.html:38 +#: rhodecode/templates/forks/forks_data.html:42 msgid "There are no forks yet" msgstr "まだフォークがありません" @@ -3507,7 +3678,7 @@ msgid "RSS journal feed" msgstr "RSS ジャーナルフィード" #: rhodecode/templates/journal/journal.html:24 -#: rhodecode/templates/pullrequests/pullrequest.html:27 +#: rhodecode/templates/pullrequests/pullrequest.html:55 msgid "Refresh" msgstr "更新" @@ -3529,19 +3700,19 @@ msgstr "ウォッチ" msgid "ADD" msgstr "追加" -#: rhodecode/templates/journal/journal.html:114 +#: rhodecode/templates/journal/journal.html:69 msgid "following user" msgstr "フォローしているユーザー" -#: rhodecode/templates/journal/journal.html:114 +#: rhodecode/templates/journal/journal.html:69 msgid "user" msgstr "ユーザー" -#: rhodecode/templates/journal/journal.html:147 +#: rhodecode/templates/journal/journal.html:102 msgid "You are not following any users or repositories" msgstr "まだどのユーザーもリポジトリもフォローしていません" -#: rhodecode/templates/journal/journal_data.html:47 +#: rhodecode/templates/journal/journal_data.html:51 msgid "No entries yet" msgstr "まだエントリがありません" @@ -3562,7 +3733,7 @@ msgstr "公開ジャーナル" msgid "New pull request" msgstr "新しいプルリクエスト" -#: rhodecode/templates/pullrequests/pullrequest.html:28 +#: rhodecode/templates/pullrequests/pullrequest.html:54 msgid "refresh overview" msgstr "概要の更新" @@ -3571,17 +3742,17 @@ msgid "Detailed compare view" msgstr "比較ビュー詳細" #: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:82 +#: rhodecode/templates/pullrequests/pullrequest_show.html:100 msgid "Pull request reviewers" msgstr "プルリクエストレビュアー" #: rhodecode/templates/pullrequests/pullrequest.html:79 -#: rhodecode/templates/pullrequests/pullrequest_show.html:94 +#: rhodecode/templates/pullrequests/pullrequest_show.html:112 msgid "owner" msgstr "所有者" #: rhodecode/templates/pullrequests/pullrequest.html:91 -#: rhodecode/templates/pullrequests/pullrequest_show.html:109 +#: rhodecode/templates/pullrequests/pullrequest_show.html:127 msgid "Add reviewer to this pull request." msgstr "このプルリクエストにレビュアーを追加" @@ -3608,6 +3779,11 @@ msgstr "プルリクエストを送る" msgid "Closed %s" msgstr "%s にクローズ" +#: rhodecode/templates/pullrequests/pullrequest_show.html:23 +#, python-format +msgid "with status %s" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_show.html:31 msgid "Status" msgstr "ステータス" @@ -3620,24 +3796,25 @@ msgstr "プルリクエストステータス" msgid "Still not reviewed by" msgstr "未レビュー" -#: rhodecode/templates/pullrequests/pullrequest_show.html:47 +#: rhodecode/templates/pullrequests/pullrequest_show.html:48 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "%d レビュアー" -#: rhodecode/templates/pullrequests/pullrequest_show.html:54 +#: rhodecode/templates/pullrequests/pullrequest_show.html:50 +#, fuzzy +msgid "pull request was reviewed by all reviewers" +msgstr "プルリクエストレビュアー" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:58 msgid "Created on" msgstr "作成日" -#: rhodecode/templates/pullrequests/pullrequest_show.html:61 +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 msgid "Compare view" msgstr "比較ビュー" -#: rhodecode/templates/pullrequests/pullrequest_show.html:65 -msgid "Incoming changesets" -msgstr "取り込み候補リビジョン" - #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 msgid "all pull requests" msgstr "すべてのプルリクエスト" @@ -3711,23 +3888,31 @@ msgstr "%s 短いログ" msgid "shortlog" msgstr "ログ" +#: rhodecode/templates/shortlog/shortlog_data.html:5 +msgid "revision" +msgstr "リビジョン" + #: rhodecode/templates/shortlog/shortlog_data.html:7 msgid "age" msgstr "経過時間" -#: rhodecode/templates/shortlog/shortlog_data.html:18 +#: rhodecode/templates/shortlog/shortlog_data.html:8 +msgid "author" +msgstr "作成者" + +#: rhodecode/templates/shortlog/shortlog_data.html:33 msgid "No commit message" msgstr "コミットメッセージが有りません" -#: rhodecode/templates/shortlog/shortlog_data.html:62 +#: rhodecode/templates/shortlog/shortlog_data.html:77 msgid "Add or upload files directly via RhodeCode" msgstr "RhodeCode経由で直接ファイルを追加またはアップロード" -#: rhodecode/templates/shortlog/shortlog_data.html:71 +#: rhodecode/templates/shortlog/shortlog_data.html:86 msgid "Push new repo" msgstr "新しいリポジトリをプッシュ" -#: rhodecode/templates/shortlog/shortlog_data.html:79 +#: rhodecode/templates/shortlog/shortlog_data.html:94 msgid "Existing repository?" msgstr "存在するリポジトリをプッシュ" @@ -3755,128 +3940,138 @@ msgstr "リポジトリ %s RSS フィード" msgid "ATOM" msgstr "ATOM" -#: rhodecode/templates/summary/summary.html:82 +#: rhodecode/templates/summary/summary.html:70 +#, fuzzy, python-format +msgid "Repository locked by %s" +msgstr "リポジトリはロックされていません" + +#: rhodecode/templates/summary/summary.html:72 +#, fuzzy +msgid "Repository unlocked" +msgstr "リポジトリはロックされていません" + +#: rhodecode/templates/summary/summary.html:91 #, python-format msgid "Non changable ID %s" msgstr "" -#: rhodecode/templates/summary/summary.html:87 +#: rhodecode/templates/summary/summary.html:96 msgid "public" msgstr "公開" -#: rhodecode/templates/summary/summary.html:95 +#: rhodecode/templates/summary/summary.html:104 msgid "remote clone" msgstr "" -#: rhodecode/templates/summary/summary.html:116 +#: rhodecode/templates/summary/summary.html:125 msgid "Contact" msgstr "コンタクト" -#: rhodecode/templates/summary/summary.html:130 +#: rhodecode/templates/summary/summary.html:139 msgid "Clone url" msgstr "クローンURL" -#: rhodecode/templates/summary/summary.html:133 +#: rhodecode/templates/summary/summary.html:142 msgid "Show by Name" msgstr "名前で表示" -#: rhodecode/templates/summary/summary.html:134 +#: rhodecode/templates/summary/summary.html:143 msgid "Show by ID" msgstr "IDで表示" -#: rhodecode/templates/summary/summary.html:142 +#: rhodecode/templates/summary/summary.html:151 msgid "Trending files" msgstr "トレンドファイル" -#: rhodecode/templates/summary/summary.html:150 -#: rhodecode/templates/summary/summary.html:166 -#: rhodecode/templates/summary/summary.html:194 +#: rhodecode/templates/summary/summary.html:159 +#: rhodecode/templates/summary/summary.html:175 +#: rhodecode/templates/summary/summary.html:203 msgid "enable" msgstr "有効にする" -#: rhodecode/templates/summary/summary.html:158 +#: rhodecode/templates/summary/summary.html:167 msgid "Download" msgstr "ダウンロード" -#: rhodecode/templates/summary/summary.html:162 +#: rhodecode/templates/summary/summary.html:171 msgid "There are no downloads yet" msgstr "まだダウンロードがありません" -#: rhodecode/templates/summary/summary.html:164 +#: rhodecode/templates/summary/summary.html:173 msgid "Downloads are disabled for this repository" msgstr "このリポジトリのダウンロードは無効化されています" -#: rhodecode/templates/summary/summary.html:170 +#: rhodecode/templates/summary/summary.html:179 msgid "Download as zip" msgstr "ZIPとしてダウンロード" -#: rhodecode/templates/summary/summary.html:173 +#: rhodecode/templates/summary/summary.html:182 msgid "Check this to download archive with subrepos" msgstr "チェックするとダウンロードアーカイブにサブリポジトリが含まれます" -#: rhodecode/templates/summary/summary.html:173 +#: rhodecode/templates/summary/summary.html:182 msgid "with subrepos" msgstr "サブリポジトリを含む" -#: rhodecode/templates/summary/summary.html:186 +#: rhodecode/templates/summary/summary.html:195 msgid "Commit activity by day / author" msgstr "コミットアクティビティ 日/作成者" -#: rhodecode/templates/summary/summary.html:197 +#: rhodecode/templates/summary/summary.html:206 msgid "Stats gathered: " msgstr "収集した統計情報: " -#: rhodecode/templates/summary/summary.html:218 +#: rhodecode/templates/summary/summary.html:227 msgid "Shortlog" msgstr "ログ" -#: rhodecode/templates/summary/summary.html:220 +#: rhodecode/templates/summary/summary.html:229 msgid "Quick start" msgstr "クイックスタート" -#: rhodecode/templates/summary/summary.html:233 +#: rhodecode/templates/summary/summary.html:243 #, python-format msgid "Readme file at revision '%s'" msgstr "" -#: rhodecode/templates/summary/summary.html:236 +#: rhodecode/templates/summary/summary.html:246 msgid "Permalink to this readme" msgstr "パーマリンク" -#: rhodecode/templates/summary/summary.html:293 +#: rhodecode/templates/summary/summary.html:304 #, python-format msgid "Download %s as %s" msgstr "%s を %sとしてダウンロード" -#: rhodecode/templates/summary/summary.html:650 +#: rhodecode/templates/summary/summary.html:661 msgid "commits" msgstr "コミット" -#: rhodecode/templates/summary/summary.html:651 +#: rhodecode/templates/summary/summary.html:662 msgid "files added" msgstr "追加されたファイル" -#: rhodecode/templates/summary/summary.html:652 +#: rhodecode/templates/summary/summary.html:663 msgid "files changed" msgstr "変更されたファイル" -#: rhodecode/templates/summary/summary.html:653 +#: rhodecode/templates/summary/summary.html:664 msgid "files removed" msgstr "削除されたファイル" -#: rhodecode/templates/summary/summary.html:656 +#: rhodecode/templates/summary/summary.html:667 msgid "commit" msgstr "コミット" -#: rhodecode/templates/summary/summary.html:657 +#: rhodecode/templates/summary/summary.html:668 msgid "file added" msgstr "追加されたファイル" -#: rhodecode/templates/summary/summary.html:658 +#: rhodecode/templates/summary/summary.html:669 msgid "file changed" msgstr "変更されたファイル" -#: rhodecode/templates/summary/summary.html:659 +#: rhodecode/templates/summary/summary.html:670 msgid "file removed" msgstr "削除されたファイル" @@ -3885,3 +4080,8 @@ msgstr "削除されたファイル" msgid "%s Tags" msgstr "%s タグ" +#: rhodecode/templates/tags/tags.html:29 +#, fuzzy +msgid "Compare tags" +msgstr "比較" +