l10n daemon script
|
e44e4a4c19
|
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-20 05:10:40 +02:00 |
|
l10n daemon script
|
653a708727
|
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:20 +02:00 |
|
l10n daemon script
|
e873eddcde
|
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:59 +02:00 |
|
l10n daemon script
|
5ef95c7c25
|
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-04-09 06:26:57 +02:00 |
|
l10n daemon script
|
56880448fd
|
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-30 05:34:44 +01:00 |
|
l10n daemon script
|
cb307e16b2
|
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-17 05:06:27 +01:00 |
|
l10n daemon script
|
7ec2662ae9
|
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-09-26 05:13:20 +02:00 |
|
l10n daemon script
|
688a7df097
|
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-06 04:49:33 +02:00 |
|
l10n daemon script
|
b7a6b1f00e
|
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-23 05:10:46 +02:00 |
|
l10n daemon script
|
c53108bb25
|
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-08 04:56:21 +02:00 |
|
l10n daemon script
|
3d0acf15a5
|
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-06-27 05:13:07 +02:00 |
|
l10n daemon script
|
ee1a535cc2
|
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-08 05:42:59 +02:00 |
|
l10n daemon script
|
c1be806f9d
|
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-16 05:57:25 +02:00 |
|
l10n daemon script
|
0fa2bcd464
|
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-10 06:05:14 +02:00 |
|
l10n daemon script
|
abce7a194c
|
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-25 05:51:13 +01:00 |
|
l10n daemon script
|
633b08d83e
|
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:48 +01:00 |
|
l10n daemon script
|
1d3368532a
|
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-02-26 05:29:15 +01:00 |
|
l10n daemon script
|
f5ac506835
|
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-02-16 05:37:45 +01:00 |
|
l10n daemon script
|
7634e82637
|
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-02-15 05:34:24 +01:00 |
|
l10n daemon script
|
2742f786d0
|
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-02-13 05:52:00 +01:00 |
|
l10n daemon script
|
af1ab23e0a
|
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-02-12 05:40:56 +01:00 |
|
l10n daemon script
|
12865f44f7
|
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-02-11 05:29:21 +01:00 |
|
l10n daemon script
|
9d3fe2cba0
|
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-02-10 05:23:38 +01:00 |
|
Nicolas Fella
|
e298b73f8e
|
Find my phone runner
Summary: Allows ringing devices from KRunner
Test Plan: Enter find, ring, or device name, activate entry
Reviewers: #kde_connect, #plasma, broulik, davidedmundson, apol
Reviewed By: #kde_connect, apol
Subscribers: sredman, apol, kdeconnect
Tags: #kde_connect
Differential Revision: https://phabricator.kde.org/D14607
|
2019-02-08 23:59:42 +01:00 |
|