Armenian Pootle issues

[cjl]

No commit links for eToys, Fructose, Fructose 0.84, Glucose, Glucose 0.92,

Glucose 0.84 commit links throw errors

Failed to commit file: [GIT] commit of ('/var/lib/pootle/checkouts/glucose84/sugar-base', 'po/hy.po') failed: # On branch master # Your branch and 'origin/master' have diverged, # and have 3 and 3 different commit(s) each, respectively. # # 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/af.po # modified: po/bn.po # modified: po/bn_IN.po # modified: po/ca.po # modified: po/cpp.po # modified: po/cs.po # modified: po/el.po # modified: po/en.po # modified: po/fa_AF.po # modified: po/fil.po # modified: po/fr.po # modified: po/gu.po # modified: po/he.po # modified: po/hi.po # modified: po/ht.po # modified: po/hu.po # modified: po/id.po # modified: po/km.po # modified: po/ko.po # modified: po/mg.po # modified: po/mi.po # modified: po/ms.po # modified: po/mvo.po # modified: po/nl.po # modified: po/pap.po # modified: po/ps.po # modified: po/pt_BR.po # modified: po/qu.po # modified: po/ru.po # modified: po/rw.po # modified: po/sk.po # modified: po/zh_CN.po # no changes added to commit (use "git add" and/or "git commit -a")

OLPC Software commit throws error

Failed to commit file: [GIT] push of ('/var/lib/pootle/checkouts/olpc_software/olpc_switch_desktop', 'po/hy.po') failed: Host key fingerprint is 65:2c:41:29:54:03:70:d9:c5:b9:5e:5a:62:33:d6:d1 +--[ RSA 2048]----+ | .o+*=+.. . | | .o o+o . E | | .. +o . | | +B + | | S+ B | | o | | | | | | | +-----------------+ To git+ssh://dev.laptop.org/git/projects/olpc-switch-desktop ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'git+ssh://dev.laptop.org/git/projects/olpc-switch-desktop'

Honey

Calendario commit throws error

Failed to commit file: [GIT] push of ('/var/lib/pootle/checkouts/honey/calendario', 'po/hy.po') failed: Host key fingerprint is 4f:5e:5c:7f:ca:94:49:9d:2e:77:85:86:7c:de:56:f1 +--[ RSA 2048]----+ | . | | . . o+| | o *.E| | . *.=o| | S . o.=o*| | + . oooo| | o o | | | | | +-----------------+ To gitorious@…:calendario/mainline.git ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'gitorious@…:calendario/mainline.git'

Clock commit throws error

Failed to commit file: [GIT] commit of ('/var/lib/pootle/checkouts/honey/clock', 'po/hy.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/da.po # modified: po/de.po # modified: po/es.po # modified: po/pt.po # modified: po/sq.po # modified: po/sw.po # modified: po/templates.po # no changes added to commit (use "git add" and/or "git commit -a")

Colors commit throws error

Failed to commit file: [GIT] commit of ('/var/lib/pootle/checkouts/honey/colors', 'po/hy.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/am.po # modified: po/cs.po # modified: po/da.po # modified: po/fa.po # modified: po/km.po # modified: po/ne.po # modified: po/rw.po # modified: po/sk.po # modified: po/sw.po # no changes added to commit (use "git add" and/or "git commit -a")

Maze commit throws error

Failed to commit file: [GIT] push of ('/var/lib/pootle/checkouts/honey/maze', 'po/hy.po') failed: Host key fingerprint is 4f:5e:5c:7f:ca:94:49:9d:2e:77:85:86:7c:de:56:f1 +--[ RSA 2048]----+ | . | | . . o+| | o *.E| | . *.=o| | S . o.=o*| | + . oooo| | o o | | | | | +-----------------+ To gitorious@…:maze/mainline.git ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'gitorious@…:maze/mainline.git'

measure_activity commit throws error

Failed to commit file: [GIT] push of ('/var/lib/pootle/checkouts/honey/measure_activity', 'po/hy.po') failed: Host key fingerprint is 4f:5e:5c:7f:ca:94:49:9d:2e:77:85:86:7c:de:56:f1 +--[ RSA 2048]----+ | . | | . . o+| | o *.E| | . *.=o| | S . o.=o*| | + . oooo| | o o | | | | | +-----------------+ remote: remote: == Gitorious: ========================================================== remote: You do not have write access to this repository remote: ======================================================================== remote: To gitorious@…:measure/mainline.git ! [remote rejected] master -> master (pre-receive hook declined) error: failed to push some refs to 'gitorious@…:measure/mainline.git'

oficina commit throws error

Failed to commit file: [GIT] commit of ('/var/lib/pootle/checkouts/honey/oficina', 'po/hy.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/Paint.pot # modified: po/am.po # modified: po/cs.po # modified: po/da.po # modified: po/es.po # modified: po/fa.po # modified: po/km.po # modified: po/lt.po # modified: po/pt.po # modified: po/sk.po # modified: po/sm.po # modified: po/sw.po # modified: po/templates.po # modified: po/tyv.po # # Untracked files: # (use "git add <file>..." to include in what will be committed) # # po/id.po no changes added to commit (use "git add" and/or "git commit -a")

paths commit throws error

Failed to commit file: [GIT] commit of ('/var/lib/pootle/checkouts/honey/paths', 'po/hy.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/Paths.pot # modified: po/ak.po # modified: po/am.po # modified: po/da.po # modified: po/el.po # modified: po/es.po # modified: po/km.po # modified: po/ne.po # modified: po/pt.po # modified: po/rw.po # modified: po/sk.po # modified: po/sq.po # modified: po/ta.po # modified: po/templates.po # modified: po/vi.po # modified: po/yo.po # no changes added to commit (use "git add" and/or "git commit -a")

stopwatch commit throws error

Failed to commit file: [GIT] push of ('/var/lib/pootle/checkouts/honey/stopwatch', 'po/hy.po') failed: Host key fingerprint is 4f:5e:5c:7f:ca:94:49:9d:2e:77:85:86:7c:de:56:f1 +--[ RSA 2048]----+ | . | | . . o+| | o *.E| | . *.=o| | S . o.=o*| | + . oooo| | o o | | | | | +-----------------+ To gitorious@…:stopwatch/stopwatch.git ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'gitorious@…:stopwatch/stopwatch.git'

[RafaelOrtiz]

Fixed glucose84 issues and honey issues, mostly merge conflicts or git add tracking needed.

[cjl]

Ok,

I think this is fixed now.