[PATCH] Update Japanese translation

[PATCH] Update Japanese translation

[しらいしななこ]

I updated Japanese translation for the latest git-gui.

Signed-off-by: しらいしななこ <nanako3@bluebottle.com>
---
 po/ja.po |  126 ++++++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 94 insertions(+), 32 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index e2cf5bd..189b726 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git-gui\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-24 10:36+0100\n"
-"PO-Revision-Date: 2007-12-05 06:12+0900\n"
+"POT-Creation-Date: 2008-02-16 21:24+0100\n"
+"PO-Revision-Date: 2008-03-14 20:32+0900\n"
 "Last-Translator: しらいし ななこ <nanako3@bluebottle.com>\n"
 "Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"
@@ -398,31 +398,31 @@ msgstr "全てコピー"
 msgid "File:"
 msgstr "ファイル:"
 
-#: git-gui.sh:2545
-msgid "Refresh"
-msgstr "再読み込み"
-
-#: git-gui.sh:2566
+#: git-gui.sh:2573
 msgid "Apply/Reverse Hunk"
 msgstr "パッチを適用/取り消す"
 
-#: git-gui.sh:2572
-msgid "Decrease Font Size"
-msgstr "フォントを小さく"
-
-#: git-gui.sh:2576
-msgid "Increase Font Size"
-msgstr "フォントを大きく"
-
-#: git-gui.sh:2581
+#: git-gui.sh:2579
 msgid "Show Less Context"
 msgstr "文脈を少なく"
 
-#: git-gui.sh:2588
+#: git-gui.sh:2586
 msgid "Show More Context"
 msgstr "文脈を多く"
 
-#: git-gui.sh:2602
+#: git-gui.sh:2594
+msgid "Refresh"
+msgstr "再読み込み"
+
+#: git-gui.sh:2615
+msgid "Decrease Font Size"
+msgstr "フォントを小さく"
+
+#: git-gui.sh:2619
+msgid "Increase Font Size"
+msgstr "フォントを大きく"
+
+#: git-gui.sh:2630
 msgid "Unstage Hunk From Commit"
 msgstr "パッチをコミット予定から外す"
 
@@ -804,6 +804,10 @@ msgstr ""
 msgid "Updating working directory to '%s'..."
 msgstr "作業ディレクトリを '%s' に更新しています…"
 
+#: lib/checkout_op.tcl:323
+msgid "files checked out"
+msgstr "チェックアウトされたファイル"
+
 #: lib/checkout_op.tcl:353
 #, tcl-format
 msgid "Aborted checkout of '%s' (file level merging is required)."
@@ -1262,11 +1266,40 @@ msgstr ""
 "- 第２行: 空白\n"
 "- 残りの行: なぜ、この変更が良い変更か、の説明。\n"
 
-#: lib/commit.tcl:257
+#: lib/commit.tcl:207
+#, tcl-format
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr "警告: Tcl はエンコーディング '%s' をサポートしていません"
+
+#: lib/commit.tcl:221
+msgid "Calling pre-commit hook..."
+msgstr "コミット前フックを実行中・・・"
+
+#: lib/commit.tcl:236
+msgid "Commit declined by pre-commit hook."
+msgstr "コミット前フックがコミットを拒否しました"
+
+#: lib/commit.tcl:259
+msgid "Calling commit-msg hook..."
+msgstr "コミット・メッセージ・フックを実行中・・・"
+
+#: lib/commit.tcl:274
+msgid "Commit declined by commit-msg hook."
+msgstr "コミット・メッセージ・フックがコミットを拒否しました"
+
+#: lib/commit.tcl:287
+msgid "Committing changes..."
+msgstr "変更点をコミット中・・・"
+
+#: lib/commit.tcl:303
 msgid "write-tree failed:"
 msgstr "write-tree が失敗しました:"
 
-#: lib/commit.tcl:275
+#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
+msgid "Commit failed."
+msgstr "コミットに失敗しました。"
+
+#: lib/commit.tcl:321
 #, tcl-format
 msgid "Commit %s appears to be corrupt"
 msgstr "コミット %s は壊れています"
@@ -1289,12 +1322,7 @@ msgstr ""
 msgid "No changes to commit."
 msgstr "コミットする変更がありません。"
 
-#: lib/commit.tcl:303
-#, tcl-format
-msgid "warning: Tcl does not support encoding '%s'."
-msgstr "警告: Tcl はエンコーディング '%s' をサポートしていません"
-
-#: lib/commit.tcl:317
+#: lib/commit.tcl:347
 msgid "commit-tree failed:"
 msgstr "commit-tree が失敗しました:"
 
@@ -1457,7 +1485,9 @@ msgstr "索引エラー"
 msgid ""
 "Updating the Git index failed.  A rescan will be automatically started to "
 "resynchronize git-gui."
-msgstr "GIT インデックスの更新が失敗しました。git-gui と同期をとるために再スキャンします。"
+msgstr ""
+"GIT インデックスの更新が失敗しました。git-gui と同期をとるために再スキャンし"
+"ます。"
 
 #: lib/index.tcl:27
 msgid "Continue"
@@ -1472,6 +1502,10 @@ msgstr "インデックスのロック解除"
 msgid "Unstaging %s from commit"
 msgstr "コミットから '%s' を降ろす"
 
+#: lib/index.tcl:313
+msgid "Ready to commit."
+msgstr "コミット準備完了"
+
 #: lib/index.tcl:326
 #, tcl-format
 msgid "Adding %s"
