l10n daemon script
|
30b516eceb
|
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-09-30 06:16:48 +02:00 |
|
l10n daemon script
|
a1c0d43deb
|
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-07-23 06:10:20 +02:00 |
|
l10n daemon script
|
c10fe06d06
|
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:44:57 +02:00 |
|
l10n daemon script
|
0e117c49a1
|
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:12:29 +02:00 |
|
l10n daemon script
|
cfd296326b
|
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-10-23 05:33:32 +02:00 |
|
l10n daemon script
|
bb7051dd3a
|
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-10-18 05:38:34 +02:00 |
|
l10n daemon script
|
fe27d39b5c
|
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-10-17 05:41:38 +02:00 |
|
l10n daemon script
|
bb32691980
|
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-07-31 05:23:00 +02:00 |
|
Volker Krause
|
008143c9db
|
Update URLs to use https
Summary: Largely done automatically using the tools from D19996.
Reviewers: yurchor, zzag
Reviewed By: yurchor, zzag
Subscribers: zzag, yurchor, kwin, kde-doc-english
Tags: #kwin, #documentation
Differential Revision: https://phabricator.kde.org/D20017
|
2019-03-25 19:26:23 +01:00 |
|
l10n daemon script
|
cd6f56a443
|
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-11 05:34:25 +02: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
|
6b0d2fc027
|
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-06-18 05:35:02 +02:00 |
|
Friedrich W. H. Kossebau
|
5369913fd0
|
Remove unused X-Plasma-RemoteLocation entries
|
2018-03-25 03:09:28 +02:00 |
|
Friedrich W. H. Kossebau
|
1a7a3b98ee
|
Remove long-time deprecated Encoding=UTF-8 from desktop format files
|
2018-03-10 02:47:57 +01:00 |
|
l10n daemon script
|
2a6048c885
|
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-05-25 05:40:47 +02:00 |
|
l10n daemon script
|
dc447860be
|
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-04-25 10:05:35 +02:00 |
|
l10n daemon script
|
4c3404e150
|
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-04-16 04:05:25 +02:00 |
|
l10n daemon script
|
8cb6d42191
|
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-21 12:50:44 +01:00 |
|
l10n daemon script
|
26339e6d6c
|
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-13 05:52:41 +01:00 |
|
l10n daemon script
|
add47b39fe
|
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-21 06:45:37 +01:00 |
|
l10n daemon script
|
006d127b09
|
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-07 06:37:50 +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
|
966775d609
|
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-11-25 05:07:25 +01:00 |
|
l10n daemon script
|
fcdc3e5a2c
|
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-11-04 09:48:38 +00:00 |
|
l10n daemon script
|
501128ccf4
|
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-10-21 09:32:33 +00:00 |
|
l10n daemon script
|
b545785325
|
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-10-13 09:54:01 +00:00 |
|
l10n daemon script
|
7bff98cec1
|
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-09-25 09:31:25 +00:00 |
|
l10n daemon script
|
75e318f907
|
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-09-20 12:51:52 +00:00 |
|
l10n daemon script
|
6ae917d7f8
|
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-09-13 10:27:05 +00:00 |
|
Martin Gräßlin
|
156bf258e9
|
Merge branch 'Plasma/5.7'
|
2016-09-12 13:14:15 +02:00 |
|
l10n daemon script
|
2befb1f81c
|
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-09-05 09:38:26 +00:00 |
|
l10n daemon script
|
ab459fb126
|
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-28 11:30:20 +00:00 |
|
l10n daemon script
|
0c69ca69ce
|
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-07-28 13:13:42 +00:00 |
|
l10n daemon script
|
4578eab797
|
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-07-28 09:56:48 +00:00 |
|
l10n daemon script
|
dbdbee9a39
|
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-07-13 10:19:49 +00:00 |
|
Martin Gräßlin
|
76fa3026dd
|
Merge branch 'Plasma/5.7'
|
2016-07-13 10:00:35 +02:00 |
|
l10n daemon script
|
ec764e32b6
|
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-06-30 13:06:15 +00:00 |
|
l10n daemon script
|
344650fe5d
|
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-06-21 10:41:58 +00:00 |
|
l10n daemon script
|
2f1014555c
|
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-06-17 13:26:16 +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
|
08f311eec8
|
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-04-27 09:34:18 +00:00 |
|
Martin Gräßlin
|
e64450c807
|
Merge branch 'Plasma/5.6'
|
2016-04-26 13:13:17 +02:00 |
|
l10n daemon script
|
21f246c279
|
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-04-21 10:02:53 +00:00 |
|
l10n daemon script
|
ca73e65ac1
|
SVN_SILENT made messages (.desktop file)
|
2016-04-11 13:10:20 +00:00 |
|
l10n daemon script
|
9331996a67
|
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-04-05 10:31:41 +00:00 |
|
l10n daemon script
|
e3272fea36
|
SVN_SILENT made messages (.desktop file)
|
2016-03-28 13:15:07 +00:00 |
|
l10n daemon script
|
863c586b19
|
SVN_SILENT made messages (.desktop file)
|
2016-03-15 14:32:45 +00:00 |
|
l10n daemon script
|
544e5a7fb8
|
SVN_SILENT made messages (.desktop file)
|
2016-03-10 12:46:31 +00:00 |
|
l10n daemon script
|
9fb71ef9a2
|
SVN_SILENT made messages (.desktop file)
|
2016-03-09 12:09:22 +00:00 |
|
l10n daemon script
|
25b6938804
|
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-02-27 09:32:00 +00:00 |
|