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

1381 commits

Author SHA1 Message Date
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
Albert Vaca Cintora
0d362169a8 Revert "Support init systems other than systemd with Run Command's samples" 
Fix example commands. "suspend" is a command to halt the shell, not to
sleep the computer. Those are just example commands so people with exotic
init systems can still type their own commands.

This reverts commit 2dc5d53ec4.
 2023-03-27 00:12:43 +02:00
Albert Vaca Cintora
7866a5f656 Remove my swearing from 10 years ago :D 2023-03-26 14:13:55 +00:00
Fushan Wen
47c6f5b768
plugins/mpris*: "xesam:artist" is of stringlist type 
Fix the type in metadata, but still use string type in network packets.
 2023-03-25 22:13:31 +08:00
Heiko Becker
97e47efdf6 Make mmtelephony plugin optional 
I see little purpose in pulling that stack in on a desktop computer,
which doesn't even have a modem.
 2023-03-20 20:44:14 +01:00
Fushan Wen
4523ba5882 Use org.freedesktop.DBus.Monitoring to monitor notifications 
Plasma notification widget also uses the interface, and sometimes
notification ids can become out of sync between the two DBus adaptors.

BUG: 447385
FIXED-IN: 23.08
 2023-03-13 02:20:12 +00:00
l10n daemon script
f9404b83ed 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-13 01:45:53 +00:00
l10n daemon script
16db8149b5 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-12 02:22:02 +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
fd40b7a37c 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-09 01:42:33 +00:00
l10n daemon script
e2d0ef02bc 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-08 01:43:20 +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
Aleix Pol
5d4b074ef5 Drop dependency with PlasmaWaylandProtocols 
Now that we are using the RemoteDesktop XDP, we don't need FakeInput
anymore.

BUG: 465767
 2023-02-17 07:48:45 +00: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
Nicolas Fella
b34a0a8f29 [plugins/virtualmonitor] Fix crash when krfb-virtualmonitor fails all retries 
After enough retries we give up and delete the QProcess

However we later access it again to print its output

Move that before the deletion

BUG: 464241
 2023-01-20 13:28:28 +01:00
l10n daemon script
7c588d4984 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-19 01:59:08 +00:00
Aleix Pol
851e456210 Use the RemoteDesktop portal to input from wayland 
Cross-desktop approach to moving the cursor remotely on wayland. Should
work on X11 too, so we can consider drop the other one as well.

It adds support for receiving full text as well, which didn't use to be
possible.
 2023-01-16 18:14:47 +01: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
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
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
l10n daemon script
332f234eea 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-30 02:04:01 +00:00
l10n daemon script
62660bab88 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-29 02:02:47 +00:00
Yoram Bar-Haim
7b1f10d4d5 Add support for phone side telephony plugin on Linux. 
## Summary

Add support for Phone side (like in the Android and SailfishOS apps) to telephony plugin.
this requires ModemManager to work.
Call state notifications are currently supported, more capabilities are possible.

Tested on PinePhone but should probably work on every linux Phone with ModemManager.
to test, pair kdeconnect on your linux phone to desktop, and call your phone.
you should get notification on the desktop, telling you that phone call is incoming.
 2022-12-28 01:06:22 +00:00
Willyanto Willyanto
29f56dcc29 Perform initialization in initialization list 
Fixes variable is assigned in constructor body. Consider performing
initialization in initialization list. (CWE-398)
 2022-12-22 23:24:31 +07: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
Carl Schwan
b2e83f506c Improve and fix pluging modules 
- Fix call to removed get() method
- Add PlaceHolderMessage in runcommand plugin
- Simplify qml code when possible
- Use latest qml import
- Fix missing i18n call

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-12-14 16:46:57 +00:00
Albert Vaca Cintora
204207f2e6 Fix ssh authentication using pubkey on recent openssh versions 
BUG: 443155
 2022-12-12 21:21:46 +01:00
Rafael Appelt
9c7082d0e7 Fix file name on plugin's readme. 2022-11-27 01:40:51 +00: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
Nicolas Fella
1fbbeb823d [plugins/clipboard] Check for null mimedata 
BUG: 461875
 2022-11-18 00:03:15 +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
l10n daemon script
5bce4746b5 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-07 01:49:31 +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
Simon Redman
8cfa308140 Fix some Qt and KF5 deprecation warnings 
## Summary

Fixes a few warnings about deprecated fields and methods.

## Test Plan

Things still seem to be basically working 🤷
 2022-10-17 21:17:49 +00:00
Yuchen Shi
b9a089344e Add config for clipboard plugin on content types to share. 
## Summary

This MR adds a config dialog for the Clipboard plugin, where the user can toggle
whether to share password and/or anything else with other devices.

Implements !39

BUG: 458063

According to previous discussion at !39 (and the bug linked), some users want to
skip sending passwords to other devices while others rely on the existing behavior.
This MR addresses that by allowing users to control those two types separately and
will replace !39 if merged.

![Screenshot with new config dialog](/uploads/3dfc6c6d69b86e6512e6a8948320a839/Screenshot_1661407807.png)

Borrowing the idea from !39, the `x-kde-passwordManagerHint` MIME data hint is used
to determine whether the content is considered secret. I've tested this method with
KeepassXC which [sets this correctly](a6d3f973fa/src/gui/Clipboard.cpp (L62)). See test plan below.

