"Shawn O. Pearce" [off-list ref] writes:
quoted
"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.
Junio C Hamano [off-list ref] wrote:
"Shawn O. Pearce" [off-list ref] writes:
quoted
quoted
"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.
---
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