Re: Please pull git-po master branch

[Jiang Xin <worldhello.net@gmail.com>]

2012/5/3 Junio C Hamano <gitster@pobox.com>:
> Thomas Rast <trast@student.ethz.ch> writes:
>
>> Hi Xin (is that how you are properly addressed?)
Yeah, as a Chinese, surname is always before given name.

>> Junio C Hamano <gitster@pobox.com> writes:
> There is nothing to "Sigh" about.  Mistakes happen, and we learn from it.

What I have learned from this:

 * Only pull reqests with updates of already exists language are accepted
   for the 'maint' branch of git-po. If a new l10n language support wants to
   be added to 'maint' branch or to the RC version, it must be fully
   discussed int this list.

 * Pull requests with a initial XX.po (untranslated) and updated TEAMS file
   will not merge to the master branch, but merge to a work in progress
   branch, such as WIP/XX.

   In order to coordinate works of potential contributors for a new l10n
   language, l10n team leader (the 1st contributor send me a pull request)
   will send a pull requst with a untranslated XX.po and update TEAMS
   file with URL of the dedicated repository for the new language XX.
   Nobody can guarantee how long XX.po will 100% translated. If merge
   this initial commit too soon to the master branch, unfinished *.po will
   be released, like da.po from Byrial Jensen, nl.po from
   Vincent van Ravesteijn, and pt_PT.po from Marco Sousa.
   So create a WIP/XX branch may resolved this problem.

Update the po/README file as follows, does it make sense?

diff --git a/po/README b/po/README
index c1520..6e047 100644
--- a/po/README
+++ b/po/README
@@ -10,19 +10,36 @@ coordinates our localization effort in the l10
coordinator repository:

         https://github.com/git-l10n/git-po/

-As a contributor for a language XX, you should first check TEAMS file in
-this directory to see whether a dedicated repository for your language XX
-exists. Fork the dedicated repository and start to work if it exists.
+As a contributor for a language XX, you should first check whether a
+dedicated repository for your language XX already exists.
+
+ * Check po/TEAMS file in the master branch of git-po to see whether a
+   dedicated repository for your language XX exists.
+
+ * If a work in progress branch 'WIP/XX' exists in the l10n coordinator
+   repository, check po/TEAMS file in it.
+
+When you find the dedicated repository, fork it and start to work.

 If you are the first contributor for the language XX, please fork this
-repository, prepare and/or update the translated message file po/XX.po
-(described later), and ask the l10n coordinator to pull your work.
+repository, make a initial commit with the po/XX.po file (based on the
+po/git.pot in the master branch, and untranslated is fine) and a updated
+po/TEAMS file (indent with TABS, no SPACES), and ask the l10n
+coordinator to pull your work.
+
+The l10n coordinator will prepare a new branch, WIP/XX, for your language,
+so other contributors can find your team easily.

 If there are multiple contributors for the same language, please first
 coordinate among yourselves and nominate the team leader for your
 language, so that the l10n coordinator only needs to interact with one
 person per language.

+After translations on po/XX.po is 100% complete, l10n team leader for
+language XX should send a pull request again. If the translations pass
+the basic syntax check, the l10n coordinator will merge your work to
+the master branch of git-po, and delete the WIP/XX branch.
+
 The overall data-flow looks like this:

     +-------------------+            +------------------+
@@ -52,11 +69,20 @@ Maintaining the po/git.pot file

 The po/git.pot file contains a message catalog extracted from Git's
 sources. The l10n coordinator maintains it by adding new translations with
-msginit(1), or update existing ones with msgmerge(1).  In order to update
-the Git sources to extract the messages from, the l10n coordinator is
-expected to pull from the main git repository at strategic point in
-history (e.g. when a major release and release candidates are tagged),
-and then run "make pot" at the top-level directory.
+msginit(1), or update existing ones with msgmerge(1).
+
+The two branches (maint and master) in git-po are used for tracking l10n
+of the counterparts of git.git. The update of po/git.pot for these two
+branches are slight different.
+
+ * When there are significant i18n updates in git.git master branch, the
+   l10n coordinator will pull from the master branch of the main git
+   repository, and then run "make pot" at the top-level directory.
+
+ * When there are significant i18n updates in git.git maint branch, update
+   the po/git.pot file like the above. Then, the l10n coordinator should
+   merge updates in the maint branch back to the master branch, and choose
+   local po/git.pot as a conflict resolution.

 Language contributors use this file to prepare translations for their
 language, but they are not expected to modify it.
@@ -68,7 +94,8 @@ Initializing a XX.po file
 (This is done by the language teams).

 If your language XX does not have translated message file po/XX.po yet,
-you add a translation for the first time by running:
+you add a translation (based on the po/git.pot file in the master branch)
+for the first time by running:

     msginit --locale=XX

@@ -116,6 +143,14 @@ in the po/ directory, where XX.po is the file you
want to update.
 Once you are done testing the translation (see below), commit the result
 and ask the l10n coordinator to pull from you.

+Please note:
+
+ * commits to the master branch will go into the next release;
+ * commits to the maint branch will go into the next "maintenance
+   release"; and
+ * commits to the maint branch will merge back to the master branch by the
+   l10n coordinator.
+

-- 
Jiang Xin