[Localization] Commiting some translations are failing

[Eduardo H. Silva]

I've made it work. What I did was, I entered into the problematic
.PO's (I use the web interface) and submitted a different translation
in one of its strings. Then changed it back to what it was. Then was
able to successfully commit the PO to VCS.

Eduardo

No dia 23 de Março de 2012 20:58, Eduardo H. Silva
<hoboprimate at gmail.com> escreveu:
> Hi Chris and all,
> I'm getting an error when committing (using translate.sugarlabs.org)
> the following translations:
>
> calculate-activity:
>
> Failed to commit file: [GIT] push of
> ('/var/lib/pootle/checkouts/fructose/calculate-activity', 'po/pt.po')
> failed: To gitorious at git.sugarlabs.org:calculate/mainline.git !
> [rejected] master -> master (non-fast-forward) error: failed to push
> some refs to 'gitorious at git.sugarlabs.org:calculate/mainline.git' To
> prevent you from losing history, non-fast-forward updates were
> rejected Merge the remote changes before pushing again. See the 'Note
> about fast-forwards' section of 'git push --help' for details.
>
> log-activity:
>
> Failed to commit file: [GIT] push of
> ('/var/lib/pootle/checkouts/fructose/log-activity', 'po/pt.po')
> failed: To gitorious at git.sugarlabs.org:log/mainline.git ! [rejected]
> master -> master (non-fast-forward) error: failed to push some refs to
> 'gitorious at git.sugarlabs.org:log/mainline.git' To prevent you from
> losing history, non-fast-forward updates were rejected Merge the
> remote changes before pushing again. See the 'Note about
> fast-forwards' section of 'git push --help' for details.
>
> turtleart-activity:
>
> Failed to commit file: [GIT] push of
> ('/var/lib/pootle/checkouts/fructose/turtleart-activity', 'po/pt.po')
> failed: To gitorious at git.sugarlabs.org:turtleart/mainline.git !
> [rejected] master -> master (non-fast-forward) error: failed to push
> some refs to 'gitorious at git.sugarlabs.org:turtleart/mainline.git' To
> prevent you from losing history, non-fast-forward updates were
> rejected Merge the remote changes before pushing again. See the 'Note
> about fast-forwards' section of 'git push --help' for details.
>
> web-activity
>
> Failed to commit file: [GIT] push of
> ('/var/lib/pootle/checkouts/fructose/web-activity', 'po/pt.po')
> failed: To gitorious at git.sugarlabs.org:browse/mainline.git !
> [rejected] master -> master (non-fast-forward) error: failed to push
> some refs to 'gitorious at git.sugarlabs.org:browse/mainline.git' To
> prevent you from losing history, non-fast-forward updates were
> rejected Merge the remote changes before pushing again. See the 'Note
> about fast-forwards' section of 'git push --help' for details.
>
> And the following projects as well:
>
> sugar-base:
>
> Failed to commit file: [GIT] commit of
> ('/var/lib/pootle/checkouts/glucose/sugar-base', 'po/pt.po') failed: #
> On branch master # Changed but not updated: # (use "git add <file>..."
> to update what will be committed) # (use "git checkout -- <file>..."
> to discard changes in working directory) # # modified: po/cpp.po # #
> Untracked files: # (use "git add <file>..." to include in what will be
> committed) # # po/ak.po # po/be.po # po/be at latin.po # po/br.po #
> po/cy.po # po/gl.po # po/gn.po # po/gom at latin.po # po/hr.po # po/ku.po
> # po/lg.po # po/lv.po # po/na.po # po/nah.po # po/nn.po # po/quy.po #
> po/st.po # po/to.po # po/tyv.po # po/uk.po # po/wo.po # po/zh_HK.po no
> changes added to commit (use "git add" and/or "git commit -a")
>
> sugar-toolkit-gtk3:
>
> Failed to commit file: [GIT] commit of
> ('/var/lib/pootle/checkouts/glucose/sugar-toolkit-gtk3', 'po/pt.po')
> failed: # On branch master # Changed but not updated: # (use "git add
> <file>..." to update what will be committed) # (use "git checkout --
> <file>..." to discard changes in working directory) # # modified:
> po/son.po # # Untracked files: # (use "git add <file>..." to include
> in what will be committed) # # po/ak.po # po/be.po # po/be at latin.po #
> po/cy.po # po/gl.po # po/gn.po # po/gom at latin.po # po/hr.po # po/ku.po
> # po/lg.po # po/lv.po # po/na.po # po/nah.po # po/nn.po # po/st.po #
> po/sugar-toolkit-gtk3.pot # po/to.po # po/tyv.po # po/uk.po # po/wo.po
> # po/zh_HK.po no changes added to commit (use "git add" and/or "git
> commit -a")
>
> sugar-toolkit:
>
> Failed to commit file: [GIT] commit of
> ('/var/lib/pootle/checkouts/glucose/sugar-toolkit', 'po/pt.po')
> failed: # On branch master # Changed but not updated: # (use "git add
> <file>..." to update what will be committed) # (use "git checkout --
> <file>..." to discard changes in working directory) # # modified:
> po/th.po # # Untracked files: # (use "git add <file>..." to include in
> what will be committed) # # po/ak.po # po/be.po # po/be at latin.po #
> po/br.po # po/cy.po # po/gl.po # po/gn.po # po/gom at latin.po # po/hr.po
> # po/ku.po # po/lg.po # po/lv.po # po/na.po # po/nah.po # po/nn.po #
> po/quy.po # po/st.po # po/sugar-toolkit.pot # po/to.po # po/tyv.po #
> po/uk.po # po/wo.po # po/zh_HK.po no changes added to commit (use "git
> add" and/or "git commit -a")
>
> Eduardo