Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes:
> ...
> - Make the current revision my new 'master'. That branch already exists,
> and I am on 'christian-new', though. No problem:
>
> $ git branch -M christian-new master
>
> (But if you do that with "-M", which means _force_ rename, make sure
> twice that this is really what you want.)
>
> - Push it.
>
> $ git push origin +master
> ...
> refs/heads/master: da7b699[...] -> cc2b761b[...]
>
> The "+" is necessary, since I rebased it...
>
> If there were more pushers than just me, I'd verify that da7b699 is
> indeed the old state of my master:
>
> $ git reflog
> ...
> d36cd96... HEAD@{20}: checkout: moving from master to christian-new
> da7b699... HEAD@{21}: commit [...]
>
> Yep.
>
> Good. Happy.
Two questions and a half.
- The above means git-gui-i18n.git's master is rebased. Is
that the intention? IOW, people are supposed to work on it
with fetch+rebase, not fetch+merge (= pull)?
- It seems that the tip of 'mob' now is out of sync wrt
'master'. What's the plan to update it with framework
changes made in 'master' (e.g. addition of po/glossary.csv)?
While I think keeping a reference for consistent translation
(within one language's *.po file) is a useful practice,
the po/glossary.csv file on 'master' seems a way suboptimal
solution. Currently it is:
$ file po/glossary.csv
po/glossary.csv: ISO-8859 text
$ head -n 1 po/glossary.csv
"English Term" "de translation"
which implies that other languages will be added at the end
separated with <TAB>?
There are two HUGE problems with that.
* Supporting many languages means looooong lines in that file.
Translators for languages later on the line would have hard
time updating or looking at that file.
* Mixed encodings. What if next language wants its strings in
UTF-8? How would you have that and ISO-8859 on a same line?
I would suggest having one glossary file per language.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
