l10n daemon script
|
ba0b34c755
|
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-11-22 06:02:11 +01:00 |
|
l10n daemon script
|
3b3aa82f58
|
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-07-23 05:24:40 +02:00 |
|
l10n daemon script
|
be4cde23ec
|
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-12-20 07:06:47 +01:00 |
|
l10n daemon script
|
5a7d6d3df9
|
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-08-28 04:30:46 +02:00 |
|
l10n daemon script
|
155b6ecb3b
|
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-06-11 04:45:20 +02:00 |
|
l10n daemon script
|
b160c5babb
|
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-03-25 04:37:53 +01:00 |
|
l10n daemon script
|
8725f2441e
|
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-03-22 05:17:38 +01:00 |
|
l10n daemon script
|
6cd42c9227
|
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-01-28 08:15:46 +01:00 |
|
l10n daemon script
|
13d389efd1
|
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:30:44 +01:00 |
|
l10n daemon script
|
c855555903
|
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-13 04:11:59 +01:00 |
|
l10n daemon script
|
56e3b5b116
|
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-08-29 09:19:15 +00:00 |
|
l10n daemon script
|
0990566c63
|
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-05-31 11:06:54 +00:00 |
|
l10n daemon script
|
bd3083e81f
|
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-30 09:40:55 +00:00 |
|
l10n daemon script
|
aa0f2c88f0
|
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-10 11:46:53 +00:00 |
|
l10n daemon script
|
aff81afd27
|
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-30 09:40:57 +00:00 |
|
l10n daemon script
|
6bb9f6db7b
|
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-17 13:07:36 +00:00 |
|
l10n daemon script
|
3433b05c97
|
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-04 17:27:21 +00:00 |
|
l10n daemon script
|
c342be5961
|
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-03 11:20:49 +00:00 |
|
l10n daemon script
|
7c747e1591
|
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-04-24 09:53:59 +00:00 |
|
l10n daemon script
|
262da1b7c9
|
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-04-07 13:20:00 +00:00 |
|
l10n daemon script
|
01b61a9ede
|
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-16 10:12:25 +00:00 |
|
l10n daemon script
|
9361fb8610
|
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-15 09:56:33 +00:00 |
|
l10n daemon script
|
17f808db9a
|
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:20:33 +00:00 |
|
l10n daemon script
|
a14e62dadc
|
SVN_SILENT made messages (.desktop file)
|
2015-02-22 10:26:29 +00:00 |
|
l10n daemon script
|
e178851846
|
SVN_SILENT made messages (.desktop file)
|
2015-01-27 11:24:24 +00:00 |
|
l10n daemon script
|
2734f709ad
|
SVN_SILENT made messages (.desktop file)
|
2015-01-21 08:55:56 +00:00 |
|
l10n daemon script
|
bf7bf73464
|
SVN_SILENT made messages (.desktop file)
|
2015-01-15 09:02:26 +00:00 |
|
l10n daemon script
|
d173ff7412
|
SVN_SILENT made messages (.desktop file)
|
2015-01-13 12:47:17 +00:00 |
|
l10n daemon script
|
a010bbc6a7
|
SVN_SILENT made messages (.desktop file)
|
2014-11-02 21:49:41 +00:00 |
|
l10n daemon script
|
7d9831d8b4
|
SVN_SILENT made messages (.desktop file)
|
2014-10-23 08:55:48 +00:00 |
|
l10n daemon script
|
5288363274
|
SVN_SILENT made messages (.desktop file)
|
2014-10-17 09:07:36 +00:00 |
|
l10n daemon script
|
08540b45eb
|
SVN_SILENT made messages (.desktop file)
|
2014-09-21 08:48:08 +00:00 |
|
l10n daemon script
|
1205c9c170
|
SVN_SILENT made messages (.desktop file)
|
2014-09-07 08:46:08 +00:00 |
|
l10n daemon script
|
e75adfa9f5
|
SVN_SILENT made messages (.desktop file)
|
2014-09-04 08:36:54 +00:00 |
|
l10n daemon script
|
baf37deacd
|
SVN_SILENT made messages (.desktop file)
|
2014-09-01 08:42:05 +00:00 |
|
l10n daemon script
|
5114d9b5da
|
SVN_SILENT made messages (.desktop file)
|
2014-08-31 08:41:36 +00:00 |
|
l10n daemon script
|
ed02a9fb96
|
SVN_SILENT made messages (.desktop file)
|
2014-08-28 08:49:28 +00:00 |
|
l10n daemon script
|
f2fc577770
|
SVN_SILENT made messages (.desktop file)
|
2014-08-24 08:45:33 +00:00 |
|
l10n daemon script
|
36b404057d
|
SVN_SILENT made messages (.desktop file)
|
2014-08-15 09:08:57 +00:00 |
|
l10n daemon script
|
1478a08c31
|
SVN_SILENT made messages (.desktop file)
|
2014-08-14 08:44:45 +00:00 |
|
Sebastian Kügler
|
b5000a21b7
|
Adapt to new systemsettings categories
Roughly, this moves the systemsettings-visible KCModules under either
Workspace | Window Behavior and Workspace | Desktop Behavior, as laid
out here: http://forum.kde.org/viewtopic.php?f=285&t=121053&start=30#p313837
|
2014-07-01 12:44:41 +02:00 |
|
l10n daemon script
|
28c7f3c47d
|
SVN_SILENT made messages (.desktop file)
|
2014-06-29 08:41:34 +00:00 |
|
l10n daemon script
|
026f5ea660
|
SVN_SILENT made messages (.desktop file)
|
2014-06-20 09:01:14 +00:00 |
|
l10n daemon script
|
4a88e1b005
|
SVN_SILENT made messages (.desktop file)
|
2014-06-16 08:24:58 +00:00 |
|
l10n daemon script
|
eb5abedbe7
|
SVN_SILENT made messages (.desktop file)
|
2014-06-12 08:30:34 +00:00 |
|
l10n daemon script
|
ea866906f0
|
SVN_SILENT made messages (.desktop file)
|
2014-06-11 08:21:08 +00:00 |
|
l10n daemon script
|
e73f6b2278
|
SVN_SILENT made messages (.desktop file)
|
2014-06-10 10:37:36 +00:00 |
|
l10n daemon script
|
9b869958b3
|
SVN_SILENT made messages (.desktop file)
|
2014-06-08 08:27:53 +00:00 |
|
l10n daemon script
|
4c49449bcb
|
SVN_SILENT made messages (.desktop file)
|
2014-06-07 08:25:25 +00:00 |
|
l10n daemon script
|
abe62085e8
|
SVN_SILENT made messages (.desktop file)
|
2014-06-06 08:52:09 +00:00 |
|