Re: Committing to branches :(
On อ., 2005-08-30 at 13:23 +0930, Clytie Siddall wrote: > Hi guys :) > > It's your perennial CVS muddler again. > > I'm doing fine with HEAD files, but I can't seem to commit to > branches. This is worrying, because I've got to get as many files in, > in the next 24hrs + (I'm not quite sure of the timezone) for release. > > The files I haven't been able to commit are listed below. Would you > please check and see if the ChangeLogs show me trying to commit, and > if so, why the completed file doesn't show up on the status pages? > > Thankyou very much. :) > When reporting problems *always* cut'n'paste the command you used and the output it produced, including error message. Without it, we haven't really got a clue what you're talking about ;) If there was no error messages (or just harmless warnings) when you commit, chances are the commit completed successfully. If you want to be sure, you can check using viewcvs. I don't know how often the status pages get updated - that's a question for the i18n list, but I don't think it's automatic. http://cvs.gnome.org/viewcvs/gdm2/po/ChangeLog CAUTION: hit stop after the first few seconds - this is a **LONG** page and you're only interested in the top few pages worth. The above link shows you've recently committed to HEAD. Note the Branches/Tags column, which shows which branch a commit is made on. You can also examine the status of one of your local working directories by checking for a 'Tag' file in the 'CVS' subdir in your working copy. If the file exists, it will contain a 'T' and then the name of the branch/tag. For HEAD, it will simply be missing. > When committing to a branch, I simply change to that directory, edit > the ChangeLog, and use "cvs commit". I haven't necessarily checked > out the branch, often files have branched, so I move their > directories into a branch directory. Should that matter? The > directories have the right name, e.g gnome-2-12. > > gnome-2-12/gdm2 > gnome-2-12/gnome-volume-manager > branch-0_9/meld > glib-2-8/glib > > btw, I never had any problems committing the gnome-2-10 files, but I > checked them out with the branch. Hmm... Don't worry. Confusion dissolves with experience :) You'll get the hang of it eventually. I think everyone does things differently. Your way seems fine to me. CCing i18n in case these notes help other translators (and because I wanna be a cross-posting maniac). -- Ross ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: Committing to branches :(
On 30/08/2005, at 3:19 PM, Ross Golder wrote: When reporting problems *always* cut'n'paste the command you used and the output it produced, including error message. Without it, we haven't really got a clue what you're talking about ;) Um, there aren't any problems actually committing. The files commit fine. But they don't show up on the status pages. That's the only error there is. If there was no error messages (or just harmless warnings) when you commit, chances are the commit completed successfully. If you want to be sure, you can check using viewcvs. I don't know how often the status pages get updated - that's a question for the i18n list, but I don't think it's automatic. It's pretty much daily, very efficient. The above link shows you've recently committed to HEAD. Note the Branches/Tags column, which shows which branch a commit is made on. Oh, @#$%, I want to commit to the gnome-2-12 branch. I just tried re- checking out the whole gnome-2-12/gdm2/po directory, and recommitting my edited file, so I'll see if that works, I suppose. Do you need to use a branch when writing "cvs commit"? I don't think I needed that when I was committing to gnome-2-10, and that worked OK. You can also examine the status of one of your local working directories by checking for a 'Tag' file in the 'CVS' subdir in your working copy. If the file exists, it will contain a 'T' and then the name of the branch/tag. For HEAD, it will simply be missing. Thankyou, that's very helpful. Don't worry. Confusion dissolves with experience :) You'll get the hang of it eventually. I think everyone does things differently. Your way seems fine to me. Thankyou. I just need it to seem fine to the branches. ;) CCing i18n in case these notes help other translators (and because I wanna be a cross-posting maniac). I think Dante had a special branch for cross-posters... :D from Clytie (vi-VN, Vietnamese free-software translation team / nhóm Việt hóa phần mềm tự do) http://groups-beta.google.com/group/vi-VN ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: Committing to branches :(
On อ., 2005-08-30 at 15:37 +0930, Clytie Siddall wrote: > > > > The above link shows you've recently committed to HEAD. Note the > > Branches/Tags column, which shows which branch a commit is made on. > > Oh, @#$%, I want to commit to the gnome-2-12 branch. I just tried re- > checking out the whole gnome-2-12/gdm2/po directory, and recommitting > my edited file, so I'll see if that works, I suppose. Do you need to > use a branch when writing "cvs commit"? I don't think I needed that > when I was committing to gnome-2-10, and that worked OK. You don't need to specify the branch when committing, as your working directory will already be associated with a particular branch (or just HEAD) as indicated by the CVS/Tag file. -- Ross ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: Committing to branches :(
On 30/08/2005, at 5:38 PM, Ross Golder wrote: You don't need to specify the branch when committing, as your working directory will already be associated with a particular branch (or just HEAD) as indicated by the CVS/Tag file. Well, you're quite right, these files don't have that Tag file in the CVS dir. Can I create the filename/CVS/Tag file, then insert the text: T branchname e.g. for gdm2 T gnome-2-12 Would that work? It's really frustrating, and, for the gnome-2-12 files, I'm worried they'll miss the release. :( from Clytie (vi-VN, Vietnamese free-software translation team / nhóm Việt hóa phần mềm tự do) http://groups-beta.google.com/group/vi-VN ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: Committing to branches :(
On พฤ., 2005-09-01 at 18:15 +0930, Clytie Siddall wrote: > On 30/08/2005, at 5:38 PM, Ross Golder wrote: > > > You don't need to specify the branch when committing, as your working > > directory will already be associated with a particular branch (or just > > HEAD) as indicated by the CVS/Tag file. > > Well, you're quite right, these files don't have that Tag file in the > CVS dir. Can I create the filename/CVS/Tag file, then insert the text: > > T branchname > > e.g. for gdm2 > > T gnome-2-12 > > Would that work? > > It's really frustrating, and, for the gnome-2-12 files, I'm worried > they'll miss the release. :( > I very nearly added a note to say 'don't be tempted to just make up the Tag file'! The way to do things, IIRC, is to do a 'cvs update -r gnome-2-12'. Don't forget to back up your data in case it does anything nasty! If you ever need to switch a working directory back to HEAD, use 'cvs update -A'. Translators would probably want to keep a seperate copy of both around, up to them. That will basically pull the patches between whatever version your working directory currently is (likely HEAD) and the version you are requesting (gnome-2-12 branch), apply them to your working directory (report any conflicts) and add the appropriate CVS/Tag files. >From there, you can copy your backed-up gnome-2-12 po files over the top, msgfmt them, cvs diff them, and when you're all happy and confident, cvs commit them. Hope this helps, -- Ross ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: Committing to branches :(
Just noticed the same problem that Clytie encountered. I successfully commit an update translation for gnome-volume-manager, acctually did it a dozen times but I don't see that the change on the statistics page. Last time I commited the file I checked to see if the comment would show up on cvs.gnome.org/viewcvs/ as it did very fast for some other stuff I commited eariler, but the last comment was from the last commit more than a month ago. The way to do things, IIRC, is to do a 'cvs update -r gnome-2-12'. Don't forget to back up your data in case it does anything nasty! If you ever need to switch a working directory back to HEAD, use 'cvs update -A'. Translators would probably want to keep a seperate copy of both around, up to them. I've tried this too. Tried even deleting the whole gnome-volume-manager directory and the did the checkout with -r gnome-2-12, commited the translation again but no luck. Clytie, if you did resolve this, how did you do it? Thanks. -Arangel ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: Committing to branches :(
On 05/09/2005, at 12:47 AM, Арангел Ангов wrote: I've tried this too. Tried even deleting the whole gnome-volume- manager directory and the did the checkout with -r gnome-2-12, commited the translation again but no luck. Clytie, if you did resolve this, how did you do it? Арангел , I'm relieved to hear I'm not the only person having trouble with gnome-volume-manager. The update process worked for every branch file I had, _except_ g-v-m. Yet, it's CVS dir. has a Tag file with contents: Tgnome-2-12 I don't know why it's not working. :( from Clytie (vi-VN, Vietnamese free-software translation team / nhóm Việt hóa phần mềm tự do) http://groups-beta.google.com/group/vi-VN ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: Committing to branches :(
Clytie Siddall wrote: Арангел , I'm relieved to hear I'm not the only person having trouble with gnome-volume-manager. The update process worked for every branch file I had, _except_ g-v-m. Yet, it's CVS dir. has a Tag file with contents: Tgnome-2-12 I don't know why it's not working. :( How about this.. hmmm, can anyone check this out? I've uploaded the mk.po for gnome-volume-manager here: http://ufo.softver.org.mk/po/mk.po Can someone try to commit it and see what's wrong? Thanks. -Arangel ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: Committing to branches :(
Today at 18:00, Арангел Ангов wrote: > How about this.. hmmm, can anyone check this out? I've uploaded the > mk.po for gnome-volume-manager here: > http://ufo.softver.org.mk/po/mk.po > > Can someone try to commit it and see what's wrong? This one is already in CVS: http://cvs.gnome.org/viewcvs/gnome-volume-manager/po/mk.po?rev=1.4.2.4&only_with_tag=gnome-2-12&view=log I have checked, and the diff shows no changes at all. You seem to have outdated CVS checkout instead. Just translate the version grabbed from l10n-status pages and submit that one without using "intltool-update mk" on it if you are still having problems. Also note that there are some "·" symbols (centered dot) instead of spaces in some messages, probably a result of copy-pasting in GTranslator (you probably want to fix those). Cheers, Danilo ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: Committing to branches :(
Danilo Šegan wrote: You seem to have outdated CVS checkout instead. Just translate the version grabbed from l10n-status pages and submit that one without using "intltool-update mk" on it if you are still having problems. Also note that there are some "·" symbols (centered dot) instead of spaces in some messages, probably a result of copy-pasting in GTranslator (you probably want to fix those). That did it. I guess the "·" symbols were a part of the problem. I just saved the file from the statistics page, translated it, got rid of the symbols and commitied it again. Thanks for the help! :) Cheers, Arangel ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: Committing to branches :(
On 06/09/2005, at 2:29 AM, Danilo Šegan wrote: I have checked, and the diff shows no changes at all. This is really weird. I have grabbed the current po from the status pages and updated it (quite a few of the strings add info about VCDs), then committed it. No change in the status pages. When I get out my current copy and have a look, those changes are not there! I know I've done them, repeatedly. I also doubt that Арангел would have kept trying to commit an un-updated file. You can see our repeated attempts for both languages in the ChangeLogs. There is something very strange here. I'll try again. I'll send you a copy: 1. of the file I have now 2. of the file I get off the status page and 3. of the file I commit today. (Sorry, editing a page and uploading files is beyond me today. :( ) I hope that's useful. I've done those changes over and over... :S from Clytie (vi-VN, Vietnamese free-software translation team / nhóm Việt hóa phần mềm tự do) http://groups-beta.google.com/group/vi-VN ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re[2]: Committing to branches :(
Ross> The way to do things, IIRC, is to do a 'cvs update -r gnome-2-12'. FYI, I've wrote a simple php script to phrase translation-status.xml, then checkout ChangeLog and LL.po under corresponding branches. So, this script can be scheduled into crontab. If anybody interested in this script, I'll be very glad to make it public. ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re[4]: Committing to branches :(
Clytie> Yes, please, Funda. Thankyou for going to the trouble to create it,
Clytie> and make it available. :)
I've put it here:
http://i18n.linux.net.cn/update-gnome-po.php.bz2
I think what an average translator will need to do is:
1. modify the _LANG definition from "zh_CN" to your language.
2. modify the _CVSROOT definition to your account.
Just put this update-gnome-po.php under ~/gnome-2.12/, and run it.
And you'll get a fully checked out CVS rawtree for you to *commit*,
not to work on it, because the PO within this repository didn't get
merged with latest POT obviously.
$currentversion=array("gnome-2.12","HEAD");
$obsoleteversion=array("gnome-2.10");
These two arrays is to define the *release* not *branch* you excepted
to be checked out. Currently, l10n-status.g.o hosts three release:
gnome-2.10 (developer-libs, desktop), gnome-2.12 (d-l, d), and HEAD
(fifth-toe, office, extras). That means, if you want to checkout a new
cvs repository with gnome-2.10, just modify it to:
$currentversion=array("gnome-2.10");
$obsoleteversion=array("gnome-2.12","HEAD");
That's it.
BTW, I have another script which works with this one quite well. It
will fetch POTs from l10n-status.g.o, then put the merged group PO
under the directory you specified. The highlight of the script is
it does not depend on l10n-status.g.o, because if the corresponding
POT cannot be found, it will checkout the whole module, then generate
POT locally.
___
gnome-i18n mailing list
gnome-i18n@gnome.org
http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: Re[2]: Committing to branches :(
On 01/09/2005, at 11:26 PM, Funda Wang wrote: Ross> The way to do things, IIRC, is to do a 'cvs update -r gnome-2-12'. FYI, I've wrote a simple php script to phrase translation-status.xml, then checkout ChangeLog and LL.po under corresponding branches. So, this script can be scheduled into crontab. If anybody interested in this script, I'll be very glad to make it public. Yes, please, Funda. Thankyou for going to the trouble to create it, and make it available. :) from Clytie (vi-VN, Vietnamese free-software translation team / nhóm Việt hóa phần mềm tự do) http://groups-beta.google.com/group/vi-VN ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Resources Page? (was: Re: Re[4]: Committing to branches :(
On 03/09/2005, at 4:15 AM, Funda Wang wrote (in summary): That's it. BTW, I have another script which works with this one quite well. It will fetch POTs from l10n-status.g.o, then put the merged group PO under the directory you specified. The highlight of the script is it does not depend on l10n-status.g.o, because if the corresponding POT cannot be found, it will checkout the whole module, then generate POT locally. Could we have a link to these scripts from the GTP pages? Perhaps we could have a Resources page? These scripts are both are very useful, and I'm sure we all have our tools and time-savers we've created or accumulated in some way. Funda's scripts certainly make a great start on the finer-instruments tray in a Gnome Translator's Toolbox. :) (You know, the big mallet you use on string-freeze-breaking developers stays in the big space down the bottom, so it doesn't crush the scripts. :D ) [Thankyou again, Funda], for taking the time to make these available. :) | V 謝謝姐姐 from Clytie (vi-VN, Vietnamese free-software translation team / nhóm Việt hóa phần mềm tự do) http://groups-beta.google.com/group/vi-VN ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
