Commit Graph

24 Commits

Author SHA1 Message Date
l10n daemon script
c718ba4b48 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"
2015-08-26 10:19:25 +00:00
l10n daemon script
9ea35bd26d 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"
2015-05-27 10:14:57 +00:00
l10n daemon script
5265842028 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"
2015-03-14 10:19:38 +00:00
l10n daemon script
4b1970cf83 SVN_SILENT made messages (.desktop file) 2015-01-27 11:23:41 +00:00
l10n daemon script
d255c63ce2 SVN_SILENT made messages (.desktop file) 2015-01-13 11:36:35 +00:00
l10n daemon script
1afbc2c461 SVN_SILENT made messages (.desktop file) 2015-01-02 09:15:04 +00:00
l10n daemon script
6f7a3ae9ea SVN_SILENT made messages (.desktop file) 2014-12-30 10:48:32 +00:00
l10n daemon script
f64207f408 SVN_SILENT made messages (.desktop file) 2014-12-14 08:54:42 +00:00
l10n daemon script
819f1107c3 SVN_SILENT made messages (.desktop file) 2014-12-08 08:40:39 +00:00
l10n daemon script
d47e417e40 SVN_SILENT made messages (.desktop file) 2014-12-07 08:47:50 +00:00
l10n daemon script
cf3898f7a9 SVN_SILENT made messages (.desktop file) 2014-12-01 08:51:21 +00:00
l10n daemon script
2c65e911e8 SVN_SILENT made messages (.desktop file) 2014-11-06 08:50:22 +00:00
l10n daemon script
4a4e3dc526 SVN_SILENT made messages (.desktop file) 2014-10-23 08:55:08 +00:00
l10n daemon script
b65201b735 SVN_SILENT made messages (.desktop file) 2014-10-15 08:33:00 +00:00
l10n daemon script
f0ad60f7cf SVN_SILENT made messages (.desktop file) 2014-09-30 10:54:42 +00:00
l10n daemon script
f12eb638f0 SVN_SILENT made messages (.desktop file) 2014-09-19 09:02:03 +00:00
l10n daemon script
e53ecf1788 SVN_SILENT made messages (.desktop file) 2014-09-12 09:02:02 +00:00
l10n daemon script
9b6205c99e SVN_SILENT made messages (.desktop file) 2014-09-08 08:41:03 +00:00
l10n daemon script
afbd6226c0 SVN_SILENT made messages (.desktop file) 2014-09-07 08:45:23 +00:00
l10n daemon script
2a91cd3969 SVN_SILENT made messages (.desktop file) 2014-09-06 08:54:16 +00:00
l10n daemon script
f6250ff903 SVN_SILENT made messages (.desktop file) 2014-09-05 09:05:29 +00:00
l10n daemon script
dc61b4d5c2 SVN_SILENT made messages (.desktop file) 2014-09-04 08:36:35 +00:00
l10n daemon script
17a60889ab SVN_SILENT made messages (.desktop file) 2014-09-03 08:37:24 +00:00
Marco Martin
5ceb8d1197 add an autotest for fallback
correct a couple of problems the test catched
2014-09-01 15:51:05 +02:00