@@ -1562,10 +1596,10 @@ msgstr "%s の %s ブランチ"
 
 #: lib/merge.tcl:119
 #, tcl-format
-msgid "Merging %s and %s"
-msgstr "%s と %s をマージします"
+msgid "Merging %s and %s..."
+msgstr "%s と %s をマージ中・・・"
 
-#: lib/merge.tcl:131
+#: lib/merge.tcl:130
 msgid "Merge completed successfully."
 msgstr "マージが完了しました"
 
@@ -1624,7 +1658,11 @@ msgstr ""
 msgid "Aborting"
 msgstr "中断しています"
 
-#: lib/merge.tcl:266
+#: lib/merge.tcl:238
+msgid "files reset"
+msgstr "リセットしたファイル"
+
+#: lib/merge.tcl:265
 msgid "Abort failed."
 msgstr "中断に失敗しました。"
 
@@ -1689,7 +1727,11 @@ msgstr "diff の文脈行数"
 msgid "New Branch Name Template"
 msgstr "新しいブランチ名のテンプレート"
 
-#: lib/option.tcl:176
+#: lib/option.tcl:191
+msgid "Spelling Dictionary:"
+msgstr "スペルチェック辞書"
+
+#: lib/option.tcl:215
 msgid "Change Font"
 msgstr "フォントを変更"
 
@@ -1814,6 +1856,26 @@ msgstr "ショートカットが書けません:"
 msgid "Cannot write icon:"
 msgstr "アイコンが書けません:"
 
+#: lib/spellcheck.tcl:37
+msgid "Not connected to aspell"
+msgstr "aspell に接続していません"
+
+#: lib/spellcheck.tcl:41
+msgid "Unrecognized aspell version"
+msgstr "aspell バージョンが判別できません"
+
+#: lib/spellcheck.tcl:135
+msgid "No Suggestions"
+msgstr "提案なし"
+
+#: lib/spellcheck.tcl:336
+msgid "Unexpected EOF from aspell"
+msgstr "aspell が予想外の EOF を返しました"
+
+#: lib/spellcheck.tcl:340
+msgid "Spell Checker Failed"
+msgstr "スペルチェック失敗"
+
 #: lib/status_bar.tcl:83
 #, tcl-format
 msgid "%s ... %*i of %*i %s (%3i%%)"
-- 
1.5.4.3

-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/

----------------------------------------------------------------------
Free pop3 email with a spam filter.
http://www.bluebottle.com/tag/5

[PATCH] git-gui: update russian translation

[Alex Riesen]

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
 po/ru.po |   48 +++++++++++++++++++++---------------------------
 1 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index 849dc5c..db55b3e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -806,7 +806,7 @@ msgstr "Обновление рабочего каталога из '%s'..."
 
 #: lib/checkout_op.tcl:323
 msgid "files checked out"
-msgstr ""
+msgstr "файлы извлечены"
 
 #: lib/checkout_op.tcl:353
 #, tcl-format
@@ -1250,7 +1250,6 @@ msgstr ""
 "Подготовьте хотя бы один файл до создания сохраненного состояния.\n"
 
 #: lib/commit.tcl:183
-#, fuzzy
 msgid ""
 "Please supply a commit message.\n"
 "\n"
@@ -1275,32 +1274,31 @@ msgstr "предупреждение: Tcl не поддерживает коди
 
 #: lib/commit.tcl:221
 msgid "Calling pre-commit hook..."
-msgstr ""
+msgstr "Вызов программы поддержки репозитория pre-commit..."
 
 #: lib/commit.tcl:236
 msgid "Commit declined by pre-commit hook."
-msgstr ""
+msgstr "Сохранение прервано программой поддержки репозитория pre-commit"
 
 #: lib/commit.tcl:259
 msgid "Calling commit-msg hook..."
-msgstr ""
+msgstr "Вызов программы поддержки репозитория commit-msg..."
 
 #: lib/commit.tcl:274
 msgid "Commit declined by commit-msg hook."
-msgstr ""
+msgstr "Сохранение прервано программой поддержки репозитория commit-msg"
 
 #: lib/commit.tcl:287
 msgid "Committing changes..."
-msgstr ""
+msgstr "Сохранение изменений..."
 
 #: lib/commit.tcl:303
 msgid "write-tree failed:"
 msgstr "Программа write-tree завершилась с ошибкой:"
 
 #: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
-#, fuzzy
 msgid "Commit failed."
-msgstr "Клонирование не удалось."
+msgstr "Сохранить состояние не удалось."
 
 #: lib/commit.tcl:321
 #, tcl-format
@@ -1506,7 +1504,6 @@ msgid "Unstaging %s from commit"
 msgstr "Удаление %s из подготовленного"
 
 #: lib/index.tcl:313
-#, fuzzy
 msgid "Ready to commit."
 msgstr "Подготовлено для сохранения"
 
@@ -1602,9 +1599,8 @@ msgid "%s of %s"
 msgstr "%s из %s"
 
 #: lib/merge.tcl:119
-#, fuzzy, tcl-format
 msgid "Merging %s and %s..."
-msgstr "Объединение %s и %s"
+msgstr "Объединение %s и %s..."
 
 #: lib/merge.tcl:130
 msgid "Merge completed successfully."
@@ -1666,9 +1662,8 @@ msgid "Aborting"
 msgstr "Прерываю"
 
 #: lib/merge.tcl:238
-#, fuzzy
 msgid "files reset"
