kallithea Changeset - 6af24662e4a7

Changeset - 6af24662e4a7

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 2 0

Andrew Shadura - 10 years ago 2016-01-12 11:44:48
andrew@shadura.me

Merge translations from stable.

2 files changed with 269 insertions and 467 deletions:

kallithea/i18n/cs/LC_MESSAGES/kallithea.po

kallithea/i18n/ja/LC_MESSAGES/kallithea.po

258

454

0 comments (0 inline, 0 general)

kallithea/i18n/cs/LC_MESSAGES/kallithea.po

➞

Show inline comments

 # Czech translations for Kallithea.
 # Copyright (C) 2014 Various authors, licensing as GPLv3
 # This file is distributed under the same license as the Kallithea project.
 # Automatically generated, 2014.
 # #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Kallithea 0.3\n"
 "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
 "POT-Creation-Date: 2015-09-08 10:34+0200\n"
 "PO-Revision-Date: 2015-02-13 15:26+0200\n"
 "Last-Translator: Andrew Shadura <andrew@shadura.me>\n"
 "PO-Revision-Date: 2015-11-12 08:51+0000\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Czech "
 "<https://hosted.weblate.org/projects/kallithea/kallithea/cs/>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Weblate 2.5-dev\n"
 #: kallithea/controllers/changelog.py:86
 #: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512
 msgid "There are no changesets yet"
 msgstr ""
 #: kallithea/controllers/changelog.py:166
 #: kallithea/controllers/admin/permissions.py:61
 #: kallithea/controllers/admin/permissions.py:65
 #: kallithea/controllers/admin/permissions.py:69
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104
 #: kallithea/templates/admin/repos/repo_edit_permissions.html:8
 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7
 #: kallithea/templates/base/perms_summary.html:14
 msgid "None"
 msgstr ""
 #: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196
 msgid "(closed)"
 msgstr "(zavřeno)"
 #: kallithea/controllers/changeset.py:89
 msgid "Show whitespace"
 msgstr ""
 #: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103
 #: kallithea/templates/files/diff_2way.html:55
 msgid "Ignore whitespace"
 msgstr ""
 #: kallithea/controllers/changeset.py:169
 #, python-format
 msgid "Increase diff context to %(num)s lines"
 msgstr ""
 #: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96
 #: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742
 msgid "Such revision does not exist for this repository"
 msgstr "Taková revize neexistuje"
 #: kallithea/controllers/changeset.py:383
 msgid ""
 "Changing status on a changeset associated with a closed pull request is "
 "not allowed"
 msgstr ""
 #: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41
@@ @@ -243,121 +244,120 @@ msgid "An error occurred during reposito @@
 msgstr ""
 #: kallithea/controllers/home.py:84
 msgid "Groups"
 msgstr "Skupiny"
 #: kallithea/controllers/home.py:89
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106
 #: kallithea/templates/admin/repos/repo_add.html:12
 #: kallithea/templates/admin/repos/repo_add.html:16
 #: kallithea/templates/admin/repos/repos.html:9
 #: kallithea/templates/admin/users/user_edit_advanced.html:6
 #: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77
 #: kallithea/templates/base/base.html:124
 #: kallithea/templates/base/base.html:390
 #: kallithea/templates/base/base.html:562
 msgid "Repositories"
 msgstr "Repozitáře"
 #: kallithea/controllers/home.py:130
 #: kallithea/templates/files/files_add.html:32
 #: kallithea/templates/files/files_delete.html:23
 #: kallithea/templates/files/files_edit.html:32
 msgid "Branch"
 msgstr "Větev"
 #: kallithea/controllers/home.py:136
 msgid "Tag"
 msgstr "Tag"
 #: kallithea/controllers/home.py:142
 msgid "Bookmark"
 msgstr "Záložka"
 #: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153
 #: kallithea/templates/journal/public_journal.html:4
 #: kallithea/templates/journal/public_journal.html:21
 msgid "Public Journal"
 msgstr ""
 #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 #: kallithea/templates/base/base.html:222
 #: kallithea/templates/journal/journal.html:4
 #: kallithea/templates/journal/journal.html:12
 msgid "Journal"
 msgstr ""
 #: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197
 #, fuzzy
 msgid "Bad captcha"
-msgstr "špatná captcha"
+msgstr "Špatná captcha"
 #: kallithea/controllers/login.py:157
 msgid "You have successfully registered into Kallithea"
 msgstr ""
 #: kallithea/controllers/login.py:202
 msgid "A password reset confirmation code has been sent"
 msgstr ""
 #: kallithea/controllers/login.py:251
 msgid "Invalid password reset token"
 msgstr ""
 #: kallithea/controllers/login.py:256
 #: kallithea/controllers/admin/my_account.py:167
 msgid "Successfully updated password"
 msgstr "Úspěšně aktualizované heslo"
 #: kallithea/controllers/pullrequests.py:124
-#, fuzzy, python-format
 #, python-format
 msgid "%s (closed)"
 msgstr ""
+msgstr "%s (zavřené)"
 #: kallithea/controllers/pullrequests.py:152
 #: kallithea/templates/changeset/changeset.html:12
 #: kallithea/templates/email_templates/changeset_comment.html:17
 msgid "Changeset"
 msgstr ""
 #: kallithea/controllers/pullrequests.py:173
 msgid "Special"
 msgstr ""
 #: kallithea/controllers/pullrequests.py:174
 msgid "Peer branches"
 msgstr ""
 #: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826
 #: kallithea/templates/switch_to_list.html:38
 #: kallithea/templates/bookmarks/bookmarks.html:10
 msgid "Bookmarks"
 msgstr "Záložky"
 #: kallithea/controllers/pullrequests.py:310
 #, python-format
 msgid "Error creating pull request: %s"
 msgstr ""
 #: kallithea/controllers/pullrequests.py:356
 #: kallithea/controllers/pullrequests.py:503
 msgid "No description"
 msgstr ""
 #: kallithea/controllers/pullrequests.py:363
 msgid "Successfully opened new pull request"
 msgstr ""
 #: kallithea/controllers/pullrequests.py:366
 #: kallithea/controllers/pullrequests.py:453
 #: kallithea/controllers/pullrequests.py:509
 #, python-format
 msgid "Invalid reviewer \"%s\" specified"
 msgstr ""
 #: kallithea/controllers/pullrequests.py:369
 #: kallithea/controllers/pullrequests.py:456
 msgid "Error occurred while creating pull request"
 msgstr ""
 #: kallithea/controllers/pullrequests.py:401
@@ @@ -401,99 +401,98 @@ msgstr "" @@
 #: kallithea/controllers/pullrequests.py:528
 msgid "Successfully deleted pull request"
 msgstr ""
 #: kallithea/controllers/pullrequests.py:594
 #, python-format
 msgid "This pull request has already been merged to %s."
 msgstr ""
 #: kallithea/controllers/pullrequests.py:596
 msgid "This pull request has been closed and can not be updated."
 msgstr ""
 #: kallithea/controllers/pullrequests.py:614
 #, python-format
 msgid "This pull request can be updated with changes on %s:"
 msgstr ""
 #: kallithea/controllers/pullrequests.py:617
 msgid "No changesets found for updating this pull request."
 msgstr ""
 #: kallithea/controllers/pullrequests.py:625
 #, python-format
 msgid "Note: Branch %s has another head: %s."
 msgstr ""
 #: kallithea/controllers/pullrequests.py:631
 msgid "Git pull requests don't support updates yet."
 msgstr ""
 #: kallithea/controllers/pullrequests.py:722
 msgid "No permission to change pull request status"
 msgstr ""
 #: kallithea/controllers/pullrequests.py:727
 msgid "Closing."
 msgstr ""
 #: kallithea/controllers/search.py:135
 msgid "Invalid search query. Try quoting it."
 msgstr ""
 #: kallithea/controllers/search.py:140
 msgid "There is no index to search in. Please run whoosh indexer"
 msgstr ""
 #: kallithea/controllers/search.py:144
 #, fuzzy
 msgid "An error occurred during search operation."
-msgstr "Došlo k chybě při vytváření gist"
+msgstr "Došlo k chybě při vyhledávání."
 #: kallithea/controllers/summary.py:180
 #: kallithea/templates/summary/summary.html:384
 msgid "No data ready yet"
 msgstr ""
 #: kallithea/controllers/summary.py:183
 #: kallithea/templates/summary/summary.html:98
 msgid "Statistics are disabled for this repository"
 msgstr ""
 #: kallithea/controllers/admin/auth_settings.py:135
 msgid "Auth settings updated successfully"
 msgstr ""
 #: kallithea/controllers/admin/auth_settings.py:146
 msgid "error occurred during update of auth settings"
 msgstr ""
 #: kallithea/controllers/admin/defaults.py:97
 msgid "Default settings updated successfully"
 msgstr ""
 #: kallithea/controllers/admin/defaults.py:112
 msgid "Error occurred during update of defaults"
 msgstr ""
 #: kallithea/controllers/admin/gists.py:59
 #: kallithea/controllers/admin/my_account.py:243
 #: kallithea/controllers/admin/users.py:285
 msgid "Forever"
 msgstr ""
 #: kallithea/controllers/admin/gists.py:60
 #: kallithea/controllers/admin/my_account.py:244
 #: kallithea/controllers/admin/users.py:286
 msgid "5 minutes"
 msgstr "5 minut"
 #: kallithea/controllers/admin/gists.py:61
 #: kallithea/controllers/admin/my_account.py:245
 #: kallithea/controllers/admin/users.py:287
 msgid "1 hour"
 msgstr "1 hodina"
 #: kallithea/controllers/admin/gists.py:62
 #: kallithea/controllers/admin/my_account.py:246
 #: kallithea/controllers/admin/users.py:288
@@ @@ -806,105 +805,103 @@ msgstr "" @@
 #, python-format
 msgid "Cannot delete repository %s which still has forks"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:326
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:374
 msgid "Repository permissions updated"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:430
 msgid "An error occurred during creation of field"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:444
 msgid "An error occurred during removal of field"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:460
 msgid "-- Not a fork --"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:491
 msgid "Updated repository visibility in public journal"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:495
 msgid "An error occurred during setting this repository in public journal"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:512
 msgid "Nothing"
 msgstr "Nic"
 #: kallithea/controllers/admin/repos.py:514
 #, python-format
 msgid "Marked repository %s as fork of %s"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:521
 msgid "An error occurred during this operation"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:537
 #: kallithea/controllers/admin/repos.py:564
 #, fuzzy
 msgid "Repository has been locked"
 msgstr ""
+msgstr "Repozitář byl uzamčen"
 #: kallithea/controllers/admin/repos.py:540
 #: kallithea/controllers/admin/repos.py:561
 #, fuzzy
 msgid "Repository has been unlocked"
 msgstr ""
+msgstr "Repozitář byl odemčen"
 #: kallithea/controllers/admin/repos.py:543
 #: kallithea/controllers/admin/repos.py:568
 msgid "An error occurred during unlocking"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:582
 msgid "Cache invalidation successful"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:586
 msgid "An error occurred during cache invalidation"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:601
 msgid "Pulled from remote location"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:604
 msgid "An error occurred during pull from remote location"
 msgstr ""
 #: kallithea/controllers/admin/repos.py:637
 msgid "An error occurred during deletion of repository stats"
 msgstr ""
 #: kallithea/controllers/admin/settings.py:170
 msgid "Updated VCS settings"
 msgstr ""
 #: kallithea/controllers/admin/settings.py:174
 msgid ""
 "Unable to activate hgsubversion support. The \"hgsubversion\" library is "
 "missing"
 msgstr ""
 #: kallithea/controllers/admin/settings.py:180
 #: kallithea/controllers/admin/settings.py:277
 msgid "Error occurred while updating application settings"
 msgstr ""
 #: kallithea/controllers/admin/settings.py:216
 #, python-format
 msgid "Repositories successfully rescanned. Added: %s. Removed: %s."
 msgstr ""
 #: kallithea/controllers/admin/settings.py:273
 msgid "Updated application settings"
@@ @@ -6005,96 +6002,98 @@ msgstr "" @@
 #~ msgstr ""
 #~ msgid "public journal"
 #~ msgstr ""
 #~ msgid "journal"
 #~ msgstr ""
 #~ msgid "forever"
 #~ msgstr ""
 #~ msgid "unmodified"
 #~ msgstr ""
 #~ msgid "Cannot delete %s it still contains attached forks"
 #~ msgstr ""
 #~ msgid "Locked repository"
 #~ msgstr ""
 #~ msgid "Unlocked repository"
 #~ msgstr ""
 #~ msgid "Unlocked"
 #~ msgstr "Odemčeno"
 #~ msgid "Locked"
 #~ msgstr "Zamčeno"
 #~ msgid "Repository has been %s"
 #~ msgstr ""
 #~ msgid "You can't edit this user"
 #~ msgstr ""
 #~ msgid "compare view"
 #~ msgstr ""
 #~ msgid "fork name %s"
 #~ msgstr ""
 #~ msgid "Pull request #%s"
 #~ msgstr ""
 #~ msgid "No Files"
 #~ msgstr ""
 #~ msgid ""
 #~ "_: \n"
 #~ ""
 #~ msgstr ""
 #~ msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s"
 #~ msgstr ""
 #~ msgid "You can't remove this user since it's crucial for entire application"
 #~ msgstr ""
 #~ msgid "Username \"%(username)s\" is forbidden"
 #~ msgstr ""
 #~ msgid "invalid password"
 #~ msgstr ""
 #~ msgid "invalid user name"
 #~ msgstr ""
 #~ msgid "Your account is disabled"
 #~ msgstr ""
 #~ msgid "Repository name %(repo)s is disallowed"
 #~ msgstr ""
 #~ msgid "invalid clone URL"
 #~ msgstr ""
 #~ msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL"
 #~ msgstr ""
 #~ msgid "This email address is already taken"
 #~ msgstr ""
 #~ msgid "email \"%(email)s\" does not exist."
 #~ msgstr ""
 #~ msgid "Revisions %(revs)s are already part of pull request or have set status"
 #~ msgstr ""
 #~ msgid "Defaults"
 #~ msgstr ""
 #~ msgid "never"
 #~ msgstr ""
 #~ msgid "My Emails"
 #~ msgstr ""
 #~ msgid "Watched"
@@ @@ -6333,49 +6332,48 @@ msgstr "" @@
 #~ msgid ""
 #~ "[Comment from %(comment_username)s] %(repo_name)s"
 #~ " changeset %(short_id)s on %(branch)s"
 #~ msgstr ""
 #~ msgid ""
 #~ "[Added by %(pr_username)s] %(repo_name)s pull"
 #~ " request %(pr_nice_id)s from %(ref)s"
 #~ msgstr ""
 #~ msgid ""
 #~ "[Comment from %(comment_username)s] %(repo_name)s"
 #~ " pull request %(pr_nice_id)s from %(ref)s"
 #~ msgstr ""
 #~ msgid "Your new password"
 #~ msgstr ""
 #~ msgid "Your new Kallithea password:%s"
 #~ msgstr ""
 #~ msgid ""
 #~ "Password reset link will be sent "
 #~ "to the email address matching your "
 #~ "username."
 #~ msgstr ""
 #~ msgid "Open New Pull Request for Selected Changesets"
 #~ msgstr ""
 #~ msgid "Show Selected Changesets __S &rarr; __E"
 #~ msgstr ""
 #~ msgid "Show Selected Changeset __S"
 #~ msgstr ""
 #~ msgid "We received a request to create a new password for your account."
 #~ msgstr ""
 #~ msgid "You can generate it by clicking following URL"
 #~ msgstr ""
 #~ msgid "Please ignore this email if you did not request a new password ."
 #~ msgstr ""
 #~ msgid "Created by"
 #~ msgstr ""

kallithea/i18n/ja/LC_MESSAGES/kallithea.po

➞

Show inline comments

 # Japanese translations for Kallithea.
 # Copyright (C) 2014 RhodeCode GmbH, and others.
 # This file is distributed under the same license as the Kallithea project.
 # Translators:
 # しろう, 2013
 # shirou - しろう, 2013
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2011
 # こいんとす <tkondou@gmail.com>, 2013
 # Takumi IINO <trot.thunder@gmail.com>, 2013
 # whosaysni <whosaysni@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Kallithea 0.3\n"
 "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
 "POT-Creation-Date: 2015-09-08 10:34+0200\n"
 "PO-Revision-Date: 2015-01-31 02:07+0200\n"
 "Last-Translator: kobanari <kobanari@nifty.com>\n"
 "PO-Revision-Date: 2016-01-07 01:53+0000\n"
 "Last-Translator: Takumi IINO <trot.thunder@gmail.com>\n"
 "Language-Team: Japanese "
 "<https://hosted.weblate.org/projects/kallithea/kallithea/ja/>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 2.5-dev\n"
 #: kallithea/controllers/changelog.py:86
 #: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512
 msgid "There are no changesets yet"
 msgstr "まだチェンジセットがありません"
 #: kallithea/controllers/changelog.py:166
 #: kallithea/controllers/admin/permissions.py:61
 #: kallithea/controllers/admin/permissions.py:65
 #: kallithea/controllers/admin/permissions.py:69
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104
 #: kallithea/templates/admin/repos/repo_edit_permissions.html:8
 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7
 #: kallithea/templates/base/perms_summary.html:14
 msgid "None"
 msgstr "なし"
 #: kallithea/controllers/changelog.py:169 kallithea/controllers/files.py:196
 msgid "(closed)"
 msgstr "(閉鎖済み)"
 #: kallithea/controllers/changeset.py:89
 msgid "Show whitespace"
 msgstr "空白を表示"
 #: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103
 #: kallithea/templates/files/diff_2way.html:55
 msgid "Ignore whitespace"
 msgstr "空白を無視"
 #: kallithea/controllers/changeset.py:169
-#, fuzzy, python-format
 #, python-format
 msgid "Increase diff context to %(num)s lines"
 msgstr "diff コンテキストを %(num)s 行増やす"
 #: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96
 #: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742
 msgid "Such revision does not exist for this repository"
 msgstr "お探しのリビジョンはこのリポジトリにはありません"
 #: kallithea/controllers/changeset.py:383
 msgid ""
 "Changing status on a changeset associated with a closed pull request is "
 "not allowed"
 msgstr "クローズしたプルリクエストに関連するチェンジセットのステータスを変更することは許可されていません"
 #: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41
 msgid "Select changeset"
 msgstr "リビジョンを選択"
 #: kallithea/controllers/compare.py:261
 msgid "Cannot compare repositories without using common ancestor"
 msgstr ""
+msgstr "共通の祖先を持たないのでリポジトリを比較できません"
 #: kallithea/controllers/error.py:71
 #, fuzzy
 msgid "No response"
-msgstr "リビジョンなし"
+msgstr "応答がありません"
 #: kallithea/controllers/error.py:72
 msgid "Unknown error"
 msgstr ""
+msgstr "不明なエラー"
 #: kallithea/controllers/error.py:100
 msgid "The request could not be understood by the server due to malformed syntax."
 msgstr "形式が間違っているため、サーバーはリクエストを処理できませんでした。"
 #: kallithea/controllers/error.py:103
 msgid "Unauthorized access to resource"
 msgstr "リソースにアクセスする権限がありません"
 #: kallithea/controllers/error.py:105
 msgid "You don't have permission to view this page"
 msgstr "このページを閲覧する権限がありません"
 #: kallithea/controllers/error.py:107
 msgid "The resource could not be found"
 msgstr "リソースが見つかりません"
 #: kallithea/controllers/error.py:109
 msgid ""
 "The server encountered an unexpected condition which prevented it from "
 "fulfilling the request."
 msgstr "サーバーが不正な状態になったため、リクエストに答えることができませんでした。"
 #: kallithea/controllers/feed.py:55
 #, python-format
 msgid "Changes on %s repository"
 msgstr "%s リポジトリでの変更"
 #: kallithea/controllers/feed.py:56
 #, python-format
 msgid "%s %s feed"
 msgstr "%s %s フィード"
 #: kallithea/controllers/feed.py:87
 #: kallithea/templates/changeset/changeset.html:182
 #: kallithea/templates/changeset/changeset.html:195
 #: kallithea/templates/compare/compare_diff.html:78
 #: kallithea/templates/compare/compare_diff.html:89
 #: kallithea/templates/pullrequests/pullrequest_show.html:339
 #: kallithea/templates/pullrequests/pullrequest_show.html:363
 msgid "Changeset was too big and was cut off..."
 msgstr "チェンジセットが大きすぎるため、省略しました"
+msgstr "チェンジセットが大きすぎるため、省略しました..."
 #: kallithea/controllers/feed.py:91
 #, python-format
 msgid "%s committed on %s"
 msgstr "%s が %s にコミット"
 #: kallithea/controllers/files.py:91
 msgid "Click here to add new file"
 msgstr "新しいファイルを追加"
 #: kallithea/controllers/files.py:92
 #, python-format
 msgid "There are no files yet. %s"
 msgstr "まだファイルがありません。 %s"
 #: kallithea/controllers/files.py:193
 #, fuzzy, python-format
 msgid "%s at %s"
 msgstr "%s と %s の間"
 #: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365
 #: kallithea/controllers/files.py:432
 #, python-format
 msgid "This repository has been locked by %s on %s"
 msgstr "このリポジトリは %s によって %s にロックされました"
 #: kallithea/controllers/files.py:317
 msgid "You can only delete files with revision being a valid branch "
 msgstr "有効なブランチ上のリビジョンからしかファイルを削除できません"
 #: kallithea/controllers/files.py:328
 #, python-format
 msgid "Deleted file %s via Kallithea"
 msgstr "Kallithea経由で %s を削除"
 #: kallithea/controllers/files.py:350
 #, python-format
 msgid "Successfully deleted file %s"
 msgstr "%s ファイルの削除に成功しました"
 #: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420
 #: kallithea/controllers/files.py:501
 msgid "Error occurred during commit"
 msgstr "コミット中にエラーが発生しました"
 #: kallithea/controllers/files.py:377
 msgid "You can only edit files with revision being a valid branch "
-msgstr "有効なブランチを示すリビジョンでのみファイルを編集できます。"
+msgstr "有効なブランチを示すリビジョンでのみファイルを編集できます "
 #: kallithea/controllers/files.py:391
 #, python-format
 msgid "Edited file %s via Kallithea"
 msgstr "Kallithea経由で %s を変更"
 #: kallithea/controllers/files.py:407
 msgid "No changes"
 msgstr "変更点なし"
 #: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490
 #, python-format
 msgid "Successfully committed to %s"
 msgstr "%s へのコミットが成功しました"
 #: kallithea/controllers/files.py:443
 msgid "Added file via Kallithea"
 msgstr "Kallithea経由でファイルを追加"
 #: kallithea/controllers/files.py:464
 msgid "No content"
 msgstr "内容がありません"
 #: kallithea/controllers/files.py:468
 msgid "No filename"
 msgstr "ファイル名がありません"
 #: kallithea/controllers/files.py:493
 msgid "Location must be relative path and must not contain .. in path"
 msgstr "場所には相対パスかつ .. を含まないパスを入力してください"
 #: kallithea/controllers/files.py:526
 msgid "Downloads disabled"
 msgstr "ダウンロードは無効化されています"
 #: kallithea/controllers/files.py:537
 #, python-format
 msgid "Unknown revision %s"
 msgstr "%s は未知のリビジョンです"
 #: kallithea/controllers/files.py:539
 msgid "Empty repository"
 msgstr "空のリポジトリ"
 #: kallithea/controllers/files.py:541
 msgid "Unknown archive type"
 msgstr "未知のアーカイブ種別です"
@@ @@ -248,363 +248,351 @@ msgid "An error occurred during reposito @@
 msgstr "リポジトリ %s のフォーク中にエラーが発生しました"
 #: kallithea/controllers/home.py:84
 msgid "Groups"
 msgstr "グループ"
 #: kallithea/controllers/home.py:89
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106
 #: kallithea/templates/admin/repos/repo_add.html:12
 #: kallithea/templates/admin/repos/repo_add.html:16
 #: kallithea/templates/admin/repos/repos.html:9
 #: kallithea/templates/admin/users/user_edit_advanced.html:6
 #: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77
 #: kallithea/templates/base/base.html:124
 #: kallithea/templates/base/base.html:390
 #: kallithea/templates/base/base.html:562
 msgid "Repositories"
 msgstr "リポジトリ"
 #: kallithea/controllers/home.py:130
 #: kallithea/templates/files/files_add.html:32
 #: kallithea/templates/files/files_delete.html:23
 #: kallithea/templates/files/files_edit.html:32
 msgid "Branch"
 msgstr "ブランチ"
 #: kallithea/controllers/home.py:136
 msgid "Tag"
 msgstr "タグ"
 #: kallithea/controllers/home.py:142
 msgid "Bookmark"
 msgstr "ブックマーク"
 #: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153
 #: kallithea/templates/journal/public_journal.html:4
 #: kallithea/templates/journal/public_journal.html:21
 msgid "Public Journal"
 msgstr "公開ジャーナル"
 #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 #: kallithea/templates/base/base.html:222
 #: kallithea/templates/journal/journal.html:4
 #: kallithea/templates/journal/journal.html:12
 msgid "Journal"
 msgstr "ジャーナル"
 #: kallithea/controllers/login.py:151 kallithea/controllers/login.py:197
 #, fuzzy
 msgid "Bad captcha"
 msgstr "キャプチャが一致しません"
 #: kallithea/controllers/login.py:157
 msgid "You have successfully registered into Kallithea"
 msgstr "Kallitheaへの登録を受け付けました"
 #: kallithea/controllers/login.py:202
 #, fuzzy
 #| msgid "Your password reset link was sent"
 msgid "A password reset confirmation code has been sent"
-msgstr "パスワードリセットのリンクを送信しました"
+msgstr "パスワードリセットの確認コードが送信されました"
 #: kallithea/controllers/login.py:251
 #, fuzzy
 #| msgid "Password reset link"
 msgid "Invalid password reset token"
-msgstr "パスワードリセットのリンク"
+msgstr "無効なパスワードリセットトークン"
 #: kallithea/controllers/login.py:256
 #: kallithea/controllers/admin/my_account.py:167
 msgid "Successfully updated password"
 msgstr "パスワードを更新しました"
 #: kallithea/controllers/pullrequests.py:124
-#, fuzzy, python-format
 #, python-format
 msgid "%s (closed)"
 msgstr ""
+msgstr "%s (閉鎖済み)"
 #: kallithea/controllers/pullrequests.py:152
 #: kallithea/templates/changeset/changeset.html:12
 #: kallithea/templates/email_templates/changeset_comment.html:17
 msgid "Changeset"
 msgstr "チェンジセット"
 #: kallithea/controllers/pullrequests.py:173
 msgid "Special"
 msgstr "スペシャル"
 #: kallithea/controllers/pullrequests.py:174
 msgid "Peer branches"
 msgstr "相手のブランチ"
 #: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826
 #: kallithea/templates/switch_to_list.html:38
 #: kallithea/templates/bookmarks/bookmarks.html:10
 msgid "Bookmarks"
 msgstr "ブックマーク"
 #: kallithea/controllers/pullrequests.py:310
 #, python-format
 msgid "Error creating pull request: %s"
 msgstr "プルリクエスト作成中にエラーが発生しました: %s"
 #: kallithea/controllers/pullrequests.py:356
 #: kallithea/controllers/pullrequests.py:503
 #, fuzzy
 msgid "No description"
