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 <brother@bsnet.se>
Subject: [Lxde-i18n] Fwd: LXDE: VCS status
To: LXDE list <lxde-i18n@lists.sourceforge.net>
Message-ID: <4DDA4371.6070702@bsnet.se>
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 <lxde@l10n.bsnet.se>
To: brother@bsnet.se

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 <yupadmin@gmail.com>
Subject: Re: [Lxde-i18n] Fwd: LXDE: VCS status
To: "Martin Bagge / brother" <brother@bsnet.se>
Cc: LXDE list <lxde-i18n@lists.sourceforge.net>
Message-ID: <BANLkTikO_BKycC9ANvfU0NZOVcAiKLgvcA@mail.gmail.com>
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://
br0ther@lxde.git.sourceforge.net/gitroot/lxde/lxdm ! [rejected] master ->
master (non-fast-forward) error: failed to push some refs to 'ssh://
br0ther@lxde.git.sourceforge.net/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 <brother@bsnet.se>
>
>
>
> 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
Lxde-i18n@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lxde-i18n


End of Lxde-i18n Digest, Vol 7, Issue 2
***************************************



--
SÚrgio Marques