[Sugar-devel] Conflicts in pootle

[Gonzalo Odiard]

The following activities projects have merge or pull conflicts.
Remember: "If you change anything inside the po directory (including the POT
file), and push it to Git, it will create a conflict which has to be updated
in the Pootle side manually."
http://wiki.sugarlabs.org/go/Translation_Team/i18n_Best_Practices
Please maintainers try to revert the commits if is possible or tell ma and I
can merge the changes with the Pootle ones.
---
honey/kandid: # Your branch is behind 'origin/master' by 16 commits, and can
be fast-forwarded.
The offending commit must be:
http://git.sugarlabs.org/kandid/mainline/commit/0e093254c3c3e10569fa3a199d5609695bcb395f
File po/Kandid.pot

honey/viewslides: # Your branch is behind 'origin/master' by 7 commits, and
can be fast-forwarded.
The offending commit must be:
http://git.sugarlabs.org/viewslides/mainline/commit/48438c1a84536e2f7e57c2d46f5fcd143ab64cbd
File po/el.po

honey/visualmatch: # Your branch is behind 'origin/master' by 32 commits,
and can be fast-forwarded.
The offending commit must be:
http://git.sugarlabs.org/visualmatch/mainline/commit/8adf1632be974cfe1cce1bc0e8b2d833fa25a9d0
 or
http://git.sugarlabs.org/visualmatch/mainline/commit/f0d175677d970f39eacb5ef2d80cc24dca9418d1
File po/VisualMatch.pot

fructose82/calculate-activity: # Your branch is ahead of
'origin/sucrose-0.82' by 4 commits.
Solved

fructose82/pippy-activity: # Your branch is behind 'origin/master' by 22
commits, and can be fast-forwarded.
Solved

glucose84/sugar: # Your branch is behind 'origin/sucrose-0.84' by 49
commits, and can be fast-forwarded.
Solved

glucose84/sugar-base: # Your branch is behind 'origin/master' by 11 commits,
and can be fast-forwarded.
Solved

Regards,

Gonzalo
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sugarlabs.org/archive/sugar-devel/attachments/20110111/aaeac88f/attachment.html>