-msgstr "説明"
+msgstr "説明がありません"
 #: kallithea/controllers/pullrequests.py:363
 msgid "Successfully opened new pull request"
 msgstr "新しいプルリクエストの作成に成功しました"
 #: kallithea/controllers/pullrequests.py:366
 #: kallithea/controllers/pullrequests.py:453
 #: kallithea/controllers/pullrequests.py:509
 #, python-format
 msgid "Invalid reviewer \"%s\" specified"
 msgstr ""
 #: kallithea/controllers/pullrequests.py:369
 #: kallithea/controllers/pullrequests.py:456
 #, fuzzy
 msgid "Error occurred while creating pull request"
 msgstr "プルリクエストの作成中にエラーが発生しました"
 #: kallithea/controllers/pullrequests.py:401
 msgid "Missing changesets since the previous pull request:"
 msgstr ""
 #: kallithea/controllers/pullrequests.py:408
 #, python-format
 msgid "New changesets on %s %s since the previous pull request:"
 msgstr ""
 #: kallithea/controllers/pullrequests.py:415
 msgid "Ancestor didn't change - show diff since previous version:"
 msgstr ""
 #: kallithea/controllers/pullrequests.py:422
 #, python-format
 msgid ""
 "This pull request is based on another %s revision and there is no simple "
 "diff."
 msgstr ""
 #: kallithea/controllers/pullrequests.py:424
 #, python-format
 msgid "No changes found on %s %s since previous version."
 msgstr ""
 #: kallithea/controllers/pullrequests.py:462
 #, python-format
 msgid "Closed, replaced by %s ."
 msgstr ""
+msgstr "%s で置き換えられたのでクローズします。"
 #: kallithea/controllers/pullrequests.py:470
 #, fuzzy
 msgid "Pull request update created"
 msgstr "プルリクエストレビュアー"
 #: kallithea/controllers/pullrequests.py:513
 #, fuzzy
 msgid "Pull request updated"
-msgstr "%s へのプルリクエスト"
+msgstr "プルリクエストを更新しました"
 #: kallithea/controllers/pullrequests.py:528
 msgid "Successfully deleted pull request"
 msgstr "プルリクエストの削除に成功しました"
 #: kallithea/controllers/pullrequests.py:594
 #, python-format
 msgid "This pull request has already been merged to %s."
 msgstr ""
 #: kallithea/controllers/pullrequests.py:596
 msgid "This pull request has been closed and can not be updated."
 msgstr ""
+msgstr "このプルリクエストはすでにクローズされていて、更新することはできません。"
 #: kallithea/controllers/pullrequests.py:614
 #, python-format
 msgid "This pull request can be updated with changes on %s:"
 msgstr ""
 #: kallithea/controllers/pullrequests.py:617
 msgid "No changesets found for updating this pull request."
 msgstr ""
+msgstr "プルリクエストを更新するためのチェンジセットが見つかりません。"
 #: kallithea/controllers/pullrequests.py:625
 #, python-format
 msgid "Note: Branch %s has another head: %s."
 msgstr ""
+msgstr "ノート: ブランチ%sには別のヘッド%sがあります。"
 #: kallithea/controllers/pullrequests.py:631
 msgid "Git pull requests don't support updates yet."
 msgstr ""
+msgstr "Gitのプルリクエストはまだ更新をサポートしていません。"
 #: kallithea/controllers/pullrequests.py:722
 #, fuzzy
 msgid "No permission to change pull request status"
-msgstr "プルリクエストステータスの投票"
+msgstr "プルリクエストステータスを変更する権限がありません"
 #: kallithea/controllers/pullrequests.py:727
 #, fuzzy
 msgid "Closing."
-msgstr "読み込み中..."
+msgstr "クローズ。"
 #: kallithea/controllers/search.py:135
 msgid "Invalid search query. Try quoting it."
 msgstr "無効な検索クエリーです。\\\"で囲んで下さい"
+msgstr "無効な検索クエリーです。\\\"で囲んで下さい。"
 #: kallithea/controllers/search.py:140
 msgid "There is no index to search in. Please run whoosh indexer"
 msgstr "検索するためのインデックスがありません。whooshでインデックスを作成して下さい"
 #: kallithea/controllers/search.py:144
 #, fuzzy
 msgid "An error occurred during search operation."
 msgstr "検索を実行する際にエラーが発生しました"
+msgstr "検索を実行する際にエラーが発生しました。"
 #: kallithea/controllers/summary.py:180
 #: kallithea/templates/summary/summary.html:384
 #, fuzzy
 msgid "No data ready yet"
-msgstr "まだデータが読み込まれていません"
+msgstr "まだデータの準備ができていません"
 #: kallithea/controllers/summary.py:183
 #: kallithea/templates/summary/summary.html:98
 msgid "Statistics are disabled for this repository"
 msgstr "このリポジトリの統計は無効化されています"
 #: kallithea/controllers/admin/auth_settings.py:135
 msgid "Auth settings updated successfully"
 msgstr "認証設定の更新に成功しました"
 #: kallithea/controllers/admin/auth_settings.py:146
 msgid "error occurred during update of auth settings"
 msgstr "認証設定の更新中にエラーが発生しました"
 #: kallithea/controllers/admin/defaults.py:97
 msgid "Default settings updated successfully"
 msgstr "デフォルト設定の更新に成功しました"
 #: kallithea/controllers/admin/defaults.py:112
 msgid "Error occurred during update of defaults"
 msgstr "デフォルト設定の更新中にエラーが発生しました"
 #: kallithea/controllers/admin/gists.py:59
 #: kallithea/controllers/admin/my_account.py:243
 #: kallithea/controllers/admin/users.py:285
 #, fuzzy
 msgid "Forever"
-msgstr "無期限"
+msgstr "永久"
 #: kallithea/controllers/admin/gists.py:60
 #: kallithea/controllers/admin/my_account.py:244
 #: kallithea/controllers/admin/users.py:286
 msgid "5 minutes"
 msgstr "5 分"
 #: kallithea/controllers/admin/gists.py:61
 #: kallithea/controllers/admin/my_account.py:245
 #: kallithea/controllers/admin/users.py:287
 msgid "1 hour"
 msgstr "1 時間"
 #: kallithea/controllers/admin/gists.py:62
 #: kallithea/controllers/admin/my_account.py:246
 #: kallithea/controllers/admin/users.py:288
 msgid "1 day"
 msgstr "1 日"
 #: kallithea/controllers/admin/gists.py:63
 #: kallithea/controllers/admin/my_account.py:247
 #: kallithea/controllers/admin/users.py:289
 msgid "1 month"
 msgstr "1 ヶ月"
 #: kallithea/controllers/admin/gists.py:67
 #: kallithea/controllers/admin/my_account.py:249
 #: kallithea/controllers/admin/users.py:291
 msgid "Lifetime"
 msgstr "有効期間"
 #: kallithea/controllers/admin/gists.py:146
 msgid "Error occurred during gist creation"
 msgstr "gist の作成中にエラーが発生しました"
 #: kallithea/controllers/admin/gists.py:184
 #, python-format
 msgid "Deleted gist %s"
 msgstr "gist %s を削除しました"
 #: kallithea/controllers/admin/gists.py:233
 #, fuzzy
 msgid "Unmodified"
-msgstr "変更なし"
+msgstr "変更しない"
 #: kallithea/controllers/admin/gists.py:262
 msgid "Successfully updated gist content"
 msgstr "Gist の内容を更新しました"
 #: kallithea/controllers/admin/gists.py:267
 msgid "Successfully updated gist data"
 msgstr "Gist データを更新しました"
 #: kallithea/controllers/admin/gists.py:270
 #, python-format
 msgid "Error occurred during update of gist %s"
 msgstr "Gist %s の更新中にエラーが発生しました"
 #: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215
 #: kallithea/model/user.py:237
 msgid "You can't edit this user since it's crucial for entire application"
-msgstr "このユーザーを編集できません。このユーザーはアプリケーションにとって必要不可欠です。"
+msgstr "このユーザーはアプリケーション全体で非常に重要なので編集できません"
 #: kallithea/controllers/admin/my_account.py:129
 msgid "Your account was updated successfully"
 msgstr "アカウントの更新に成功しました"
 #: kallithea/controllers/admin/my_account.py:144
 #: kallithea/controllers/admin/users.py:202
 #, python-format
 msgid "Error occurred during update of user %s"
 msgstr "ユーザー %s の更新中にエラーが発生しました"
 #: kallithea/controllers/admin/my_account.py:178
 msgid "Error occurred during update of user password"
 msgstr "パスワードの更新中にエラーが発生しました"
 #: kallithea/controllers/admin/my_account.py:220
 #: kallithea/controllers/admin/users.py:415
 #, python-format
 msgid "Added email %s to user"
 msgstr "ユーザーにメールアドレス %s を追加しました"
 #: kallithea/controllers/admin/my_account.py:226
 #: kallithea/controllers/admin/users.py:421
 msgid "An error occurred during email saving"
 msgstr "メールの保存時にエラーが発生しました"
 #: kallithea/controllers/admin/my_account.py:235
 #: kallithea/controllers/admin/users.py:433
 msgid "Removed email from user"
 msgstr "ユーザーからメールアドレスを削除しました"
 #: kallithea/controllers/admin/my_account.py:259
 #: kallithea/controllers/admin/users.py:308
 msgid "API key successfully created"
 msgstr "APIキーの作成に成功しました"
 #: kallithea/controllers/admin/my_account.py:271
 #: kallithea/controllers/admin/users.py:321
 msgid "API key successfully reset"
 msgstr "APIキーのリセットに成功しました"
 #: kallithea/controllers/admin/my_account.py:275
 #: kallithea/controllers/admin/users.py:325
 msgid "API key successfully deleted"
 msgstr "APIキーの削除に成功しました"
 #: kallithea/controllers/admin/permissions.py:62
 #: kallithea/controllers/admin/permissions.py:66
@@ @@ -776,198 +764,196 @@ msgid "An error occurred during revoking @@
 msgstr "権限の取消中にエラーが発生しました"
 #: kallithea/controllers/admin/repos.py:152
 #, python-format
 msgid "Error creating repository %s"
 msgstr "リポジトリ %s の作成中にエラーが発生しました"
 #: kallithea/controllers/admin/repos.py:213
 #, python-format
 msgid "Created repository %s from %s"
 msgstr "リポジトリ %s を %s から作成しました"
 #: kallithea/controllers/admin/repos.py:222
 #, python-format
 msgid "Forked repository %s as %s"
 msgstr "リポジトリ %s を %s としてフォークしました"
 #: kallithea/controllers/admin/repos.py:225
 #, python-format
 msgid "Created repository %s"
 msgstr "リポジトリ %s を作成しました"
 #: kallithea/controllers/admin/repos.py:262
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr "リポジトリ %s の更新に成功しました"
 #: kallithea/controllers/admin/repos.py:283
 #, python-format
 msgid "Error occurred during update of repository %s"
 msgstr "リポジトリ %s の更新中にエラーが発生しました"
 #: kallithea/controllers/admin/repos.py:310
 #, python-format
 msgid "Detached %s forks"
 msgstr "%s 個のフォークを切り離しました"
 #: kallithea/controllers/admin/repos.py:313
 #, python-format
 msgid "Deleted %s forks"
 msgstr "%s 個のフォークを削除しました"
 #: kallithea/controllers/admin/repos.py:318
 #, python-format
 msgid "Deleted repository %s"
 msgstr "リポジトリ %s を削除しました"
 #: kallithea/controllers/admin/repos.py:321
-#, fuzzy, python-format
 #, python-format
 msgid "Cannot delete repository %s which still has forks"
 msgstr "フォークしたリポジトリが存在するため、 %s は削除できません"
+msgstr "フォークしたリポジトリが存在するため、 リポジトリ %s は削除できません"
 #: kallithea/controllers/admin/repos.py:326
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr "%s の削除中にエラーが発生しました"
 #: kallithea/controllers/admin/repos.py:374
 msgid "Repository permissions updated"
 msgstr "リポジトリ権限を更新しました"
 #: kallithea/controllers/admin/repos.py:430
 msgid "An error occurred during creation of field"
 msgstr "フィールドの作成中にエラーが発生しました"
 #: kallithea/controllers/admin/repos.py:444
 msgid "An error occurred during removal of field"
 msgstr "フィールドの削除中にエラーが発生しました"
 #: kallithea/controllers/admin/repos.py:460
 msgid "-- Not a fork --"
 msgstr "-- フォークではありません --"
 #: kallithea/controllers/admin/repos.py:491
 msgid "Updated repository visibility in public journal"
 msgstr "公開ジャーナルでのリポジトリの可視性を更新しました"
 #: kallithea/controllers/admin/repos.py:495
 msgid "An error occurred during setting this repository in public journal"
 msgstr "このリポジトリの公開ジャーナルの設定中にエラーが発生しました"
 #: kallithea/controllers/admin/repos.py:512
 msgid "Nothing"
 msgstr "ありません"
 #: kallithea/controllers/admin/repos.py:514
 #, python-format
 msgid "Marked repository %s as fork of %s"
 msgstr "%s リポジトリを %s のフォークとする"
 #: kallithea/controllers/admin/repos.py:521
 msgid "An error occurred during this operation"
 msgstr "操作中にエラーが発生しました"
 #: kallithea/controllers/admin/repos.py:537
 #: kallithea/controllers/admin/repos.py:564
 #, fuzzy
 msgid "Repository has been locked"
-msgstr "リポジトリはロックされていません"
+msgstr "リポジトリがロックされました"
 #: kallithea/controllers/admin/repos.py:540
 #: kallithea/controllers/admin/repos.py:561
 #, fuzzy
 msgid "Repository has been unlocked"
-msgstr "リポジトリはロックされていません"
+msgstr "リポジトリのロックが解除されました"
 #: kallithea/controllers/admin/repos.py:543
 #: kallithea/controllers/admin/repos.py:568
 msgid "An error occurred during unlocking"
 msgstr "アンロック中にエラーが発生しました"
 #: kallithea/controllers/admin/repos.py:582
 msgid "Cache invalidation successful"
 msgstr "キャッシュの無効化に成功しました"
 #: kallithea/controllers/admin/repos.py:586
 msgid "An error occurred during cache invalidation"
 msgstr "キャッシュの無効化中にエラーが発生しました"
 #: kallithea/controllers/admin/repos.py:601
 msgid "Pulled from remote location"
 msgstr "リモートから取得"
 #: kallithea/controllers/admin/repos.py:604
 msgid "An error occurred during pull from remote location"
 msgstr "リモートから取得中にエラーが発生しました"
 #: kallithea/controllers/admin/repos.py:637
 msgid "An error occurred during deletion of repository stats"
 msgstr "リポジトリステートの削除中にエラーが発生しました"
 #: kallithea/controllers/admin/settings.py:170
 msgid "Updated VCS settings"
 msgstr "VCS設定を更新しました"
 #: kallithea/controllers/admin/settings.py:174
 msgid ""
 "Unable to activate hgsubversion support. The \"hgsubversion\" library is "
 "missing"
-msgstr "\"hgsubversion\"ライブラリが見つからないため、hgsubversionサポートを有効に出来ません。"
 msgstr "\"hgsubversion\"ライブラリが見つからないため、hgsubversionサポートを有効に出来ません"
 #: kallithea/controllers/admin/settings.py:180
 #: kallithea/controllers/admin/settings.py:277
 msgid "Error occurred while updating application settings"
 msgstr "アプリケーション設定の更新中にエラーが発生しました"
 #: kallithea/controllers/admin/settings.py:216
-#, fuzzy, python-format
 #, python-format
 msgid "Repositories successfully rescanned. Added: %s. Removed: %s."
 msgstr "リポジトリの再スキャンに成功しました。 追加: %s 削除: %s"
+msgstr "リポジトリの再スキャンに成功しました。 追加: %s 削除: %s。"
 #: kallithea/controllers/admin/settings.py:273
 msgid "Updated application settings"
 msgstr "アプリケーション設定を更新しました"
 #: kallithea/controllers/admin/settings.py:330
 msgid "Updated visualisation settings"
 msgstr "表示設定を更新しました"
 #: kallithea/controllers/admin/settings.py:335
 msgid "Error occurred during updating visualisation settings"
 msgstr "表示設定の更新中にエラーが発生しました"
 #: kallithea/controllers/admin/settings.py:361
 msgid "Please enter email address"
 msgstr "メールアドレスを入力してください"
 #: kallithea/controllers/admin/settings.py:376
 msgid "Send email task created"
 msgstr "メール送信タスクを作成しました"
 #: kallithea/controllers/admin/settings.py:407
 msgid "Added new hook"
 msgstr "新しいフックを追加しました"
 #: kallithea/controllers/admin/settings.py:421
 msgid "Updated hooks"
 msgstr "フックを更新しました"
 #: kallithea/controllers/admin/settings.py:425
 msgid "Error occurred during hook creation"
 msgstr "フックの作成中にエラーが発生しました"
 #: kallithea/controllers/admin/settings.py:451
 msgid "Whoosh reindex task scheduled"
 msgstr "Whooshの再インデックスタスクを予定に入れました"
 #: kallithea/controllers/admin/user_groups.py:150
 #, python-format
 msgid "Created user group %s"
 msgstr "ユーザーグループ %s を作成しました"
 #: kallithea/controllers/admin/user_groups.py:163
 #, python-format
 msgid "Error occurred during creation of user group %s"
 msgstr "ユーザーグループ %s の作成中にエラーが発生しました"
 #: kallithea/controllers/admin/user_groups.py:201
@@ @@ -985,189 +971,187 @@ msgid "Successfully deleted user group" @@
 msgstr "ユーザーグループの削除に成功しました"
 #: kallithea/controllers/admin/user_groups.py:247
 msgid "An error occurred during deletion of user group"
 msgstr "ユーザーグループの削除中にエラーが発生しました"
 #: kallithea/controllers/admin/user_groups.py:314
 msgid "Target group cannot be the same"
 msgstr "対象に同じ物を選ぶことはできません"
 #: kallithea/controllers/admin/user_groups.py:320
 msgid "User group permissions updated"
 msgstr "ユーザーグループ権限を更新しました"
 #: kallithea/controllers/admin/user_groups.py:440
 #: kallithea/controllers/admin/users.py:384
 msgid "Updated permissions"
 msgstr "権限を更新しました"
 #: kallithea/controllers/admin/user_groups.py:444
 #: kallithea/controllers/admin/users.py:388
 msgid "An error occurred during permissions saving"
 msgstr "権限の保存時にエラーが発生しました"
 #: kallithea/controllers/admin/users.py:134
 #, python-format
 msgid "Created user %s"
 msgstr "ユーザー %s を作成しました"
 #: kallithea/controllers/admin/users.py:149
 #, python-format
 msgid "Error occurred during creation of user %s"
 msgstr "ユーザー %s の作成中にエラーが発生しました"
 #: kallithea/controllers/admin/users.py:182
 msgid "User updated successfully"
 msgstr "ユーザーの更新に成功しました"
 #: kallithea/controllers/admin/users.py:218
 msgid "Successfully deleted user"
 msgstr "ユーザーの削除に成功しました"
 #: kallithea/controllers/admin/users.py:223
 msgid "An error occurred during deletion of user"
 msgstr "ユーザーの削除中にエラーが発生しました"
 #: kallithea/controllers/admin/users.py:236
 msgid "The default user cannot be edited"
 msgstr ""
+msgstr "デフォルト ユーザーを編集できません"
 #: kallithea/controllers/admin/users.py:463
 #, python-format
 msgid "Added IP address %s to user whitelist"
 msgstr "ユーザーホワイトリストにIP %s を追加しました"
 #: kallithea/controllers/admin/users.py:469
 msgid "An error occurred while adding IP address"
 msgstr "IPアドレスの保存中にエラーが発生しました"
 #: kallithea/controllers/admin/users.py:483
 msgid "Removed IP address from user whitelist"
 msgstr "ユーザーホワイトリストからIPアドレスを削除しました"
 #: kallithea/lib/auth.py:743
 #, python-format
 msgid "IP %s not allowed"
 msgstr "IPアドレス %s は許可されません"
 #: kallithea/lib/auth.py:756
 #, fuzzy
 msgid "Invalid API key"
-msgstr "新しいAPIキー"
+msgstr "APIキーが無効です"
 #: kallithea/lib/auth.py:812
 msgid "You need to be a registered user to perform this action"
 msgstr "このアクションを実行するためには登録済みのユーザーである必要があります"
 #: kallithea/lib/auth.py:844
 msgid "You need to be signed in to view this page"
 msgstr "このページを閲覧するためにはサインインが必要です"
 #: kallithea/lib/base.py:490
 msgid "Repository not found in the filesystem"
 msgstr ""
+msgstr "ファイルシステム内にリポジトリが見つかりません"
 #: kallithea/lib/base.py:516 kallithea/lib/helpers.py:622
 msgid "Changeset not found"
 msgstr "リビジョンが見つかりません"
 #: kallithea/lib/diffs.py:66
 msgid "Binary file"
 msgstr "バイナリファイル"
 #: kallithea/lib/diffs.py:82
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr "チェンジセットが大きすぎるため省略しました。差分を表示する場合は差分メニューを使用してください"
 #: kallithea/lib/diffs.py:92
 msgid "No changes detected"
 msgstr "検出された変更はありません"
 #: kallithea/lib/helpers.py:609
 #, python-format
 msgid "Deleted branch: %s"
 msgstr "削除されたブランチ: %s"
 #: kallithea/lib/helpers.py:611
 #, python-format
 msgid "Created tag: %s"
 msgstr "作成したタグ: %s"
 #: kallithea/lib/helpers.py:671
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr "%s から %s までのすべてのチェンジセットを表示"
 #: kallithea/lib/helpers.py:677
 #, fuzzy
 msgid "Compare view"
 msgstr "比較ビュー"
 #: kallithea/lib/helpers.py:696
 msgid "and"
 msgstr "と"
 #: kallithea/lib/helpers.py:697
 #, python-format
 msgid "%s more"
 msgstr "%s 以上"
 #: kallithea/lib/helpers.py:698 kallithea/templates/changelog/changelog.html:44
 msgid "revisions"
 msgstr "リビジョン"
 #: kallithea/lib/helpers.py:722
-#, fuzzy, python-format
 #, python-format
 msgid "Fork name %s"
 msgstr "フォーク名 %s"
 #: kallithea/lib/helpers.py:742
-#, fuzzy, python-format
 #, python-format
 msgid "Pull request %s"
 msgstr "プルリクエスト #%s"
 #: kallithea/lib/helpers.py:752
 msgid "[deleted] repository"
 msgstr "リポジトリを[削除]"
 #: kallithea/lib/helpers.py:754 kallithea/lib/helpers.py:766
 msgid "[created] repository"
 msgstr "リポジトリを[作成]"
 #: kallithea/lib/helpers.py:756
 msgid "[created] repository as fork"
 msgstr "フォークしてリポジトリを[作成]"
 #: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:768
 msgid "[forked] repository"
 msgstr "リポジトリを[フォーク]"
 #: kallithea/lib/helpers.py:760 kallithea/lib/helpers.py:770
 msgid "[updated] repository"
 msgstr "リポジトリを[更新]"
 #: kallithea/lib/helpers.py:762
 msgid "[downloaded] archive from repository"
 msgstr "リポジトリからアーカイブを[ダウンロード]"
 #: kallithea/lib/helpers.py:764
 msgid "[delete] repository"
 msgstr "リポジトリを[削除]"
 #: kallithea/lib/helpers.py:772
 msgid "[created] user"
 msgstr "ユーザーを[作成]"
 #: kallithea/lib/helpers.py:774
 msgid "[updated] user"
 msgstr "ユーザーを[更新]"
 #: kallithea/lib/helpers.py:776
 msgid "[created] user group"
 msgstr "ユーザーグループを[作成]"
 #: kallithea/lib/helpers.py:778
 msgid "[updated] user group"
 msgstr "ユーザーグループを[更新]"
 #: kallithea/lib/helpers.py:780
@@ @@ -1199,98 +1183,98 @@ msgid "[pulled] from" @@
 msgstr "[プル]"
 #: kallithea/lib/helpers.py:794
 msgid "[started following] repository"
 msgstr "リポジトリの[フォローを開始]"
 #: kallithea/lib/helpers.py:796
 msgid "[stopped following] repository"
 msgstr "リポジトリの[フォローを停止]"
 #: kallithea/lib/helpers.py:1124
 #, python-format
 msgid " and %s more"
 msgstr " と %s 以上"
 #: kallithea/lib/helpers.py:1128
 #: kallithea/templates/compare/compare_diff.html:65
 #: kallithea/templates/pullrequests/pullrequest_show.html:326
 msgid "No files"
 msgstr "ファイルはありません"
 #: kallithea/lib/helpers.py:1194
 msgid "new file"
 msgstr "新しいファイル"
 #: kallithea/lib/helpers.py:1197
 msgid "mod"
 msgstr "変更"
 #: kallithea/lib/helpers.py:1200
 msgid "del"
 msgstr "削除"
 #: kallithea/lib/helpers.py:1203
 msgid "rename"
 msgstr "リネーム"
 #: kallithea/lib/helpers.py:1208
 msgid "chmod"
 msgstr "chmod"
 #: kallithea/lib/helpers.py:1444
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
 "the filesystem please run the application again in order to rescan "
 "repositories"
 msgstr ""
 "%s "
 "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。"
 "%s リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプ"
 "リケーションを再起動してください"
 #: kallithea/lib/utils2.py:415
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d 年"
 #: kallithea/lib/utils2.py:416
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d ヶ月"
 #: kallithea/lib/utils2.py:417
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 日"
 #: kallithea/lib/utils2.py:418
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 時間"
 #: kallithea/lib/utils2.py:419
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
 #: kallithea/lib/utils2.py:420
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 #: kallithea/lib/utils2.py:436
 #, python-format
 msgid "in %s"
 msgstr "%s 以内"
 #: kallithea/lib/utils2.py:438
 #, python-format
 msgid "%s ago"
 msgstr "%s 前"
 #: kallithea/lib/utils2.py:440
 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651
 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1697
 msgid "Registration disabled"
 msgstr "新規登録を無効にする"
 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436
 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482
 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539
 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600
 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652
 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679
 msgid "User Registration with manual account activation"
 msgstr "ユーザーの新規登録時に手動でアカウントをアクティベートする"
 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437
 #: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483
 #: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540
 #: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541
 #: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562
 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601
 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653
 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680
 msgid "User Registration with automatic account activation"
 msgstr "ユーザーの新規登録時に自動でアカウントをアクティベートする"
 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645
 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1691
 msgid "Repository creation enabled with write permission to a repository group"
 msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成が有効です"
 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646
 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1692
 msgid "Repository creation disabled with write permission to a repository group"
 msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成は無効です"
 #: kallithea/model/comment.py:72
 #, python-format
 msgid "on line %s"
 msgstr "%s 行目"
 #: kallithea/model/comment.py:217 kallithea/model/pull_request.py:169
 msgid "[Mention]"
 msgstr "[Mention]"
 #: kallithea/model/db.py:1667
 msgid "Default user has no access to new repositories"
 msgstr ""
