tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4664 commits 81 branches 117 tags 12 MiB
Commit graph

457 commits

Author SHA1 Message Date
l10n daemon script
f0b5fb65fa 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:57 +00:00
Andreas Sturmlechner
6e99c00d76
Drop obsolete QT_VERSION_CHECK ifdefs from code 
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
 2023-12-28 19:18:02 +01:00
Andreas Sturmlechner
79bc9a85e4 Cleanup all occurences of QT_MAJOR_VERSION in cmake 
Follow-up to 7f03aa548c

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
 2023-12-28 17:49:07 +01:00
Bharadwaj Raju
b174e57162 kcm: Don't hardcode link color 
BUG: 477094
 2023-11-19 17:34:25 +05:30
l10n daemon script
d3c2d52c3b 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:12:13 +00:00
Laurent Montel
b61f32262e GIT_SILENT: Adapt to KConfigGroup name officially being a QString type 2023-11-06 20:05:39 +01:00
l10n daemon script
4b1b1b9b14 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:52:33 +00:00
l10n daemon script
acdd83e100 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-21 01:20:48 +00:00
Nate Graham
6f319ab504 Implement Plasma 6 settings re-org 
Part of https://invent.kde.org/plasma/systemsettings/-/issues/15; see
that Issue for details.
 2023-10-02 15:10:05 +00:00
l10n daemon script
028f1c938d 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-09-25 01:22:07 +00:00
Albert Vaca Cintora
5cc2043c35 Update old-style connect/disconnect where possible 2023-08-08 22:51:30 +02:00
Albert Vaca Cintora
a467247f08 Only use proxy signals for Q_PROPERTY NOTIFY 
In other cases we can just connect to the signal from the parent class
 2023-08-08 20:24:22 +02:00
l10n daemon script
b0a122089d 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-01 01:39:50 +00:00
Alexander Lohnau
6fbecf28da Remove trailing / for KPluginMetaData::findPlugins 
This is not needed and pretty much all usages of this method don't do it too
 2023-07-31 06:39:08 +00:00
Alexander Lohnau
dd5e61ab0a KdeConnectKcm: Do not make generated UI class instance a ptr 2023-07-30 07:27:45 +00:00
l10n daemon script
1ff98bc580 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-07-30 01:37:54 +00:00
l10n daemon script
885d311b31 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-07-28 01:41:47 +00:00
Albert Vaca Cintora
bd72602875 Move setWhenAvailable from dbusinterfaces to dbushelpers 2023-07-23 16:53:57 +02:00
Alexander Lohnau
7d66b07ef7 Remove unused createId methods 2023-07-22 19:12:33 +02:00
Alexander Lohnau
f066946a84 Remove unused categories from metadata 2023-07-22 19:12:32 +02:00
Albert Vaca Cintora
6c1b81a384 Use nullptr instead of 0 2023-07-20 18:26:24 +02:00
Alexander Lohnau
52b6d57942 Qt6 build fixes in plugins and KCM 2023-07-20 11:15:46 +03:00
Alexander Lohnau
c5bfc4a5b0 Allow building against Qt6/KF6 2023-07-20 11:15:41 +03:00
Albert Vaca Cintora
9c87393b28 clang-format pass 2023-07-16 16:20:34 +02:00
Albert Vaca Cintora
981796ed66 Fix KCM reloading the plugins N times when a device was selcted 
Every time a device is selected, `pluginsConfigChanged` would trigger even
if no plugins actually changed (there's a boolean to distinghish that on
the signal that we were ignoring). On top of that, we were connecting to
the signal again each time we selected a device, causing this bug to
trigger N+1 times every time a device was selected.

This is bad because `pluginsConfigChanged` would reload all the plugins,
which for some plugins even implies network calls to the connected device.
 2023-06-24 17:45:48 +00:00
Albert Vaca Cintora
064ddfa3fe Refactor PairingHandler 
We now have a single PairingHandler for all types of links.

The implementation now is more aligned with the one for Android.
 2023-06-02 16:38:52 +00:00
l10n daemon script
ac76b27af6 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-03-27 01:57:05 +00:00
l10n daemon script
14fbfe04db 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-03-11 01:45:11 +00:00
l10n daemon script
9ee562cac3 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-03-05 01:58:22 +00:00
l10n daemon script
74b8b0152c 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-03-02 02:21:05 +00:00
l10n daemon script
97be950a2d 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:03:03 +00:00
Nate Graham
15665a25ce Set Bug Report URL 
CCBUG: 464600
 2023-02-12 17:25:08 -07:00