-msgstr "файлов"
+msgstr "изменения в файлах отменены"
 
 #: lib/merge.tcl:265
 msgid "Abort failed."
@@ -1701,7 +1696,7 @@ msgstr "Имя пользователя"
 
 #: lib/option.tcl:117
 msgid "Email Address"
-msgstr "Адес электронной почты"
+msgstr "Адрес электронной почты"
 
 #: lib/option.tcl:119
 msgid "Summarize Merge Commits"
@@ -1732,9 +1727,8 @@ msgid "Number of Diff Context Lines"
 msgstr "Число строк в контексте diff"
 
 #: lib/option.tcl:127
-#, fuzzy
 msgid "Commit Message Text Width"
-msgstr "Комментарий к состоянию:"
+msgstr "Ширина комментария к состоянию:"
 
 #: lib/option.tcl:128
 msgid "New Branch Name Template"
@@ -1742,7 +1736,7 @@ msgstr "Шаблон для имени новой ветви"
 
 #: lib/option.tcl:192
 msgid "Spelling Dictionary:"
-msgstr ""
+msgstr "Словарь для проверки правописания:"
 
 #: lib/option.tcl:216
 msgid "Change Font"
@@ -1871,40 +1865,40 @@ msgstr "Невозможно записать значок:"
 
 #: lib/spellcheck.tcl:57
 msgid "Unsupported spell checker"
-msgstr ""
+msgstr "Неподдерживаемая программа проверки правописания"
 
 #: lib/spellcheck.tcl:65
 msgid "Spell checking is unavailable"
-msgstr ""
+msgstr "Проверка правописания не доступна"
 
 #: lib/spellcheck.tcl:68
 msgid "Invalid spell checking configuration"
-msgstr ""
+msgstr "Неправильная конфигурация программы проверки правописания"
 
 #: lib/spellcheck.tcl:70
 #, tcl-format
 msgid "Reverting dictionary to %s."
-msgstr ""
+msgstr "Словарь вернут к %s."
 
 #: lib/spellcheck.tcl:73
 msgid "Spell checker silently failed on startup"
-msgstr ""
+msgstr "Программа проверки правописания не смогла запустится"
 
 #: lib/spellcheck.tcl:80
 msgid "Unrecognized spell checker"
-msgstr ""
+msgstr "Нераспознаная программа проверки правописания"
 
 #: lib/spellcheck.tcl:180
 msgid "No Suggestions"
-msgstr ""
+msgstr "Исправлений не найдено"
 
 #: lib/spellcheck.tcl:381
 msgid "Unexpected EOF from spell checker"
-msgstr ""
+msgstr "Программа проверки правописания прервала передачу данных"
 
 #: lib/spellcheck.tcl:385
 msgid "Spell Checker Failed"
-msgstr ""
+msgstr "Ошибка проверки правописания"
 
 #: lib/status_bar.tcl:83
 #, tcl-format
-- 
1.5.4.4.578.g182d

Re: [PATCH] Update Japanese translation

[Shawn O. Pearce]

 <nanako3@bluebottle.com> wrote:
> I updated Japanese translation for the latest git-gui.
> 
> Signed-off-by: しらいしななこ <nanako3@bluebottle.com>
> ---
>  po/ja.po |  126 ++++++++++++++++++++++++++++++++++++++++++++++----------------
>  1 files changed, 94 insertions(+), 32 deletions(-)
> 
> diff --git a/po/ja.po b/po/ja.po
> index e2cf5bd..189b726 100644
> --- a/po/ja.po
> +++ b/po/ja.po
> @@ -8,8 +8,8 @@ msgid ""
>  msgstr ""
>  "Project-Id-Version: git-gui\n"
>  "Report-Msgid-Bugs-To: \n"
> -"POT-Creation-Date: 2007-11-24 10:36+0100\n"
> -"PO-Revision-Date: 2007-12-05 06:12+0900\n"
> +"POT-Creation-Date: 2008-02-16 21:24+0100\n"
> +"PO-Revision-Date: 2008-03-14 20:32+0900\n"

Unfortunately this patch does not apply after Peter's regeneration
of the POT file (0212242d66):

  "POT-Creation-Date: 2008-03-14 07:18+0100\n"

I certainly can fix up a merge conflict in the header, but I do not
dare try to fix up the merge conflicts in the lower parts, where
there are actual Japanese translations.  Would you please be so kind
as to fetch my lastest master branch and submit an updated patch?

-- 
Shawn.

Re: [PATCH] Update Japanese translation

[Junio C Hamano]

"Shawn O. Pearce" <spearce@spearce.org> writes:

>>  "Report-Msgid-Bugs-To: \n"
>> -"POT-Creation-Date: 2007-11-24 10:36+0100\n"
>> -"PO-Revision-Date: 2007-12-05 06:12+0900\n"
>> +"POT-Creation-Date: 2008-02-16 21:24+0100\n"
>> +"PO-Revision-Date: 2008-03-14 20:32+0900\n"
>
> Unfortunately this patch does not apply after Peter's regeneration
> of the POT file (0212242d66):
>
>   "POT-Creation-Date: 2008-03-14 07:18+0100\n"