+msgstr "デフォルトユーザーは新しいリポジトリにアクセスできません"
 #: kallithea/model/db.py:1668
 #, fuzzy
 msgid "Default user has read access to new repositories"
-msgstr "リソースにアクセスする権限がありません"
+msgstr "デフォルトユーザーは新しいリポジトリに読み取りアクセスする権限があります"
 #: kallithea/model/db.py:1669
 #, fuzzy
 msgid "Default user has write access to new repositories"
-msgstr "リソースにアクセスする権限がありません"
+msgstr "デフォルトユーザーは新しいリポジトリに書き込みアクセスする権限があります"
 #: kallithea/model/db.py:1670
 msgid "Default user has admin access to new repositories"
 msgstr ""
 #: kallithea/model/db.py:1672
 msgid "Default user has no access to new repository groups"
 msgstr ""
 #: kallithea/model/db.py:1673
 msgid "Default user has read access to new repository groups"
 msgstr ""
 #: kallithea/model/db.py:1674
 msgid "Default user has write access to new repository groups"
 msgstr ""
 #: kallithea/model/db.py:1675
 msgid "Default user has admin access to new repository groups"
 msgstr ""
 #: kallithea/model/db.py:1677
 msgid "Default user has no access to new user groups"
 msgstr ""
 #: kallithea/model/db.py:1678
 msgid "Default user has read access to new user groups"
 msgstr ""
 #: kallithea/model/db.py:1679
 msgid "Default user has write access to new user groups"
 msgstr ""
 #: kallithea/model/db.py:1680
 msgid "Default user has admin access to new user groups"
 msgstr ""
 #: kallithea/model/db.py:1682
 #, fuzzy
 msgid "Only admins can create repository groups"
-msgstr "リポジトリグループ %s を作成しました"
+msgstr "管理者のみがリポジトリのグループを作成できます"
 #: kallithea/model/db.py:1683
 #, fuzzy
 msgid "Non-admins can create repository groups"
-msgstr "リポジトリグループ %s を作成しました"
+msgstr "非管理者がリポジトリのグループを作成できます"
 #: kallithea/model/db.py:1685
 #, fuzzy
 msgid "Only admins can create user groups"
-msgstr "ユーザーグループを作成"
+msgstr "管理者だけがユーザー グループを作成することができます"
 #: kallithea/model/db.py:1686
 #, fuzzy
 msgid "Non-admins can create user groups"
-msgstr "ユーザーグループを作成"
+msgstr "非管理者ユーザーがグループを作成することができます"
 #: kallithea/model/db.py:1688
 #, fuzzy
 msgid "Only admins can create top level repositories"
-msgstr "トップレベルリポジトリ数"
+msgstr "管理者だけがトップレベルにリポジトリを作成することができます"
 #: kallithea/model/db.py:1689
 #, fuzzy
 msgid "Non-admins can create top level repositories"
-msgstr "トップレベルリポジトリ数"
+msgstr "非管理者がトップレベルにリポジトリを作成することができます"
 #: kallithea/model/db.py:1694
 #, fuzzy
 msgid "Only admins can fork repositories"
-msgstr "リポジトリ総数"
+msgstr "管理者のみがリポジトリをフォークすることができます"
 #: kallithea/model/db.py:1695
 #, fuzzy
 msgid "Non-admins can can fork repositories"
-msgstr "すべてのリポジトリのキャッシュを無効化する"
+msgstr "非管理者がリポジトリをフォークすることができます"
 #: kallithea/model/db.py:1698
 #, fuzzy
 msgid "User registration with manual account activation"
 msgstr "ユーザーの新規登録時に手動でアカウントをアクティベートする"
 #: kallithea/model/db.py:1699
 #, fuzzy
 msgid "User registration with automatic account activation"
 msgstr "ユーザーの新規登録時に自動でアカウントをアクティベートする"
 #: kallithea/model/db.py:2228
 #, fuzzy
 msgid "Not reviewed"
 msgstr "未レビュー"
 #: kallithea/model/db.py:2231
 #, fuzzy
 msgid "Under review"
 msgstr "レビュー中"
 #: kallithea/model/forms.py:57
 msgid "Please enter a login"
 msgstr "ログイン名を入力してください"
 #: kallithea/model/forms.py:58
 #, python-format
 msgid "Enter a value %(min)i characters long or more"
 msgstr "%(min)i 文字以上必要です"
 #: kallithea/model/forms.py:66
 msgid "Please enter a password"
 msgstr "パスワードを入力してください"
 #: kallithea/model/forms.py:67
 #, python-format
 msgid "Enter %(min)i characters or more"
 msgstr "%(min)i 文字以上必要です"
 #: kallithea/model/forms.py:160
 msgid "Name must not contain only digits"
 msgstr "数字だけの名前は使えません"
 #: kallithea/model/notification.py:254
-#, fuzzy, python-format
 #, python-format
 msgid "%(user)s commented on changeset %(age)s"
-msgstr "%(user)s がチェンジセットにコメント %(when)s"
+msgstr "%(user)s がチェンジセットにコメント %(age)s"
 #: kallithea/model/notification.py:255
-#, fuzzy, python-format
 #, python-format
 msgid "%(user)s sent message %(age)s"
-msgstr "%(user)s がメッセージを送信 %(when)s"
+msgstr "%(user)s がメッセージを送信 %(age)s"
 #: kallithea/model/notification.py:256
-#, fuzzy, python-format
 #, python-format
 msgid "%(user)s mentioned you %(age)s"
-msgstr "%(user)s がにあなたにメンション %(when)s"
+msgstr "%(user)s がにあなたにメンション %(age)s"
 #: kallithea/model/notification.py:257
-#, fuzzy, python-format
 #, python-format
 msgid "%(user)s registered in Kallithea %(age)s"
-msgstr "%(user)s がKallitheaに登録 %(when)s"
+msgstr "%(user)s がKallitheaに登録 %(age)s"
 #: kallithea/model/notification.py:258
-#, fuzzy, python-format
 #, python-format
 msgid "%(user)s opened new pull request %(age)s"
-msgstr "%(user)s が新しいプルリクエストを作成 %(when)s"
+msgstr "%(user)s が新しいプルリクエストを作成 %(age)s"
 #: kallithea/model/notification.py:259
-#, fuzzy, python-format
 #, python-format
 msgid "%(user)s commented on pull request %(age)s"
-msgstr "%(user)s がプルリクエストにコメント %(when)s"
+msgstr "%(user)s がプルリクエストにコメント %(age)s"
 #: kallithea/model/notification.py:266
 #, python-format
 msgid "%(user)s commented on changeset at %(when)s"
 msgstr "%(user)s がチェンジセットにコメント %(when)s"
 #: kallithea/model/notification.py:267
 #, python-format
 msgid "%(user)s sent message at %(when)s"
 msgstr "%(user)s がメッセージを送信 %(when)s"
 #: kallithea/model/notification.py:268
 #, python-format
 msgid "%(user)s mentioned you at %(when)s"
 msgstr "%(user)s がにあなたにメンション %(when)s"
 #: kallithea/model/notification.py:269
 #, python-format
 msgid "%(user)s registered in Kallithea at %(when)s"
 msgstr "%(user)s がKallitheaに登録 %(when)s"
 #: kallithea/model/notification.py:270
 #, python-format
 msgid "%(user)s opened new pull request at %(when)s"
 msgstr "%(user)s が新しいプルリクエストを作成 %(when)s"
 #: kallithea/model/notification.py:271
 #, python-format
 msgid "%(user)s commented on pull request at %(when)s"
 msgstr "%(user)s がプルリクエストにコメント %(when)s"
 #: kallithea/model/notification.py:302
 #, python-format
 msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s"
 msgstr ""
 #: kallithea/model/notification.py:305
-#, fuzzy, python-format
 #, python-format
 msgid "New user %(new_username)s registered"
-msgstr "ユーザー名 %(new_username)s は不正です"
+msgstr "新しいユーザー %(new_username)s が登録されました"
 #: kallithea/model/notification.py:307
 #, fuzzy, python-format
 #| msgid "%(user)s wants you to review pull request %(pr_nice_id)s:
 #| %(pr_title)s"
 #| msgid "%(user)s wants you to review pull request %(pr_nice_id)s:"
 msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s"
 msgstr "%(user)s がプリリクエスト #%(pr_id)s: %(pr_title)s のレビューを求めています"
 #: kallithea/model/notification.py:308
 #, fuzzy, python-format
 #| msgid "[commented] on pull request for"
 msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s"
 msgstr "プルリクエストに[コメント]"
 #: kallithea/model/notification.py:321
 #, fuzzy
 msgid "Closing"
-msgstr "メールアドレス:"
+msgstr "クローズ"
 #: kallithea/model/pull_request.py:137
-#, fuzzy, python-format
 #, python-format
 msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s"
-msgstr "%(user)s がプリリクエスト #%(pr_id)s: %(pr_title)s のレビューを求めています"
+msgstr "%(user)s がプリリクエスト #%(pr_nice_id)s: %(pr_title)s のレビューを求めています"
 #: kallithea/model/scm.py:812
 msgid "latest tip"
 msgstr "最新のtip"
 #: kallithea/model/user.py:192
 msgid "New user registration"
 msgstr "新規ユーザー登録"
 #: kallithea/model/user.py:256
 #, fuzzy
 msgid "You can't remove this user since it is crucial for the entire application"
 msgstr "このユーザーを削除できません。このユーザーはアプリケーションにとって必要不可欠です。"
 #: kallithea/model/user.py:261
-#, fuzzy, python-format
 #, python-format
 msgid ""
 "User \"%s\" still owns %s repositories and cannot be removed. Switch "
 "owners or remove those repositories: %s"
 msgstr "ユーザー \"%s\" はまだ %s 個のリポジトリの所有者のため削除することはできません。リポジトリの所有者を変更するか削除してください。 %s"
 msgstr ""
 "ユーザー \"%s\" はまだ %s 個のリポジトリの所有者のため削除することはできません。リポジトリの所有者を変更するか削除してください： %s"
 #: kallithea/model/user.py:266
-#, fuzzy, python-format
 #, python-format
 msgid ""
 "User \"%s\" still owns %s repository groups and cannot be removed. Switch"
 " owners or remove those repository groups: %s"
 msgstr "ユーザー \"%s\" はまだ %s 個のリポジトリの所有者のため削除することはできません。リポジトリの所有者を変更するか削除してください。 %s"
 msgstr ""
 "ユーザー \"%s\" はまだ %s "
 "個のリポジトリグループの所有者のため削除することはできません。リポジトリグループの所有者を変更するか削除してください： %s"
 #: kallithea/model/user.py:273
-#, fuzzy, python-format
 #, python-format
 msgid ""
 "User \"%s\" still owns %s user groups and cannot be removed. Switch "
 "owners or remove those user groups: %s"
 msgstr "ユーザー \"%s\" はまだ %s 個のリポジトリの所有者のため削除することはできません。リポジトリの所有者を変更するか削除してください。 %s"
 msgstr ""
 "ユーザー \"%s\" はまだ %s 個のユーザーグループの所有者のため削除することはできません。ユーザーグループの所有者を変更するか削除してください。 "
 "%s"
 #: kallithea/model/user.py:360
 msgid "Password reset link"
 msgstr "パスワードリセットのリンク"
 #: kallithea/model/user.py:408
 #, fuzzy
 #| msgid "Password reset link"
 msgid "Password reset notification"
-msgstr "パスワードリセットのリンク"
+msgstr "パスワードの再設定通知"
 #: kallithea/model/user.py:409
 #, python-format
 msgid ""
 "The password to your account %s has been changed using password reset "
 "form."
 msgstr ""
 #: kallithea/model/validators.py:77 kallithea/model/validators.py:78
 msgid "Value cannot be an empty list"
 msgstr "空のリストにはできません"
 #: kallithea/model/validators.py:95
 #, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr "ユーザー名 \"%(username)s\" はすでに使われています"
 #: kallithea/model/validators.py:97
-#, fuzzy, python-format
 #, python-format
 msgid "Username \"%(username)s\" cannot be used"
-msgstr "ユーザー名 %(username)s は不正です"
+msgstr "ユーザー名 %(username)s は使用できません"
 #: kallithea/model/validators.py:99
 #, fuzzy
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or"
 " dashes and must begin with an alphanumeric character or underscore"
 msgstr "ユーザー名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットまたはアンダースコア(_)から始まる必要があります"
 msgstr ""
 "ユーザー名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットまたはアンダースコア(_)から始まる必"
 "要があります"
 #: kallithea/model/validators.py:126
 msgid "The input is not valid"
 msgstr "入力が正しくありません"
 #: kallithea/model/validators.py:133
 #, python-format
 msgid "Username %(username)s is not valid"
 msgstr "ユーザー名 %(username)s は不正です"
 #: kallithea/model/validators.py:152
 msgid "Invalid user group name"
 msgstr "不正なユーザーグループ名です"
 #: kallithea/model/validators.py:153
 #, python-format
 msgid "User group \"%(usergroup)s\" already exists"
 msgstr "ユーザーグループ \"%(usergroup)s\" はすでに存在します"
 #: kallithea/model/validators.py:155
 msgid ""
 "user group name may only contain alphanumeric characters underscores, "
 "periods or dashes and must begin with alphanumeric character"
 msgstr ""
 "ユーザーグループ名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットから始まる必要があります"
 " "
 #: kallithea/model/validators.py:193
 msgid "Cannot assign this group as parent"
 msgstr "このグループは親にできません"
 #: kallithea/model/validators.py:194
 #, python-format
 msgid "Group \"%(group_name)s\" already exists"
 msgstr "グループ \"%(group_name)s\" はすでに存在します"
 #: kallithea/model/validators.py:196
 #, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr "グループ名 \"%(group_name)s\" を持つリポジトリはすでに存在します"
 #: kallithea/model/validators.py:254
 msgid "Invalid characters (non-ascii) in password"
 msgstr "パスワードに利用出来ない文字列(non-ascii)です"
 #: kallithea/model/validators.py:269
 msgid "Invalid old password"
 msgstr "古いpasswordが間違っています"
 #: kallithea/model/validators.py:285
 msgid "Passwords do not match"
 msgstr "パスワードが一致しません"
 #: kallithea/model/validators.py:300
 #, fuzzy
 msgid "Invalid username or password"
-msgstr "不正なパスワードです"
+msgstr "ユーザー名とパスワードの組み合わせが無効です"
 #: kallithea/model/validators.py:331
 msgid "Token mismatch"
 msgstr "トークンが一致しません"
 #: kallithea/model/validators.py:345
-#, fuzzy, python-format
 #, python-format
 msgid "Repository name %(repo)s is not allowed"
 msgstr "リポジトリ名 %(repo)s は許可されていません"
 #: kallithea/model/validators.py:347
 #, python-format
 msgid "Repository named %(repo)s already exists"
 msgstr "リポジトリ %(repo)s はすでに存在します"
 #: kallithea/model/validators.py:348
 #, python-format
 msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
 msgstr "リポジトリ \"%(repo)s\" は グループ \"%(group)s\" にすでに存在します"
 #: kallithea/model/validators.py:350
 #, python-format
 msgid "Repository group with name \"%(repo)s\" already exists"
 msgstr "リポジトリグループ名 \"%(repo)s\" はすでに存在します"
 #: kallithea/model/validators.py:465
 #, fuzzy
 msgid "Invalid repository URL"
-msgstr "非公開リポジトリ"
+msgstr "無効なリポジトリのURL"
 #: kallithea/model/validators.py:466
 msgid ""
 "Invalid repository URL. It must be a valid http, https, ssh, svn+http or "
 "svn+https URL"
 msgstr ""
 #: kallithea/model/validators.py:489
 msgid "Fork has to be the same type as parent"
 msgstr "フォークは親と同じ種別の必要があります"
 #: kallithea/model/validators.py:504
 msgid "You don't have permissions to create repository in this group"
 msgstr "このグループにリポジトリを作成する権限がありません"
 #: kallithea/model/validators.py:506
 msgid "no permission to create repository in root location"
 msgstr "ルートにリポジトリを作成する権限がありません"
 #: kallithea/model/validators.py:556
 msgid "You don't have permissions to create a group in this location"
 msgstr "この場所にグループを作成する権限がありません"
 #: kallithea/model/validators.py:597
 msgid "This username or user group name is not valid"
 msgstr "ユーザー名かユーザーグループが不正です"
 #: kallithea/model/validators.py:690
 msgid "This is not a valid path"
 msgstr "不正なパスです"
 #: kallithea/model/validators.py:705
 #, fuzzy
 msgid "This email address is already in use"
 msgstr "このメールアドレスはすでに取得されています"
 #: kallithea/model/validators.py:725
-#, fuzzy, python-format
 #, python-format
 msgid "Email address \"%(email)s\" not found"
-msgstr "メールアドレス \"%(email)s\" は存在しません"
+msgstr "メールアドレス \"%(email)s\" がみつかりません"
 #: kallithea/model/validators.py:762
 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に対するログイン属性は必須です。 - これは \"ユーザー名\" と同じです"
 #: kallithea/model/validators.py:774
 msgid "Please enter a valid IPv4 or IPv6 address"
 msgstr "有効なIPv4かIPv6のアドレスを入力してください"
 #: kallithea/model/validators.py:775
 #, python-format
 msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr "ネットワークサイズ (bits) は0-32の範囲にする必要があります ( %(bits)r は不正です)"
 #: kallithea/model/validators.py:808
 msgid "Key name can only consist of letters, underscore, dash or numbers"
-msgstr "キー名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)、数字しか使えません。"
+msgstr "キー名にはアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)、数字が使えます"
 #: kallithea/model/validators.py:822
 msgid "Filename cannot be inside a directory"
 msgstr "ファイル名はディレクトリ内にすることはできません"
 #: kallithea/model/validators.py:838
 #, python-format
 msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name"
 msgstr "%(loaded)s プラグインと %(next_to_load)s プラグインで同じ名前が使われています"
 #: kallithea/templates/about.html:4 kallithea/templates/about.html:17
 msgid "About"
 msgstr ""
 #: kallithea/templates/index.html:5
 msgid "Dashboard"
 msgstr "ダッシュボード"
 #: kallithea/templates/index_base.html:6
 #: kallithea/templates/admin/my_account/my_account_repos.html:3
 #: kallithea/templates/admin/my_account/my_account_watched.html:3
 #: kallithea/templates/admin/repo_groups/repo_groups.html:9
 #: kallithea/templates/admin/repos/repos.html:9
 #: kallithea/templates/admin/user_groups/user_groups.html:9
 #: kallithea/templates/admin/users/users.html:9
 #: kallithea/templates/bookmarks/bookmarks.html:9
 #: kallithea/templates/branches/branches.html:9
 #: kallithea/templates/journal/journal.html:9
 #: kallithea/templates/journal/journal.html:48
 #: kallithea/templates/journal/journal.html:49
 #: kallithea/templates/tags/tags.html:9
 msgid "quick filter..."
 msgstr "クイックフィルタ..."
 #: kallithea/templates/index_base.html:6
 msgid "repositories"
 msgstr "リポジトリ"
 #: kallithea/templates/index_base.html:20
 #: kallithea/templates/index_base.html:25
 #: kallithea/templates/admin/repos/repo_add.html:5
 #: kallithea/templates/admin/repos/repo_add.html:19
 #: kallithea/templates/admin/repos/repos.html:22
 msgid "Add Repository"
 msgstr "リポジトリを追加"
 #: kallithea/templates/index_base.html:22
 #: kallithea/templates/index_base.html:27
@@ @@ -2306,542 +2275,531 @@ msgstr "最後の変更点" @@
 #: kallithea/templates/admin/my_account/my_account_repos.html:48
 #: kallithea/templates/admin/my_account/my_account_watched.html:48
 #: kallithea/templates/admin/repos/repos.html:49
 #: kallithea/templates/journal/journal.html:189
 #: kallithea/templates/journal/journal.html:280
 msgid "Tip"
 msgstr "Tip"
 #: kallithea/templates/index_base.html:132
 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10
 #: kallithea/templates/admin/repo_groups/repo_groups.html:49
 #: kallithea/templates/admin/repos/repo_edit_settings.html:53
 #: kallithea/templates/admin/repos/repos.html:50
 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8
 #: kallithea/templates/admin/user_groups/user_groups.html:50
 #: kallithea/templates/pullrequests/pullrequest_data.html:16
 #: kallithea/templates/pullrequests/pullrequest_show.html:156
 #: kallithea/templates/pullrequests/pullrequest_show.html:233
 #: kallithea/templates/summary/summary.html:134
 msgid "Owner"
 msgstr "所有者"
 #: kallithea/templates/index_base.html:140
 #: kallithea/templates/admin/my_account/my_account_repos.html:57
 #: kallithea/templates/admin/my_account/my_account_watched.html:57
 #: kallithea/templates/base/root.html:43
 #: kallithea/templates/bookmarks/bookmarks.html:79
 #: kallithea/templates/branches/branches.html:79
 #: kallithea/templates/journal/journal.html:198
 #: kallithea/templates/journal/journal.html:289
 #: kallithea/templates/tags/tags.html:79
 msgid "Click to sort ascending"
 msgstr "昇順で並び換え"
 #: kallithea/templates/index_base.html:141
 #: kallithea/templates/admin/my_account/my_account_repos.html:58
 #: kallithea/templates/admin/my_account/my_account_watched.html:58
 #: kallithea/templates/base/root.html:44
 #: kallithea/templates/bookmarks/bookmarks.html:80
 #: kallithea/templates/branches/branches.html:80
 #: kallithea/templates/journal/journal.html:199
 #: kallithea/templates/journal/journal.html:290
 #: kallithea/templates/tags/tags.html:80
 msgid "Click to sort descending"
 msgstr "降順で並び替え"
 #: kallithea/templates/index_base.html:142
 msgid "No repositories found."
 msgstr "リポジトリが見つかりません"
+msgstr "リポジトリが見つかりません。"
 #: kallithea/templates/index_base.html:143
 #: kallithea/templates/admin/my_account/my_account_repos.html:60
 #: kallithea/templates/admin/my_account/my_account_watched.html:60
 #: kallithea/templates/base/root.html:46
 #: kallithea/templates/bookmarks/bookmarks.html:82
 #: kallithea/templates/branches/branches.html:82
 #: kallithea/templates/journal/journal.html:201
 #: kallithea/templates/journal/journal.html:292
 #: kallithea/templates/tags/tags.html:82
 msgid "Data error."
 msgstr "データエラー"
 #: kallithea/templates/index_base.html:144
 #: kallithea/templates/admin/my_account/my_account_repos.html:61
 #: kallithea/templates/admin/my_account/my_account_watched.html:61
 #: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47
 #: kallithea/templates/bookmarks/bookmarks.html:83
 #: kallithea/templates/branches/branches.html:83
 #: kallithea/templates/journal/journal.html:202
 #: kallithea/templates/journal/journal.html:293
 #: kallithea/templates/tags/tags.html:83
 msgid "Loading..."
 msgstr "読み込み中..."
 #: kallithea/templates/login.html:5 kallithea/templates/login.html:15
 #: kallithea/templates/base/base.html:326
 msgid "Log In"
 msgstr "ログイン"
 #: kallithea/templates/login.html:13
 #, python-format
 msgid "Log In to %s"
 msgstr "%s へログイン"
 #: kallithea/templates/login.html:26 kallithea/templates/register.html:24
 #: kallithea/templates/admin/admin_log.html:5
 #: kallithea/templates/admin/my_account/my_account_profile.html:25
 #: kallithea/templates/admin/users/user_add.html:32
 #: kallithea/templates/admin/users/user_edit_profile.html:24
 #: kallithea/templates/admin/users/users.html:50
 #: kallithea/templates/base/base.html:302
 #: kallithea/templates/pullrequests/pullrequest_show.html:166
 msgid "Username"
 msgstr "ユーザー名"
 #: kallithea/templates/login.html:33 kallithea/templates/register.html:33
 #: kallithea/templates/admin/my_account/my_account.html:37
 #: kallithea/templates/admin/users/user_add.html:41
 #: kallithea/templates/base/base.html:311
 msgid "Password"
 msgstr "パスワード"
 #: kallithea/templates/login.html:44
 msgid "Remember me"
 msgstr "次回から自動的にサインイン"
 #: kallithea/templates/login.html:53
 msgid "Forgot your password ?"
 msgstr "パスワードを忘れた?"
 #: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322
 msgid "Don't have an account ?"
 msgstr "アカウントを持っていない?"
 #: kallithea/templates/login.html:59
 msgid "Sign In"
 msgstr "サインイン"
 #: kallithea/templates/password_reset.html:5
 msgid "Password Reset"
-msgstr "パスワードリセット"
+msgstr "パスワードのリセット"
 #: kallithea/templates/password_reset.html:12
 #: kallithea/templates/password_reset_confirmation.html:12
-#, fuzzy, python-format
 #, python-format
 msgid "Reset Your Password to %s"
-msgstr "パスワードを %s にリセットします"
+msgstr "%sのパスワードをリセット"
 #: kallithea/templates/password_reset.html:14
 #: kallithea/templates/password_reset_confirmation.html:5
 #: kallithea/templates/password_reset_confirmation.html:14
 #, fuzzy
 msgid "Reset Your Password"
-msgstr "パスワードをリセット"
+msgstr "パスワードのリセット"
 #: kallithea/templates/password_reset.html:25
 msgid "Email Address"
 msgstr "メールアドレス"
 #: kallithea/templates/password_reset.html:35
 #: kallithea/templates/register.html:79
 msgid "Captcha"
 msgstr "キャプチャ"
 #: kallithea/templates/password_reset.html:46
 #, fuzzy
 msgid "Send Password Reset Email"
-msgstr "パスワードリセットのメールを送信"
+msgstr "パスワードリセットメールを送信"
 #: kallithea/templates/password_reset.html:47
 #, fuzzy
 #| msgid "" "Password reset link will be sent to the email address matching
 #| your " "username."
 #| msgid "" "
 msgid ""
 "A password reset link will be sent to the specified email address if it "
 "is registered in the system."
