From: Sérgio M. <sma...@gm...> - 2011-05-25 10:10:38
|
Isnt pt already fine? I commit the files to vcs. Mantin, can You check it? > Message: 7 > Date: Mon, 23 May 2011 13:22:25 +0200 > From: Martin Bagge / brother <br...@bs...> > Subject: [Lxde-i18n] Fwd: LXDE: VCS status > To: LXDE list <lxd...@li...> > Message-ID: <4DD...@bs...> > Content-Type: text/plain; charset=ISO-8859-1 > > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA256 > > FYI and so on. > All individual translators have been hilighted, just wanted to point the > problem out more clearly. > > As the nl, pt and uk translator(s) have not committed their work to LXDM > the entire respository is now blocked from updates. When I decide to > update it to get new files into the box I will reset the files for these > languages and all the translations done will be lost. This is why it is > important to finish the translation by clicking "Commit to VCS". > > The second list of things are the other component that have tracked > files changed but not committed to VCS yet. As soon as they start to get > updates in their trees they will also fail to update as there are > changed files blocking. Not yet a problem, but soon. > > - -------- Original Message -------- > Subject: LXDE: VCS status > Date: Mon, 23 May 2011 13:00:54 +0200 > From: LXDE VCS <lx...@l1...> > To: br...@bs... > > LXDM > po/nl.po: needs update > po/pt.po: needs update > po/uk.po: needs update > refusing to pull with rebase: your working tree is not up-to-date > > - --Status-- > GPicView > # modified: po/pt.po > GTKNetCat > # modified: po/pt.po > LXapperance > # modified: po/pt.po > LXApperance ObConf > # modified: po/uk.po > LXDM > # modified: po/nl.po > # modified: po/pt.po > # modified: po/uk.po > LXInput > # modified: po/lg.po > # modified: po/zh_CN.po > LXLauncher > # modified: po/pt.po > # modified: po/zh_CN.po > LXMenu-data > # modified: po/pt.po > LXMusic > # modified: po/pt.po > LXPanel > # modified: po/pt.po > # modified: po/uk.po > LXPolKit > # modified: po/pt.po > LXRandR > # modified: po/pt.po > LXSession edit > # modified: po/pt.po > LXShortcut > # modified: po/uk.po > LXTask > # modified: po/pt.po > LXTerminal > # modified: po/pt.po > PCManFM > # modified: po/hr.po > # modified: po/id.po > # modified: po/pt.po > libFM > # modified: po/pt.po > > Deadbeef > # modified: po/id.po > # modified: po/pt.po > > End of report > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.11 (GNU/Linux) > Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ > > iQEcBAEBCAAGBQJN2kNxAAoJEJbdSEaj0jV7Be8H/09uHfIWtgY7E1dXCzOyGIEQ > uaNNuQQYs4wBk6Yg1QgrzXTkLg15iQeAV9RWR+Ewc/tojNFpo1sXN1AfHYVys2kL > nMm/M6sbySPh82gKw6PXOp+J1I+e4RZqHLfm14oI4dHHzA3I9ljUMDSestywHXsS > w9ZFd/N89M0Z3Mte23aiRbgphkbYFdTXBnw1NE66KE8g5YHqv85i0+MSECbVvGaG > 4duxaHigy594xK7M2EVK4xDWwXUa6uuIXiAfsvLr9YhLYZqoZJYfmk5QNbAtHkSd > L+JlcILpLT6KMVglIUhftdVoP+5iH2eQffgRCFHcJBosQ4uDYEop0cdUgcmXNuk= > =bT4Q > -----END PGP SIGNATURE----- > > > > ------------------------------ > > Message: 8 > Date: Tue, 24 May 2011 22:24:01 +0200 > From: YUP <yup...@gm...> > Subject: Re: [Lxde-i18n] Fwd: LXDE: VCS status > To: "Martin Bagge / brother" <br...@bs...> > Cc: LXDE list <lxd...@li...> > Message-ID: <BAN...@ma...> > Content-Type: text/plain; charset="iso-8859-1" > > Hi, is this the problem you are talking about? I got this trying to update > existing translation for lxdm to VCS. > > Failed to commit file: [GIT] push of ('/var/lib/pootle/po/lxde/lxdm', > 'po/uk.po') failed: To ssh:// > br...@lx.../gitroot/lxde/lxdm ! [rejected] master -> > master (non-fast-forward) error: failed to push some refs to 'ssh:// > br...@lx.../gitroot/lxde/lxdm' To prevent you from > losing history, non-fast-forward updates were rejected Merge the remote > changes (e.g. 'git pull') before pushing again. See the 'Note about > fast-forwards' section of 'git push --help' for details. > > Yarema > > > 2011/5/23 Martin Bagge / brother <br...@bs...> > > > > > > > > The second list of things are the other component that have tracked > > files changed but not committed to VCS yet. As soon as they start to get > > updates in their trees they will also fail to update as there are > > changed files blocking. Not yet a problem, but soon. > > > > > -------------- next part -------------- > An HTML attachment was scrubbed... > > ------------------------------ > > > ------------------------------------------------------------------------------ > vRanger cuts backup time in half-while increasing security. > With the market-leading solution for virtual backup and recovery, > you get blazing-fast, flexible, and affordable data protection. > Download your free trial now. > http://p.sf.net/sfu/quest-d2dcopy1 > > ------------------------------ > > _______________________________________________ > Lxde-i18n mailing list > Lxd...@li... > https://lists.sourceforge.net/lists/listinfo/lxde-i18n > > > End of Lxde-i18n Digest, Vol 7, Issue 2 > *************************************** > -- Sérgio Marques |
From: Martin B. / b. <br...@bs...> - 2011-05-25 11:18:01
|
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 On 2011-05-25 12:10, Sérgio Marques wrote: > Isnt pt already fine? I commit the files to vcs. PT is committed complete. No worries. - -- brother http://sis.bthstudent.se -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQEcBAEBCAAGBQJN3OVgAAoJEJbdSEaj0jV7H9gH/jqMzzrULntT7y5xC5h/T3zj lcQzbUDUFwrnAuM6i7v0/uhWll8DRrocWmp1f0KtIyjy/1crbqV1qqfStsAnPpq4 WNJYDaazygJeBAF78+GW/4ws22Bji8lAl/1GohtTZNdIUDSqgAOL96vrHO0Yjg87 +DA7F1VX0CRRVautUHiLC5S4xWFezO51/g6zhcjjm1PLZ0zSbejTgty0R1vquLyX aXi+XLabosypA6K281AlkmRPH5A2Qq5OW4cs7uuWrcV3EOXsAnKkXERyNjDt4yUy Rpcjs+9nbIO3Cp30b0G9prhAjE6bzczN9cbuUnGdWmZCayBdCwKxnA7D+XmWK4Q= =N/gk -----END PGP SIGNATURE----- |