[Localization] Commiting some translations are failing

[Chris Leonard]

I was doing an massive update of the AbiWord template.

cjl

On Sun, Mar 25, 2012 at 2:21 PM, Eduardo H. Silva <hoboprimate at gmail.com> wrote:
> Ah I see. Yes, the error message wasn't very clear on that.
>
> P.S.- Why is pootle so slow sometimes? I initially thought it was when
> some background wide-scale uploading or updating of .po files was
> going on, but for example, at this hour, is this happening and is
> making pootle inaccessible?
>
> Eduardo
>
> No dia 24 de Março de 2012 14:39, Chris Leonard
> <cjlhomeaddress at gmail.com> escreveu:
>> Eduardo,
>>
>> I'm sorry for the delay in replying, the reality (as you've
>> discovered) is that error messages of that type is what you get when
>> you try to commit an unchanged PO file that has already been
>> committed.  If you see those, you do *not* really need to make a
>> reversible change to be assured that they are already committed.
>>
>> I wish Pootle didn't complain about this particular situation in the
>> way it does as it is bad to teach users to "simply ignore" error
>> messages, even when they do not signify a genuine problem.  I'm not
>> sure fi an updat et oa more current version of Pootle would resolve
>> this or not, but I would like to get that scheduled for other reasons
>> (like trying to fix suggestion handling).
>>
>> cjl
>>
>>
>> On Sat, Mar 24, 2012 at 10:23 AM, Eduardo H. Silva
>> <hoboprimate at gmail.com> wrote:
>>> 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
>>> _______________________________________________
>>> Localization mailing list
>>> Localization at lists.laptop.org
>>> http://lists.laptop.org/listinfo/localization