-msgstr "該当するメールアドレスにパスワードリセットのリンクを送信します"
+msgstr "システムに登録されている場合、パスワードリセットのリンクを指定されたメールアドレスに送信します。"
 #: kallithea/templates/password_reset_confirmation.html:19
 #, python-format
 msgid "You are about to set a new password for the email address %s."
 msgstr ""
 #: kallithea/templates/password_reset_confirmation.html:20
 msgid ""
 "Note that you must use the same browser session for this as the one used "
 "to request the password reset."
 msgstr ""
 #: kallithea/templates/password_reset_confirmation.html:30
 msgid "Code you received in the email"
 msgstr ""
 #: kallithea/templates/password_reset_confirmation.html:39
 #, fuzzy
 #| msgid "New password"
 msgid "New Password"
 msgstr "新しいパスワード"
 #: kallithea/templates/password_reset_confirmation.html:48
 #, fuzzy
 #| msgid "Confirm new password"
 msgid "Confirm New Password"
 msgstr "新しいパスワードの確認"
 #: kallithea/templates/password_reset_confirmation.html:56
 msgid "Confirm"
 msgstr ""
 #: kallithea/templates/register.html:5 kallithea/templates/register.html:14
 #: kallithea/templates/register.html:90
 msgid "Sign Up"
 msgstr "サインアップ"
 #: kallithea/templates/register.html:12
 #, python-format
 msgid "Sign Up to %s"
 msgstr "%s へサインアップ"
 #: kallithea/templates/register.html:42
 msgid "Re-enter password"
 msgstr "パスワード再入力"
 #: kallithea/templates/register.html:51
 #: kallithea/templates/admin/my_account/my_account_profile.html:34
 #: kallithea/templates/admin/users/user_add.html:59
 #: kallithea/templates/admin/users/user_edit_profile.html:78
 #: kallithea/templates/admin/users/users.html:51
 msgid "First Name"
 msgstr "名前"
 #: kallithea/templates/register.html:60
 #: kallithea/templates/admin/my_account/my_account_profile.html:43
 #: kallithea/templates/admin/users/user_add.html:68
 #: kallithea/templates/admin/users/user_edit_profile.html:87
 #: kallithea/templates/admin/users/users.html:52
 msgid "Last Name"
 msgstr "名字"
 #: kallithea/templates/register.html:69
 #: kallithea/templates/admin/my_account/my_account_profile.html:52
 #: kallithea/templates/admin/settings/settings.html:31
 #: kallithea/templates/admin/users/user_add.html:77
 #: kallithea/templates/admin/users/user_edit_profile.html:33
 msgid "Email"
 msgstr "メールアドレス"
 #: kallithea/templates/register.html:92
 msgid "Registered accounts are ready to use and need no further action."
 msgstr ""
 #: kallithea/templates/register.html:94
 msgid "Please wait for an administrator to activate your account."
 msgstr ""
 #: kallithea/templates/switch_to_list.html:10
 #: kallithea/templates/branches/branches_data.html:69
 msgid "There are no branches yet"
 msgstr "まだブランチがありません"
 #: kallithea/templates/switch_to_list.html:16
 msgid "Closed Branches"
 msgstr "閉鎖済みブランチ"
 #: kallithea/templates/switch_to_list.html:32
 #: kallithea/templates/tags/tags_data.html:44
 msgid "There are no tags yet"
 msgstr "まだタグがありません"
 #: kallithea/templates/switch_to_list.html:45
 #: kallithea/templates/bookmarks/bookmarks_data.html:43
 msgid "There are no bookmarks yet"
 msgstr "まだブックマークがありません"
 #: kallithea/templates/admin/admin.html:5
 #: kallithea/templates/admin/admin.html:13
 #: kallithea/templates/base/base.html:59
 #, fuzzy
 msgid "Admin Journal"
-msgstr "管理者ジャーナル"
+msgstr "管理ジャーナル"
 #: kallithea/templates/admin/admin.html:10
 msgid "journal filter..."
 msgstr "ジャーナルフィルタ..."
 #: kallithea/templates/admin/admin.html:12
 #: kallithea/templates/journal/journal.html:11
 #, fuzzy
 msgid "Filter"
-msgstr "フィルタ"
+msgstr "フィルター"
 #: kallithea/templates/admin/admin.html:13
 #: kallithea/templates/journal/journal.html:12
-#, fuzzy, python-format
 #, python-format
 msgid "%s Entry"
 msgid_plural "%s Entries"
 msgstr[0] "%s 個のエントリ"
 #: kallithea/templates/admin/admin_log.html:6
 #: kallithea/templates/admin/my_account/my_account_repos.html:50
 #: kallithea/templates/admin/my_account/my_account_watched.html:50
 #: kallithea/templates/admin/repo_groups/repo_groups.html:50
 #: kallithea/templates/admin/repos/repo_edit_fields.html:8
 #: kallithea/templates/admin/repos/repos.html:52
 #: kallithea/templates/admin/user_groups/user_groups.html:51
 #: kallithea/templates/admin/users/users.html:57
 #: kallithea/templates/journal/journal.html:191
 #: kallithea/templates/journal/journal.html:282
 msgid "Action"
 msgstr "アクション"
 #: kallithea/templates/admin/admin_log.html:7
 #: kallithea/templates/admin/permissions/permissions_globals.html:18
 msgid "Repository"
 msgstr "リポジトリ"
 #: kallithea/templates/admin/admin_log.html:8
 #: kallithea/templates/bookmarks/bookmarks.html:51
 #: kallithea/templates/bookmarks/bookmarks_data.html:9
 #: kallithea/templates/branches/branches.html:51
 #: kallithea/templates/branches/branches_data.html:9
 #: kallithea/templates/tags/tags.html:51
 #: kallithea/templates/tags/tags_data.html:9
 msgid "Date"
 msgstr "日時"
 #: kallithea/templates/admin/admin_log.html:9
 msgid "From IP"
 msgstr "アクセス元IPアドレス"
 #: kallithea/templates/admin/admin_log.html:63
 msgid "No actions yet"
 msgstr "まだアクションがありません"
 #: kallithea/templates/admin/auth/auth_settings.html:5
 msgid "Authentication Settings"
 msgstr "認証設定"
 #: kallithea/templates/admin/auth/auth_settings.html:11
 #: kallithea/templates/base/base.html:65
 msgid "Authentication"
 msgstr "認証"
 #: kallithea/templates/admin/auth/auth_settings.html:28
 msgid "Authentication Plugins"
 msgstr "認証プラグイン"
 #: kallithea/templates/admin/auth/auth_settings.html:31
 msgid "Enabled Plugins"
 msgstr "有効なプラグイン"
 #: kallithea/templates/admin/auth/auth_settings.html:33
 #, fuzzy
 msgid ""
 "Comma-separated list of plugins; Kallithea will try user authentication "
 "in plugin order"
-msgstr "カンマ区切りのプラグインの一覧です。プラグインの並び順はKallitheaがユーザー認証を試す順番でもあります。"
+msgstr "カンマ区切りのプラグインの一覧です。Kallitheaはプラグインの並び順でユーザー認証を試みます"
 #: kallithea/templates/admin/auth/auth_settings.html:34
 msgid "Available built-in plugins"
 msgstr "有効な組み込みプラグイン"
 #: kallithea/templates/admin/auth/auth_settings.html:51
 msgid "Plugin"
 msgstr "プラグイン"
 #: kallithea/templates/admin/auth/auth_settings.html:101
 #: kallithea/templates/admin/defaults/defaults.html:82
 #: kallithea/templates/admin/my_account/my_account_password.html:36
 #: kallithea/templates/admin/my_account/my_account_profile.html:60
 #: kallithea/templates/admin/permissions/permissions_globals.html:112
 #: kallithea/templates/admin/repo_groups/repo_group_add.html:69
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114
 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42
 #: kallithea/templates/admin/repos/repo_edit_permissions.html:101
 #: kallithea/templates/admin/repos/repo_edit_settings.html:127
 #: kallithea/templates/admin/settings/settings_hooks.html:53
 #: kallithea/templates/admin/user_groups/user_group_add.html:57
 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104
 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60
 #: kallithea/templates/admin/users/user_add.html:96
 #: kallithea/templates/admin/users/user_edit_profile.html:113
 #: kallithea/templates/base/default_perms_box.html:64
 msgid "Save"
 msgstr "保存"
 #: kallithea/templates/admin/defaults/defaults.html:5
 #: kallithea/templates/admin/defaults/defaults.html:11
 #: kallithea/templates/base/base.html:66
 #, fuzzy
 msgid "Repository Defaults"
 msgstr "リポジトリのデフォルト設定"
 #: kallithea/templates/admin/defaults/defaults.html:33
 #: kallithea/templates/admin/repos/repo_add_base.html:55
 #: kallithea/templates/admin/repos/repo_edit_fields.html:7
 msgid "Type"
 msgstr "リポジトリの種別"
 #: kallithea/templates/admin/defaults/defaults.html:42
 #: kallithea/templates/admin/repos/repo_add_base.html:73
 #: kallithea/templates/admin/repos/repo_edit_settings.html:75
 #: kallithea/templates/data_table/_dt_elements.html:72
 msgid "Private repository"
 msgstr "非公開リポジトリ"
 #: kallithea/templates/admin/defaults/defaults.html:46
 #: kallithea/templates/admin/repos/repo_add_base.html:77
 #: kallithea/templates/admin/repos/repo_edit_settings.html:79
 #: kallithea/templates/forks/fork.html:72
 msgid ""
 "Private repositories are only visible to people explicitly added as "
 "collaborators."
-msgstr "非公開リポジトリはコラボレーターとして明示的に追加された人でないと見つけられません"
+msgstr "非公開リポジトリはコラボレーターとして明示的に追加された人のみ閲覧できます。"
 #: kallithea/templates/admin/defaults/defaults.html:53
 #: kallithea/templates/admin/repos/repo_edit_settings.html:84
 msgid "Enable statistics"
 msgstr "統計を有効にする"
 #: kallithea/templates/admin/defaults/defaults.html:57
 #: kallithea/templates/admin/repos/repo_edit_settings.html:88
 msgid "Enable statistics window on summary page."
 msgstr "概要ページの統計ウィンドウを有効にします"
+msgstr "概要ページの統計ウィンドウを有効にします。"
 #: kallithea/templates/admin/defaults/defaults.html:63
 #: kallithea/templates/admin/repos/repo_edit_settings.html:93
 msgid "Enable downloads"
 msgstr "ダウンロードを有効にする"
 #: kallithea/templates/admin/defaults/defaults.html:67
 #: kallithea/templates/admin/repos/repo_edit_settings.html:97
 msgid "Enable download menu on summary page."
 msgstr "概要ページのダウンロードメニューを有効にします"
+msgstr "概要ページのダウンロードメニューを有効にします。"
 #: kallithea/templates/admin/defaults/defaults.html:73
 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34
 #: kallithea/templates/admin/repos/repo_edit_settings.html:102
 msgid "Enable locking"
 msgstr "ロックを有効にする"
 #: kallithea/templates/admin/defaults/defaults.html:77
 #: kallithea/templates/admin/repos/repo_edit_settings.html:106
 msgid "Enable lock-by-pulling on repository."
 msgstr "リポジトリのpullのロックを有効にします"
+msgstr "リポジトリのpullのロックを有効にします。"
 #: kallithea/templates/admin/gists/edit.html:5
 #: kallithea/templates/admin/gists/edit.html:18
 msgid "Edit Gist"
 msgstr "Gistを編集"
 #: kallithea/templates/admin/gists/edit.html:36
 #, python-format
 msgid ""
 "Gist was update since you started editing. Copy your changes and click "
 "%(here)s to reload new version."
 msgstr ""
 "編集開始後にGistが更新されています。あなたの変更箇所をコピーしておき、 %(here)s "
 "をクリックして新しいバージョンを読み込みなおしてください。"
 #: kallithea/templates/admin/gists/edit.html:55
 #: kallithea/templates/admin/gists/new.html:39
 msgid "Gist description ..."
 msgstr "Gist の説明..."
 #: kallithea/templates/admin/gists/edit.html:57
 #: kallithea/templates/admin/gists/new.html:41
 msgid "Gist lifetime"
 msgstr "Gist 有効期間"
 #: kallithea/templates/admin/gists/edit.html:61
 #: kallithea/templates/admin/gists/edit.html:63
 #: kallithea/templates/admin/gists/index.html:57
 #: kallithea/templates/admin/gists/index.html:59
 #: kallithea/templates/admin/gists/show.html:47
 #: kallithea/templates/admin/gists/show.html:49
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:8
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:27
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:32
 #: kallithea/templates/admin/users/user_edit_api_keys.html:8
 #: kallithea/templates/admin/users/user_edit_api_keys.html:27
 #: kallithea/templates/admin/users/user_edit_api_keys.html:32
 msgid "Expires"
 msgstr "失効"
 #: kallithea/templates/admin/gists/edit.html:61
 #: kallithea/templates/admin/gists/index.html:57
 #: kallithea/templates/admin/gists/show.html:47
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:8
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:27
 #: kallithea/templates/admin/users/user_edit_api_keys.html:8
 #: kallithea/templates/admin/users/user_edit_api_keys.html:27
 #, fuzzy
 msgid "Never"
-msgstr "無し"
+msgstr "しない"
 #: kallithea/templates/admin/gists/edit.html:145
 msgid "Update Gist"
 msgstr "Gistを更新"
 #: kallithea/templates/admin/gists/edit.html:146
 #: kallithea/templates/changeset/changeset_file_comment.html:81
 msgid "Cancel"
 msgstr "キャンセル"
 #: kallithea/templates/admin/gists/index.html:6
 #: kallithea/templates/admin/gists/index.html:16
-#, fuzzy, python-format
 #, python-format
 msgid "Private Gists for User %s"
 msgstr "ユーザー %s の非公開 Gists"
 #: kallithea/templates/admin/gists/index.html:8
 #: kallithea/templates/admin/gists/index.html:18
-#, fuzzy, python-format
 #, python-format
 msgid "Public Gists for User %s"
 msgstr "ユーザー %s の公開 Gists"
 #: kallithea/templates/admin/gists/index.html:10
 #: kallithea/templates/admin/gists/index.html:20
 msgid "Public Gists"
 msgstr "公開 Gists"
 #: kallithea/templates/admin/gists/index.html:37
 #: kallithea/templates/admin/gists/show.html:25
 #: kallithea/templates/base/base.html:237
 msgid "Create New Gist"
 msgstr "新しい Gist を作成"
 #: kallithea/templates/admin/gists/index.html:54
 #: kallithea/templates/data_table/_dt_elements.html:141
 msgid "Created"
 msgstr "作成日"
 #: kallithea/templates/admin/gists/index.html:74
 msgid "There are no gists yet"
 msgstr "まだgistがありません"
 #: kallithea/templates/admin/gists/new.html:5
 #: kallithea/templates/admin/gists/new.html:18
 msgid "New Gist"
 msgstr "Gistを新規作成"
 #: kallithea/templates/admin/gists/new.html:47
 msgid "name this file..."
 msgstr "ファイルに名前をつける..."
 #: kallithea/templates/admin/gists/new.html:56
 msgid "Create Private Gist"
 msgstr "非公開 Gist を作成"
 #: kallithea/templates/admin/gists/new.html:57
 msgid "Create Public Gist"
 msgstr "公開 Gist を作成"
 #: kallithea/templates/admin/gists/new.html:58
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:15
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:70
 #: kallithea/templates/admin/my_account/my_account_emails.html:46
 #: kallithea/templates/admin/my_account/my_account_password.html:37
 #: kallithea/templates/admin/my_account/my_account_profile.html:61
 #: kallithea/templates/admin/permissions/permissions_globals.html:113
 #: kallithea/templates/admin/permissions/permissions_ips.html:39
 #: kallithea/templates/admin/gists/show.html:63
 #: kallithea/templates/base/perms_summary.html:43
 #: kallithea/templates/base/perms_summary.html:79
 #: kallithea/templates/base/perms_summary.html:81
 #: kallithea/templates/changeset/changeset_file_comment.html:83
 #: kallithea/templates/changeset/changeset_file_comment.html:192
 #: kallithea/templates/data_table/_dt_elements.html:122
 #: kallithea/templates/data_table/_dt_elements.html:123
 #: kallithea/templates/data_table/_dt_elements.html:150
 #: kallithea/templates/data_table/_dt_elements.html:151
 #: kallithea/templates/data_table/_dt_elements.html:165
 #: kallithea/templates/data_table/_dt_elements.html:167
 #: kallithea/templates/data_table/_dt_elements.html:181
 #: kallithea/templates/data_table/_dt_elements.html:183
 #: kallithea/templates/files/diff_2way.html:56
 #: kallithea/templates/files/files_source.html:41
 #: kallithea/templates/files/files_source.html:44
 #: kallithea/templates/pullrequests/pullrequest_show.html:41
 msgid "Edit"
 msgstr "編集"
 #: kallithea/templates/admin/gists/show.html:65
 #: kallithea/templates/files/files_edit.html:49
 #: kallithea/templates/files/files_source.html:34
 msgid "Show as Raw"
 msgstr "Raw形式で表示"
 #: kallithea/templates/admin/gists/show.html:73
 msgid "created"
 msgstr "作成日"
 #: kallithea/templates/admin/gists/show.html:86
 #: kallithea/templates/files/files_source.html:73
 msgid "Show as raw"
 msgstr "Raw形式で表示"
 #: kallithea/templates/admin/my_account/my_account.html:5
 #: kallithea/templates/admin/my_account/my_account.html:9
 #: kallithea/templates/base/base.html:343
 msgid "My Account"
 msgstr "アカウント"
 #: kallithea/templates/admin/my_account/my_account.html:35
 #: kallithea/templates/admin/users/user_edit.html:29
 msgid "Profile"
 msgstr "プロフィール"
 #: kallithea/templates/admin/my_account/my_account.html:36
 #, fuzzy
 msgid "Email Addresses"
-msgstr "新しいメールアドレス"
+msgstr "メールアドレス"
 #: kallithea/templates/admin/my_account/my_account.html:38
 #: kallithea/templates/admin/users/user_edit.html:31
 #, fuzzy
 msgid "API Keys"
-msgstr "新しいAPIキー"
+msgstr "APIキー"
 #: kallithea/templates/admin/my_account/my_account.html:39
 #, fuzzy
 msgid "Owned Repositories"
-msgstr "リポジトリ"
+msgstr "所有しているリポジトリ"
 #: kallithea/templates/admin/my_account/my_account.html:40
 #: kallithea/templates/journal/journal.html:53
 #, fuzzy
 msgid "Watched Repositories"
-msgstr "リポジトリを作成する"
+msgstr "ウォッチ中のリポジトリ"
 #: kallithea/templates/admin/my_account/my_account.html:41
 #: kallithea/templates/admin/permissions/permissions.html:30
 #: kallithea/templates/admin/user_groups/user_group_edit.html:32
 #: kallithea/templates/admin/users/user_edit.html:34
 #, fuzzy
 msgid "Show Permissions"
-msgstr "権限のコピー"
+msgstr "権限の表示"
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:6
 #: kallithea/templates/admin/users/user_edit_api_keys.html:6
 msgid "Built-in"
 msgstr "ビルトイン"
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:14
 #: kallithea/templates/admin/users/user_edit_api_keys.html:14
-#, fuzzy, python-format
 #, python-format
 msgid "Confirm to reset this API key: %s"
 msgstr "このAPIキーをリセットしてもよろしいですか？: %s"
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:30
 #: kallithea/templates/admin/users/user_edit_api_keys.html:30
 #, fuzzy
 msgid "Expired"
-msgstr "失効済み"
+msgstr "期限切れ"
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:40
 #: kallithea/templates/admin/users/user_edit_api_keys.html:40
-#, fuzzy, python-format
 #, python-format
 msgid "Confirm to remove this API key: %s"
 msgstr "このAPIキーを削除してもよろしいですか？: %s"
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:42
 #: kallithea/templates/admin/users/user_edit_api_keys.html:42
 #, fuzzy
 msgid "Remove"
 msgstr "削除"
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:49
 #: kallithea/templates/admin/users/user_edit_api_keys.html:49
 #, fuzzy
 msgid "No additional API keys specified"
 msgstr "API キーが指定されていません"
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:61
 #: kallithea/templates/admin/users/user_edit_api_keys.html:61
 #, fuzzy
 msgid "New API key"
 msgstr "新しいAPIキー"
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:69
 #: kallithea/templates/admin/my_account/my_account_emails.html:45
 #: kallithea/templates/admin/permissions/permissions_ips.html:38
 #: kallithea/templates/admin/repos/repo_add_base.html:81
 #: kallithea/templates/admin/repos/repo_edit_fields.html:58
 #: kallithea/templates/admin/users/user_edit_api_keys.html:69
 #: kallithea/templates/admin/users/user_edit_emails.html:45
 #: kallithea/templates/admin/users/user_edit_ips.html:49
 msgid "Add"
 msgstr "追加"
 #: kallithea/templates/admin/my_account/my_account_emails.html:7
 #: kallithea/templates/admin/users/user_edit_emails.html:7
 msgid "Primary"
 msgstr "プライマリ"
 #: kallithea/templates/admin/my_account/my_account_emails.html:20
 #: kallithea/templates/admin/users/user_edit_emails.html:20
 #, python-format
 msgid "Confirm to delete this email: %s"
 msgstr "このメールアドレスを削除してもよろしいですか？ : %s"
 #: kallithea/templates/admin/my_account/my_account_emails.html:26
 #: kallithea/templates/admin/users/user_edit_emails.html:26
 #, fuzzy
 msgid "No additional emails specified."
 msgstr "追加のメールアドレスはありません"
+msgstr "追加のメールアドレスはありません。"
 #: kallithea/templates/admin/my_account/my_account_emails.html:38
 #: kallithea/templates/admin/users/user_edit_emails.html:38
 msgid "New email address"
 msgstr "新しいメールアドレス"
 #: kallithea/templates/admin/my_account/my_account_password.html:1
 #, fuzzy
 msgid "Change Your Account Password"
 msgstr "パスワードを変更してください"
 #: kallithea/templates/admin/my_account/my_account_password.html:10
 msgid "Current password"
 msgstr "現在のパスワード"
 #: kallithea/templates/admin/my_account/my_account_password.html:19
 #: kallithea/templates/admin/users/user_edit_profile.html:60
 msgid "New password"
 msgstr "新しいパスワード"
 #: kallithea/templates/admin/my_account/my_account_password.html:28
 msgid "Confirm new password"
 msgstr "新しいパスワードの確認"
 #: kallithea/templates/admin/my_account/my_account_password.html:45
 #, python-format
 msgid "This account is managed with %s and the password cannot be changed here"
 msgstr ""
 #: kallithea/templates/admin/my_account/my_account_profile.html:11
 msgid "Change your avatar at"
 msgstr "アバターを変更できます : "
 #: kallithea/templates/admin/my_account/my_account_profile.html:12
 #: kallithea/templates/admin/users/user_edit_profile.html:9
 msgid "Using"
 msgstr "メールアドレス:"
 #: kallithea/templates/admin/my_account/my_account_profile.html:14
 #: kallithea/templates/admin/users/user_edit_profile.html:11
 msgid "Avatars are disabled"
 msgstr "アバターは無効です"
 #: kallithea/templates/admin/my_account/my_account_profile.html:15
 msgid "Missing email, please update your user email address."
 msgstr "メールアドレスがありません。更新してください。"
 #: kallithea/templates/admin/my_account/my_account_profile.html:16
 #: kallithea/templates/admin/users/user_edit_profile.html:15
 #, fuzzy
 msgid "Current IP"
 msgstr "現在の IP"
+msgstr "現在の IP アドレス"
 #: kallithea/templates/admin/my_account/my_account_repos.html:1
 #, fuzzy
 msgid "Repositories You Own"
 msgstr "あなたが所有者のリポジトリ"
 #: kallithea/templates/admin/my_account/my_account_repos.html:59
 #: kallithea/templates/admin/my_account/my_account_watched.html:59
 #: kallithea/templates/base/root.html:45
 #: kallithea/templates/bookmarks/bookmarks.html:81
 #: kallithea/templates/branches/branches.html:81
 #: kallithea/templates/journal/journal.html:200
 #: kallithea/templates/journal/journal.html:291
 #: kallithea/templates/tags/tags.html:81
 msgid "No records found."
 msgstr "レコードが見つかりません"
 #: kallithea/templates/admin/my_account/my_account_watched.html:1
 #, fuzzy
 msgid "Repositories You are Watching"
 msgstr "あなたがウォッチしているリポジトリ"
 #: kallithea/templates/admin/notifications/notifications.html:5
 #: kallithea/templates/admin/notifications/notifications.html:9
 msgid "My Notifications"
 msgstr "通知"
 #: kallithea/templates/admin/notifications/notifications.html:24
 msgid "All"
 msgstr "すべて"
 #: kallithea/templates/admin/notifications/notifications.html:25
 msgid "Comments"
 msgstr "コメント"
 #: kallithea/templates/admin/notifications/notifications.html:26
 #: kallithea/templates/base/base.html:183
 msgid "Pull Requests"
 msgstr "プルリクエスト"
 #: kallithea/templates/admin/notifications/notifications.html:30
 #, fuzzy
 msgid "Mark All Read"
-msgstr "すべて既読にする"
+msgstr "すべて既読としてマーク"
 #: kallithea/templates/admin/notifications/notifications_data.html:40
 msgid "No notifications here yet"
 msgstr "まだ通知がありません"
 #: kallithea/templates/admin/notifications/show_notification.html:5
 #: kallithea/templates/admin/notifications/show_notification.html:11
 #, fuzzy
 msgid "Show Notification"
 msgstr "通知を表示"
 #: kallithea/templates/admin/notifications/show_notification.html:9
 #: kallithea/templates/base/base.html:342
 msgid "Notifications"
 msgstr "通知"
 #: kallithea/templates/admin/permissions/permissions.html:5
 #: kallithea/templates/admin/permissions/permissions.html:11
 #: kallithea/templates/base/base.html:64
 #, fuzzy
 msgid "Default Permissions"
 msgstr "デフォルトの権限"
 #: kallithea/templates/admin/permissions/permissions.html:28
 #: kallithea/templates/admin/settings/settings.html:29
 msgid "Global"
 msgstr "全般"
 #: kallithea/templates/admin/permissions/permissions.html:29
 #: kallithea/templates/admin/users/user_edit.html:32
 #, fuzzy
 msgid "IP Whitelist"
 msgstr "IPアドレスのホワイトリスト"
 #: kallithea/templates/admin/permissions/permissions_globals.html:7
 msgid "Anonymous access"
 msgstr "匿名アクセス"
 #: kallithea/templates/admin/permissions/permissions_globals.html:13
 #, fuzzy, python-format
 msgid ""
 "Allow access to Kallithea without needing to log in. Anonymous users use "
 "%s user permissions."
 msgstr "ログインしなくても Kallithea にアクセスできるようにします。匿名ユーザーは %s ユーザーパーミッションを使います"
 #: kallithea/templates/admin/permissions/permissions_globals.html:25
 msgid ""
 "All default permissions on each repository will be reset to chosen "
 "permission, note that all custom default permission on repositories will "
 "be lost"
 msgstr "選択したパーミッションで、各リポジトリのデフォルトパーミッションをリセットします。各リポジトリの既存のカスタムデフォルトパーミッション設定は無くなるので注意してください"
 #: kallithea/templates/admin/permissions/permissions_globals.html:26
 #, fuzzy
 msgid "Apply to all existing repositories"
 msgstr "既存のリポジトリを import しますか？"
 #: kallithea/templates/admin/permissions/permissions_globals.html:27
 msgid "Permissions for the Default user on new repositories."
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_globals.html:32
 #: kallithea/templates/admin/repos/repo_add_base.html:37
 #: kallithea/templates/admin/repos/repo_edit_settings.html:35
 #: kallithea/templates/data_table/_dt_elements.html:202
 #: kallithea/templates/forks/fork.html:48
 msgid "Repository group"
 msgstr "リポジトリグループ"
 #: kallithea/templates/admin/permissions/permissions_globals.html:39
 msgid ""
 "All default permissions on each repository group will be reset to chosen "
 "permission, note that all custom default permission on repository groups "
 "will be lost"
 msgstr "選択したパーミッションで、各リポジトリグループのデフォルトパーミッションをリセットします。各リポジトリグループの既存のカスタムデフォルトパーミッション設定は無くなるので注意してください"
 #: kallithea/templates/admin/permissions/permissions_globals.html:40
 #, fuzzy
 msgid "Apply to all existing repository groups"
 msgstr "既存のリポジトリを import しますか？"
 #: kallithea/templates/admin/permissions/permissions_globals.html:41
 #, fuzzy
 msgid "Permissions for the Default user on new repository groups."
 msgstr "親のリポジトリグループにセットされているパーミッションをコピーします。"
 #: kallithea/templates/admin/permissions/permissions_globals.html:46
 #: kallithea/templates/data_table/_dt_elements.html:209
 msgid "User group"
 msgstr "ユーザーグループ"
 #: kallithea/templates/admin/permissions/permissions_globals.html:53
 #, fuzzy
 msgid ""
 "All default permissions on each user group will be reset to chosen "
 "permission, note that all custom default permission on user groups will "
 "be lost"
 msgstr "選択したパーミッションで、各ユーザーグループのデフォルトパーミッションをリセットします。各ユーザーグループの既存のカスタムデフォルトパーミッション設定は無くなるので注意してください"
 #: kallithea/templates/admin/permissions/permissions_globals.html:54
 msgid "Apply to all existing user groups"
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_globals.html:55
 msgid "Permissions for the Default user on new user groups."
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_globals.html:60
 #, fuzzy
 msgid "Top level repository creation"
