Translation_server

Michal Čihař edited this page May 16, 2016 · 4 revisions

About l10n.cihar.com

The translation server at http://l10n.cihar.com/ runs Weblate and allows people to contribute to translations using easy to use web based interface. All changes are automatically done in all branches and commited to Git repository with correct authorship.

Merging changes

In case it is possible to merge translations automatically to official repository and you have privileges for that, you can push changes back to phpMyAdmin's Git repository.

Git repository

All repositories are also exported using git server:

git://l10n.cihar.com/phpmyadmin-master.git git://l10n.cihar.com/phpmyadmin-4-0.git git://l10n.cihar.com/phpmyadmin-documentation.git

Merging different branches

See Git#Merging_translations.

Conflict resolution

In case po files can not be automatically merged, you need to manually fix possible conflicts:

git remote add weblategit://l10n.cihar.com/phpmyadmin-master.git git remote update weblate git checkout origin/master git merge weblate/master # Fix merge conflicts git commit git push

Category:Devel Category:Translating

Clone this wiki locally
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.
Press h to open a hovercard with more details.