Commit Graph

5799 Commits (fb15b72b5e888081cd5d183a1a4302bf9db37ad7)
 

Author SHA1 Message Date
l10n daemon script fb15b72b5e GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script ffdc21fb4d GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 0ab482cf72 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 450719df6f GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 6a5823dc41 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 41df3d0286 GIT_SILENT made messages (after extraction) 2 years ago
l10n daemon script 3df78966af GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script afb67eac4d GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 635b95364f GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 434bda9412 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 84299ec43b GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script dd099490f5 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 374d595463 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script e326a49c57 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 924c7d4236 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script ce84831f6f GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script f52ae4b1aa GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script c7f750b7c4 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script a8ef323ddb SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2 years ago
l10n daemon script 9ebe871fc4 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script d24bcacded GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script fb790b1dfb GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 2185ea79ad GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script da1003231e GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script b1cc3647de GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script d2c4bb985a GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 58a2ea0686 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 6ef724f597 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script e8a994d024 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 95a033da12 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 131cd0adc4 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 7cd40d2445 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 4b73a18643 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 06b67460e4 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 0bc2416ae5 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 8442fce737 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 7ad5f1eacf GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 550a66af55 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 999db79976 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script e5c2c6bc19 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2 years ago
l10n daemon script 8248c9e4e4 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 6b5c5b2ad5 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 0f66604ff7 GIT_SILENT made messages (after extraction) 2 years ago
l10n daemon script 9b398e3d40 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 6b452706eb GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 497fb7e38e GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script f72781c3c1 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 3ce06ee5e2 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 1e9e3ac071 GIT_SILENT Sync po/docbooks with svn 2 years ago
l10n daemon script 70e096b230 GIT_SILENT Sync po/docbooks with svn 2 years ago