-msgstr "リポジトリ作成"
+msgstr "トップレベルリポジトリの作成"
 #: kallithea/templates/admin/permissions/permissions_globals.html:64
 msgid "Enable this to allow non-admins to create repositories at the top level."
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_globals.html:65
 msgid ""
 "Note: This will also give all users API access to create repositories "
 "everywhere. That might change in future versions."
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_globals.html:70
 msgid "Repository creation with group write access"
 msgstr "グループ書き込み権限でのリポジトリ作成"
 #: kallithea/templates/admin/permissions/permissions_globals.html:74
 #, fuzzy
 msgid ""
 "With this, write permission to a repository group allows creating "
 "repositories inside that group. Without this, group write permissions "
 "mean nothing."
 msgstr "リポジトリグループに書き込みパーミッションを付与すると、グループ内にリポジトリを作成できるようになります"
 #: kallithea/templates/admin/permissions/permissions_globals.html:79
 msgid "User group creation"
 msgstr "ユーザーグループ作成"
 #: kallithea/templates/admin/permissions/permissions_globals.html:83
 msgid "Enable this to allow non-admins to create user groups."
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_globals.html:88
 msgid "Repository forking"
 msgstr "リポジトリのフォーク"
 #: kallithea/templates/admin/permissions/permissions_globals.html:92
 msgid "Enable this to allow non-admins to fork repositories."
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_globals.html:97
 msgid "Registration"
 msgstr "新規登録"
 #: kallithea/templates/admin/permissions/permissions_globals.html:105
 msgid "External auth account activation"
 msgstr "外部認証アカウントのアクティベート"
 #: kallithea/templates/admin/permissions/permissions_ips.html:13
 #: kallithea/templates/admin/users/user_edit_ips.html:23
-#, fuzzy, python-format
 #, python-format
 msgid "Confirm to delete this IP address: %s"
 msgstr "このIPアドレスを削除してもよろしいですか？ : %s"
 #: kallithea/templates/admin/permissions/permissions_ips.html:19
 #: kallithea/templates/admin/users/user_edit_ips.html:30
 #, fuzzy
 msgid "All IP addresses are allowed."
 msgstr "すべてのIPアドレスが許可されています"
+msgstr "すべてのIPアドレスが許可されています。"
 #: kallithea/templates/admin/permissions/permissions_ips.html:30
 #: kallithea/templates/admin/users/user_edit_ips.html:42
 msgid "New IP address"
 msgstr "新しいIPアドレス"
 #: kallithea/templates/admin/repo_groups/repo_group_add.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105
 #: kallithea/templates/admin/repo_groups/repo_groups.html:10
 #: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80
 msgid "Repository Groups"
 msgstr "リポジトリグループ"
 #: kallithea/templates/admin/repo_groups/repo_group_add.html:33
 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8
 #: kallithea/templates/admin/user_groups/user_group_add.html:32
 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7
 msgid "Group name"
 msgstr "グループ名"
 #: kallithea/templates/admin/repo_groups/repo_group_add.html:51
 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26
 msgid "Group parent"
 msgstr "親グループ"
 #: kallithea/templates/admin/repo_groups/repo_group_add.html:60
 #: kallithea/templates/admin/repos/repo_add_base.html:46
 msgid "Copy parent group permissions"
 msgstr "親グループのパーミッションをコピー"
 #: kallithea/templates/admin/repo_groups/repo_group_add.html:64
 #: kallithea/templates/admin/repos/repo_add_base.html:50
 msgid "Copy permission set from parent repository group."
 msgstr "親のリポジトリグループにセットされているパーミッションをコピーします。"
 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:5
-#, fuzzy, python-format
 #, python-format
 msgid "%s Repository Group Settings"
-msgstr "%s リポジトリグループ 設定"
+msgstr "%s リポジトリグループ設定"
 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:21
 msgid "Add Child Group"
 msgstr "子グループを追加"
 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:40
 #: kallithea/templates/admin/repos/repo_edit.html:12
 #: kallithea/templates/admin/repos/repo_edit.html:40
 #: kallithea/templates/admin/settings/settings.html:11
 #: kallithea/templates/admin/user_groups/user_group_edit.html:29
 #: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151
 #: kallithea/templates/data_table/_dt_elements.html:45
 #: kallithea/templates/data_table/_dt_elements.html:49
 msgid "Settings"
 msgstr "設定"
 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:41
 #: kallithea/templates/admin/repos/repo_edit.html:46
 #: kallithea/templates/admin/user_groups/user_group_edit.html:30
 #: kallithea/templates/admin/users/user_edit.html:33
 msgid "Advanced"
 msgstr "高度な設定"
 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:42
 #: kallithea/templates/admin/repos/repo_edit.html:43
 #: kallithea/templates/admin/user_groups/user_group_edit.html:31
 msgid "Permissions"
 msgstr "権限設定"
 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:1
 #, python-format
 msgid "Repository Group: %s"
 msgstr "リポジトリグループ: %s"
 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:6
 msgid "Top level repositories"
 msgstr "トップレベルリポジトリ数"
 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:7
 msgid "Total repositories"
 msgstr "リポジトリ総数"
 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:8
 msgid "Children groups"
 msgstr "子グループ数"
 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9
 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7
 #: kallithea/templates/admin/users/user_edit_advanced.html:8
 #: kallithea/templates/pullrequests/pullrequest_show.html:148
 msgid "Created on"
 msgstr "作成日"
 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21
 #: kallithea/templates/data_table/_dt_elements.html:190
 #, 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] "このグループを削除してもよろしいですか？ : %s %s 個のリポジトリ"
 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:25
 msgid "Delete this repository group"
 msgstr "このリポジトリグループを削除"
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11
 #: kallithea/templates/admin/repos/repo_edit_permissions.html:12
 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11
 #, fuzzy
 msgid "User/User Group"
 msgstr "ユーザー/ユーザーグループ"
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45
 #: kallithea/templates/admin/repos/repo_edit_permissions.html:24
 #: kallithea/templates/admin/repos/repo_edit_permissions.html:37
 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28
 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45
 #, fuzzy
 msgid "Default"
-msgstr "default"
+msgstr "Default"
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71
 #: kallithea/templates/admin/repos/repo_edit_permissions.html:43
 #: kallithea/templates/admin/repos/repo_edit_permissions.html:68
 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34
 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71
 #, fuzzy
 msgid "Revoke"
 msgstr "取消"
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97
 #: kallithea/templates/admin/repos/repo_edit_permissions.html:94
 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97
 msgid "Add new"
 msgstr "新規追加"
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103
 #, fuzzy
 msgid "Apply to children"
 msgstr "子要素にも適用"
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107
 msgid "Both"
 msgstr "両方"
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108
 msgid ""
 "Set or revoke permission to all children of that group, including non-"
 "private repositories and other groups if selected."
 msgstr "このグループに属する全ての子要素のパーミッションを設定または無効化します。選択されていれば、非公開でないリポジトリや他のリポジトリも対象に含みます。"
 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38
 msgid ""
 "Enable lock-by-pulling on group. This option will be applied to all other"
 " groups and repositories inside"
-msgstr "グループのpullのロックを有効にします。このオプションはグループに含まれる全てのグループとリポジトリに適用されます。"
+msgstr "グループに対してpullのロックを有効にします。このオプションはグループに含まれる全てのグループとリポジトリに適用されます。"
 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53
 #, fuzzy
 msgid "Remove this group"
-msgstr "このユーザーグループを削除"
+msgstr "このグループを削除"
 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53
 #, fuzzy
 msgid "Confirm to delete this group"
-msgstr "このユーザーグループを削除してもよろしいですか？: %s"
+msgstr "このグループを削除してもよろしいですか？: %s"
 #: kallithea/templates/admin/repo_groups/repo_group_show.html:4
 #, python-format
 msgid "%s Repository group dashboard"
 msgstr "%s リポジトリグループダッシュボード"
 #: kallithea/templates/admin/repo_groups/repo_group_show.html:9
 msgid "Home"
 msgstr "ホーム"
 #: kallithea/templates/admin/repo_groups/repo_group_show.html:13
 msgid "with"
 msgstr "と"
 #: kallithea/templates/admin/repo_groups/repo_groups.html:5
 #, fuzzy
 msgid "Repository Groups Administration"
 msgstr "リポジトリグループ管理"
 #: kallithea/templates/admin/repo_groups/repo_groups.html:48
 #, fuzzy
 msgid "Number of Top-level Repositories"
 msgstr "トップレベルリポジトリ数"
 #: kallithea/templates/admin/repos/repo_add_base.html:17
 #, fuzzy
 msgid "Clone remote repository"
-msgstr "リポジトリを[作成]"
+msgstr "リモートリポジトリをクローン"
 #: kallithea/templates/admin/repos/repo_add_base.html:22
 msgid ""
 "Optional: URL of a remote repository. If set, the repository will be "
 "created as a clone from this URL."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_add_base.html:32
 #: kallithea/templates/admin/repos/repo_edit_settings.html:69
 #: kallithea/templates/forks/fork.html:42
 msgid "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr "短く要点を絞ってください。長い説明にはREADMEファイルを利用してください。"
 #: kallithea/templates/admin/repos/repo_add_base.html:41
 #: kallithea/templates/admin/repos/repo_edit_settings.html:39
 #: kallithea/templates/forks/fork.html:52
 msgid "Optionally select a group to put this repository into."
 msgstr "オプション：このリポジトリが属するグループを選択します"
 #: kallithea/templates/admin/repos/repo_add_base.html:59
 msgid "Type of repository to create."
 msgstr "作成するリポジトリの種別を指定します"
 #: kallithea/templates/admin/repos/repo_add_base.html:64
 #: kallithea/templates/admin/repos/repo_edit_settings.html:44
 #: kallithea/templates/forks/fork.html:58
 msgid "Landing revision"
 msgstr "ランディングリビジョン"
 #: kallithea/templates/admin/repos/repo_add_base.html:68
 msgid ""
 "Default revision for files page, downloads, full text search index and "
 "readme generation"
 msgstr "ファイルページ、ダウンロード、全文検索インデックス、READMEなどの生成に使うデフォルトのリビジョン"
 #: kallithea/templates/admin/repos/repo_creating.html:9
 #, fuzzy, python-format
 msgid "%s Creating Repository"
 msgstr "%s Creating repository"
 #: kallithea/templates/admin/repos/repo_creating.html:13
 msgid "Creating repository"
 msgstr "リポジトリを作成中"
 #: kallithea/templates/admin/repos/repo_creating.html:27
 #, python-format
 msgid ""
 "Repository \"%(repo_name)s\" is being created, you will be redirected "
 "when this process is finished.repo_name"
 msgstr "リポジトリ \"%(repo_name)s\" を作成中です。処理を完了したらリダイレクトします。"
 #: kallithea/templates/admin/repos/repo_creating.html:39
 msgid ""
 "We're sorry but error occurred during this operation. Please check your "
 "Kallithea server logs, or contact administrator."
 msgstr "恐れいります。操作中にエラーが発生しました。 Kallithea サーバのログをチェックするか、管理者に問い合わせてください。"
 #: kallithea/templates/admin/repos/repo_edit.html:8
-#, fuzzy, python-format
 #, python-format
 msgid "%s Repository Settings"
 msgstr "%s リポジトリ設定"
 #: kallithea/templates/admin/repos/repo_edit.html:49
 #, fuzzy
 msgid "Extra Fields"
 msgstr "拡張フィールド"
 #: kallithea/templates/admin/repos/repo_edit.html:52
 msgid "Caches"
 msgstr "キャッシュ"
 #: kallithea/templates/admin/repos/repo_edit.html:55
 msgid "Remote"
 msgstr "リモート"
 #: kallithea/templates/admin/repos/repo_edit.html:58
 #: kallithea/templates/summary/statistics.html:8
 #: kallithea/templates/summary/summary.html:171
 #: kallithea/templates/summary/summary.html:172
 msgid "Statistics"
 msgstr "統計"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:1
 #, fuzzy
 msgid "Parent"
-msgstr "親リビジョン"
+msgstr "Parent"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:5
 #: kallithea/templates/admin/repos/repo_edit_fork.html:5
 msgid "Set"
 msgstr "保存"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:8
 #: kallithea/templates/admin/repos/repo_edit_fork.html:9
 #, fuzzy
 msgid "Manually set this repository as a fork of another from the list."
-msgstr "このリポジトリをリスト中の他のリポジトリのフォークとして、手動で設定します"
+msgstr "一覧から別のフォークとしてこのリポジトリを手動で設定します。"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:22
 #, fuzzy
 msgid "Public Journal Visibility"
 msgstr "公開ジャーナルでの可視性"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:29
 msgid "Remove from public journal"
 msgstr "公開ジャーナルから削除する"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:34
 #, fuzzy
 msgid "Add to Public Journal"
 msgstr "公開ジャーナルへ追加"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:40
 #, fuzzy
 msgid ""
 "All actions done in this repository will be visible to everyone in the "
 "public journal."
 msgstr "公開ジャーナルでは、このリポジトリに対して行った操作のすべてが公開されます"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:46
 #, fuzzy
 msgid "Change Locking"
 msgstr "ロック"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:52
 #, fuzzy
 msgid "Confirm to unlock repository."
 msgstr "このリポジトリのロックを解除しますか？"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:54
 #, fuzzy
 msgid "Unlock Repository"
 msgstr "リポジトリのロックを解除"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:60
 #, fuzzy
 msgid "Confirm to lock repository."
 msgstr "このリポジトリをロックしますか？"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:62
 #, fuzzy
 msgid "Lock Repository"
-msgstr "リポジトリのロックを解除"
+msgstr "リポジトリをロック"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:64
 msgid "Repository is not locked"
 msgstr "リポジトリはロックされていません"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:68
 msgid ""
 "Force locking on the repository. Works only when anonymous access is "
 "disabled. Triggering a pull locks the repository.  The user who is "
 "pulling locks the repository; only the user who pulled and locked it can "
 "unlock it by doing a push."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:79
 #: kallithea/templates/data_table/_dt_elements.html:130
 #, python-format
 msgid "Confirm to delete this repository: %s"
 msgstr "このリポジトリを削除してもよろしいですか？ : %s"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:81
 #, fuzzy
 msgid "Delete this Repository"
 msgstr "このリポジトリを削除"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:84
-#, fuzzy, python-format
 #, python-format
 msgid "This repository has %s fork"
 msgid_plural "This repository has %s forks"
 msgstr[0] "%s 個のフォークがあります"
+msgstr[0] "このリポジトリには %s 個のフォークがあります"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:85
 msgid "Detach forks"
 msgstr "フォークの切り離し"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:86
 msgid "Delete forks"
 msgstr "フォークも削除"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:90
 msgid ""
 "The deleted repository will be moved away and hidden until the "
 "administrator expires it. The administrator can both permanently delete "
 "it or restore it."
 msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
 #, fuzzy
 msgid "Invalidate Repository Cache"
 msgstr "リポジトリのキャッシュを無効化"
 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
 #, fuzzy
 msgid "Confirm to invalidate repository cache."
 msgstr "リポジトリのキャッシュを無効化してもよろしいですか？"
 #: kallithea/templates/admin/repos/repo_edit_caches.html:7
 #, fuzzy
 msgid ""
 "Manually invalidate cache for this repository. On first access, the "
 "repository will be cached again."
 msgstr "このリポジトリのキャッシュを手動で無効化します。リポジトリへの初回アクセス時に再びキャッシュされます。"
 #: kallithea/templates/admin/repos/repo_edit_caches.html:12
 #, fuzzy
 msgid "List of Cached Values"
 msgstr "キャッシュしている値の一覧"
 #: kallithea/templates/admin/repos/repo_edit_caches.html:15
 msgid "Prefix"
 msgstr "プレフィックス"
 #: kallithea/templates/admin/repos/repo_edit_caches.html:16
 #: kallithea/templates/admin/repos/repo_edit_fields.html:6
 msgid "Key"
 msgstr "キー"
 #: kallithea/templates/admin/repos/repo_edit_caches.html:17
 #: kallithea/templates/admin/user_groups/user_group_add.html:49
 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24
 #: kallithea/templates/admin/user_groups/user_groups.html:49
 #: kallithea/templates/admin/users/user_add.html:86
 #: kallithea/templates/admin/users/user_edit_profile.html:96
 #: kallithea/templates/admin/users/users.html:54
 msgid "Active"
 msgstr "アクティブ"
 #: kallithea/templates/admin/repos/repo_edit_fields.html:5
 msgid "Label"
 msgstr "ラベル"
 #: kallithea/templates/admin/repos/repo_edit_fields.html:19
 #, python-format
 msgid "Confirm to delete this field: %s"
 msgstr "このフィールドを削除してもよろしいですか？ : %s"
 #: kallithea/templates/admin/repos/repo_edit_fields.html:33
 msgid "New field key"
 msgstr "新しいフィールドのキー"
 #: kallithea/templates/admin/repos/repo_edit_fields.html:41
 msgid "New field label"
 msgstr "新しいフィールドのラベル"
 #: kallithea/templates/admin/repos/repo_edit_fields.html:44
 msgid "Enter short label"
 msgstr "ラベルを入力してください"
 #: kallithea/templates/admin/repos/repo_edit_fields.html:50
 msgid "New field description"
 msgstr "新しいフィールドの説明"
 #: kallithea/templates/admin/repos/repo_edit_fields.html:53
 msgid "Enter description of a field"
 msgstr "フィールドの説明を入力してください"
 #: kallithea/templates/admin/repos/repo_edit_fields.html:66
 #, fuzzy
 msgid "Extra fields are disabled."
 msgstr "拡張フィールドは無効化されています"
 #: kallithea/templates/admin/repos/repo_edit_permissions.html:21
 #, fuzzy
 msgid "Private Repository"
 msgstr "非公開リポジトリ"
 #: kallithea/templates/admin/repos/repo_edit_remote.html:3
 #, fuzzy
 msgid "Remote repository URL"
-msgstr "リポジトリ %s を作成しました"
+msgstr "リモートリポジトリURL"
 #: kallithea/templates/admin/repos/repo_edit_remote.html:9
 #, fuzzy
 msgid "Pull Changes from Remote Repository"
-msgstr "リポジトリに[リモートからプル]"
+msgstr "リモートリポジトリから変更を取り込む"
 #: kallithea/templates/admin/repos/repo_edit_remote.html:11
 #, fuzzy
 msgid "Confirm to pull changes from remote repository."
-msgstr "リモートから変更を取り込んでもよろしいですか？"
+msgstr "リモートリポジトリから変更を取り込んでもよろしいですか？"
 #: kallithea/templates/admin/repos/repo_edit_remote.html:17
 #, fuzzy
 msgid "This repository does not have a remote repository URL."
-msgstr "このリポジトリにリモート URLは設定されていません"
+msgstr "このリポジトリにリモートURLは設定されていません"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:11
 #, fuzzy
 msgid "Permanent Repository ID"
-msgstr "非公開リポジトリ"
+msgstr "リポジトリID"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:11
 #, fuzzy
 msgid "What is that?"
 msgstr "これは何？"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:13
 msgid "URL by id"
 msgstr "id を使ってURLを表現"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:14
 #, fuzzy
 msgid ""
 "In case this repository is renamed or moved into another group the "
 "repository URL changes.\n"
 "                               Using the above permanent URL guarantees "
 "that this repository always will be accessible on that URL.\n"
 "                               This is useful for CI systems, or any "
 "other cases that you need to hardcode the URL into a 3rd party service."
 msgstr ""
 "通常、リポジトリの名前を変更したり、別のグループに移動すると、リポジトリのURLが変わります。\n"
 "上のURLを使えば、常にリポジトリにアクセスできます。\n"
-"この機能は、CIを使っている場合や、3rd pirtyのサービス向けにURLをハードコードしたいときに便利です。"
+"この機能は、CIを使っている場合や、3rd pirtyのサービス向けにURLを固定化したいときに便利です。"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:21
 #, fuzzy
 msgid "Remote repository"
-msgstr "リポジトリを[作成]"
+msgstr "リモートリポジトリ"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:25
 #, fuzzy
 msgid "Repository URL"
-msgstr "リポジトリ"
+msgstr "リポジトリURL"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:29
 msgid ""
 "Optional: URL of a remote repository. If set, the repository can be "
 "pulled from this URL."
 msgstr ""
+msgstr "オプション: リモートリポジトリのURLです。設定した場合、このURLから変更を取得することができます。"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:48
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr "ファイルページ、ダウンロード、検索、READMEのデフォルトのリビジョンを指定します"
 #: kallithea/templates/admin/repos/repo_edit_settings.html:58
 msgid "Change owner of this repository."
 msgstr "リポジトリの所有者を変更"
 #: kallithea/templates/admin/repos/repo_edit_statistics.html:6
 msgid "Processed commits"
 msgstr "処理済みコミット数"
 #: kallithea/templates/admin/repos/repo_edit_statistics.html:7
 msgid "Processed progress"
 msgstr "処理状況"
 #: kallithea/templates/admin/repos/repo_edit_statistics.html:10
 #, fuzzy
 msgid "Reset Statistics"
 msgstr "統計情報をリセット"
 #: kallithea/templates/admin/repos/repo_edit_statistics.html:10
 #, fuzzy
 msgid "Confirm to remove current statistics."
 msgstr "現在の統計情報をリセットしてもよろしいですか？"
 #: kallithea/templates/admin/repos/repos.html:5
 #, fuzzy
 msgid "Repositories Administration"
 msgstr "リポジトリ管理"
 #: kallithea/templates/admin/repos/repos.html:51
 msgid "State"
 msgstr "状態"
 #: kallithea/templates/admin/settings/settings.html:5
 #, fuzzy
 msgid "Settings Administration"
 msgstr "設定管理"
 #: kallithea/templates/admin/settings/settings.html:27
 msgid "VCS"
 msgstr "VCS"
 #: kallithea/templates/admin/settings/settings.html:28
 #, fuzzy
 msgid "Remap and Rescan"
 msgstr "再マップと再スキャン"
 #: kallithea/templates/admin/settings/settings.html:30
 msgid "Visual"
 msgstr "表示"
 #: kallithea/templates/admin/settings/settings.html:32
 #: kallithea/templates/admin/settings/settings_vcs.html:19
 msgid "Hooks"
 msgstr "フック"
 #: kallithea/templates/admin/settings/settings.html:33
 #, fuzzy
 msgid "Full Text Search"
 msgstr "全文検索"
 #: kallithea/templates/admin/settings/settings.html:34
 msgid "System Info"
 msgstr "システム情報"
 #: kallithea/templates/admin/settings/settings_email.html:7
 msgid "Send test email to"
 msgstr "テストメールの送信"
 #: kallithea/templates/admin/settings/settings_email.html:15
 msgid "Send"
 msgstr "送信"
 #: kallithea/templates/admin/settings/settings_global.html:8
 msgid "Site branding"
 msgstr "サイト名"
 #: kallithea/templates/admin/settings/settings_global.html:12
 msgid "Set a custom title for your Kallithea Service."
 msgstr "このKallitheaサービスのカスタムタイトルを設定します。"
 #: kallithea/templates/admin/settings/settings_global.html:18
 msgid "HTTP authentication realm"
 msgstr "HTTP認証レルム"
 #: kallithea/templates/admin/settings/settings_global.html:27
 msgid "Analytics HTML block"
 msgstr ""
 #: kallithea/templates/admin/settings/settings_global.html:31
 msgid ""
 "HTML with JavaScript for web analytics systems like Google Analytics or "
 "Piwik. This will be added at the bottom of every page."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_global.html:37
 msgid "ReCaptcha public key"
 msgstr "ReCaptcha 公開鍵"
 #: kallithea/templates/admin/settings/settings_global.html:41
 msgid "Public key for reCaptcha system."
 msgstr "reCaptchaの公開鍵。"
 #: kallithea/templates/admin/settings/settings_global.html:47
 msgid "ReCaptcha private key"
 msgstr "ReCaptcha 秘密鍵"
 #: kallithea/templates/admin/settings/settings_global.html:51
 #, fuzzy
 msgid ""
 "Private key for reCaptcha system. Setting this value will enable captcha "
 "on registration."
 msgstr "reCaptchaの秘密鍵。この値が設定されると登録時のキャプチャが有効になります。"
 #: kallithea/templates/admin/settings/settings_global.html:56
 #: kallithea/templates/admin/settings/settings_vcs.html:80
 #: kallithea/templates/admin/settings/settings_visual.html:116
 #, fuzzy
 msgid "Save Settings"
 msgstr "設定を保存"
 #: kallithea/templates/admin/settings/settings_hooks.html:1
 #, fuzzy
 msgid "Built-in Mercurial Hooks (Read-Only)"
-msgstr "組み込みのMercurialフック - 編集不可"
+msgstr "組み込みのMercurialフック (編集不可)"
 #: kallithea/templates/admin/settings/settings_hooks.html:15
 msgid ""
 "Hooks can be used to trigger actions on certain events such as push / "
 "pull. They can trigger Python functions or external applications."
 msgstr "フックを使うと、リポジトリへのプッシュやプルといった特定のイベントに合わせて、何らかのアクションを実行できます。フック機能では、Pythonの関数を呼び出したり、外部アプリケーションを起動したりできます。"
 #: kallithea/templates/admin/settings/settings_hooks.html:19
 #, fuzzy
 msgid "Custom Hooks"
 msgstr "カスタムフック"
 #: kallithea/templates/admin/settings/settings_hooks.html:67
 msgid "Failed to remove hook"
 msgstr "フックの削除に失敗しました"
 #: kallithea/templates/admin/settings/settings_mapping.html:6
 msgid "Rescan option"
 msgstr "再スキャンオプション"
 #: kallithea/templates/admin/settings/settings_mapping.html:11
 #, fuzzy
 msgid "Delete records of missing repositories"
