Commit Graph

5823 Commits (e119477dd3ee8a9441d02107d249084da407cd80)
 

Author SHA1 Message Date
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
l10n daemon script 20fd0d594f GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 43263448b9 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script f808081a8c GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script a38de3b932 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 486c412b74 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 7ebe4f78c3 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 46c7b5a308 GIT_SILENT Sync po/docbooks with svn 1 year ago
l10n daemon script 3c664ace34 GIT_SILENT Sync po/docbooks with svn 1 year ago
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