Commit Graph

5857 Commits (9ded428488ea22095d1af9c0ada0bf34ae2902f7)
 

Author SHA1 Message Date
l10n daemon script 9ded428488 GIT_SILENT Sync po/docbooks with svn 10 months ago
l10n daemon script bda5b87e50 GIT_SILENT Sync po/docbooks with svn 11 months ago
l10n daemon script 0c23bdc7ca GIT_SILENT Sync po/docbooks with svn 11 months ago
l10n daemon script 64a49f836e GIT_SILENT Sync po/docbooks with svn 11 months ago
l10n daemon script a4c3f63d28 GIT_SILENT Sync po/docbooks with svn 11 months ago
l10n daemon script e9a087d7c0 GIT_SILENT Sync po/docbooks with svn 11 months ago
l10n daemon script cd31a31853 GIT_SILENT Sync po/docbooks with svn 11 months ago
l10n daemon script c695eee084 GIT_SILENT Sync po/docbooks with svn 12 months ago
l10n daemon script 40f7af27d1 GIT_SILENT Sync po/docbooks with svn 12 months ago
l10n daemon script 8f0a47366f GIT_SILENT Sync po/docbooks with svn 12 months ago
l10n daemon script af90ffdbf2 GIT_SILENT Sync po/docbooks with svn 12 months ago
l10n daemon script 4a6ab9ee5e GIT_SILENT Sync po/docbooks with svn 12 months ago
l10n daemon script 49a8afceb4 GIT_SILENT Sync po/docbooks with svn 12 months ago
l10n daemon script b611f2df4b GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 88e68c759d GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 26c13a6a36 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 43d45b6751 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 732f743f7c GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 5bb708a036 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 0ecbf447ae GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 8e143c6190 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script c98764c7ea 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"
1 year ago
l10n daemon script 9a24d28399 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 64dd572ae4 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script bb42391d22 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script d9727bd138 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script bb3ee5215f GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script c7b91356a4 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script e2ebfd4df9 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 4257e0cf41 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 15f29dab18 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 0d511a4380 GIT_SILENT made messages (after extraction) 1 year ago
l10n daemon script 913dc5f1f4 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 02c1b883ac GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script e119477dd3 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"
1 year ago
l10n daemon script a9f8f2ace3 GIT_SILENT made messages (after extraction) 1 year ago
l10n daemon script 0e2207470a GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 0a44f2c086 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"
1 year ago
l10n daemon script 9c84a3a463 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 22bbf12e6c 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"
1 year ago
l10n daemon script b1569b4468 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 9e47519e82 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 7f046e5570 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 9007b39e58 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 42d355ccaf GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 5667fec1d3 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script a72b7badef GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 9671d83bee GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script a840ac6faa GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 1f1027e22d GIT_SILENT Sync po/docbooks with svn 1 year ago