-msgstr "リポジトリから検索"
+msgstr "見つからないリポジトリのレコードを削除"
 #: kallithea/templates/admin/settings/settings_mapping.html:13
 msgid ""
 "Check this option to remove all comments, pull requests and other records"
 " related to repositories that no longer exist in the filesystem."
 msgstr ""
 #: kallithea/templates/admin/settings/settings_mapping.html:17
 msgid "Invalidate cache for all repositories"
 msgstr "すべてのリポジトリのキャッシュを無効化する"
 #: kallithea/templates/admin/settings/settings_mapping.html:19
 #, fuzzy
 msgid "Check this to reload data and clear cache keys for all repositories."
 msgstr "すべてのリポジトリのキャッシュを無効化する"
 #: kallithea/templates/admin/settings/settings_mapping.html:23
 #, fuzzy
 msgid "Install Git hooks"
-msgstr "GITフックをインストール"
+msgstr "Gitフックをインストール"
 #: kallithea/templates/admin/settings/settings_mapping.html:25
 #, fuzzy
 msgid ""
 "Verify if Kallithea's Git hooks are installed for each repository. "
 "Current hooks will be updated to the latest version."
-msgstr "各リポジトリに Kallitheas の GIT フックがインストールされているか確認してください。現在のフックは最新版に更新されます"
+msgstr "各リポジトリに Kallitheas の Gitフックがインストールされているか確認してください。現在のフックは最新版に更新されます"
 #: kallithea/templates/admin/settings/settings_mapping.html:28
 msgid "Overwrite existing Git hooks"
 msgstr ""
+msgstr "既存のGitフックを上書きする"
 #: kallithea/templates/admin/settings/settings_mapping.html:30
 msgid ""
 "If installing Git hooks, overwrite any existing hooks, even if they do "
 "not seem to come from Kallithea. WARNING: This operation will destroy any"
 " custom git hooks you may have deployed by hand!"
 msgstr ""
 "GitフックをインストールするとKallitheaから設定されたものであっても既存のフックは全て上書きされます。警告: "
 "この操作はあなたが手動で配置したGitのカスタムフックを全て破壊します!"
 #: kallithea/templates/admin/settings/settings_mapping.html:35
 msgid "Rescan Repositories"
 msgstr "リポジトリを再スキャン"
 #: kallithea/templates/admin/settings/settings_search.html:7
 msgid "Index build option"
 msgstr "インデックス作成時の設定"
 #: kallithea/templates/admin/settings/settings_search.html:12
 msgid "Build from scratch"
 msgstr "一度削除してから再度インデックスを作成"
 #: kallithea/templates/admin/settings/settings_search.html:15
 #, fuzzy
 msgid ""
 "This option completely reindexeses all of the repositories for proper "
 "fulltext search capabilities."
 msgstr "このオプションを使うと、全文検索の機能が正しく発揮されるよう、 Kallithea 中の全てのファイルのインデックスを再生成します。"
 #: kallithea/templates/admin/settings/settings_search.html:21
 msgid "Reindex"
 msgstr "再インデックス"
 #: kallithea/templates/admin/settings/settings_system.html:4
 msgid "Kallithea version"
 msgstr "Kallithea バージョン"
 #: kallithea/templates/admin/settings/settings_system.html:4
 #, fuzzy
 msgid "Check for updates"
 msgstr "更新を確認"
 #: kallithea/templates/admin/settings/settings_system.html:5
 msgid "Kallithea configuration file"
 msgstr ""
+msgstr "Kallithea の設定ファイル"
 #: kallithea/templates/admin/settings/settings_system.html:6
 msgid "Python version"
 msgstr "Python バージョン"
 #: kallithea/templates/admin/settings/settings_system.html:7
 msgid "Platform"
 msgstr "プラットフォーム"
 #: kallithea/templates/admin/settings/settings_system.html:8
 #, fuzzy
 msgid "Git version"
-msgstr "GIT バージョン"
+msgstr "Git バージョン"
 #: kallithea/templates/admin/settings/settings_system.html:9
 #, fuzzy
 msgid "Git path"
-msgstr "GIT パス"
+msgstr "Git パス"
 #: kallithea/templates/admin/settings/settings_system.html:10
 msgid "Upgrade info endpoint"
 msgstr "更新情報のエンドポイント"
 #: kallithea/templates/admin/settings/settings_system.html:10
 #, fuzzy
 msgid "Note: please make sure this server can access this URL"
 msgstr "ノート: サーバーがこのURLにアクセスできることを確認して下さい"
 #: kallithea/templates/admin/settings/settings_system.html:15
 msgid "Checking for updates..."
 msgstr "更新を確認中..."
 #: kallithea/templates/admin/settings/settings_system.html:23
 #, fuzzy
 msgid "Python Packages"
 msgstr "Python パッケージ"
 #: kallithea/templates/admin/settings/settings_vcs.html:6
 msgid "Web"
 msgstr "Web"
 #: kallithea/templates/admin/settings/settings_vcs.html:11
 msgid "Require SSL for vcs operations"
 msgstr "VCSの操作にSSLを必須とする"
 #: kallithea/templates/admin/settings/settings_vcs.html:13
 #, fuzzy
 msgid ""
 "Activate to require SSL both pushing and pulling. If SSL certificate is "
 "missing, it will return an HTTP Error 406: Not Acceptable."
 msgstr "プッシュ、プル時にSSLを要求します。SSLでない場合はHTTP Error 406: Not Acceptableを返します。"
 #: kallithea/templates/admin/settings/settings_vcs.html:24
 msgid "Show repository size after push"
 msgstr "プッシュ後にリポジトリのサイズを表示する"
 #: kallithea/templates/admin/settings/settings_vcs.html:28
 msgid "Log user push commands"
 msgstr "ユーザーのプッシュコマンドを記録する"
 #: kallithea/templates/admin/settings/settings_vcs.html:32
 msgid "Log user pull commands"
 msgstr "ユーザーのプルコマンドを記録する"
 #: kallithea/templates/admin/settings/settings_vcs.html:36
 msgid "Update repository after push (hg update)"
 msgstr "プッシュ後にリポジトリを更新する (hg update)"
 #: kallithea/templates/admin/settings/settings_vcs.html:42
 #, fuzzy
 msgid "Mercurial extensions"
 msgstr "Mercurialエクステンション"
 #: kallithea/templates/admin/settings/settings_vcs.html:47
 msgid "Enable largefiles extension"
 msgstr "largefilesエクステンションを有効にする"
 #: kallithea/templates/admin/settings/settings_vcs.html:51
 msgid "Enable hgsubversion extension"
 msgstr "hgsubversionエクステンションを有効にする"
 #: kallithea/templates/admin/settings/settings_vcs.html:53
 #, fuzzy
 msgid ""
 "Requires hgsubversion library to be installed. Enables cloning of remote "
 "Subversion repositories while converting them to Mercurial."
 msgstr ""
 "hgsubversion "
 "ライブラリのインストールが必要です。リモートのSVNリポジトリをクローンしてMercurialリポジトリに変換するすることが可能です。"
 #: kallithea/templates/admin/settings/settings_vcs.html:64
 #, fuzzy
 msgid "Location of repositories"
-msgstr "リポジトリ総数"
+msgstr "リポジトリの場所"
 #: kallithea/templates/admin/settings/settings_vcs.html:69
 msgid ""
 "Click to unlock. You must restart Kallithea in order to make this setting"
 " take effect."
 msgstr "アンロックする。この設定を有効にするためにはKallitheaの再起動が必要です。"
 #: kallithea/templates/admin/settings/settings_vcs.html:72
 #, fuzzy
 msgid ""
 "Filesystem location where repositories are stored. After changing this "
 "value, a restart and rescan of the repository folder are both required."
-msgstr "リポジトリを保存するファイルシステムのロケーション。この値を変更した場合、サーバーの再起動とリポジトリフォルダの再スキャンが必要です。"
+msgstr "リポジトリを保存するファイルシステム上の場所。この値を変更した場合、サーバーの再起動とリポジトリフォルダの再スキャンが必要です。"
 #: kallithea/templates/admin/settings/settings_visual.html:8
 msgid "General"
 msgstr "一般"
 #: kallithea/templates/admin/settings/settings_visual.html:13
 msgid "Use repository extra fields"
 msgstr "リポジトリの拡張フィールドを使用する"
 #: kallithea/templates/admin/settings/settings_visual.html:15
 msgid "Allows storing additional customized fields per repository."
 msgstr "追加のカスタムフィールドをリポジトリ毎に保存することを許可します。"
 #: kallithea/templates/admin/settings/settings_visual.html:18
 msgid "Show Kallithea version"
 msgstr "Kallitheaのバージョンを表示する"
 #: kallithea/templates/admin/settings/settings_visual.html:20
 msgid "Shows or hides a version number of Kallithea displayed in the footer."
 msgstr "フッターに表示されるKallitheaのバージョン番号の表示、非表示を設定します。"
 #: kallithea/templates/admin/settings/settings_visual.html:24
 msgid "Use Gravatars in Kallithea"
 msgstr "Gravatorsを利用する"
 #: kallithea/templates/admin/settings/settings_visual.html:30
 #, fuzzy
 msgid ""
 "Gravatar URL allows you to use another avatar server application.\n"
 "                                                        The following "
 "variables of the URL will be replaced accordingly.\n"
 "                                                        {scheme}    "
 "'http' or 'https' sent from running Kallithea server,\n"
 "                                                        {email}     user "
 "email,\n"
 "                                                        {md5email}  md5 "
 "hash of the user email (like at gravatar.com),\n"
 "                                                        {size}      size "
 "of the image that is expected from the server application,\n"
 "                                                        {netloc}    "
 "network location/server host of running Kallithea server"
 msgstr ""
 "Gravatar URL を設定すると、外部のアバターサーバーアプリケーションを使用します。\n"
 "必要に応じて、 URL に以下の変数を使ってください。\n"
 "{scheme} Kallithea サーバからリクエストを送信するときに使うスキーム。 'http' または 'https'\n"
 "{email} ユーザーのメールアドレス\n"
 "{md5email} ユーザーのメールアドレスの md5 ハッシュ値 (gravatar.com で使っています)\n"
 "{size} サーバーアプリケーションに要求する画像のサイズ\n"
 "{netloc} Kallithea サーバーのアドレスまたはホスト名"
 #: kallithea/templates/admin/settings/settings_visual.html:42
 #, fuzzy
 msgid ""
 "Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'."
 "\n"
 "                                                        The following "
 "variables are available:\n"
 "                                                        {scheme} 'http' "
 "or 'https' sent from running Kallithea server,\n"
 "                                                        {user}   current "
 "user username,\n"
 "                                                        {netloc} network "
 "location/server host of running Kallithea server,\n"
 "                                                        {repo}   full "
 "repository name,\n"
 "                                                        {repoid} ID of "
 "repository, can be used to contruct clone-by-id"
 msgstr ""
 "クローン URL のスキーマは、 '{scheme}://{user}@{netloc}/{repo}' "
 "のような形式にします。使える変数は下記の通りです:\n"
 "                                                        {scheme} "
 "Kallithea サーバからリクエストを送信するときに使うスキーム。 'http' または 'https'\n"
 "                                                        {scheme} Kallithea "
 "サーバからリクエストを送信するときに使うスキーム。 'http' または 'https'\n"
 "                                                        {user}   "
 "ユーザーのユーザー名\n"
 "                                                        {netloc} "
 "Kallithea サーバーのアドレスまたはホスト名\n"
 "現在のユーザーのユーザー名\n"
 "                                                        {netloc} Kallithea "
 "サーバーのアドレスまたはホスト名\n"
 "                                                        {repo}   "
 "リポジトリの完全な名前\n"
 "                                                        {repoid} リポジトリの "
 "ID。 clone-by-id に使います。"
 "                                                        {repoid} リポジトリの ID。 "
 "clone-by-id に使います。"
 #: kallithea/templates/admin/settings/settings_visual.html:55
 msgid "Dashboard items"
 msgstr "ダッシュボードの項目"
 #: kallithea/templates/admin/settings/settings_visual.html:59
 msgid ""
 "Number of items displayed in the main page dashboard before pagination is"
 " shown."
 msgstr "メインページダッシュボードで1ページに表示する要素数。"
 #: kallithea/templates/admin/settings/settings_visual.html:65
 msgid "Admin pages items"
 msgstr "管理ページの項目"
 #: kallithea/templates/admin/settings/settings_visual.html:69
 msgid ""
 "Number of items displayed in the admin pages grids before pagination is "
 "shown."
 msgstr "管理ページで、ページ分割しないでグリッドに表示する項目の数"
 #: kallithea/templates/admin/settings/settings_visual.html:75
 msgid "Icons"
 msgstr "アイコン"
 #: kallithea/templates/admin/settings/settings_visual.html:80
 msgid "Show public repository icon on repositories"
 msgstr "公開リポジトリのアイコンを表示する"
 #: kallithea/templates/admin/settings/settings_visual.html:84
 msgid "Show private repository icon on repositories"
 msgstr "非公開リポジトリのアイコンを表示する"
 #: kallithea/templates/admin/settings/settings_visual.html:86
 #, fuzzy
 msgid "Show public/private icons next to repository names."
-msgstr "リポジトリ名の横に公開/非公開アイコンを表示します。"
+msgstr "リポジトリ名の隣に公開/非公開アイコンを表示します。"
 #: kallithea/templates/admin/settings/settings_visual.html:92
 #, fuzzy
 msgid "Meta Tagging"
 msgstr "メタタグ"
 #: kallithea/templates/admin/settings/settings_visual.html:97
 msgid "Stylify recognised meta tags:"
 msgstr "次のメタタグを変換する"
+msgstr "次のメタタグを変換する:"
 #: kallithea/templates/admin/settings/settings_visual.html:111
 #, fuzzy
 msgid ""
 "Parses meta tags from the repository description field and turns them "
 "into colored tags."
 msgstr "リポジトリの説明のメタタグを解析して色つきのタグに変換します。"
 #: kallithea/templates/admin/user_groups/user_group_add.html:5
 msgid "Add user group"
 msgstr "ユーザーグループを追加"
 #: kallithea/templates/admin/user_groups/user_group_add.html:10
 #: kallithea/templates/admin/user_groups/user_group_edit.html:11
 #: kallithea/templates/admin/user_groups/user_groups.html:10
 #: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83
 msgid "User Groups"
 msgstr "ユーザーグループ"
 #: kallithea/templates/admin/user_groups/user_group_add.html:12
 #: kallithea/templates/admin/user_groups/user_groups.html:25
 msgid "Add User Group"
 msgstr "ユーザーグループを追加"
 #: kallithea/templates/admin/user_groups/user_group_add.html:44
 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19
 msgid "Short, optional description for this user group."
 msgstr "このユーザーグループの簡潔な説明を書いてください"
+msgstr "このユーザーグループの簡潔な説明を書いてください。"
 #: kallithea/templates/admin/user_groups/user_group_edit.html:5
 #, python-format
 msgid "%s user group settings"
 msgstr "%s ユーザーグループ設定"
 #: kallithea/templates/admin/user_groups/user_group_edit.html:33
 #, fuzzy
 msgid "Show Members"
-msgstr "メンバー"
+msgstr "メンバーを表示"
 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:1
 #, python-format
 msgid "User Group: %s"
 msgstr "ユーサーグループ: %s"
 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6
 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32
 #: kallithea/templates/admin/user_groups/user_groups.html:48
 msgid "Members"
 msgstr "メンバー"
 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19
 #: kallithea/templates/data_table/_dt_elements.html:174
 #, python-format
 msgid "Confirm to delete this user group: %s"
 msgstr "このユーザーグループを削除してもよろしいですか？: %s"
 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:21
 msgid "Delete this user group"
 msgstr "このユーザーグループを削除"
 #: kallithea/templates/admin/user_groups/user_group_edit_members.html:17
 msgid "No members yet"
 msgstr "まだメンバーがいません"
 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40
 msgid "Chosen group members"
 msgstr "グループメンバーを選ぶ"
 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49
 msgid "Available members"
 msgstr "有効なメンバー"
 #: kallithea/templates/admin/user_groups/user_groups.html:5
 #, fuzzy
 msgid "User Groups Administration"
 msgstr "ユーザーグループ管理"
 #: kallithea/templates/admin/users/user_add.html:5
 msgid "Add user"
 msgstr "ユーザーを追加"
 #: kallithea/templates/admin/users/user_add.html:10
 #: kallithea/templates/admin/users/user_edit.html:11
 #: kallithea/templates/admin/users/users.html:10
 #: kallithea/templates/base/base.html:62
 msgid "Users"
 msgstr "ユーザー"
 #: kallithea/templates/admin/users/user_add.html:12
 #: kallithea/templates/admin/users/users.html:24
 msgid "Add User"
 msgstr "ユーザーを追加"
 #: kallithea/templates/admin/users/user_add.html:50
 msgid "Password confirmation"
 msgstr "パスワード再入力"
 #: kallithea/templates/admin/users/user_edit.html:5
 #, python-format
 msgid "%s user settings"
 msgstr "%s ユーザー設定"
 #: kallithea/templates/admin/users/user_edit.html:30
 msgid "Emails"
 msgstr "メールアドレス"
 #: kallithea/templates/admin/users/user_edit_advanced.html:1
 #, python-format
 msgid "User: %s"
 msgstr "ユーザー: %s"
 #: kallithea/templates/admin/users/user_edit_advanced.html:7
 #: kallithea/templates/admin/users/user_edit_profile.html:42
 msgid "Source of Record"
 msgstr "アカウントのソース"
 #: kallithea/templates/admin/users/user_edit_advanced.html:9
 #: kallithea/templates/admin/users/users.html:53
 msgid "Last Login"
 msgstr "最終ログイン日時"
 #: kallithea/templates/admin/users/user_edit_advanced.html:10
 msgid "Member of User Groups"
 msgstr "グループのメンバー数"
 #: kallithea/templates/admin/users/user_edit_advanced.html:21
 #: kallithea/templates/data_table/_dt_elements.html:158
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr "このユーザーを削除してもよろしいですか？ : %s"
 #: kallithea/templates/admin/users/user_edit_advanced.html:23
 msgid "Delete this user"
 msgstr "このユーザーを削除"
 #: kallithea/templates/admin/users/user_edit_ips.html:8
 #, python-format
 msgid "Inherited from %s"
 msgstr "%s から継承"
 #: kallithea/templates/admin/users/user_edit_profile.html:8
 msgid "Change avatar at"
 msgstr "アバターを変更:"
 #: kallithea/templates/admin/users/user_edit_profile.html:12
 msgid "Missing email, please update this user email address."
 msgstr "メールアドレスがありません。このユーザーのメールアドレスを更新してください。"
 #: kallithea/templates/admin/users/user_edit_profile.html:51
 msgid "Name in Source of Record"
 msgstr "アカウントのソースでの名前"
 #: kallithea/templates/admin/users/user_edit_profile.html:69
 msgid "New password confirmation"
 msgstr "新しいパスワード 再入力"
 #: kallithea/templates/admin/users/users.html:5
 #, fuzzy
 msgid "Users Administration"
 msgstr "ユーザー管理"
 #: kallithea/templates/admin/users/users.html:56
 #, fuzzy
 msgid "Auth Type"
 msgstr "認証タイプ"
 #: kallithea/templates/base/base.html:18
 #, python-format
 msgid "Server instance: %s"
 msgstr "サーバーインスタンス: %s"
 #: kallithea/templates/base/base.html:30
 msgid "Support"
 msgstr "サポート"
 #: kallithea/templates/base/base.html:90
 msgid "Mercurial repository"
 msgstr "Mercurialリポジトリ"
 #: kallithea/templates/base/base.html:93
 msgid "Git repository"
 msgstr "Gitリポジトリ"
 #: kallithea/templates/base/base.html:119
 #, fuzzy
 msgid "Create Fork"
 msgstr "フォークを作成"
 #: kallithea/templates/base/base.html:130
 #: kallithea/templates/data_table/_dt_elements.html:13
 #: kallithea/templates/data_table/_dt_elements.html:17
 #: kallithea/templates/summary/summary.html:8
 msgid "Summary"
 msgstr "要約"
 #: kallithea/templates/base/base.html:132
 #: kallithea/templates/base/base.html:134
 #: kallithea/templates/changelog/changelog.html:14
 #: kallithea/templates/data_table/_dt_elements.html:21
 #: kallithea/templates/data_table/_dt_elements.html:25
 msgid "Changelog"
 msgstr "履歴"
 #: kallithea/templates/base/base.html:136
 #: kallithea/templates/data_table/_dt_elements.html:29
 #: kallithea/templates/data_table/_dt_elements.html:33
 #: kallithea/templates/files/files.html:11
 msgid "Files"
 msgstr "ファイル"
 #: kallithea/templates/base/base.html:138
 msgid "Switch To"
 msgstr "ブランチの切り替え"
 #: kallithea/templates/base/base.html:145
 #: kallithea/templates/base/base.html:147
 msgid "Options"
 msgstr "オプション"
 #: kallithea/templates/base/base.html:155
 #: kallithea/templates/forks/forks_data.html:21
 #, fuzzy
 msgid "Compare Fork"
-msgstr "フォークを比較"
+msgstr "フォークと比較"
 #: kallithea/templates/base/base.html:157
 #: kallithea/templates/bookmarks/bookmarks.html:56
 #: kallithea/templates/bookmarks/bookmarks_data.html:13
 #: kallithea/templates/branches/branches.html:56
 #: kallithea/templates/branches/branches_data.html:13
 #: kallithea/templates/tags/tags.html:56
 #: kallithea/templates/tags/tags_data.html:13
 msgid "Compare"
 msgstr "比較"
 #: kallithea/templates/base/base.html:159
 #: kallithea/templates/base/base.html:247
 #: kallithea/templates/search/search.html:14
 #: kallithea/templates/search/search.html:54
 msgid "Search"
 msgstr "検索"
 #: kallithea/templates/base/base.html:163
 msgid "Unlock"
 msgstr "アンロック"
 #: kallithea/templates/base/base.html:165
 msgid "Lock"
 msgstr "ロック"
 #: kallithea/templates/base/base.html:173
 msgid "Follow"
 msgstr "フォロー"
 #: kallithea/templates/base/base.html:174
 msgid "Unfollow"
 msgstr "アンフォロー"
 #: kallithea/templates/base/base.html:177
 #: kallithea/templates/data_table/_dt_elements.html:37
 #: kallithea/templates/data_table/_dt_elements.html:41
 #: kallithea/templates/forks/fork.html:9
 msgid "Fork"
 msgstr "フォーク"
 #: kallithea/templates/base/base.html:178
 #: kallithea/templates/pullrequests/pullrequest.html:88
 msgid "Create Pull Request"
 msgstr "プルリクエストを作成"
 #: kallithea/templates/base/base.html:183
 #, python-format
 msgid "Show Pull Requests for %s"
 msgstr "%s のプルリクエストを表示"
 #: kallithea/templates/base/base.html:221
 msgid "Show recent activity"
 msgstr "最近の活動を表示"
 #: kallithea/templates/base/base.html:227
 #: kallithea/templates/base/base.html:228
 msgid "Public journal"
 msgstr "公開ジャーナル"
 #: kallithea/templates/base/base.html:233
 msgid "Show public gists"
 msgstr "公開 gists を表示"
 #: kallithea/templates/base/base.html:234
 msgid "Gists"
 msgstr "Gists"
 #: kallithea/templates/base/base.html:238
 #, fuzzy
 msgid "All Public Gists"
-msgstr "すべての公開 gists"
+msgstr "すべての公開 Gists"
 #: kallithea/templates/base/base.html:240
 #, fuzzy
 msgid "My Public Gists"
-msgstr "公開 gists"
+msgstr "公開 Gists"
 #: kallithea/templates/base/base.html:241
 #, fuzzy
 msgid "My Private Gists"
-msgstr "非公開 gists"
+msgstr "非公開 Gists"
 #: kallithea/templates/base/base.html:246
 msgid "Search in repositories"
 msgstr "リポジトリから検索"
 #: kallithea/templates/base/base.html:269
 #: kallithea/templates/base/base.html:270
 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6
 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10
 #, fuzzy
 msgid "My Pull Requests"
-msgstr "プルリクエスト"
+msgstr "私のプルリクエスト"
 #: kallithea/templates/base/base.html:289
 #, fuzzy
 msgid "Not Logged In"
 msgstr "ログインしていません"
 #: kallithea/templates/base/base.html:296
 #, fuzzy
 msgid "Login to Your Account"
-msgstr "ログイン"
+msgstr "あなたのアカウントにログイン"
 #: kallithea/templates/base/base.html:319
 msgid "Forgot password ?"
 msgstr "パスワードを忘れた?"
 #: kallithea/templates/base/base.html:346
 msgid "Log Out"
 msgstr "ログアウト"
 #: kallithea/templates/base/base.html:395
 msgid "No matches found"
 msgstr "一致するものが見つかりません"
 #: kallithea/templates/base/base.html:524
 msgid "Keyboard shortcuts"
 msgstr "キーボードショートカット"
 #: kallithea/templates/base/base.html:533
 msgid "Site-wide shortcuts"
 msgstr "サイト全体"
 #: kallithea/templates/base/default_perms_box.html:14
 #, fuzzy
 msgid "Inherit defaults"
 msgstr "デフォルト権限を継承"
 #: kallithea/templates/base/default_perms_box.html:19
 #, python-format
 msgid ""
 "Select to inherit global settings, IP whitelist and permissions from the "
 "%s."
 msgstr ""
 #: kallithea/templates/base/default_perms_box.html:28
 msgid "Create repositories"
 msgstr "リポジトリを作成する"
 #: kallithea/templates/base/default_perms_box.html:33
 msgid "Select this option to allow repository creation for this user"
 msgstr "ユーザーにリポジトリ作成を許可する場合はこのオプションを選んでください"
 #: kallithea/templates/base/default_perms_box.html:40
 msgid "Create user groups"
 msgstr "ユーザーグループを作成"
 #: kallithea/templates/base/default_perms_box.html:45
 msgid "Select this option to allow user group creation for this user"
 msgstr "ユーザーにユーザーグループの作成を許可する場合はこのオプションを選んでください"
 #: kallithea/templates/base/default_perms_box.html:52
 msgid "Fork repositories"
 msgstr "リポジトリをフォークする"
 #: kallithea/templates/base/default_perms_box.html:57
 msgid "Select this option to allow repository forking for this user"
 msgstr "ユーザーにリポジトリのフォークを許可する場合はこのオプションを選んでください"
 #: kallithea/templates/base/perms_summary.html:13
 #: kallithea/templates/changelog/changelog.html:42
 msgid "Show"
 msgstr "表示"
 #: kallithea/templates/base/perms_summary.html:22
 msgid "No permissions defined yet"
 msgstr "まだ権限設定がありません"
 #: kallithea/templates/base/perms_summary.html:30
 #: kallithea/templates/base/perms_summary.html:54
 msgid "Permission"
 msgstr "権限"
 #: kallithea/templates/base/perms_summary.html:32
 #: kallithea/templates/base/perms_summary.html:56
 msgid "Edit Permission"
 msgstr "権限を編集"
 #: kallithea/templates/base/perms_summary.html:90
 msgid "No permission defined"
 msgstr "権限が設定されていません"
 #: kallithea/templates/base/root.html:22
 #, fuzzy
 msgid "Add Another Comment"
 msgstr "別のコメントを追加"
 #: kallithea/templates/base/root.html:23
 #: kallithea/templates/data_table/_dt_elements.html:214
 msgid "Stop following this repository"
 msgstr "このリポジトリのフォローをやめる"
 #: kallithea/templates/base/root.html:24
 msgid "Start following this repository"
 msgstr "このリポジトリのフォローする"
 #: kallithea/templates/base/root.html:25
 msgid "Group"
 msgstr "グループ"
 #: kallithea/templates/base/root.html:26
 msgid "members"
 msgstr "メンバー"
 #: kallithea/templates/base/root.html:27
 msgid "Loading ..."
 msgstr "読み込み中..."
 #: kallithea/templates/base/root.html:28
 msgid "loading ..."
 msgstr "読み込み中..."
 #: kallithea/templates/base/root.html:29
 msgid "Search truncated"
 msgstr "検索結果は省略されています"
 #: kallithea/templates/base/root.html:30
 msgid "No matching files"
 msgstr "マッチするファイルはありません"
 #: kallithea/templates/base/root.html:31
 #, fuzzy
 #| msgid "on pull request"
 msgid "Open New Pull Request from {0}"