Here is the guide to your translators, in your po/README:

    By comparing "POT-Creation-Date:" line in po/git-gui.pot file and
    po/af.po file, you can tell if there are new messages that need to be
    translated.  You would need the GNU gettext package to perform this
    step.

            $ msgmerge -U po/af.po po/git-gui.pot

    [NEEDSWORK: who is responsible for updating po/git-gui.pot file by
    running xgettext?  IIRC, Christian recommended against running it
    nilly-willy because it can become a source of unnecessary merge
    conflicts.  Perhaps we should mention something like "

    The po/git-gui.pot file is updated by the internationalization
    coordinator from time to time.  You _could_ update it yourself, but
    translators are discouraged from doing so because we would want all
    language teams to be working off of the same version of git-gui.pot.

    " here?]

Shawn, I think you guys should nail down the workflow right first, and
then mention the above a bit more prominently to avoid future accidents
like this.

It is perfectly fine if Peter regenerated the POT file for everybody as
the i18n coordinator, but the thing is, I think that regeneration should
have been done *before* you asked for translators to send in the
translation updates, not _after_ they have fetched from you in response to
your call for help and started working.

Probably it would be the easiest to reduce unnecessary work from
translators, if you just applied the patch to the version _before_
re-generation of POT, then msgmerge the updated POT after that.

It appears the patch was done on top of 48ed49f, so I would imagine a
sensible approach would be for _you_ to do:

    $ git checkout 48ed49f
    $ git am -s ja.patch
    $ git checkout master
    $ git checkout HEAD@{1} po/ja.po
    $ git commit -a -C HEAD@{1}
    $ msgmerge -U po/ja.po po/git-gui.pot
    $ git commit -m 'Adjusted older translation to updated POT' po/ja.po

Then ask Nana to re-fetch and fix that up.  At least that would reduce the
need for re-translation.

Re: [PATCH] Update Japanese translation

[Shawn O. Pearce]

Junio C Hamano <gitster@pobox.com> wrote:
> "Shawn O. Pearce" <spearce@spearce.org> writes:
> 
> >>  "Report-Msgid-Bugs-To: \n"
> >> -"POT-Creation-Date: 2007-11-24 10:36+0100\n"
> >> -"PO-Revision-Date: 2007-12-05 06:12+0900\n"
> >> +"POT-Creation-Date: 2008-02-16 21:24+0100\n"
> >> +"PO-Revision-Date: 2008-03-14 20:32+0900\n"
> >
> > Unfortunately this patch does not apply after Peter's regeneration
> > of the POT file (0212242d66):
> >
> >   "POT-Creation-Date: 2008-03-14 07:18+0100\n"
> 
> Here is the guide to your translators, in your po/README:
 
>             $ msgmerge -U po/af.po po/git-gui.pot

Gah, I forgot about that.
 
> Shawn, I think you guys should nail down the workflow right first, and
> then mention the above a bit more prominently to avoid future accidents
> like this.
> 
> It is perfectly fine if Peter regenerated the POT file for everybody as
> the i18n coordinator, but the thing is, I think that regeneration should
> have been done *before* you asked for translators to send in the
> translation updates, not _after_ they have fetched from you in response to
> your call for help and started working.

Yes.  I clearly dropped the ball on that one.  I did try by asking
for assistance _before_ a tagged release, but I failed to make sure
the POT was up to date first.

> It appears the patch was done on top of 48ed49f, so I would imagine a
> sensible approach would be for _you_ to do:
> 
>     $ git checkout 48ed49f
...
>     $ msgmerge -U po/ja.po po/git-gui.pot
>     $ git commit -m 'Adjusted older translation to updated POT' po/ja.po

Done, and now on repo.or.cz, master branch.  I did actually try to
go back to that version, apply it, and merge it forward, but I forgot
about msgmerge as a means of dealing with a conflicted PO file.

> Then ask Nana to re-fetch and fix that up.  At least that would reduce the
> need for re-translation.

Nana, hopefully a re-fetch will be easier to fix up.  :)

-- 
Shawn.

Re: [PATCH] Update Japanese translation

[Junio C Hamano]

"Shawn O. Pearce" <spearce@spearce.org> writes:

> Junio C Hamano <gitster@pobox.com> wrote:
> ...
>> Shawn, I think you guys should nail down the workflow right first, and
>> then mention the above a bit more prominently to avoid future accidents
>> like this.
>> 
>> It is perfectly fine if Peter regenerated the POT file for everybody as
>> the i18n coordinator, but the thing is, I think that regeneration should
>> have been done *before* you asked for translators to send in the
>> translation updates, not _after_ they have fetched from you in response to
>> your call for help and started working.
>
> Yes.  I clearly dropped the ball on that one.  I did try by asking
> for assistance _before_ a tagged release, but I failed to make sure
> the POT was up to date first.

After looking at the process and README once again, I think the problem
was not Peter's update to POT file itself.  Keeping POT up to date
relative to the software is absolutely necessary.  What was unwarranted
was that the same commit updated language files by running msgmerge before
checking if there is any outstanding translation work.  If we assume that
the translators do not have access to msgmerge, that is a good service to
them (the less they have to do, the better), but otherwise, it is better
to be leave po/${language}.po files alone.

How about doing something like this?

 po/README |   62 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/po/README b/po/README
index 9d8b736..8264079 100644
--- a/po/README
+++ b/po/README
@@ -178,18 +178,6 @@ step.
 
 	$ msgmerge -U po/af.po po/git-gui.pot
 
