On Wed, Nov 23, 2011 at 2:27 PM, Martin Bagge / brother
<brother@bsnet.se> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
>
> On 2011-11-23 07:02, LXDE VCS wrote:
>> deadbeef error: Your local changes to the following files would be
>> overwritten by merge: po/he.po po/ja.po Please, commit your changes
>> or stash them before you can merge. error: The following untracked
>> working tree files would be overwritten by merge: po/cs.po Please
>> move or remove them before you can merge. Updating 28ddb0e..32fee2a
>> Aborting
>
> Someone (included in CC) pushed changes in deadbeef that threatens to
> overwrite he.po, ja.po and cs.po at the Pootle server. The push is from
> the beginning a very bad decision as I have stated over and over again
> but it did happen.
>
> I can not in any way at all guarantee that your changes will make this
> merge. I have warned you about this situation more than a dozen times
> and still you fail to do anything about it. It is draining for me to see
> it repeat.
>
> At http://lxde.bsnet.se/~brother/l10n_status.txt the current status of
> the complete project is shown. This list is recreated every hour.
> All files listed in the report is in danger to be lost in the exact same
> way as deadbeef is threatening files now. You MUST click the commit link
> when you are finished with the current session otherwise the changes
> will not leave the Pootle server and will not be in version control.
>
> After trying my best the easiest way out was to srap the changes in
> ja.po and he.po. I did a copy of the files before and then used
> msgsmerge together with the new files and it does look like that will
> work. I'll add them to git but they need to be reviewed.
>
> $ msgmerge he.po he_new.po > he_merge.po
>
> $ msgfmt --statistics he.po
> 392 translated messages.
>
> $ msgfmt --statistics he_new.po
> 257 translated messages.
>
> $ msgfmt --statistics he_merge.po
> 251 translated messages, 6 fuzzy translations.
>
> $ msgmerge ja.po ja_new.po > ja_merge.po
>
> $ msgfmt --statistics ja.po
> 217 translated messages.
>
> $ msgfmt --statistics ja_new.po
> 246 translated messages.
>
> $ msgfmt --statistics ja_merge.po
> 246 translated messages.
>
> Neither 246 nor 257 is the correct amount of strings that needs
> translation so I have made a complete update of ALL po files in the
> project. No file is 100% done anymore (including te cs.po that started
> this crazy thing).
>
> This is the current statistics for the deadbeef component. Please note
> that this is not a core LXDE component.
>
> LC ? ? ?Done ? ?Fuzzy ? Todo ? ?Ratio
> cs ? ? ?389 ? ? 2 ? ? ? 0 ? ? ? 99,5%
> pt_BR ? 389 ? ? 2 ? ? ? 0 ? ? ? 99,5%
> ru ? ? ?389 ? ? 2 ? ? ? 0 ? ? ? 99,5%
> he ? ? ?383 ? ? 8 ? ? ? 0 ? ? ? 98%
> de ? ? ?380 ? ? 1 ? ? ? 10 ? ? ?97,2%
> ug ? ? ?371 ? ? 1 ? ? ? 19 ? ? ?94,9%
> be ? ? ?277 ? ? 38 ? ? ?76 ? ? ?70,8%
> es ? ? ?277 ? ? 38 ? ? ?76 ? ? ?70,8%
> gl ? ? ?277 ? ? 38 ? ? ?76 ? ? ?70,8%
> hu ? ? ?277 ? ? 38 ? ? ?76 ? ? ?70,8%
> kk ? ? ?277 ? ? 38 ? ? ?76 ? ? ?70,8%
> nl ? ? ?277 ? ? 38 ? ? ?76 ? ? ?70,8%
> pl ? ? ?277 ? ? 38 ? ? ?76 ? ? ?70,8%
> pt ? ? ?277 ? ? 38 ? ? ?76 ? ? ?70,8%
> tr ? ? ?277 ? ? 38 ? ? ?76 ? ? ?70,8%
> uk ? ? ?277 ? ? 38 ? ? ?76 ? ? ?70,8%
> sr ? ? ?274 ? ? 40 ? ? ?77 ? ? ?70,1%
> sr@latin ? ? ? ?274 ? ? 40 ? ? ?77 ? ? ?70,1%
> el ? ? ?223 ? ? 45 ? ? ?123 ? ? 57%
> en_GB ? 223 ? ? 45 ? ? ?123 ? ? 57%
> fa ? ? ?223 ? ? 45 ? ? ?123 ? ? 57%
> fr ? ? ?223 ? ? 45 ? ? ?123 ? ? 57%
> it ? ? ?223 ? ? 45 ? ? ?123 ? ? 57%
> sv 223 45 123 57%
> da ? ? ?222 ? ? 45 ? ? ?124 ? ? 56,8%
> lg ? ? ?222 ? ? 45 ? ? ?124 ? ? 56,8%
> sl ? ? ?222 ? ? 45 ? ? ?124 ? ? 56,8%
> zh_CN ? 222 ? ? 45 ? ? ?124 ? ? 56,8%
> bg ? ? ?221 ? ? 46 ? ? ?124 ? ? 56,5%
> ja ? ? ?211 ? ? 58 ? ? ?122 ? ? 54%
> bn ? ? ?211 ? ? 45 ? ? ?135 ? ? 54%
> sk ? ? ?211 ? ? 45 ? ? ?135 ? ? 54%
> id ? ? ?186 ? ? 39 ? ? ?166 ? ? 47,6%
> te ? ? ?185 ? ? 43 ? ? ?163 ? ? 47,3%
> hr ? ? ?160 ? ? 37 ? ? ?194 ? ? 40,9%
> et ? ? ?151 ? ? 3 ? ? ? 237 ? ? 38,6%
> vi ? ? ?135 ? ? 121 ? ? 135 ? ? 34,5%
> km ? ? ?101 ? ? 23 ? ? ?267 ? ? 25,8%
> ca ? ? ?88 ? ? ?49 ? ? ?254 ? ? 22,5%
> zh_TW ? 72 ? ? ?18 ? ? ?301 ? ? 18,4%
> fi ? ? ?38 ? ? ?9 ? ? ? 344 ? ? 9,7%
> nb ? ? ?17 ? ? ?3 ? ? ? 371 ? ? 4,3%
> eo ? ? ?15 ? ? ?2 ? ? ? 374 ? ? 3,8%
> lt ? ? ?1 ? ? ? 0 ? ? ? 390 ? ? 0%
> si ? ? ?1 ? ? ? 0 ? ? ? 390 ? ? 0%
> af ? ? ?0 ? ? ? 0 ? ? ? 391 ? ? 0%
> am ? ? ?0 ? ? ? 0 ? ? ? 391 ? ? 0%
> ar ? ? ?0 ? ? ? 0 ? ? ? 391 ? ? 0%
> bn_IN ? 0 ? ? ? 0 ? ? ? 391 ? ? 0%
> bs ? ? ?0 ? ? ? 0 ? ? ? 391 ? ? 0%
> es_VE ? 0 ? ? ? 0 ? ? ? 391 ? ? 0%
> eu ? ? ?0 ? ? ? 0 ? ? ? 391 ? ? 0%
> fo ? ? ?0 ? ? ? 0 ? ? ? 391 ? ? 0%
> jv ? ? ?0 ? ? ? 0 ? ? ? 391 ? ? 0%
> ko ? ? ?0 ? ? ? 0 ? ? ? 391 ? ? 0%
> li ? ? ?0 ? ? ? 0 ? ? ? 391 ? ? 0%
> ml ? ? ?0 ? ? ? 0 ? ? ? 391 ? ? 0%
> ms ? ? ?0 ? ? ? 0 ? ? ? 391 ? ? 0%
> nn ? ? ?0 ? ? ? 0 ? ? ? 391 ? ? 0%
> pa ? ? ?0 ? ? ? 0 ? ? ? 391 ? ? 0%
> ps ? ? ?0 ? ? ? 0 ? ? ? 391 ? ? 0%
> ro ? ? ?0 ? ? ? 0 ? ? ? 391 ? ? 0%
> th ? ? ?0 ? ? ? 0 ? ? ? 391 ? ? 0%
> ur ? ? ?0 ? ? ? 0 ? ? ? 391 ? ? 0%
> ur_PK ? 0 ? ? ? 0 ? ? ? 391 ? ? 0%
>
> - --
> brother
> http://sis.bthstudent.se
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.11 (GNU/Linux)
> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
>
> iQEcBAEBCAAGBQJOzPTQAAoJEJbdSEaj0jV7NDwIAJyyld/qUgKc16HP3CiDKTZ4
> 1+0ywGzXx78pl8gFpzMniR4uD/XUc/dTQTA2zR7wu4STpPHwzGOfM1JATpwLsuJw
> 9zKHnR4NPBO3WWt1EYwfxubGQpR0mxDqzCYWzdEfi+z3FbvB4Jhrj73AS0hjOouv
> QdXo7qzHa/pKLXglv/GxCiz+2W6bjc1wllaRf+pN067FBt7nABpRmX4S2voCA+bQ
> VhGO/TGIAGw0wOd6bR+P4Z92P8l9wDYG28DFZhs3LMGZerClMfdgDubq+FJyw8gQ
> cMrlS9+0M0ueVOhSV29gMaxWWnQT9C0Guo8/jutQQiF/kJwlUIUC/JKvitCKBwE=
> =SceH
> -----END PGP SIGNATURE-----
>

Hi Martin,

I have made my changes in deadbeef. Commit them to vcs but http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/deadbeef;a=summary

does not shows them. Can You explain me why?
--
SÚrgio Marques