-msgstr "プルリクエスト #%s にコメント"
+msgstr "新しいプルリクエストを{0}から作成"
 #: kallithea/templates/base/root.html:32
 msgid "Open New Pull Request for {0} &rarr; {1}"
 msgstr ""
+msgstr "{0} &rarr; {1}から新しいプルリクエストを作成する"
 #: kallithea/templates/base/root.html:33
 #, fuzzy
 #| msgid "Show Selected Changesets __S &rarr; __E"
 msgid "Show Selected Changesets {0} &rarr; {1}"
-msgstr "選択した変更 __S -> __E を表示"
+msgstr "選択したチェンジセット{0} &rarr; {0}を表示"
 #: kallithea/templates/base/root.html:34
 #, fuzzy
 msgid "Selection Link"
 msgstr "セレクション・リンク"
 #: kallithea/templates/base/root.html:35
 #: kallithea/templates/changeset/diff_block.html:8
 #, fuzzy
 msgid "Collapse Diff"
 msgstr "差分をたたむ"
 #: kallithea/templates/base/root.html:36
 #, fuzzy
 msgid "Expand Diff"
 msgstr "差分を表示"
 #: kallithea/templates/base/root.html:37
 msgid "Failed to revoke permission"
 msgstr "権限の取消に失敗しました"
 #: kallithea/templates/base/root.html:38
 #, fuzzy
 msgid "Confirm to revoke permission for {0}: {1} ?"
 msgstr "権限 {0}: {1} を取り消してもよろしいですか？"
 #: kallithea/templates/base/root.html:39
 msgid "enabled"
 msgstr "有効"
 #: kallithea/templates/base/root.html:40
 msgid "disabled"
 msgstr "無効"
 #: kallithea/templates/base/root.html:42
 #, fuzzy
 msgid "Specify changeset"
 msgstr "チェンジセットを指定"
 #: kallithea/templates/bookmarks/bookmarks.html:5
 #, python-format
 msgid "%s Bookmarks"
 msgstr "%s ブックマーク"
 #: kallithea/templates/bookmarks/bookmarks.html:26
 msgid "Compare Bookmarks"
 msgstr "ブックマークを比較"
 #: kallithea/templates/bookmarks/bookmarks.html:53
 #: kallithea/templates/bookmarks/bookmarks_data.html:10
 #: kallithea/templates/branches/branches.html:53
 #: kallithea/templates/branches/branches_data.html:10
 #: kallithea/templates/changelog/changelog_summary_data.html:10
 #: kallithea/templates/tags/tags.html:53
 #: kallithea/templates/tags/tags_data.html:10
 msgid "Author"
 msgstr "作成者"
 #: kallithea/templates/bookmarks/bookmarks.html:54
 #: kallithea/templates/bookmarks/bookmarks_data.html:12
 #: kallithea/templates/branches/branches.html:54
 #: kallithea/templates/branches/branches_data.html:12
 #: kallithea/templates/changelog/changelog_summary_data.html:7
 #: kallithea/templates/files/files_browser.html:32
 #: kallithea/templates/pullrequests/pullrequest.html:62
 #: kallithea/templates/pullrequests/pullrequest.html:78
 #: kallithea/templates/tags/tags.html:54
 #: kallithea/templates/tags/tags_data.html:12
 msgid "Revision"
 msgstr "リビジョン"
 #: kallithea/templates/branches/branches.html:5
 #, python-format
 msgid "%s Branches"
 msgstr "%s ブランチ"
 #: kallithea/templates/branches/branches.html:26
 msgid "Compare Branches"
 msgstr "ブランチを比較"
 #: kallithea/templates/changelog/changelog.html:6
 #, python-format
 msgid "%s Changelog"
 msgstr "%s チェンジログ"
 #: kallithea/templates/changelog/changelog.html:21
 #, python-format
 msgid "showing %d out of %d revision"
 msgid_plural "showing %d out of %d revisions"
 msgstr[0] "%d / %d リビジョンを表示"
 #: kallithea/templates/changelog/changelog.html:49
 msgid "Clear selection"
 msgstr "選択を解除"
 #: kallithea/templates/changelog/changelog.html:55
 #, fuzzy
 msgid "Go to tip of repository"
-msgstr "このリポジトリをロックしますか？"
+msgstr "リポジトリの最新のリビジョン(tip)に移動"
 #: kallithea/templates/changelog/changelog.html:60
 #: kallithea/templates/forks/forks_data.html:19
 #, python-format
 msgid "Compare fork with %s"
 msgstr "%s とフォークを比較"
 #: kallithea/templates/changelog/changelog.html:62
-#, fuzzy, python-format
 #, python-format
 msgid "Compare fork with parent repository (%s)"
-msgstr "フォーク元(%s)とフォークを比較"
+msgstr "フォーク元(%s)と比較"
 #: kallithea/templates/changelog/changelog.html:66
 #: kallithea/templates/files/files.html:29
 #, fuzzy
 msgid "Branch filter:"
-msgstr "フィルタ"
+msgstr "ブランチフィルタ:"
 #: kallithea/templates/changelog/changelog.html:92
 #: kallithea/templates/changelog/changelog_summary_data.html:20
-#, fuzzy, python-format
 #, python-format
 msgid ""
 "Changeset status: %s\n"
 "Click to open associated pull request %s"
 msgstr ""
 "チェンジセットステータス: %s\n"
-"関連するプルリクエスト #%s を開く"
 "関連するプルリクエスト %s を開く"
 #: kallithea/templates/changelog/changelog.html:96
 #: kallithea/templates/compare/compare_cs.html:24
 #, python-format
 msgid "Changeset status: %s"
 msgstr "チェンジセットステータス: %s"
 #: kallithea/templates/changelog/changelog.html:115
 #: kallithea/templates/compare/compare_cs.html:63
 msgid "Expand commit message"
 msgstr "コミットメッセージを展開"
 #: kallithea/templates/changelog/changelog.html:124
 #: kallithea/templates/compare/compare_cs.html:30
 msgid "Changeset has comments"
 msgstr "チェンジセットにコメントがあります"
 #: kallithea/templates/changelog/changelog.html:134
 #: kallithea/templates/changelog/changelog_summary_data.html:54
 #: kallithea/templates/changeset/changeset.html:94
 #: kallithea/templates/changeset/changeset_range.html:92
 #, python-format
 msgid "Bookmark %s"
 msgstr "ブックマーク %s"
 #: kallithea/templates/changelog/changelog.html:140
 #: kallithea/templates/changelog/changelog_summary_data.html:60
 #: kallithea/templates/changeset/changeset.html:101
 #: kallithea/templates/changeset/changeset_range.html:98
 #, python-format
 msgid "Tag %s"
 msgstr "タグ %s"
 #: kallithea/templates/changelog/changelog.html:145
 #: kallithea/templates/changelog/changelog_summary_data.html:65
 #: kallithea/templates/changeset/changeset.html:106
 #: kallithea/templates/changeset/changeset_range.html:102
 #, python-format
 msgid "Branch %s"
 msgstr "ブランチ %s"
 #: kallithea/templates/changelog/changelog.html:310
 msgid "There are no changes yet"
 msgstr "まだ変更がありません"
 #: kallithea/templates/changelog/changelog_details.html:4
 #: kallithea/templates/changeset/changeset.html:77
 msgid "Removed"
@@ @@ -4946,623 +4801,598 @@ msgstr "削除" @@
 #: kallithea/templates/changelog/changelog_details.html:5
 #: kallithea/templates/changeset/changeset.html:78
 msgid "Changed"
 msgstr "変更"
 #: kallithea/templates/changelog/changelog_details.html:6
 #: kallithea/templates/changeset/changeset.html:79
 #: kallithea/templates/changeset/diff_block.html:79
 msgid "Added"
 msgstr "追加"
 #: kallithea/templates/changelog/changelog_details.html:8
 #: kallithea/templates/changelog/changelog_details.html:9
 #: kallithea/templates/changelog/changelog_details.html:10
 #: kallithea/templates/changeset/changeset.html:81
 #: kallithea/templates/changeset/changeset.html:82
 #: kallithea/templates/changeset/changeset.html:83
 #, python-format
 msgid "Affected %s files"
 msgstr "%s ファイルに影響"
 #: kallithea/templates/changelog/changelog_summary_data.html:8
 #: kallithea/templates/files/files_add.html:60
 #: kallithea/templates/files/files_delete.html:39
 #: kallithea/templates/files/files_edit.html:63
 msgid "Commit Message"
 msgstr "コミットメッセージ"
 #: kallithea/templates/changelog/changelog_summary_data.html:9
 #: kallithea/templates/pullrequests/pullrequest_data.html:17
 msgid "Age"
 msgstr "経過時間"
 #: kallithea/templates/changelog/changelog_summary_data.html:11
 msgid "Refs"
 msgstr "Refs"
 #: kallithea/templates/changelog/changelog_summary_data.html:81
 msgid "Add or upload files directly via Kallithea"
 msgstr "Kallithea経由で直接ファイルを追加またはアップロード"
 #: kallithea/templates/changelog/changelog_summary_data.html:84
 #: kallithea/templates/files/files_add.html:21
 #: kallithea/templates/files/files_ypjax.html:9
 msgid "Add New File"
 msgstr "新しいファイルを追加"
 #: kallithea/templates/changelog/changelog_summary_data.html:90
 #, fuzzy
 msgid "Push new repository"
 msgstr "新しいリポジトリをプッシュ"
 #: kallithea/templates/changelog/changelog_summary_data.html:98
 msgid "Existing repository?"
 msgstr "存在するリポジトリをプッシュ"
 #: kallithea/templates/changeset/changeset.html:8
 #, python-format
 msgid "%s Changeset"
 msgstr "%s チェンジセット"
 #: kallithea/templates/changeset/changeset.html:36
 #, fuzzy
 msgid "Parent rev."
 msgstr "親リビジョン"
 #: kallithea/templates/changeset/changeset.html:42
 #, fuzzy
 msgid "Child rev."
 msgstr "子リビジョン"
 #: kallithea/templates/changeset/changeset.html:50
 #: kallithea/templates/changeset/changeset_file_comment.html:37
 #: kallithea/templates/changeset/changeset_range.html:48
 msgid "Changeset status"
 msgstr "チェンジセットステータス"
 #: kallithea/templates/changeset/changeset.html:54
 #: kallithea/templates/changeset/diff_block.html:27
 #: kallithea/templates/files/diff_2way.html:49
 msgid "Raw diff"
 msgstr "diffとして差分を表示"
 #: kallithea/templates/changeset/changeset.html:57
 msgid "Patch diff"
 msgstr "パッチとして差分を表示"
 #: kallithea/templates/changeset/changeset.html:60
 #: kallithea/templates/changeset/diff_block.html:30
 #: kallithea/templates/files/diff_2way.html:52
 msgid "Download diff"
 msgstr "差分をダウンロード"
 #: kallithea/templates/changeset/changeset.html:89
 #: kallithea/templates/changeset/changeset_range.html:88
 #, fuzzy
 msgid "Merge"
 msgstr "マージ"
 #: kallithea/templates/changeset/changeset.html:123
 #, fuzzy
 msgid "Grafted from:"
 msgstr "作成日"
 #: kallithea/templates/changeset/changeset.html:129
 msgid "Transplanted from:"
 msgstr ""
 #: kallithea/templates/changeset/changeset.html:135
 #, fuzzy
 msgid "Replaced by:"
 msgstr "作成日"
 #: kallithea/templates/changeset/changeset.html:149
 #, fuzzy
 msgid "Preceded by:"
 msgstr "作成日"
 #: kallithea/templates/changeset/changeset.html:166
 #: kallithea/templates/compare/compare_diff.html:54
 #: kallithea/templates/pullrequests/pullrequest_show.html:318
 #, python-format
 msgid "%s file changed"
 msgid_plural "%s files changed"
 msgstr[0] "%s ファイルに影響"
 #: kallithea/templates/changeset/changeset.html:168
 #: kallithea/templates/compare/compare_diff.html:56
 #: kallithea/templates/pullrequests/pullrequest_show.html:320
 #, 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 個の削除"
 #: kallithea/templates/changeset/changeset.html:182
 #: kallithea/templates/changeset/changeset.html:195
 #: kallithea/templates/pullrequests/pullrequest_show.html:339
 #: kallithea/templates/pullrequests/pullrequest_show.html:363
 #, fuzzy
 msgid "Show full diff anyway"
-msgstr "すべての差分を表示"
+msgstr "とにかくすべての差分を表示"
 #: kallithea/templates/changeset/changeset.html:247
 #: kallithea/templates/changeset/changeset.html:284
 #, fuzzy
 msgid "No revisions"
 msgstr "リビジョンなし"
 #: kallithea/templates/changeset/changeset_file_comment.html:21
 #, fuzzy
 msgid "on pull request"
 msgstr "プルリクエスト #%s にコメント"
 #: kallithea/templates/changeset/changeset_file_comment.html:22
 #, fuzzy
 msgid "No title"
-msgstr "新しいファイル"
+msgstr "No title"
 #: kallithea/templates/changeset/changeset_file_comment.html:24
 #, fuzzy
 msgid "on this changeset"
 msgstr "チェンジセットはありません"
 #: kallithea/templates/changeset/changeset_file_comment.html:30
 #, fuzzy
 msgid "Delete comment?"
-msgstr "%d 個のコメント"
+msgstr "コメントを削除しますか？"
 #: kallithea/templates/changeset/changeset_file_comment.html:37
 #, fuzzy
 msgid "Status change"
-msgstr "最近の変更点"
+msgstr "ステータスを変更"
 #: kallithea/templates/changeset/changeset_file_comment.html:59
 msgid "Commenting on line {1}."
 msgstr "{1} 行目にコメント"
 #: kallithea/templates/changeset/changeset_file_comment.html:60
 #: kallithea/templates/changeset/changeset_file_comment.html:148
 #, python-format
 msgid "Comments parsed using %s syntax with %s support."
-msgstr "コメントには %s 構文 ( %s サポートつき ) が利用出来ます"
+msgstr "コメントには %s 構文 ( %s サポートつき ) が利用できます。"
 #: kallithea/templates/changeset/changeset_file_comment.html:62
 #, fuzzy
 msgid "Use @username inside this text to notify another user"
-msgstr "テキスト内で @username を使うと、その Kallithea のユーザーに通知を送信します"
+msgstr "テキスト内で @username を使うと、そのユーザーに通知されます"
 #: kallithea/templates/changeset/changeset_file_comment.html:72
 #: kallithea/templates/changeset/changeset_file_comment.html:184
 msgid "Comment preview"
 msgstr "コメントのプレビュー"
 #: kallithea/templates/changeset/changeset_file_comment.html:77
 #, fuzzy
 msgid "Submitting ..."
 msgstr "送信中..."
 #: kallithea/templates/changeset/changeset_file_comment.html:80
 #: kallithea/templates/changeset/changeset_file_comment.html:190
 msgid "Comment"
 msgstr "コメント"
 #: kallithea/templates/changeset/changeset_file_comment.html:82
 #: kallithea/templates/changeset/changeset_file_comment.html:191
 msgid "Preview"
 msgstr "プレビュー"
 #: kallithea/templates/changeset/changeset_file_comment.html:90
 msgid "You need to be logged in to comment."
-msgstr "コメントするにはログインが必要です"
+msgstr "コメントにはログインする必要があります。"
 #: kallithea/templates/changeset/changeset_file_comment.html:90
 msgid "Login now"
 msgstr "今すぐログインする"
 #: kallithea/templates/changeset/changeset_file_comment.html:94
 msgid "Hide"
 msgstr "隠す"
 #: kallithea/templates/changeset/changeset_file_comment.html:106
 #, python-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d 個のコメント"
 #: kallithea/templates/changeset/changeset_file_comment.html:107
-#, fuzzy, python-format
 #, python-format
 msgid "%d inline"
 msgid_plural "%d inline"
-msgstr[0] "(%d インライン)"
+msgstr[0] "%d inline"
 #: kallithea/templates/changeset/changeset_file_comment.html:108
-#, fuzzy, python-format
 #, python-format
 msgid "%d general"
 msgid_plural "%d general"
 msgstr[0] ""
+msgstr[0] "%d general"
 #: kallithea/templates/changeset/changeset_file_comment.html:150
 #, fuzzy
 msgid "Use @username inside this text to notify another user."
-msgstr "テキスト内で @username を使うと、その Kallithea のユーザーに通知を送信します"
+msgstr "テキスト内で @username を使うと、そのユーザーに通知されます。"
 #: kallithea/templates/changeset/changeset_file_comment.html:157
 msgid "Vote for pull request status"
 msgstr "プルリクエストステータスの投票"
 #: kallithea/templates/changeset/changeset_file_comment.html:159
 #, fuzzy
 msgid "Set changeset status"
-msgstr "リビジョンステータスを変更"
+msgstr "リビジョンステータスを設定"
 #: kallithea/templates/changeset/changeset_file_comment.html:163
 #, fuzzy
 msgid "No change"
-msgstr "変更点なし"
+msgstr "変更なし"
 #: kallithea/templates/changeset/changeset_file_comment.html:176
 #, fuzzy
 msgid "Close"
 msgstr "(閉鎖済み)"
 #: kallithea/templates/changeset/changeset_range.html:5
 #, python-format
 msgid "%s Changesets"
 msgstr "%s チェンジセット"
 #: kallithea/templates/changeset/changeset_range.html:56
 msgid "Files affected"
 msgstr "影響のあるファイル"
 #: kallithea/templates/changeset/diff_block.html:21
 #: kallithea/templates/files/diff_2way.html:43
 msgid "Show full diff for this file"
 msgstr "このファイルのすべての差分を表示"
 #: kallithea/templates/changeset/diff_block.html:24
 #: kallithea/templates/changeset/diff_block.html:98
 #: kallithea/templates/files/diff_2way.html:46
 msgid "Show full side-by-side diff for this file"
 msgstr "このファイルの差分を並べて表示"
 #: kallithea/templates/changeset/diff_block.html:38
 msgid "Show inline comments"
 msgstr "インラインコメントを表示"
 #: kallithea/templates/changeset/diff_block.html:86
 #, fuzzy
 msgid "Deleted"
 msgstr "削除"
 #: kallithea/templates/changeset/diff_block.html:89
 #, fuzzy
 msgid "Renamed"
 msgstr "リネーム"
 #: kallithea/templates/compare/compare_cs.html:4
 msgid "No changesets"
 msgstr "チェンジセットはありません"
 #: kallithea/templates/compare/compare_cs.html:8
 msgid "Ancestor"
 msgstr "祖先"
 #: kallithea/templates/compare/compare_cs.html:44
 msgid "First (oldest) changeset in this list"
 msgstr ""
 #: kallithea/templates/compare/compare_cs.html:46
 msgid "Last (most recent) changeset in this list"
 msgstr ""
 #: kallithea/templates/compare/compare_cs.html:48
 msgid "Position in this list of changesets"
 msgstr ""
 #: kallithea/templates/compare/compare_cs.html:76
 #, fuzzy
 msgid "Show merge diff"
-msgstr "すべての差分を表示"
+msgstr "マージの差分を表示"
 #: kallithea/templates/compare/compare_cs.html:86
 #: kallithea/templates/pullrequests/pullrequest_show.html:310
 #, fuzzy
 msgid "Common ancestor"
-msgstr "チェンジセットにコメント"
+msgstr "共通の祖先"
 #: kallithea/templates/compare/compare_cs.html:90
 msgid "No common ancestor found - repositories are unrelated"
 msgstr ""
+msgstr "共通の祖先が見つかりません - リポジトリ同士に関連がありません"
 #: kallithea/templates/compare/compare_cs.html:98
 #, fuzzy
 msgid "is"
-msgstr "Gist"
+msgstr "is"
 #: kallithea/templates/compare/compare_cs.html:99
-#, fuzzy, python-format
 #, python-format
 msgid "%s changesets"
 msgstr "%s チェンジセット"
 #: kallithea/templates/compare/compare_cs.html:100
 #, fuzzy
 msgid "behind"
-msgstr "再インデックス"
+msgstr "behind"
 #: kallithea/templates/compare/compare_diff.html:6
 #: kallithea/templates/compare/compare_diff.html:8
 #, python-format
 msgid "%s Compare"
 msgstr "%s 比較"
 #: kallithea/templates/compare/compare_diff.html:13
 #: kallithea/templates/compare/compare_diff.html:35
 msgid "Compare Revisions"
 msgstr "リビジョンを比較"
 #: kallithea/templates/compare/compare_diff.html:33
 msgid "Swap"
 msgstr "入れ替え"
 #: kallithea/templates/compare/compare_diff.html:42
 #, fuzzy
 msgid "Compare revisions, branches, bookmarks, or tags."
 msgstr "リビジョン、ブランチ、ブックマークもしくはタグの比較を行います。"
 #: kallithea/templates/compare/compare_diff.html:47
 #: kallithea/templates/pullrequests/pullrequest_show.html:305
 #, python-format
 msgid "Showing %s commit"
 msgid_plural "Showing %s commits"
 msgstr[0] "%s コミットを表示"
 #: kallithea/templates/compare/compare_diff.html:78
 #: kallithea/templates/compare/compare_diff.html:89
 msgid "Show full diff"
 msgstr "すべての差分を表示"
 #: kallithea/templates/data_table/_dt_elements.html:74
 msgid "Public repository"
 msgstr "公開リポジトリ"
 #: kallithea/templates/data_table/_dt_elements.html:84
 msgid "Repository creation in progress..."
 msgstr "リポジトリを作成しています..."
 #: kallithea/templates/data_table/_dt_elements.html:98
 msgid "No changesets yet"
 msgstr "まだチェンジセットがありません"
 #: kallithea/templates/data_table/_dt_elements.html:105
 #: kallithea/templates/data_table/_dt_elements.html:107
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "%s の RSS フィードを購読"
 #: kallithea/templates/data_table/_dt_elements.html:113
 #: kallithea/templates/data_table/_dt_elements.html:115
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr "%s の ATOM フィードを購読"
 #: kallithea/templates/data_table/_dt_elements.html:139
 msgid "Creating"
 msgstr "作成中"
 #: kallithea/templates/email_templates/changeset_comment.html:5
 #, python-format
 msgid "Comment from %s on %s changeset %s mentioned you"
 msgstr ""
 #: kallithea/templates/email_templates/changeset_comment.html:7
-#, fuzzy, python-format
 #, python-format
 msgid "Comment from %s on %s changeset %s"
 msgstr ""
+msgstr "%sから%sのチェンジセット%sに対するコメント"
 #: kallithea/templates/email_templates/changeset_comment.html:12
 msgid "The changeset status was changed to"
 msgstr "チェンジセットを次に変更"
 #: kallithea/templates/email_templates/main.html:6
 msgid "This is an automatic notification. Don't reply to this mail."
 msgstr ""
+msgstr "これは自動的に送信される通知です。このメールに返信しないでください。"
 #: kallithea/templates/email_templates/password_reset.html:4
 #, python-format
 msgid "Hello %s"
 msgstr "こんにちは %s"
 #: kallithea/templates/email_templates/password_reset.html:6
 #, fuzzy
 #| msgid "We received a request to create a new password for your account."
 msgid "We have received a request to reset the password for your account."
-msgstr "アカウントの新しいパスワードの生成リクエストを受け取りました。"
+msgstr "あなたのアカウントのパスワードリセットリクエストを受け取りました。"
 #: kallithea/templates/email_templates/password_reset.html:7
 msgid "To set a new password, click the following link"
 msgstr ""
+msgstr "新しいパスワードを設定するために、次のリンクをクリックしてください"
 #: kallithea/templates/email_templates/password_reset.html:10
 msgid ""
 "Should you not be able to use the link above, please type the following "
 "code into the password reset form"
 msgstr ""
 #: kallithea/templates/email_templates/password_reset.html:12
 msgid ""
 "If it weren't you who requested the password reset, just disregard this "
 "message."
 msgstr ""
+msgstr "パスワードリセットのリクエストをしていない場合、このメッセージは無視してください。"
 #: kallithea/templates/email_templates/pull_request.html:5
-#, fuzzy, python-format
 #, python-format
 msgid "%s mentioned you on %s pull request \"%s\""
 msgstr ""
+msgstr "%sさんが%sへのプルリクエスト \"%s\"でメンションしました"
 #: kallithea/templates/email_templates/pull_request.html:7
-#, fuzzy, python-format
 #, python-format
 msgid "%s requested your review of %s pull request \"%s\""
 msgstr ""
+msgstr "%sさんが%sへのプルリクエスト \"%s\"でレビューを要求しています"
 #: kallithea/templates/email_templates/pull_request_comment.html:4
-#, fuzzy, python-format
 #, python-format
 msgid "Comment from %s on %s pull request \"%s\""
 msgstr ""