-[NEEDSWORK: who is responsible for updating po/git-gui.pot file by
-running xgettext?  IIRC, Christian recommended against running it
-nilly-willy because it can become a source of unnecessary merge
-conflicts.  Perhaps we should mention something like "
-
-The po/git-gui.pot file is updated by the internationalization
-coordinator from time to time.  You _could_ update it yourself, but
-translators are discouraged from doing so because we would want all
-language teams to be working off of the same version of git-gui.pot.
-
-" here?]
-
 This updates po/af.po (again, replace "af" with your language
 code) so that it contains msgid lines (i.e. the original) that
 your translation did not have before.  There are a few things to
@@ -207,3 +195,53 @@ watch out for:
 
  - New messages added to the software will have msgstr lines with empty
    strings.  You would need to translate them.
+
+The po/git-gui.pot file is updated by the internationalization
+coordinator from time to time.  You _could_ update it yourself, but
+translators are discouraged from doing so because we would want all
+language teams to be working off of the same version of git-gui.pot.
+
+****************************************************************
+
+This section is a note to the internationalization coordinator, and
+translators do not have to worry about it too much.
+
+The message template file po/git-gui.pot needs to be kept up to date
+relative to the software the translations apply to, and it is the
+responsibility of the internationalization coordinator.
+
+When updating po/git-gui.pot file, however, _never_ run "msgmerge -U
+po/xx.po" for individual language translations, unless you are absolutely
+sure that there is no outstanding work on translation for language xx.
+Doing so will create unnecessary merge conflicts and force needless
+re-translation on translators.  The translator however may not have access
+to the msgmerge tool, in which case the coordinator may run it for the
+translator as a service.
+
+But mistakes do happen.  Suppose a translation was based on an older
+version X, the POT file was updated at version Y and then msgmerge was run
+at version Z for the language, and the translator sent in a patch based on
+version X:
+
+         ? translated
+        /       
+    ---X---Y---Z (master)
+
+The coordinator could recover from such a mistake by first applying the
+patch to X, replace the translated file in Z, and then running msgmerge
+again based on the updated POT file and commit the result.  The sequence
+would look like this:
+
+    $ git checkout X
+    $ git am -s xx.patch
+    $ git checkout master
+    $ git checkout HEAD@{1} po/xx.po
+    $ msgmerge -U po/xx.po po/git-gui.pot
+    $ git commit -c HEAD@{1} po/xx.po
+
+State in the message that the translated messages are based on a slightly
+older version, and msgmerge was run to incorporate changes to message
+templates from the updated POT file.  The result needs to be further
+translated, but at least the messages that were updated by the patch that
+were not changed by the POT update will survive the process and do not
+need to be re-translated.

Re: [PATCH] Update Japanese translation

[Shawn O. Pearce]

Junio C Hamano <gitster@pobox.com> wrote:
> How about doing something like this?

Yea, this looks good.  Can I apply it?  SBO?
 
>  po/README |   62 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
>  1 files changed, 50 insertions(+), 12 deletions(-)
> 
> diff --git a/po/README b/po/README
> index 9d8b736..8264079 100644
> --- a/po/README
> +++ b/po/README
> @@ -178,18 +178,6 @@ step.
>  
>  	$ msgmerge -U po/af.po po/git-gui.pot
>  
> -[NEEDSWORK: who is responsible for updating po/git-gui.pot file by
> -running xgettext?  IIRC, Christian recommended against running it
> -nilly-willy because it can become a source of unnecessary merge
> -conflicts.  Perhaps we should mention something like "
> -
> -The po/git-gui.pot file is updated by the internationalization
> -coordinator from time to time.  You _could_ update it yourself, but
> -translators are discouraged from doing so because we would want all
> -language teams to be working off of the same version of git-gui.pot.
> -
> -" here?]
> -
>  This updates po/af.po (again, replace "af" with your language
>  code) so that it contains msgid lines (i.e. the original) that
>  your translation did not have before.  There are a few things to
> @@ -207,3 +195,53 @@ watch out for:
>  
>   - New messages added to the software will have msgstr lines with empty
>     strings.  You would need to translate them.
> +
> +The po/git-gui.pot file is updated by the internationalization
> +coordinator from time to time.  You _could_ update it yourself, but
> +translators are discouraged from doing so because we would want all
> +language teams to be working off of the same version of git-gui.pot.
> +
> +****************************************************************
> +
> +This section is a note to the internationalization coordinator, and
> +translators do not have to worry about it too much.
> +
> +The message template file po/git-gui.pot needs to be kept up to date
> +relative to the software the translations apply to, and it is the
> +responsibility of the internationalization coordinator.
> +
> +When updating po/git-gui.pot file, however, _never_ run "msgmerge -U
> +po/xx.po" for individual language translations, unless you are absolutely
> +sure that there is no outstanding work on translation for language xx.
> +Doing so will create unnecessary merge conflicts and force needless
> +re-translation on translators.  The translator however may not have access
> +to the msgmerge tool, in which case the coordinator may run it for the
> +translator as a service.
> +
> +But mistakes do happen.  Suppose a translation was based on an older
> +version X, the POT file was updated at version Y and then msgmerge was run
> +at version Z for the language, and the translator sent in a patch based on
> +version X:
> +
> +         ? translated
> +        /       
> +    ---X---Y---Z (master)
> +
> +The coordinator could recover from such a mistake by first applying the
> +patch to X, replace the translated file in Z, and then running msgmerge
> +again based on the updated POT file and commit the result.  The sequence
> +would look like this:
> +
> +    $ git checkout X
> +    $ git am -s xx.patch
> +    $ git checkout master
> +    $ git checkout HEAD@{1} po/xx.po
> +    $ msgmerge -U po/xx.po po/git-gui.pot
> +    $ git commit -c HEAD@{1} po/xx.po
> +
> +State in the message that the translated messages are based on a slightly
> +older version, and msgmerge was run to incorporate changes to message
> +templates from the updated POT file.  The result needs to be further
> +translated, but at least the messages that were updated by the patch that
> +were not changed by the POT update will survive the process and do not
> +need to be re-translated.

-- 
Shawn.

Re: [PATCH] Update Japanese translation

[Junio C Hamano]

"Shawn O. Pearce" <spearce@spearce.org> writes:

> Junio C Hamano <gitster@pobox.com> wrote:
>> How about doing something like this?
>
> Yea, this looks good.  Can I apply it?  SBO?

Surely, and thanks.

Re: [PATCH] Update Japanese translation

[Peter Karlsson]

Junio C Hamano:

> What was unwarranted was that the same commit updated language files by 
> running msgmerge before checking if there is any outstanding translation 
> work.

Indeed, that was probably not such a good idea. I should just have updated 
the POT file and the Swedish translation, and let the other files be updated 
by the other translator, or someone who co-ordinates the translations.

BTW, this is one of the reasons why I would like you to consider using 
Translation Project for these things. They have infrastructure to handle 
these conditions.

-- 
\\// Peter - http://www.softwolves.pp.se/

[PATCH] Update Japanese translation

[しらいしななこ]

---
 po/ja.po |   22 +++++++++-------------
 1 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index 083acdf..28e6d62 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: git-gui\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-03-14 07:18+0100\n"
-"PO-Revision-Date: 2008-03-14 20:32+0900\n"
+"PO-Revision-Date: 2008-03-15 20:12+0900\n"
 "Last-Translator: しらいし ななこ <nanako3@bluebottle.com>\n"
 "Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"
@@ -1724,9 +1724,8 @@ msgid "Number of Diff Context Lines"
 msgstr "diff の文脈行数"
 
 #: lib/option.tcl:127
-#, fuzzy
 msgid "Commit Message Text Width"
-msgstr "コミットメッセージ:"
+msgstr "コミットメッセージのテキスト幅"
 
 #: lib/option.tcl:128
 msgid "New Branch Name Template"
@@ -1863,39 +1862,36 @@ msgstr "アイコンが書けません:"
 
 #: lib/spellcheck.tcl:57
 msgid "Unsupported spell checker"
-msgstr ""
+msgstr "サポートされていないスペルチェッカーです"
 
 #: lib/spellcheck.tcl:65
-#, fuzzy
 msgid "Spell checking is unavailable"
-msgstr "スペルチェック失敗"
+msgstr "スペルチェック機能は使えません"
 
 #: lib/spellcheck.tcl:68
 msgid "Invalid spell checking configuration"
-msgstr ""
+msgstr "スペルチェックの設定が不正です"
 
 #: lib/spellcheck.tcl:70
 #, tcl-format
 msgid "Reverting dictionary to %s."
-msgstr ""
+msgstr "辞書を %s に巻き戻します"
 
 #: lib/spellcheck.tcl:73
 msgid "Spell checker silently failed on startup"
-msgstr ""
+msgstr "スペルチェッカーの起動に失敗しました"
 
 #: lib/spellcheck.tcl:80
-#, fuzzy
 msgid "Unrecognized spell checker"
-msgstr "aspell バージョンが判別できません"
+msgstr "スペルチェッカーが判別できません"
 
 #: lib/spellcheck.tcl:180
 msgid "No Suggestions"
 msgstr "提案なし"
 
 #: lib/spellcheck.tcl:381
-#, fuzzy
 msgid "Unexpected EOF from spell checker"
-msgstr "aspell が予想外の EOF を返しました"
+msgstr "スペルチェッカーが予想外の EOF を返しました"
 
 #: lib/spellcheck.tcl:385
 msgid "Spell Checker Failed"
-- 
1.5.4.4.718.ga6ccf



-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/

----------------------------------------------------------------------
Finally - A spam blocker that actually works.
http://www.bluebottle.com/tag/4

[PATCH] Update japanese translation

[miurahr]

From: Hiroshi Miura <miurahr@linux.com>

- Update untranslated terms

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
---
 gitk-git/po/ja.po | 97 ++++++++++++++++++++++++-------------------------------
 1 file changed, 42 insertions(+), 55 deletions(-)

diff --git a/gitk-git/po/ja.po b/gitk-git/po/ja.po
index 59e42a8..cb55909 100644
--- a/gitk-git/po/ja.po
+++ b/gitk-git/po/ja.po
@@ -9,14 +9,15 @@ msgstr ""
 "Project-Id-Version: gitk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-05-17 14:32+1000\n"
-"PO-Revision-Date: 2009-11-06 01:45+0900\n"
-"Last-Translator: Mizar <mizar.jp@gmail.com>\n"
+"PO-Revision-Date: 2015-11-03 16:38+0900\n"
+"Last-Translator: Hiroshi Miura <miurahr@linux.com>\n"
 "Language-Team: Japanese\n"
-"Language: \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: Poedit 1.5.4\n"
+"Language: ja\n"
 
 #: gitk:140
 msgid "Couldn't get list of unmerged files:"
@@ -24,11 +25,11 @@ msgstr "マージされていないファイルのリストを取得できませ
 
 #: gitk:212 gitk:2381
 msgid "Color words"
-msgstr ""
+msgstr "単語に色を付ける"
 
 #: gitk:217 gitk:2381 gitk:8220 gitk:8253
 msgid "Markup words"
-msgstr ""
+msgstr "単語をマークする"
 
 #: gitk:324
 msgid "Error parsing revisions:"
@@ -308,19 +309,16 @@ msgid "Compare with marked commit"
 msgstr "マークを付けたコミットと比較する"
 
 #: gitk:2629 gitk:2640
-#, fuzzy
 msgid "Diff this -> marked commit"
-msgstr "これと選択したコミットのdiffを見る"
+msgstr "これ->選択したコミットのdiff"
 
 #: gitk:2630 gitk:2641
-#, fuzzy
 msgid "Diff marked commit -> this"
-msgstr "選択したコミットとこれのdiffを見る"
+msgstr "選択したコミット->これのdiff"
 
 #: gitk:2631
-#, fuzzy
 msgid "Revert this commit"
-msgstr "このコミットにマークをつける"
+msgstr "このコミットをリバート"
 
 #: gitk:2647
 msgid "Check out this branch"
@@ -332,7 +330,7 @@ msgstr "このブランチを除去する"
 
 #: gitk:2649
 msgid "Copy branch name"
-msgstr ""
+msgstr "ブランチ名をコピー"
 
 #: gitk:2656
 msgid "Highlight this too"
@@ -352,7 +350,7 @@ msgstr "親コミットから blame をかける"
 
 #: gitk:2660
 msgid "Copy path"
-msgstr ""
+msgstr "パスをコピー"
 
 #: gitk:2667
 msgid "Show origin of this line"
@@ -363,7 +361,6 @@ msgid "Run git gui blame on this line"
 msgstr "この行に git gui で blame をかける"
 
 #: gitk:3014
-#, fuzzy
 msgid ""
 "\n"
 "Gitk - a commit viewer for git\n"
@@ -375,7 +372,7 @@ msgstr ""
 "\n"
 "Gitk - gitコミットビューア\n"
 "\n"
-"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
+"Copyright © 2005-2014 Paul Mackerras\n"
 "\n"
 "使用および再配布は GNU General Public License に従ってください"
 
@@ -397,9 +394,9 @@ msgid "<%s-Q>\t\tQuit"
 msgstr "<%s-Q>\t\t終了"
 
 #: gitk:3049
-#, fuzzy, tcl-format
+#, tcl-format
 msgid "<%s-W>\t\tClose window"
-msgstr "<%s-F>\t\t検索"
+msgstr "<%s-W>\t\tウインドウを閉じる"
 
 #: gitk:3050
 msgid "<Home>\t\tMove to first commit"
@@ -410,19 +407,16 @@ msgid "<End>\t\tMove to last commit"
 msgstr "<End>\t\t最後のコミットに移動"
 
 #: gitk:3052
-#, fuzzy
 msgid "<Up>, p, k\tMove up one commit"
-msgstr "<Up>, p, i\t一つ上のコミットに移動"
+msgstr "<Up>, p, k\t一つ上のコミットに移動"
 
 #: gitk:3053
-#, fuzzy
 msgid "<Down>, n, j\tMove down one commit"
-msgstr "<Down>, n, k\t一つ下のコミットに移動"
+msgstr "<Down>, n, j\t一つ下のコミットに移動"
 
 #: gitk:3054
-#, fuzzy
 msgid "<Left>, z, h\tGo back in history list"
-msgstr "<Left>, z, j\t履歴の前に戻る"
+msgstr "<Left>, z, h\t履歴の前に戻る"
 
 #: gitk:3055
 msgid "<Right>, x, l\tGo forward in history list"
@@ -431,7 +425,7 @@ msgstr "<Right>, x, l\t履歴の次へ進む"
 #: gitk:3056
 #, tcl-format
 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
-msgstr ""
+msgstr "<%s-n>\tヒストリの現在からn番目の親コミットへ移動する"
 
 #: gitk:3057
 msgid "<PageUp>\tMove up one page in commit list"
@@ -514,9 +508,8 @@ msgid "<Return>\tMove to next find hit"
 msgstr "<Return>\t次を検索して移動"
 
 #: gitk:3075
-#, fuzzy
 msgid "g\t\tGo to commit"
-msgstr "<End>\t\t最後のコミットに移動"
+msgstr "g\t\tコミットに移動"
 
 #: gitk:3076
 msgid "/\t\tFocus the search box"
@@ -672,9 +665,8 @@ msgid "Matches all Commit Info criteria"
 msgstr "コミット情報の全ての条件に一致"
 
 #: gitk:4086
-#, fuzzy
 msgid "Matches no Commit Info criteria"
-msgstr "コミット情報の全ての条件に一致"
+msgstr "コミット情報に一致しません"
 
 #: gitk:4087
 msgid "Changes to Files:"
@@ -761,9 +753,8 @@ msgid "-- criteria for selecting revisions"
 msgstr "― リビジョンの選択条件"
 
 #: gitk:4241
-#, fuzzy
 msgid "View Name"
-msgstr "ビュー名:"
+msgstr "ビュー名"
 
 #: gitk:4316
 msgid "Apply (F5)"
@@ -984,12 +975,11 @@ msgstr "タグ名:"
 
 #: gitk:9268
 msgid "Tag message is optional"
-msgstr ""
+msgstr "タグメッセージは任意です"
 
 #: gitk:9270
-#, fuzzy
 msgid "Tag message:"
-msgstr "タグ名:"
+msgstr "タグメッセージ："
 
 #: gitk:9274 gitk:9439
 msgid "Create"
@@ -1066,33 +1056,32 @@ msgid "No changes committed"
 msgstr "何の変更もコミットされていません"
 
 #: gitk:9593
-#, fuzzy, tcl-format
+#, tcl-format
 msgid "Commit %s is not included in branch %s -- really revert it?"
 msgstr ""
-"コミット %s は既にブランチ %s に含まれています ― 本当にこれを再適用しますか？"
+"コミット %s は既にブランチ %s に含まれていません ― 本当にこれをリバートします"
+"か？"
 
 #: gitk:9598
-#, fuzzy
 msgid "Reverting"
-msgstr "リセット中"
+msgstr "リバート中"
 
 #: gitk:9606
-#, fuzzy, tcl-format
+#, tcl-format
 msgid ""
 "Revert failed because of local changes to the following files:%s Please "
 "commit, reset or stash  your changes and try again."
 msgstr ""
-"ファイル '%s' のローカルな変更のためにチェリーピックは失敗しました。\n"
+"ファイル '%s' のローカルな変更のためにリバートは失敗しました。\n"
 "あなたの変更に commit, reset, stash のいずれかを行ってからやり直してくださ"
 "い。"
 
 #: gitk:9610
-#, fuzzy
 msgid ""
 "Revert failed because of merge conflict.\n"
 " Do you wish to run git citool to resolve it?"
 msgstr ""
-"マージの衝突によってチェリーピックは失敗しました。\n"
+"マージの衝突によってリバートは失敗しました。\n"
 "この解決のために git citool を実行したいですか？"
 
 #: gitk:9653
@@ -1200,9 +1189,8 @@ msgid "Show local changes"
 msgstr "ローカルな変更を表示"
 
 #: gitk:11361
-#, fuzzy
 msgid "Auto-select SHA1 (length)"
-msgstr "SHA1 の自動選択"
+msgstr "SHA1(l鍵長)の自動選択"
 
 #: gitk:11365
 msgid "Hide remote refs"
@@ -1217,13 +1205,12 @@ msgid "Tab spacing"
 msgstr "タブ空白幅"
 
 #: gitk:11374
-#, fuzzy
 msgid "Display nearby tags/heads"
-msgstr "近くのタグを表示する"
+msgstr "近くのタグ/headを表示する"
 
 #: gitk:11377
 msgid "Maximum # tags/heads to show"
-msgstr ""
+msgstr "表示する最大のタグ/ヘッド数 #"
 
 #: gitk:11380
 msgid "Limit diffs to listed paths"
@@ -1242,21 +1229,20 @@ msgid "Choose..."
 msgstr "選択..."
 
 #: gitk:11395
-#, fuzzy
 msgid "General options"
-msgstr "パッチ生成"
+msgstr "全般オプション"
 
 #: gitk:11398
 msgid "Use themed widgets"
-msgstr ""
+msgstr "テーマのウィジェットを使う"
 
 #: gitk:11400
 msgid "(change requires restart)"
-msgstr ""
+msgstr "(変更を反映するには再スタートの必要があります）"
 
 #: gitk:11402
 msgid "(currently unavailable)"
-msgstr ""
+msgstr "（現在存在しない）"
 
 #: gitk:11413
 msgid "Colors: press to choose"
@@ -1343,17 +1329,16 @@ msgid "Gitk preferences"
 msgstr "Gitk 設定"
 
 #: gitk:11494
-#, fuzzy
 msgid "General"
-msgstr "生成"
+msgstr "全般"
 
 #: gitk:11495
 msgid "Colors"
-msgstr ""
+msgstr "色"
 
 #: gitk:11496
 msgid "Fonts"
-msgstr ""
+msgstr "フォント"
 
 #: gitk:11546
 #, tcl-format
@@ -1365,6 +1350,8 @@ msgid ""
 "Sorry, gitk cannot run with this version of Tcl/Tk.\n"
 " Gitk requires at least Tcl/Tk 8.4."
 msgstr ""
+"申し訳有りません。gitkは、このバージョンのTcl/Tkでは動作しません。\n"
+"Gitkには少なくともTcl/Tk 8.4が必要です。"
 
 #: gitk:12269
 msgid "Cannot find a git repository here."
-- 
2.6.2

Re: [PATCH] Update japanese translation

[Junio C Hamano]

miurahr@linux.com writes:

> From: Hiroshi Miura <miurahr@linux.com>
>
> - Update untranslated terms
>
> Signed-off-by: Hiroshi Miura <miurahr@linux.com>
> ---
>  gitk-git/po/ja.po | 97 ++++++++++++++++++++++++-------------------------------
>  1 file changed, 42 insertions(+), 55 deletions(-)

Sorry but I do not take patches directly to gitk or git-gui, both of
which are independent projects of their own.

Could you redo this change against Paul Mackerras's tree, which is
our upstream "gitk" project, that is found here:

    git://git.kernel.org/pub/scm/gitk/gitk.git

and Cc Paul Mackerras <paulus@samba.org>  when you post your patch?

Thanks.

Re: [PATCH] Update japanese translation

[Hiroshi Miura]

On Tue, Nov 03, 2015 at 12:40:45PM -0800, Junio C Hamano wrote:
> Could you redo this change against Paul Mackerras's tree, which is
> our upstream "gitk" project, that is found here:
> 
>     git://git.kernel.org/pub/scm/gitk/gitk.git
> 
> and Cc Paul Mackerras <paulus@samba.org>  when you post your patch?
 
 Thank you for advise. I tried again.

-- 
Hiroshi Miura