l10n daemon script
a1653720e5 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-09 02:05:26 +00:00
l10n daemon script
3c231724d5 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-08 02:04:40 +00:00
l10n daemon script
e31f3c4abb 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-05 01:59:29 +00:00
l10n daemon script
c4495d5855 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-04 02:05:14 +00:00
l10n daemon script
6d9c5cdd3e 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-03 02:04:58 +00:00
l10n daemon script
b5ab505074 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-02 02:03:13 +00:00
l10n daemon script
920cc2a4dc 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-01-22 01:59:52 +00:00
l10n daemon script
058c2b095f 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-01-16 01:58:23 +00:00
l10n daemon script
1e8fd02c69 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-01-13 02:01:41 +00:00
l10n daemon script
ff71c0aa3b 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-01-10 01:58:48 +00:00
l10n daemon script
ed92c41245 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-01-08 01:59:58 +00:00
l10n daemon script
c80bd87f63 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-01-06 01:56:10 +00:00
l10n daemon script
58de62cd8e 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-01-05 01:57:09 +00:00
l10n daemon script
51da8a9d9a 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-01-04 02:00:19 +00:00
l10n daemon script
e9fc7ccd42 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-01-03 02:00:00 +00:00
l10n daemon script
a72d22101c 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-01-02 02:27:35 +00:00
l10n daemon script
3ee29af814 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-01-01 02:14:13 +00:00
l10n daemon script
dae358cee0 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-12-31 01:59:33 +00:00
Alexander Lohnau
8e3202a67e Remove unused values from metadata json file 2022-12-30 09:19:13 +00:00
Alexander Lohnau
89ca7651d5 Use embedded JSON metadata & install KCM in new namespace 2022-12-30 09:19:13 +00:00
l10n daemon script
6acbcd628d 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-12-15 01:56:04 +00:00
Nicolas Fella
2ce55df1ba Remove unused KPluginInfo include 2022-12-06 19:44:15 +01:00
l10n daemon script
4656144ac9 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-19 01:48:52 +00:00
l10n daemon script
e712748881 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-17 01:47:30 +00:00
Volker Krause
002848efa8 Adapt build system to also support Qt 6 
This is complicated by the Qt 5.6 requirement of SailfishOS, hopefully
that didn't get broken by this.
 2022-10-29 16:51:41 +02:00
l10n daemon script
e77ba5b542 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-20 02:01:51 +00:00
l10n daemon script
f556dc721b 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-30 01:47:48 +00:00
Nicolas Fella
a918ffc0cb Add and make use of ECM's clang-format integration 2022-09-11 23:21:58 +00:00
l10n daemon script
0719e4eb49 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-11 01:43:06 +00:00
l10n daemon script
34da0ad9e1 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-05 01:43:43 +00:00
l10n daemon script
b25f7e07a8 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-08-27 01:49:35 +00:00
l10n daemon script
3819d96ee1 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-08-24 01:49:19 +00:00
l10n daemon script
fae10ece8b 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-01 01:48:04 +00:00
l10n daemon script
cb7a9203dd 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-25 01:56:17 +00:00
l10n daemon script
889beb8a53 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:53 +00:00
l10n daemon script
f4b1f84228 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:02:58 +00:00
l10n daemon script
c94ebc5d21 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:11:54 +00:00
l10n daemon script
af2d51349a 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-01 01:55:05 +00:00
l10n daemon script
1910ada166 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-31 01:57:25 +00:00
l10n daemon script
7f3181a86e 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:13:15 +00:00
l10n daemon script
c91eaceee1 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-04-25 01:49:25 +00:00
Nicolas Fella
f7f3c01ec8 Use undeprecated install dirs 
Using kde-dev-scripts/kf5/cmakelists_install_vars.pl
 2022-04-21 00:50:14 +02:00
l10n daemon script
81349acd82 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-04-12 01:42:58 +00:00
l10n daemon script
872e213010 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-31 01:41:19 +00:00
l10n daemon script
f5037a42d8 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-25 01:46:05 +00:00
l10n daemon script
662058bea4 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-17 01:46:52 +00:00
l10n daemon script
5b314846fe 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-02-20 01:45:04 +00:00
l10n daemon script
33db3d3dc2 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-02-18 01:48:51 +00:00
l10n daemon script
b2c80f27ac 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-02-15 01:47:16 +00:00
Alexander Lohnau
e365e1b35c Port from KPluginSelector to new KPluginWidget class 
Task: https://phabricator.kde.org/T12265
 2021-12-15 08:24:22 +01:00
Alexander Lohnau
fd681e62ab Port deprecated KCMultiDialog methods & embed json metadata in KCM 
This KCM will have to get installed installed in the new plasma namespace eventually.
But considering that this app is part of the release service, we should not
depend on changes in a not yet released Plasma version.

Task: https://phabricator.kde.org/T14501
 2021-12-15 08:24:22 +01:00
ivan tkachenko
9302a2b3be
[KCM] Fix layout: stretch left VBox without margins 
Default margins are non-zero for widgets/layouts. Thus, nested widgets
are gonna shrink further and further inward for no good reason.

This patch makes left column of this KCM (the host name, devices list
view and a Refresh button) visually aligned with the QGroupBox on the
right.
 2021-12-08 02:56:05 +03:00
Kai Uwe Broulik
14633d4486 [KCM] Squeeze key and make it selectable by mouse 
Avoids it blowing up the layout
 2021-12-01 11:26:53 +00:00
l10n daemon script
034e5fb03c 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-11-29 01:34:49 +00:00
l10n daemon script
5c76528250 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-11-24 01:36:30 +00:00
l10n daemon script
ff40955e2c 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-11-16 01:23:36 +00:00
l10n daemon script
6fe9953f74 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-11-13 01:25:12 +00:00
l10n daemon script
03371d054c 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-11-02 01:13:44 +00:00
l10n daemon script
0ce60e9230 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-10-15 01:14:37 +00:00
Matt Alexander
f596972bcb Update help link to reference a page that helps with connectivity problems. The one that was currently used was mostly concerned with project development. 2021-10-12 08:06:04 +00:00
l10n daemon script
61b2e607b4 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-26 01:12:22 +00:00
l10n daemon script
a3792aa75f 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-20 01:22:57 +00:00
l10n daemon script
47c34f8023 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-19 01:24:32 +00:00
l10n daemon script
9d5dcc9915 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-15 01:21:17 +00:00
l10n daemon script
977c58dcf8 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-14 01:21:55 +00:00
l10n daemon script
bcf79a5235 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-13 01:16:46 +00:00
l10n daemon script
634be9a254 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-12 01:17:16 +00:00
l10n daemon script
db697c5692 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-11 01:15:16 +00:00