l10n daemon script
|
43114cafd8
|
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-07-02 02:00:11 +00:00 |
|
l10n daemon script
|
684d4cd1d2
|
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-13 02:25:21 +00:00 |
|
l10n daemon script
|
988f12ece9
|
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-28 02:12:38 +00:00 |
|
l10n daemon script
|
fd60ff3e4b
|
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-15 01:52:42 +00:00 |
|
l10n daemon script
|
3ef3fd6ad0
|
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-05 01:43:20 +00:00 |
|
l10n daemon script
|
0568905c67
|
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-08-23 01:25:48 +00:00 |
|
l10n daemon script
|
1ccd81ecf1
|
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-12-29 06:14:58 +01:00 |
|
l10n daemon script
|
242c52e93b
|
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-12-10 06:33:54 +01:00 |
|
l10n daemon script
|
398ba03d26
|
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-12-09 06:43:02 +01:00 |
|
l10n daemon script
|
a661ac27d4
|
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-11-01 06:34:37 +01:00 |
|
l10n daemon script
|
02bf543919
|
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-29 06:36:15 +01:00 |
|
l10n daemon script
|
9d8a727f9f
|
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-05 06:13:09 +02:00 |
|
l10n daemon script
|
cc6fc7a4fa
|
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-29 06:01:26 +02:00 |
|
l10n daemon script
|
3bb9314603
|
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-24 05:54:22 +02:00 |
|
l10n daemon script
|
6765b10f8d
|
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:39:07 +02:00 |
|
l10n daemon script
|
6e4afc466c
|
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:06:46 +02:00 |
|
l10n daemon script
|
e0ea9fd04c
|
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-12 06:06:11 +01:00 |
|
l10n daemon script
|
c2b4350521
|
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-12-03 05:37:17 +01:00 |
|
l10n daemon script
|
6f1c729906
|
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-13 05:19:36 +02:00 |
|
Tranter Madi
|
935e422926
|
Remove the padding of the bookmark bar
Summary: Remove the padding of the bookmark bar
Test Plan:
Breeze widget style:
{F6796625}
Fusion widget style:
{F6796628}
Reviewers: #falkon, #vdg, drosca
Reviewed By: #falkon, #vdg, drosca
Subscribers: cullmann, drosca, abetts, ngraham, falkon
Tags: #falkon
Differential Revision: https://phabricator.kde.org/D20834
|
2019-07-13 17:45:31 +02:00 |
|
l10n daemon script
|
2887d87ed5
|
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-05-30 05:09:20 +02:00 |
|
l10n daemon script
|
d636dff966
|
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-04-24 05:52:57 +02:00 |
|
l10n daemon script
|
e4299fb85c
|
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-04-20 06:00:37 +02:00 |
|
David Rosca
|
d2d3d45932
|
Don't use subfolders for QML/Python extensions
|
2019-04-19 11:38:15 +02:00 |
|
l10n daemon script
|
1f1978751f
|
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-03-23 06:07:37 +01:00 |
|
l10n daemon script
|
524697d139
|
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-01-27 05:34:59 +01:00 |
|
l10n daemon script
|
caf1380774
|
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-01-21 05:18:24 +01:00 |
|
l10n daemon script
|
64c5e0b8f0
|
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-01-20 05:42:16 +01:00 |
|
l10n daemon script
|
0684603930
|
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-12-24 05:18:23 +01:00 |
|
l10n daemon script
|
f3a1622326
|
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-09-24 05:40:20 +02:00 |
|
l10n daemon script
|
099901f0a6
|
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-08 05:44:02 +02:00 |
|
l10n daemon script
|
06020d9615
|
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-03 05:28:07 +02:00 |
|
l10n daemon script
|
034365355a
|
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-26 05:38:12 +02:00 |
|
l10n daemon script
|
9a725b3c62
|
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-22 05:22:41 +02:00 |
|
l10n daemon script
|
0c30443e84
|
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-06 05:35:48 +02:00 |
|
l10n daemon script
|
aca4f6c0a9
|
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-05-16 05:26:16 +02:00 |
|
l10n daemon script
|
4809dfacaa
|
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-05-01 05:43:21 +02:00 |
|
l10n daemon script
|
dd60458d6a
|
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-04-24 05:25:10 +02:00 |
|
l10n daemon script
|
3f48bdf5db
|
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-04-21 05:30:07 +02:00 |
|
l10n daemon script
|
0d2776a261
|
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-04-11 05:05:41 +02:00 |
|
l10n daemon script
|
62c8ff085b
|
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-04-10 05:32:53 +02:00 |
|
l10n daemon script
|
4815b584f6
|
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-04-06 05:22:55 +02:00 |
|
l10n daemon script
|
680b07008a
|
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-03-30 05:23:04 +02:00 |
|
l10n daemon script
|
4c7f7cfc2e
|
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-03-26 05:08:41 +02:00 |
|
l10n daemon script
|
91059a3fb3
|
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-03-22 05:17:51 +01:00 |
|
l10n daemon script
|
34550e08f1
|
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-03-21 05:30:17 +01:00 |
|
l10n daemon script
|
f838f02db1
|
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-03-06 05:24:12 +01:00 |
|
David Rosca
|
a89a9a8ddc
|
WebView: Add support for changing default background color
BUG: 390316
|
2018-02-24 18:00:53 +01:00 |
|
David Rosca
|
4bd8de6a50
|
AboutDialog: Replace QTextBrowser with QLabel
|
2018-02-24 10:03:41 +01:00 |
|
l10n daemon script
|
b4eaa10c10
|
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-02-19 05:02:21 +01:00 |
|