704
edits
Changes
Jump to navigation
Jump to search
Line 169:
Line 169: + + + + + + + + + + + + +
→Resolving conflicts
sudo -u pootle git pull -s ours
sudo -u pootle git pull -s ours
== Checking that pootle is working ==
* When commiting from pootle interface, repos in git reflect the commit as something similar to:
pootle pushed 3fd0cf7b to taportfolio/mainline:master
on March 04, 2011 01:32
Commit from Sugar Labs: Translation System by user cjl.: 2 of 25 messages translated (0 fuzzy).
* Pogenerator.py (in cronjob), it's also giving mails with info like:
Already up-to-date. or
####### Checking POT for Write (master) ######
== Pootle scripts: ==
== Pootle scripts: ==