On Mon, 13 Jun 2011, LXDE VCS wrote: > PCManFM > From git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/pcmanfm > 96ff0c7..fa7d474 master -> origin/master > error: Your local changes to the following files would be overwritten by > merge: > po/fr.po > po/lt.po > po/sl.po > Please, commit your changes or stash them before you can merge. > Updating 96ff0c7..fa7d474 > Aborting
I did this merge and hope I did not fail. pt_BR had some strings affected. FR, LT and SL was uncommitted but I didn't have any string conflicts for those. please please please please do NOT update the PO files in git without communicating that with me. commit f4d08749212bcc101e5f9904072ee80a971aa0d9 has resynced PO files after these conflicts, check your files. > libfm > From git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/libfm > 448491b..94d9f4e master -> origin/master > error: Your local changes to the following files would be overwritten by > merge: > po/fr.po > po/sl.po > Please, commit your changes or stash them before you can merge. > Updating 448491b..94d9f4e > Aborting pt_BR had string conflicts that I merged by hand in rebase in master. nl was affected but no string conflicts. fr and sl was rescued via branched rebase, no real string conflicts. when I did the PO resync I got gettext errors for FR and SL that I had to correct by hand. They had the same error, strings appearing twice (the newly added ones ofc...) and was fairly easy to correct. Please make an extra look =) > --Status-- > LXapperance > # modified: po/lt.po > # modified: po/ru.po > LXApperance ObConf > # modified: po/uk.po > LXInput > # modified: po/en_GB.po > # modified: po/hr.po > # modified: po/lg.po > # modified: po/lt.po > LXPanel > # modified: po/sl.po > # modified: po/uk.po > LXRandR > # modified: po/sl.po > LXSession edit > # modified: po/en_GB.po > # modified: po/es.po > # modified: po/lt.po > # modified: po/ru.po > > Deadbeef > # modified: po/fr.po > # modified: po/gl.po > # modified: po/sl.po All people resposible for these translations may make me suffer from merges and rebasing. I try to do it but there are times when strings are lost (I had to kill a Russian file yesterday). If you don't click the commit to VCS link in the review part of Pootle I can not guarantee that you have a file in the tree. I know it is not even then guaranteed that your file will not be in merge conflict but it is very much less likely to happen. This screenshot is the hint I try to send every now and then to people. http://salyut.bsnet.se/~brother/bilder/ss-101021-vcs_click.png There are longer versions of this workflow present in the list archive for lxde-i18n or at the LXDE wiki. I will still bug you about this and I will always try to do the best but I can not promise anything, please try to remember. That's all. (my wish is that the developers do not touch the PO files, update the POT as much as you like but stay away of the POs. I take care of them when needed - ping me to make me do it sooner than later.) -- /brother http://martin.bagge.nu Attempting to decrypt Bruce Schneier's cyphertext causes extreme time dilation ------------------------------------------------------------------------------ EditLive Enterprise is the world's most technically advanced content authoring tool. Experience the power of Track Changes, Inline Image Editing and ensure content is compliant with Accessibility Checking. http://p.sf.net/sfu/ephox-dev2dev _______________________________________________ Pcmanfm-develop mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/pcmanfm-develop