+msgstr "%sから%sのプルリクエスト \"%s\"に対するコメント"
 #: kallithea/templates/email_templates/pull_request_comment.html:9
 #, fuzzy
 msgid "The comment closed the pull request with status"
 msgstr "%s がプルリクエスト\"%s\" にコメントしました"
 #: kallithea/templates/email_templates/pull_request_comment.html:11
 #, fuzzy
 msgid "The comment was made with status"
 msgstr "プルリクエストを以下のステータスで閉じました："
 #: kallithea/templates/email_templates/registration.html:6
 msgid "View this user here"
 msgstr "このユーザを閲覧する"
 #: kallithea/templates/files/diff_2way.html:15
 #, python-format
 msgid "%s File side-by-side diff"
 msgstr "%s ファイルの差分を並べて表示"
 #: kallithea/templates/files/diff_2way.html:19
 #: kallithea/templates/files/file_diff.html:8
 msgid "File diff"
 msgstr "ファイル差分"
 #: kallithea/templates/files/file_diff.html:4
 #, python-format
 msgid "%s File Diff"
 msgstr "%s ファイル差分"
 #: kallithea/templates/files/files.html:4
 #: kallithea/templates/files/files.html:80
 #, python-format
 msgid "%s Files"
 msgstr "%s ファイル"
 #: kallithea/templates/files/files_add.html:4
 #, python-format
 msgid "%s Files Add"
 msgstr "%s ファイルを追加"
 #: kallithea/templates/files/files_add.html:40
 #: kallithea/templates/files/files_edit.html:38
 #: kallithea/templates/files/files_ypjax.html:3
 msgid "Location"
 msgstr "場所"
 #: kallithea/templates/files/files_add.html:42
 msgid "Enter filename..."
 msgstr "ファイル名..."
 #: kallithea/templates/files/files_add.html:44
 #: kallithea/templates/files/files_add.html:48
 msgid "or"
 msgstr "または"
 #: kallithea/templates/files/files_add.html:44
 msgid "Upload File"
 msgstr "アップロードファイル"
 #: kallithea/templates/files/files_add.html:48
 msgid "Create New File"
 msgstr "新しいファイルを作成"
 #: kallithea/templates/files/files_add.html:53
 msgid "New file mode"
 msgstr "ファイルモード"
 #: kallithea/templates/files/files_add.html:64
 #: kallithea/templates/files/files_delete.html:43
 #: kallithea/templates/files/files_edit.html:67
 #, fuzzy
 msgid "Commit Changes"
 msgstr "変更をコミット"
 #: kallithea/templates/files/files_browser.html:33
 msgid "Previous revision"
 msgstr "前のリビジョン"
 #: kallithea/templates/files/files_browser.html:35
 msgid "Next revision"
 msgstr "次のリビジョン"
 #: kallithea/templates/files/files_browser.html:41
 msgid "Follow current branch"
 msgstr "このブランチで追跡"
 #: kallithea/templates/files/files_browser.html:44
 msgid "Search File List"
 msgstr "ファイル一覧を検索"
 #: kallithea/templates/files/files_browser.html:48
 msgid "Loading file list..."
 msgstr "ファイル一覧を読み込み中..."
 #: kallithea/templates/files/files_browser.html:61
 msgid "Size"
 msgstr "サイズ"
 #: kallithea/templates/files/files_browser.html:62
 msgid "Last Revision"
 msgstr "最後のリビジョン"
 #: kallithea/templates/files/files_browser.html:63
 #, fuzzy
 msgid "Last Modified"
 msgstr "最終更新日"
 #: kallithea/templates/files/files_browser.html:64
 #, fuzzy
 msgid "Last Committer"
 msgstr "最後の作成者"
 #: kallithea/templates/files/files_delete.html:4
 #, python-format
 msgid "%s Files Delete"
 msgstr "%s のファイルを削除"
 #: kallithea/templates/files/files_delete.html:12
 #: kallithea/templates/files/files_delete.html:31
 msgid "Delete file"
 msgstr "ファイルを削除"
 #: kallithea/templates/files/files_edit.html:4
 #, python-format
 msgid "%s File Edit"
 msgstr "%s のファイルを編集"
 #: kallithea/templates/files/files_edit.html:21
 msgid "Edit file"
 msgstr "ファイルを編集"
 #: kallithea/templates/files/files_edit.html:48
 #: kallithea/templates/files/files_source.html:32
 msgid "Show Annotation"
 msgstr "アノテーションを表示"
 #: kallithea/templates/files/files_edit.html:50
 #: kallithea/templates/files/files_source.html:35
 msgid "Download as Raw"
 msgstr "Raw形式でダウンロード"
 #: kallithea/templates/files/files_edit.html:53
 msgid "Source"
 msgstr "ソース"
 #: kallithea/templates/files/files_edit.html:58
 msgid "Editing file"
 msgstr "ファイルを編集"
 #: kallithea/templates/files/files_history_box.html:2
 #, python-format
 msgid "%s author"
 msgid_plural "%s authors"
 msgstr[0] "%s 人の作成者"
 #: kallithea/templates/files/files_source.html:7
 msgid "Diff to Revision"
@@ @@ -5602,428 +5432,408 @@ msgid "Deleting files allowed only when @@
 msgstr "ファイルの削除はブランチのヘッドリビジョンでのみ行えます"
 #: kallithea/templates/files/files_source.html:63
 #, python-format
 msgid "Binary file (%s)"
 msgstr "バイナリファイル (%s)"
 #: kallithea/templates/files/files_source.html:73
 msgid "File is too big to display"
 msgstr "表示するには大きすぎるファイルです"
 #: kallithea/templates/files/files_ypjax.html:5
 msgid "annotation"
 msgstr "アノテーション"
 #: kallithea/templates/files/files_ypjax.html:23
 msgid "Go Back"
 msgstr "戻る"
 #: kallithea/templates/files/files_ypjax.html:24
 msgid "No files at given path"
 msgstr "そのパスにはファイルはありません"
 #: kallithea/templates/followers/followers.html:5
 #, python-format
 msgid "%s Followers"
 msgstr "%s フォロワー"
 #: kallithea/templates/followers/followers.html:9
 #: kallithea/templates/summary/summary.html:142
 #: kallithea/templates/summary/summary.html:143
 msgid "Followers"
 msgstr "フォロワー"
 #: kallithea/templates/followers/followers_data.html:12
 msgid "Started following -"
 msgstr "フォロー開始日 -"
 #: kallithea/templates/forks/fork.html:5
 #, python-format
 msgid "Fork repository %s"
 msgstr "リポジトリ %s をフォーク"
 #: kallithea/templates/forks/fork.html:27
 msgid "Fork name"
 msgstr "フォーク名"
 #: kallithea/templates/forks/fork.html:62
 #, fuzzy
 msgid "Default revision for files page, downloads, whoosh, and readme."
 msgstr "ファイルページ、ダウンロード、検索、READMEのデフォルトのリビジョンを指定します"
+msgstr "ファイルページ、ダウンロード、検索、READMEのデフォルトのリビジョンを指定します。"
 #: kallithea/templates/forks/fork.html:68
 msgid "Private"
 msgstr "非公開"
 #: kallithea/templates/forks/fork.html:77
 msgid "Copy permissions"
 msgstr "権限のコピー"
 #: kallithea/templates/forks/fork.html:81
 msgid "Copy permissions from forked repository"
 msgstr "フォーク元リポジトリから権限をコピーします"
 #: kallithea/templates/forks/fork.html:87
 msgid "Update after clone"
 msgstr "クローン後にupdateする"
 #: kallithea/templates/forks/fork.html:91
 msgid "Checkout source after making a clone"
 msgstr "クローンした後にソースをチェックアウトします"
 #: kallithea/templates/forks/fork.html:96
 msgid "Fork this Repository"
 msgstr "このリポジトリをフォーク"
 #: kallithea/templates/forks/forks.html:5
 #, python-format
 msgid "%s Forks"
 msgstr "%s フォーク"
 #: kallithea/templates/forks/forks.html:9
 #: kallithea/templates/summary/summary.html:148
 #: kallithea/templates/summary/summary.html:149
 msgid "Forks"
 msgstr "フォーク"
 #: kallithea/templates/forks/forks_data.html:17
 msgid "Forked"
 msgstr "フォークしました"
 #: kallithea/templates/forks/forks_data.html:30
 msgid "There are no forks yet"
 msgstr "まだフォークがありません"
 #: kallithea/templates/journal/journal.html:21
 msgid "ATOM journal feed"
 msgstr "ATOM ジャーナルフィード"
 #: kallithea/templates/journal/journal.html:22
 msgid "RSS journal feed"
 msgstr "RSS ジャーナルフィード"
 #: kallithea/templates/journal/journal.html:56
 msgid "My Repositories"
-msgstr "リポジトリ"
+msgstr "私のリポジトリ"
 #: kallithea/templates/journal/journal_data.html:43
 msgid "No entries yet"
 msgstr "まだエントリがありません"
 #: kallithea/templates/journal/public_journal.html:13
 msgid "ATOM public journal feed"
 msgstr "ATOM 公開ジャーナルフィード"
 #: kallithea/templates/journal/public_journal.html:14
 msgid "RSS public journal feed"
 msgstr "RSS 公開ジャーナルフィード"
 #: kallithea/templates/pullrequests/pullrequest.html:4
 #: kallithea/templates/pullrequests/pullrequest.html:8
 #, fuzzy
 msgid "New Pull Request"
 msgstr "新しいプルリクエスト"
 #: kallithea/templates/pullrequests/pullrequest.html:31
 #: kallithea/templates/pullrequests/pullrequest_data.html:15
 #: kallithea/templates/pullrequests/pullrequest_show.html:29
 #: kallithea/templates/pullrequests/pullrequest_show.html:54
 msgid "Title"
 msgstr "タイトル"
 #: kallithea/templates/pullrequests/pullrequest.html:34
 msgid "Summarize the changes - or leave empty"
 msgstr ""
 #: kallithea/templates/pullrequests/pullrequest.html:43
 #: kallithea/templates/pullrequests/pullrequest_show.html:66
 msgid "Write a short description on this pull request"
 msgstr "このプルリクエストの簡潔な説明を書いてください"
 #: kallithea/templates/pullrequests/pullrequest.html:49
 msgid "Changeset flow"
 msgstr "変更の流れ"
 #: kallithea/templates/pullrequests/pullrequest.html:56
 msgid "Origin repository"
 msgstr "元のリポジトリ"
 #: kallithea/templates/pullrequests/pullrequest.html:72
 msgid "Destination repository"
 msgstr "相手のリポジトリ"
 #: kallithea/templates/pullrequests/pullrequest_data.html:6
 #, fuzzy
 msgid "No entries"
 msgstr "まだエントリがありません"
 #: kallithea/templates/pullrequests/pullrequest_data.html:14
 #, fuzzy
 msgid "Vote"
-msgstr "取消"
+msgstr "投票"
 #: kallithea/templates/pullrequests/pullrequest_data.html:18
 msgid "From"
 msgstr ""
+msgstr "From"
 #: kallithea/templates/pullrequests/pullrequest_data.html:19
 msgid "To"
 msgstr ""
+msgstr "To"
 #: kallithea/templates/pullrequests/pullrequest_data.html:28
 #, python-format
 msgid "You voted: %s"
 msgstr ""
+msgstr "あなたの投票内容: %s"
 #: kallithea/templates/pullrequests/pullrequest_data.html:30
 msgid "You didn't vote"
 msgstr ""
+msgstr "投票していません"
 #: kallithea/templates/pullrequests/pullrequest_data.html:35
 msgid "(no title)"
 msgstr ""
+msgstr "(no title)"
 #: kallithea/templates/pullrequests/pullrequest_data.html:37
 #: kallithea/templates/pullrequests/pullrequest_show.html:31
 #: kallithea/templates/pullrequests/pullrequest_show.html:83
 msgid "Closed"
 msgstr "クローズ"
 #: kallithea/templates/pullrequests/pullrequest_data.html:67
 #, fuzzy
 msgid "Delete Pull Request"
-msgstr "新しいプルリクエスト"
+msgstr "プルリクエストの削除"
 #: kallithea/templates/pullrequests/pullrequest_data.html:68
 msgid "Confirm to delete this pull request"
 msgstr "このプルリクエストを削除してもよろしいですか？"
 #: kallithea/templates/pullrequests/pullrequest_data.html:70
-#, fuzzy, python-format
 #, python-format
 msgid "Confirm again to delete this pull request with %s comments"
-msgstr "このプルリクエストを削除してもよろしいですか？"
+msgstr "このプルリクエストには %s件のコメントがありますが削除してもよろしいですか？"
 #: kallithea/templates/pullrequests/pullrequest_show.html:6
-#, fuzzy, python-format
 #, python-format
 msgid "%s Pull Request %s"
-msgstr "%s プルリクエスト #%s"
 msgstr "%s プルリクエスト %s"
 #: kallithea/templates/pullrequests/pullrequest_show.html:10
 #, fuzzy, python-format
 msgid "Pull request %s from %s#%s"
 msgstr "%s からのプルリクエスト"
 #: kallithea/templates/pullrequests/pullrequest_show.html:57
 #, fuzzy
 msgid "Summarize the changes"
-msgstr "変更をコミット"
+msgstr "変更の概要"
 #: kallithea/templates/pullrequests/pullrequest_show.html:74
 msgid "Reviewer voting result"
 msgstr ""
+msgstr "レビュアーの投票結果"
 #: kallithea/templates/pullrequests/pullrequest_show.html:80
 #: kallithea/templates/pullrequests/pullrequest_show.html:81
 msgid "Pull request status calculated from votes"
 msgstr "投票からプルリクエストのステータスを計算"
 #: kallithea/templates/pullrequests/pullrequest_show.html:93
 msgid "Still not reviewed by"
 msgstr "未レビュー"
 #: kallithea/templates/pullrequests/pullrequest_show.html:97
 #, python-format
 msgid "%d reviewer"
 msgid_plural "%d reviewers"
 msgstr[0] "%d 人のレビュアー"
 #: kallithea/templates/pullrequests/pullrequest_show.html:99
 msgid "Pull request was reviewed by all reviewers"
 msgstr "プルリクエストはすべてのレビュアーにレビューされました"
 #: kallithea/templates/pullrequests/pullrequest_show.html:101
 #, fuzzy
 msgid "There are no reviewers"
-msgstr "まだブランチがありません"
+msgstr "レビュアーがいません"
 #: kallithea/templates/pullrequests/pullrequest_show.html:107
 msgid "Origin"
 msgstr ""
+msgstr "Origin"
 #: kallithea/templates/pullrequests/pullrequest_show.html:113
 #, fuzzy
 msgid "on"
-msgstr "なし"
+msgstr "on"
 #: kallithea/templates/pullrequests/pullrequest_show.html:120
 msgid "Target"
 msgstr ""
+msgstr "Target"
 #: kallithea/templates/pullrequests/pullrequest_show.html:124
 msgid ""
 "This is just a range of changesets and doesn't have a target or a real "
 "merge ancestor."
 msgstr ""
 #: kallithea/templates/pullrequests/pullrequest_show.html:133
 msgid "Pull changes"
 msgstr "変更を取得:"
 #: kallithea/templates/pullrequests/pullrequest_show.html:173
 #, fuzzy
 msgid "Update"
-msgstr "ユーザーを[更新]"
 msgstr "更新"
 #: kallithea/templates/pullrequests/pullrequest_show.html:191
 msgid "Current revision - no change"
 msgstr ""
+msgstr "現在のリビジョン ｰ 変更なし"
 #: kallithea/templates/pullrequests/pullrequest_show.html:213
 #, fuzzy
 msgid "Pull Request Reviewers"
 msgstr "プルリクエストレビュアー"
 #: kallithea/templates/pullrequests/pullrequest_show.html:238
 #, fuzzy
 msgid "Remove reviewer"
-msgstr "レビュアー"
+msgstr "レビュアーを削除"
 #: kallithea/templates/pullrequests/pullrequest_show.html:250
 msgid "Type name of reviewer to add"
 msgstr ""
+msgstr "追加するレビュアーの名前を入力"
 #: kallithea/templates/pullrequests/pullrequest_show.html:258
 #, fuzzy
 msgid "Potential Reviewers"
-msgstr "コメントのプレビュー"
+msgstr "レビュワー候補"
 #: kallithea/templates/pullrequests/pullrequest_show.html:261
 msgid "Click to add the repository owner as reviewer:"
 msgstr ""
+msgstr "クリックしてリポジトリの所有所をレビュアーに追加:"
 #: kallithea/templates/pullrequests/pullrequest_show.html:284
 msgid "Save Changes"
 msgstr "変更を保存"
 #: kallithea/templates/pullrequests/pullrequest_show.html:285
 #, fuzzy
 msgid "Save as New Pull Request"
-msgstr "新しいプルリクエストを作成"
+msgstr "新しいプルリクエストとして保存"
 #: kallithea/templates/pullrequests/pullrequest_show.html:286
 #, fuzzy
 msgid "Cancel Changes"
-msgstr "最近の変更点"
+msgstr "変更をキャンセル"
 #: kallithea/templates/pullrequests/pullrequest_show.html:296
 #, fuzzy
 msgid "Pull Request Content"
-msgstr "プルリクエストを以下のステータスに変更しました："
+msgstr "プルリクエストの内容"
 #: kallithea/templates/pullrequests/pullrequest_show_all.html:6
 #, python-format
 msgid "%s Pull Requests"
 msgstr "%s プルリクエスト"
 #: kallithea/templates/pullrequests/pullrequest_show_all.html:11
-#, fuzzy, python-format
 #, python-format
 msgid "Pull Requests from %s'"
 msgstr "%s からのプルリクエスト"
+msgstr "%s' からのプルリクエスト"
 #: kallithea/templates/pullrequests/pullrequest_show_all.html:13
-#, fuzzy, python-format
 #, python-format
 msgid "Pull Requests to '%s'"
 msgstr "%s へのプルリクエスト"
+msgstr "'%s' へのプルリクエスト"
 #: kallithea/templates/pullrequests/pullrequest_show_all.html:32
 #, fuzzy
 msgid "Open New Pull Request"
 msgstr "新しいプルリクエストを作成"
 #: kallithea/templates/pullrequests/pullrequest_show_all.html:37
-#, fuzzy, python-format
 #, python-format
 msgid "Show Pull Requests to %s"
 msgstr "%s へのプルリクエストを表示"
 #: kallithea/templates/pullrequests/pullrequest_show_all.html:39
-#, fuzzy, python-format
 #, python-format
 msgid "Show Pull Requests from '%s'"
 msgstr "%s からのプルリクエストを表示"
 #: kallithea/templates/pullrequests/pullrequest_show_all.html:49
 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28
 msgid "Hide closed pull requests (only show open pull requests)"
 msgstr ""
+msgstr "クローズしたプルリクエストを隠す（クローズしていないプルリクエストのみ表示する）"
 #: kallithea/templates/pullrequests/pullrequest_show_all.html:51
 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30
 #, fuzzy
 msgid "Show closed pull requests (in addition to open pull requests)"
 msgstr "クローズしたプルリクエストも表示"
+msgstr "クローズしたプルリクエストも表示(クローズしていないプルリクエストに加えて)"
 #: kallithea/templates/pullrequests/pullrequest_show_my.html:35
 #, fuzzy
 msgid "Pull Requests Created by Me"
-msgstr "プルリクエストレビュアー"
+msgstr "作成したプルリクエスト"
 #: kallithea/templates/pullrequests/pullrequest_show_my.html:38
 #, fuzzy
 msgid "Pull Requests I Participate In"
-msgstr "あなたがレビュアーとして参加しているプルリクエスト"
+msgstr "参加しているプルリクエスト"
 #: kallithea/templates/search/search.html:6
 #, python-format
 msgid "%s Search"
 msgstr "%s 検索"
 #: kallithea/templates/search/search.html:8
 #: kallithea/templates/search/search.html:16
 #, fuzzy
 msgid "Search in All Repositories"
 msgstr "全てのリポジトリから検索"
 #: kallithea/templates/search/search.html:50
 msgid "Search term"
 msgstr "検索キーワード"
 #: kallithea/templates/search/search.html:62
 msgid "Search in"
 msgstr "検索対象"
 #: kallithea/templates/search/search.html:65
 msgid "File contents"
 msgstr "ファイルの内容"
 #: kallithea/templates/search/search.html:66
 msgid "Commit messages"
 msgstr "コミットメッセージ"
 #: kallithea/templates/search/search.html:67
 msgid "File names"
 msgstr "ファイル名"
 #: kallithea/templates/search/search_commit.html:35
 #: kallithea/templates/search/search_content.html:21
 #: kallithea/templates/search/search_path.html:15
 msgid "Permission denied"
 msgstr "権限がありません"
 #: kallithea/templates/summary/statistics.html:4
 #, python-format
 msgid "%s Statistics"
 msgstr "%s 統計情報"
 #: kallithea/templates/summary/statistics.html:16
 #: kallithea/templates/summary/summary.html:39
 #, python-format
 msgid "%s ATOM feed"
 msgstr "%s ATOM フィード"
 #: kallithea/templates/summary/statistics.html:17
 #: kallithea/templates/summary/summary.html:40
 #, python-format
 msgid "%s RSS feed"
 msgstr "%s RSS フィード"
 #: kallithea/templates/summary/statistics.html:36
 #: kallithea/templates/summary/summary.html:100
@@ @@ -6055,173 +5865,168 @@ msgstr "追加されたファイル" @@
 #: kallithea/templates/summary/statistics.html:392
 msgid "files changed"
 msgstr "変更されたファイル"
 #: kallithea/templates/summary/statistics.html:393
 msgid "files removed"
 msgstr "削除されたファイル"
 #: kallithea/templates/summary/statistics.html:395
 msgid "commit"
 msgstr "コミット"
 #: kallithea/templates/summary/statistics.html:396
 msgid "file added"
 msgstr "追加されたファイル"
 #: kallithea/templates/summary/statistics.html:397
 msgid "file changed"
 msgstr "変更されたファイル"
 #: kallithea/templates/summary/statistics.html:398
 msgid "file removed"
 msgstr "削除されたファイル"
 #: kallithea/templates/summary/summary.html:4
 #, python-format
 msgid "%s Summary"
 msgstr "%s 要約"
 #: kallithea/templates/summary/summary.html:13
 #, python-format
 msgid "Repository locked by %s"
 msgstr "リポジトリは %s によってロックされました"
 #: kallithea/templates/summary/summary.html:15
 msgid "Repository unlocked"
 msgstr "リポジトリはロックされていません"
 #: kallithea/templates/summary/summary.html:22
 msgid "Fork of"
 msgstr "フォーク元"
 #: kallithea/templates/summary/summary.html:29
 msgid "Clone from"
 msgstr "クローン元"
 #: kallithea/templates/summary/summary.html:72
 #, fuzzy
 msgid "Clone URL"
 msgstr "クローンURL"
 #: kallithea/templates/summary/summary.html:78
 msgid "Show by Name"
 msgstr "名前で表示"
 #: kallithea/templates/summary/summary.html:79
 msgid "Show by ID"
 msgstr "IDで表示"
 #: kallithea/templates/summary/summary.html:92
 msgid "Trending files"
 msgstr "トレンドファイル"
 #: kallithea/templates/summary/summary.html:108
 msgid "Download"
 msgstr "ダウンロード"
 #: kallithea/templates/summary/summary.html:112
 msgid "There are no downloads yet"
 msgstr "まだダウンロードがありません"
 #: kallithea/templates/summary/summary.html:114
 msgid "Downloads are disabled for this repository"
 msgstr "このリポジトリのダウンロードは無効化されています"
 #: kallithea/templates/summary/summary.html:120
 msgid "Download as zip"
 msgstr "ZIPでダウンロード"
 #: kallithea/templates/summary/summary.html:125
 msgid "Check this to download archive with subrepos"
 msgstr "チェックするとダウンロードアーカイブにサブリポジトリが含まれます"
 #: kallithea/templates/summary/summary.html:125
 #, fuzzy
 msgid "With subrepos"
 msgstr "サブリポジトリを含める"
 #: kallithea/templates/summary/summary.html:156
 msgid "Repository Size"
 msgstr "リポジトリサイズ"
 #: kallithea/templates/summary/summary.html:163
 #: kallithea/templates/summary/summary.html:165
 msgid "Feed"
 msgstr "フィード"
 #: kallithea/templates/summary/summary.html:186
 #, fuzzy
 msgid "Latest Changes"
-msgstr "最近の変更点"
+msgstr "最近の変更"
 #: kallithea/templates/summary/summary.html:188
 #, fuzzy
 msgid "Quick Start"
 msgstr "クイックスタート"
 #: kallithea/templates/summary/summary.html:202
 #, python-format
 msgid "Readme file from revision %s:%s"
 msgstr "リビジョン %s:%s の README ファイル"
 #: kallithea/templates/summary/summary.html:293
 #, python-format
 msgid "Download %s as %s"
 msgstr "%s を %s でダウンロード"
 #: kallithea/templates/tags/tags.html:5
 #, python-format
 msgid "%s Tags"
 msgstr "%s タグ"
 #: kallithea/templates/tags/tags.html:26
 #, fuzzy
 msgid "Compare Tags"
 msgstr "タグを比較"
 #~ msgid "No comments."
 #~ msgstr "%d 個のコメント"
 #~ msgid "public journal"
 #~ msgstr "公開ジャーナル"
 #~ msgid "journal"
 #~ msgstr "ジャーナル"
 #~ msgid "Locked repository"
 #~ msgstr "リポジトリをロックしました"
 #~ msgid "Unlocked repository"
 #~ msgstr "リポジトリのロックを解除しました"
 #~ msgid "Unlocked"
 #~ msgstr "アンロック"
 #~ msgid "Locked"
 #~ msgstr "ロック"
 #~ msgid "Repository has been %s"
 #~ msgstr "リポジトリは %s されています"
 #~ msgid "You can't edit this user"
 #~ msgstr "このユーザーは編集できません"
 #~ msgid "No Files"
 #~ msgstr "ファイルなし"
 #~ msgid ""
 #~ msgstr "テキスト内で @username を使うと、その Kallithea のユーザーに通知を送信します"
 #~ msgid "Username \"%(username)s\" is forbidden"
 #~ msgstr "ユーザー名 \"%(username)s\" は許可されていません"
 #~ msgid "invalid user name"
 #~ msgstr "不正なユーザー名です"
 #~ msgid "Your account is disabled"
 #~ msgstr "アカウントは無効です"
 #~ msgid "invalid clone URL"
 #~ msgstr "無効なクローンURIです"
@@ @@ -6377,49 +6182,48 @@ msgstr "タグを比較" @@
 #~ msgid "owner"
 #~ msgstr "所有者"
 #~ msgid "reviewer"
 #~ msgstr "レビュアー"
 #~ msgid ""
 #~ "Your password reset was successful, new"
 #~ " password has been sent to your "
 #~ "email"
 #~ msgstr "パスワードをリセットに成功しました。新しいパスワードをあなたのメールアドレスに送りました"
 #~ msgid ""
 #~ "[Comment from %(comment_username)s] %(repo_name)s"
 #~ " changeset %(short_id)s on %(branch)s"
 #~ msgstr ""
 #~ msgid ""
 #~ "[Added by %(pr_username)s] %(repo_name)s pull"
 #~ " request %(pr_nice_id)s from %(ref)s"
 #~ msgstr ""
 #~ msgid ""
 #~ "[Comment from %(comment_username)s] %(repo_name)s"
 #~ " pull request %(pr_nice_id)s from %(ref)s"
 #~ msgstr ""
 #~ msgid "Your new password"
 #~ msgstr "新しいパスワード"
 #~ msgid "Your new Kallithea password:%s"
 #~ msgstr "新しいKallitheaパスワード:%s"
 #~ msgid "Open New Pull Request for Selected Changesets"
 #~ msgstr "選択したチェンジセットから新しいプルリクエストを作成"
 #~ msgid "Show Selected Changeset __S"
 #~ msgstr "選択した変更 __S を表示"
 #~ msgid "You can generate it by clicking following URL"
 #~ msgstr "下のURLをクリックすることで再生成が行えます。"
 #~ msgid "Please ignore this email if you did not request a new password ."
 #~ msgstr "新しいパスワードを生成しない場合はこのメールを無視してください。"
 #~ msgid "Created by"
 #~ msgstr "作成日"

0 comments (0 inline, 0 general)