Commit graph

128 commits

Author SHA1 Message Date
l10n daemon script df3bfa005d 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"
2024-02-18 01:13:47 +00:00
l10n daemon script 651098cf5a 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"
2024-01-08 02:08:32 +00:00
l10n daemon script 20a5bb2b5c 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"
2023-12-14 01:15:39 +00:00
l10n daemon script 1641c47234 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"
2023-11-07 02:06:23 +00:00
l10n daemon script c16357bebf 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"
2023-11-04 11:46:37 +00:00
l10n daemon script e11183bfb9 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"
2023-10-20 01:19:41 +00:00
l10n daemon script 54a72d01ad 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"
2023-08-07 01:48:35 +00:00
l10n daemon script 9ef28fffec 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"
2023-02-20 02:01:39 +00:00
l10n daemon script bf745445bf 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"
2023-02-16 02:03:52 +00:00
l10n daemon script 9f1300c115 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"
2022-11-10 01:51:04 +00:00
l10n daemon script 9579a4540f 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"
2022-10-28 01:51:08 +00:00
l10n daemon script 804cadfb53 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"
2022-09-18 01:41:53 +00:00
l10n daemon script 1626b59fef 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"
2022-06-09 02:00:18 +00:00
l10n daemon script dfe316c6ec 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"
2022-06-07 02:06:15 +00:00
l10n daemon script e8d5f24ad4 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"
2022-05-13 01:44:03 +00:00
l10n daemon script 5042078495 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"
2022-03-29 02:04:54 +00:00
l10n daemon script 7ae4288f35 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"
2021-09-10 01:16:35 +00:00
l10n daemon script 724b9413e3 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"
2021-06-02 01:14:44 +00:00
l10n daemon script dc74ffa68c 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"
2020-10-17 06:04:22 +02:00
l10n daemon script 90502b2961 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"
2020-06-18 05:35:59 +02:00
l10n daemon script 2857dc241f 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"
2020-06-17 14:03:40 +02:00
l10n daemon script ef53790eba 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"
2020-06-10 05:21:36 +02:00
l10n daemon script cc452498e5 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"
2020-06-09 09:16:32 +02:00
l10n daemon script 0d5bd0bc43 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"
2020-02-04 06:09:17 +01:00
l10n daemon script 2d90b6210c 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"
2019-11-03 05:15:02 +01:00
l10n daemon script bf7a53d62b 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"
2019-08-12 05:10:27 +02:00
l10n daemon script 4e9bbfddb0 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"
2018-10-10 06:37:12 +02:00
l10n daemon script f1d3c68115 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"
2018-08-04 05:43:46 +02:00
l10n daemon script 62ce3db93b 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"
2017-09-16 05:03:07 +02:00
l10n daemon script 53a6cde141 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"
2017-02-04 06:23:35 +01:00
l10n daemon script fb77e0d1fd 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-12-20 13:06:28 +01: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 2e847d2f81 SVN_SILENT made messages (.desktop file) 2013-07-01 03:53:16 +00:00
Script Kiddy cbc693b664 SVN_SILENT made messages (.desktop file) 2013-04-20 09:48:58 +02:00
Script Kiddy a034e086e5 SVN_SILENT made messages (.desktop file) 2013-02-08 08:27:14 +01:00
Script Kiddy ba79674de9 SVN_SILENT made messages (.desktop file) 2013-02-05 16:52:55 +01:00
Script Kiddy be60fbf64d SVN_SILENT made messages (.desktop file) 2013-01-23 08:25:54 +01:00
Script Kiddy 44b7ff680c SVN_SILENT made messages (.desktop file) 2013-01-22 20:35:02 +01:00
Script Kiddy 341c0bc7f2 SVN_SILENT made messages (.desktop file) 2012-12-24 09:00:24 +01:00
Script Kiddy d4aceee67e SVN_SILENT made messages (.desktop file) 2012-12-23 07:56:06 +01:00
Script Kiddy e653d83816 SVN_SILENT made messages (.desktop file) 2012-08-07 18:30:47 +02:00
Script Kiddy b815d7356d SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdegraphics/okular/; revision=1231185
2011-05-10 10:01:23 +00:00
Script Kiddy 64b8965b35 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdegraphics/okular/; revision=1230852
2011-05-08 07:37:44 +00:00
Script Kiddy 6754fbd1c4 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdegraphics/okular/; revision=1213671
2011-01-11 09:12:11 +00:00
Script Kiddy ff913d232f SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdegraphics/okular/; revision=1108213
2010-03-28 07:14:45 +00:00
Script Kiddy bf36e688a5 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdegraphics/okular/; revision=1085570
2010-02-05 13:33:34 +00:00
Script Kiddy c2390f3197 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdegraphics/okular/; revision=1065022
2009-12-22 10:04:12 +00:00
Script Kiddy 9f6f5a3947 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdegraphics/okular/; revision=1060240
2009-12-08 10:51:24 +00:00
Script Kiddy d819d858bd SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdegraphics/okular/; revision=1053122
2009-11-23 10:50:42 +00:00