Commit graph

92 commits

Author SHA1 Message Date
l10n daemon script 57c5cbfde0 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"
2016-01-09 03:25:47 +00:00
l10n daemon script a2fd918ad9 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"
2016-01-05 04:07:32 +00:00
l10n daemon script 2fee136339 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-12-08 03:41:42 +00:00
l10n daemon script 16f0780688 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-11-22 03:43:12 +00:00
l10n daemon script 9a5c82a411 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-11-05 04:21:47 +00:00
l10n daemon script 98ac941316 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-10-18 04:25:21 +00:00
l10n daemon script 8c141cc2fc 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-10-12 04:04:13 +00:00
l10n daemon script cd34059f53 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-10-08 04:21:25 +00:00
l10n daemon script 7b8f0a7459 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-09-26 04:04:15 +00:00
l10n daemon script 22ba4596fa 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-09-21 03:49:52 +00:00
l10n daemon script 558b4bb765 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-09-15 05:00:52 +00:00
l10n daemon script dde68921b6 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-09-13 04:04:10 +00:00
l10n daemon script f6d4b45650 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-09-10 05:23:01 +00:00
l10n daemon script 2669a2f354 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-09-08 05:32:59 +00:00
l10n daemon script 2b1cf29728 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-09-06 04:39:34 +00:00
l10n daemon script 6a2b5fc7b8 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-09-04 03:59:45 +00:00
l10n daemon script 79fa933c73 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-09-03 04:18:26 +00:00
l10n daemon script ef99f17efb 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-09-02 03:58:51 +00:00
l10n daemon script 8703484e63 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-09-01 05:00:47 +00:00
l10n daemon script 7be388fa0f 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-31 04:47:52 +00:00
Albert Astals Cid ab8944dcce Add Comment
BUGS: 351973
2015-08-30 16:43:39 +02:00
l10n daemon script 9a3672b255 SVN_SILENT made messages (.desktop file) 2014-12-26 04:18:45 +00:00
l10n daemon script e6ef3cb64b SVN_SILENT made messages (.desktop file) 2014-12-25 04:05:24 +00:00
l10n daemon script 8365cf2873 SVN_SILENT made messages (.desktop file) 2014-09-30 04:39:47 +00:00
l10n daemon script 896de56ef0 SVN_SILENT made messages (.desktop file) 2014-07-25 05:38:42 +00:00
l10n daemon script 1b5cbbea59 SVN_SILENT made messages (.desktop file) 2014-07-24 04:51:37 +00:00
l10n daemon script 6a46dd7447 SVN_SILENT made messages (.desktop file) 2014-06-30 04:40:38 +00:00
l10n daemon script c1859fd649 SVN_SILENT made messages (.desktop file) 2014-06-22 04:32:12 +00:00
l10n daemon script 02c782f7e4 SVN_SILENT made messages (.desktop file) 2014-06-03 05:10:11 +00:00
l10n daemon script 8068e5b502 SVN_SILENT made messages (.desktop file) 2014-03-27 04:50:09 +00:00
l10n daemon script 355997d377 SVN_SILENT made messages (.desktop file) 2014-03-17 04:40:09 +00:00
l10n daemon script 6e529dd214 SVN_SILENT made messages (.desktop file) 2014-03-04 05:57:24 +00:00
Albert Astals Cid 3c79ac8ea1 Merge remote-tracking branch 'origin/KDE/4.12' into KDE/4.13 2014-03-01 17:03:23 +01:00
l10n daemon script cad1e895d2 SVN_SILENT made messages (.desktop file) 2014-03-01 07:08:28 +00:00
l10n daemon script 514ef4a3ac SVN_SILENT made messages (.desktop file) 2014-02-24 07:26:07 +00:00
l10n daemon script 6f62e29846 SVN_SILENT made messages (.desktop file) 2014-02-24 04:37:30 +00:00
l10n daemon script 5a8d7e34aa SVN_SILENT made messages (.desktop file) 2014-02-22 04:22:37 +00:00
l10n daemon script 41d55ee477 SVN_SILENT made messages (.desktop file) 2014-02-18 05:09:56 +00:00
l10n daemon script d751245137 SVN_SILENT made messages (.desktop file) 2014-02-17 07:20:35 +00:00
l10n daemon script e1f7b5c512 SVN_SILENT made messages (.desktop file) 2014-02-17 04:40:59 +00:00
l10n daemon script 2a52fdfb93 SVN_SILENT made messages (.desktop file) 2014-02-03 06:38:54 +00:00
l10n daemon script 463e6b2ca8 SVN_SILENT made messages (.desktop file) 2014-02-02 04:20:04 +00:00
l10n daemon script a98d7c8b2a SVN_SILENT made messages (.desktop file) 2014-01-12 06:39:24 +00:00
l10n daemon script 23347d6047 SVN_SILENT made messages (.desktop file) 2014-01-12 04:09:47 +00:00
l10n daemon script 9374b7adf4 SVN_SILENT made messages (.desktop file) 2014-01-05 06:38:05 +00:00
l10n daemon script c49565282e SVN_SILENT made messages (.desktop file) 2014-01-05 04:07:16 +00:00
l10n daemon script 8a8f7e891e SVN_SILENT made messages (.desktop file) 2013-12-10 04:04:26 +00:00
Albert Astals Cid 9dbb62137d Merge remote-tracking branch 'origin/KDE/4.12' 2013-12-09 18:47:29 +01:00
l10n daemon script 44f0202dc7 SVN_SILENT made messages (.desktop file) 2013-12-07 06:20:27 +00:00
l10n daemon script 36baeaa00f SVN_SILENT made messages (.desktop file) 2013-11-29 04:25:56 +00:00