-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256
Translators please recheck your things! The things below is just FYI this sentence is all you NEED to read. =) On Mon, 11 Jun 2012, Martin Bagge / brother wrote: > What to do to solve this situation? > I will try clean up your master branch and will then apply them to our git > HEAD at sourceforge. I will then push that to my github account so you can > grab it from there. > We need to work out a scheme for you to be able to contribute even though > we have the git HEAD at SF.net =) I located our common split point * 3aaa915 - Installation fixes. (4 weeks ago) All you commits after that I did the following with. - removed the automake cache directory - removed the *.gmo files from the po directory - removed the backup files (filename~) - probably even more When I had the clean "done" I splitted the commits where you added translation things mixed with code changes. Two of these commits then became four commits. * | f85b216 - Add Ukranian translation. (31 minutes ago) * | 4e5a60a - Some random changes to alot of files, derived from the commit that was called "Adding UK translation". (33 minutes ago and * | 31d6272 - [l10n] Updates to es, lt, ru, uk and the POT file. (27 minutes ago) * | b1f2eeb - Some random changes to some shit. (28 minutes ago And then I merged our git HEAD with your (and mine=)) changes. I found myself merging RU, LT, UK and ES translations by hand as you had changes to those files. I just used our version with no modifications but there might still be errors because of either you or me so I included the translators to hilight that they need to recheck the component. As aconclusion. I rebased the shit out of your master branch. You can NOT continue to use that and also try to send changes to LXDE upstream. My suggestion: Drop your github master branch and use my LXDE upstream branch as your new master. https://github.com/brother/lxkb_config.git The branch name is "LXDE-upstream". Practically you will do something like this to drop your master and add our: git remote add LXDE https://github.com/brother/lxkb_config.git git remote update git checkout LXDE-upstream git branch -D master git checkout -b master git push -f origin master:master This operation WILL BREAK TRACEABILITY for forks from your code. THIS IS NOT A PROPER WAY TO WORK WITH THINGS! Suggestions for better ways to solve this problem is welcome from others more experienced in git. Thanks. - -- /brother http://martin.bagge.nu Bruce Schneier once found the inverse of a trapdoor function counting only on the fingers of one hand -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQEcBAEBCAAGBQJP1lw2AAoJEJbdSEaj0jV7KskH/1PIi/QfpP7g6H59afU41DW0 auEoo4mdXALE7z3celMPPRSjM7CdReGsXWH28rrIVYZXyafUXvChih0yOZwWSXC0 Ic18yKWXeALnGhPMFA81B2wDTpunPn0RJZDOu1vNVJgAM2nzgcTY9EtenAgTR5DH PDKPv8Y9A6lQmjSQzFz+ePIe5bjQO2HtyiZrpIbjVzWGGV/qhhA4hSLy/PUAickY 84TC5LJAi5xHrqqkvVTgYAveJF+aFg05XhtQVteyDZjX/E4LvWYE7Lw/1hA1tzia 2rNTF3KapHc398dZsIGYjtQCVkZrB0BFr12iZedHmez2BmdJNR+q45ucefRrmfw= =T/bz -----END PGP SIGNATURE----- ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Lxde-list mailing list Lxde-list@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/lxde-list