In theory, MIME also can be used to test for images and another checkbox can
be easily added should we decided to support images later. For now though, the
enum and the config supports only passwords or "anything else". Both defaults to true,
thus keeping full backwards compatibility. I've been keeping both unchecked since
I only share in one direction (Android to Linux), which wasn't possible until this MR.
Others may want to make their own choices.

## Test Plan

Please reference the screenshot above for the steps.

From the indicator, right-click and select `Configure`. Select a device from the
left side (or pair one if needed). In "available plugins", make sure "Clipboard"
is checked, and verify that a "Configure" icon button is now shown on the right.

Clicking that icon should bring up the new config dialog, where the two check boxes
can be toggled as desired. Click on "OK" to save and apply the settings. Clicking on
"Defaults" should bring both back to checked (the default behavior).

Copy normal plain text from your favorite text editor and it should be sent to another
device if the "anything else" checkbox is checked. I've tested this on an Android phone
but I see no reason it won't work elsewhere given the code for sending has not been changed.
(Feel free to test on other devices.)

Open KeepassXC and select an entry, right click and select "Copy password". This sets
the MIME hint so it should be treated as a password, controlled by the "passwords" checkbox.
I've toggled the settings multiple times on and off. Once "OK" is clicked, the next clipboard
change should pick up the latest settings.

I've only tested on Linux desktops (Arch Linux) since I do not own a Mac. I don't believe any
OS X application sets `x-kde-passwordManagerHint` at all, so they may be controlled by "anything else".
 2022-10-17 21:04:20 +00:00
Aleix Pol
c989be56cd virtualmonitor: Make sure we clean up m_process after deleting 2022-10-17 00:33:33 +02:00
l10n daemon script
ab054f060d 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-16 01:56:08 +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
Bharadwaj Raju
1f5fd06924 [plasmoid] Add inline reply for notifications instead of opening a dialog 
Instead of opening the reply dialog when clicking Reply in the plasmoid, it opens an inline reply UI.
 2022-09-26 19:51:28 +00:00
l10n daemon script
ae0815ea45 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-24 01:45:58 +00:00
l10n daemon script
dbf8b07cab 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-23 01:43:42 +00:00
l10n daemon script
6e67932058 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-22 01:45:45 +00:00
l10n daemon script
03a58c66a5 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-20 01:48:04 +00:00
ValdikSS ValdikSS
2006424e21 Prevent null pointer dereference if there's no audio devices 
BUG: 454917
 2022-09-17 15:54:11 +03: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
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
Kareem Abduljaleel
186526c0bb [Photo Plugin] Make photo plugin use QUrl instead of a local path 
This is a companion merge request for !476,

this way it can be accessed directly from QML's FileDialog
 2022-09-02 17:32:01 +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
8752e67f83 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-26 01:44:16 +00:00
l10n daemon script
b525d660bc 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-25 01:46:23 +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
de5b15c2aa 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-21 01:47:29 +00:00
l10n daemon script
bf56ef0eb7 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-16 01:47:35 +00:00
l10n daemon script
7f0b03f254 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-11 01:42:55 +00:00
l10n daemon script
4918be1ef0 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-10 01:51:08 +00:00
l10n daemon script
4c3613088d 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-09 01:44:40 +00:00
l10n daemon script
7e72879845 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-08 01:47:08 +00:00
l10n daemon script
a452ee6d16 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-04 01:45:07 +00:00
l10n daemon script
65d83a6229 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-02 01:44:38 +00:00
l10n daemon script
1c65ede57c 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-01 01:42:52 +00:00
l10n daemon script
cdc5f1eba2 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-31 01:46:42 +00:00
l10n daemon script
84c7e28d29 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-30 01:44:31 +00:00
l10n daemon script
ed43fcb236 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-28 01:43:54 +00:00
l10n daemon script
c658c8eefd 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-27 01:46:11 +00:00
l10n daemon script
7f21dd910d 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-26 01:44:57 +00:00
l10n daemon script
b39bd70fac 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-25 01:43:13 +00:00
l10n daemon script
653a8e34a3 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-24 01:43:58 +00:00
David Marzal
97aef5a58a Revert Description[x-test] for trasnlation 2022-07-23 16:44:03 +00:00
David Marzal
ae20cd1208 Improve wording of functionality contacts plugin 2022-07-23 16:44:03 +00:00
l10n daemon script
623c74f81f 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-23 01:45:01 +00:00
l10n daemon script
68cdecff16 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-20 01:42:56 +00:00
l10n daemon script
182fd5f279 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-15 01:46:22 +00:00
l10n daemon script
280c0fb27f 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-14 01:49:45 +00:00
l10n daemon script
87b41a96a9 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-10 01:49:18 +00:00
l10n daemon script
b100d75077 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-09 01:46:21 +00:00
l10n daemon script
30d7abbb76 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-07 01:42:28 +00:00
Nicolas Fella
ad01ef1695 Fix activating existing settings window on Wayland 
Add the necessary bits for XDG activation to work

Move the code for launching the settings from the daemon to the respective processes so that we don't need to pass activation tokens over another process boundary
 2022-07-06 12:55:39 +00:00
l10n daemon script
2da891b312 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-04 01:47:05 +00:00
l10n daemon script
58cc209582 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-03 01:55:31 +00:00
l10n daemon script
3f42e61b1d 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:21 +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
d497860cd3 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-23 01:42:11 +00:00
l10n daemon script
12180f8d99 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-20 01:51:58 +00:00
l10n daemon script
fc1efc3ea9 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-14 01:49:10 +00:00