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." <a href="http://wiki.sugarlabs.org/go/Translation_Team/i18n_Best_Practices">http://wiki.sugarlabs.org/go/Translation_Team/i18n_Best_Practices</a> 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: <a href="http://git.sugarlabs.org/kandid/mainline/commit/0e093254c3c3e10569fa3a199d5609695bcb395f">http://git.sugarlabs.org/kandid/mainline/commit/0e093254c3c3e10569fa3a199d5609695bcb395f</a> File po/Kandid.pot <div id=":1xn"> honey/viewslides: # Your branch is behind 'origin/master' by 7 commits, and can be fast-forwarded. The offending commit must be: <a href="http://git.sugarlabs.org/viewslides/mainline/commit/48438c1a84536e2f7e57c2d46f5fcd143ab64cbd">http://git.sugarlabs.org/viewslides/mainline/commit/48438c1a84536e2f7e57c2d46f5fcd143ab64cbd</a> 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: <a href="http://git.sugarlabs.org/visualmatch/mainline/commit/8adf1632be974cfe1cce1bc0e8b2d833fa25a9d0">http://git.sugarlabs.org/visualmatch/mainline/commit/8adf1632be974cfe1cce1bc0e8b2d833fa25a9d0</a> or <a href="http://git.sugarlabs.org/visualmatch/mainline/commit/f0d175677d970f39eacb5ef2d80cc24dca9418d1">http://git.sugarlabs.org/visualmatch/mainline/commit/f0d175677d970f39eacb5ef2d80cc24dca9418d1</a> 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 </div> Regards, Gonzalo