Weixuan Xiao
a045278822
Fix and improve unicode input on macOS and Windows
...
Unicode text input from remote devices gives random texts because the plugin mistook the text encoding. Insert a Unicode 16 bits character each time instead of a UTF-8 character.
The API accepts the `UniChar` Unicode characters:
```c
void CGEventKeyboardSetUnicodeString(CGEventRef event, UniCharCount stringLength, const UniChar *unicodeString);
```
from https://developer.apple.com/documentation/coregraphics/1456028-cgeventkeyboardsetunicodestring .
2022-04-28 12:40:53 +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
Ömer Fadıl Usta
da84914b7d
Fix PlaySound with correct QUrl
...
It was missing to use fromLocalFile
BUG: 452591
2022-04-21 13:16:40 +00:00
Waldo Lemmer
2dc5d53ec4
Support init systems other than systemd with Run Command's samples
...
`systemctl reboot`, `systemctl poweroff` and `systemctl suspend` only work on Systemd
I replaced them with the more universal versions (`reboot`, `poweroff`, and `suspend`) which work on Systemd, OpenRC, runit, SysVinit, and GNU Shepherd. These commands show up here:
![image](/uploads/b10ae0397974c90971d8cd054d13e1b4/image.png)
2022-04-21 01:02:10 +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
Weixuan Xiao
f1843cb492
Improve D-Bus implementation on macOS
...
Better patch to replace !218 .
- Auto and quick detection of previous D-Bus instance;
- Remove private D-Bus compile definition, only use it on macOS without an existing D-Bus instance;
- Safe reboot after crashes because the indicator is not relating on the kdeconnectd to run a D-Bus session;
- Safe exit after clicking on `Quit` in the systray.
More details in commit logs:
Only enable private D-Bus on macOS because the other platforms do not
need them.
The app should be able to easily detect the session bus from the env
DBUS_LAUNCHD_SESSION_BUS_SOCKET from launchd through launchctl.
Because https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/dbus/dbus-sysdeps-unix.c#L4392
shows that it is the only probing method on macOS with launchd.
The D-Bus session bus can be easily found from launchd/launchctl
with DBUS_LAUNCHD_SESSION_BUS_SOCKET env. It can be an external one
(installed from HomeBrew) or an internal one (launched by a previous
instance followed by a crash).
The indicator helper on macOS can now automatically detect whether we can use a potentially
(with launchd/launchctl env set, or KDE Connect macOS
private_bus_address set) existed and usable session bus.
If previous bus is usable, just try to launch the kdeconnectd with us.
Otherwise, launch a private D-Bus daemon, export the launchd/launchctl
env, and run a kdeconnectd instance.
Everything works better and quicker now :)
2022-04-12 05:40:03 +00: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
1c67f4eccf
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-29 02:08:15 +00:00
l10n daemon script
9f99f87082
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-23 02:03:39 +00:00
Aleix Pol
21dbf0410f
kcm: Fix showing plugins' configuration
...
We were using the plugin infrastructure to tell the name of the plugin
we were configuring.
Since this doesn't make any sense, just let the kcms themselves define
where they want their settings to be.
This fixes a regression from when we ported away from using KService to
list them. e365e1b35c
2022-03-21 18:03:45 +01:00
l10n daemon script
a09825c498
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-20 02:05:33 +00:00
l10n daemon script
5a9361c22b
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-18 01:49:08 +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
Michael Prager
ef0efc360f
[Connectivity Report] Fixed crash if signalStrengths is empty.
...
BUG: 449276
2022-03-10 17:36:07 +01:00
Albert Vaca Cintora
19b8249ed1
Changes as per CR
2022-03-10 17:17:55 +01:00
Albert Vaca Cintora
58adbc8cb4
SharePlugin: Read and write shared file creation time
...
When sharing a file, add metadata about the file's creation time and last
modified time. When receiving a shared file, read those fields and set them
on the file we create.
Note: Qt doesn't support setting the creation date on Unix [1].
[1] https://code.qt.io/cgit/qt/qtbase.git/tree/src/corelib/io/qfilesystemengine_unix.cpp?h=v5.15.2&id=40143c189b7c1bf3c2058b77d00ea5c4e3be8b28#n1590
2022-03-10 17:17:55 +01:00
Weixuan Xiao
9b5871523d
Fix macOS build due to the inappropriate QTimer pointer
...
The type of `m_clipboardMonitorTimer` is unintentionally modified in 5d970ddd48
, which causes failing build on macOS.
2022-02-26 19:10: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
1c61349115
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-13 01:40:53 +00:00
l10n daemon script
b859463f22
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-07 01:45:12 +00:00
Nicolas Fella
bb4ac289e2
Show pairing notification also when in do not disturb mode
...
Pairing is the result of explicit user action and requires interaction
Otherwise there is no visual feedback for a pairing attempt, leaving the user wondering why nothing happens
2022-01-23 22:11:27 +01:00
l10n daemon script
bb39ef84b5
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-12-16 01:53:14 +00:00
Nicolas Fella
dc34cfb66c
Disable Battery plugin on Windows
...
It's causing severe issues
https://bugs.kde.org/show_bug.cgi\?id\=444612
2021-12-15 19:12:45 +01: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
Méven Car
5d970ddd48
Port clipboard plugin to KGuiaddons KSystemClipboard
2021-12-13 15:06:25 +00:00
Kai Uwe Broulik
2a3ab4104e
[Connectivity Report] Only emit signal when it has actually changed
...
Avoids pointless DBus traffic
2021-11-30 23:37:54 +01: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
Nicolas Fella
4444b4d373
Always show notification when receiving files
...
Otherwise we get no notification for very short transfers
BUG: 417823
2021-11-16 13:32:10 +01:00
l10n daemon script
c630a3de90
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-04 01:16:42 +00:00
l10n daemon script
4462b74866
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-03 01:25:15 +00:00
Laurent Montel
6957b6aa39
GIT_SILENT: add missing override
2021-10-27 06:53:06 +02:00
Albert Vaca Cintora
460eb70a81
Allow ssh-rsa when mounting sshfs
...
Fixes "Unable to negotiate with 192.168.0.10 port 1741: no matching host
key type found. Their offer: ssh-rsa"
2021-10-24 23:36:25 +02:00
Aleix Pol
599bcbac56
clipboard: Sync wayland implementation with that on Plasma
...
It has a few important issues fixed that should make our life a bit
better.
2021-10-18 17:43:55 +00:00
l10n daemon script
89f3dccf32
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-16 01:16:19 +00:00
Nicolas Fella
ee85a5d56e
[sendreplydialog] Move focus on tab
...
Currently pressing tab inserts a tab character. To enable keyboard navigation it should however focus the next item in the focus chain (the send button). Given that this is a simple reply to a text message and not a fully fledged text editor there's probably no need to insert a tab character anyway
CCBUG: 441742
2021-09-26 17:27:42 +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
Nicolas Fella
695e36755b
[sendreplydialog] Submit on enter, enter newline on shift+enter
...
This enables better keyboard navigation and is consistent with virtually all messaging apps
CCBUG: 441742
2021-09-22 15:45:58 +02: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
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
9d78e17e42
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-02 01:17:46 +00:00
l10n daemon script
066d798e0f
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-22 01:15:46 +00:00
Piyush Aggarwal
a7a58cc8c6
Revert "plugins/mousepad: wait for a microsecond to allow interpolation"
...
This reverts the microsec delay as it introduces a lot of aggregated delay in mouse movement.
2021-08-09 03:06:56 +05:30
Piyush Aggarwal
3e1e9f4410
improve mouse lock behaviour and info label text
2021-08-09 03:00:40 +05:30
Weixuan XIAO
55b946f825
Enable presenter on macOS
...
QML is currently available on macOS after packing in Craft
2021-07-30 09:35:39 +02:00
l10n daemon script
a3082de593
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-07-28 01:18:37 +00:00
l10n daemon script
ec88335b24
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-07-27 01:22:11 +00:00
l10n daemon script
a820faed14
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-07-21 01:13:45 +00:00
l10n daemon script
ac53f3f3cb
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-07-18 01:17:03 +00:00
Piyush Aggarwal
a92112ad47
remotecontrolplugin: fix sendCommand param
2021-07-16 01:49:09 +05:30
Piyush Aggarwal
6c4ba39653
remotecontrolplugin: change sendCommand function params to allow support for scroll
2021-07-15 08:18:07 +05:30
l10n daemon script
71d4719550
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-07-08 01:19:15 +00:00
l10n daemon script
219609ee6d
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-07-05 01:15:57 +00:00
Tony Sesek
89e7c36158
Add autoResume to pausemusic_config.qml
2021-07-02 04:05:18 +00:00
Piyush Aggarwal
0d2a15c41f
wayland/x11 remoteinput.cpp: add missing conditional check for isSingleRelease
2021-07-01 11:08:43 +05:30
l10n daemon script
875e57cf4f
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-06-30 01:19:37 +00:00
Piyush Aggarwal
2c0c822600
windowsremoteinput: add missing isSingleRelease to condition
2021-06-29 07:02:33 +05:30
Alexander Lohnau
30d895d868
Clean up unneeded JSON parameter in kcoreaddons_add_plugin
...
The moc process already rebuilds the plugin when the JSON file changes, consequently the additional parameter is not needed.
Task: https://phabricator.kde.org/T14649
2021-06-28 20:33:52 +02:00
l10n daemon script
0255ce1fd0
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-06-28 01:27:23 +00:00
l10n daemon script
3559af16d7
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-06-26 01:22:17 +00:00
Piyush Aggarwal
d71af0134e
mpriscontrolplugin-win: add nullptr check for autoRepeatMode and isShuffleActive
2021-06-24 15:29:43 +05:30
l10n daemon script
3ffe96a826
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-06-24 01:19:09 +00:00
l10n daemon script
3fa2c8aa1f
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-06-23 01:15:23 +00:00
Piyush Aggarwal
0e35f33464
pausemusicplugin-win: rewrite plugin
2021-06-22 12:57:13 +05:30
Piyush Aggarwal
ee19722eea
mpriscontrolplugin-win: add support for loopStatus and shuffle control
2021-06-22 10:43:34 +05:30
Piyush Aggarwal
a59ea0e9b8
mpriscontrolplugin-win: send -1 volume to show per-app volume control is not supported
2021-06-22 08:17:23 +05:30
Łukasz Patron
fb8646b309
Expose LoopStatus and Shuffle control over mpris control plugin
...
This allows us to read and write these to fields from KDE Connect client.
2021-06-21 17:38:05 +00:00
Piyush Aggarwal
a01af1b406
systemvolumeplugin: populate sink description with sink name when building with minGW32
2021-06-21 11:18:53 +05:30
l10n daemon script
d071d034c3
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-06-21 01:25:33 +00:00
Piyush Aggarwal
d37f4061c9
systemvolumeplugin_win: fix a desktop memory leak that occurs when sink list is open on Android app
2021-06-20 22:22:08 +05:30
l10n daemon script
8cd17dbe71
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-06-20 01:19:35 +00:00
l10n daemon script
2eef999365
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-06-19 01:18:29 +00:00
Piyush Aggarwal
bf4ac716bf
plugins/lockdevice: add support for Windows
2021-06-17 20:32:16 +05:30
Piyush Aggarwal
f60a7bdd19
plugins/lockdevice: add support for remote lock success/failure notification
2021-06-17 20:31:05 +05:30
Piyush Aggarwal
a6de73d437
add compilation check for WIN_SDK_VERSION
2021-06-15 18:06:03 +05:30
Piyush Aggarwal
d11f15a3e6
mpriscontrolplugin: resolve AUMID to display name of the media app when possible
2021-06-15 17:17:52 +05:30
l10n daemon script
f681911dd3
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-06-15 01:17:48 +00:00
l10n daemon script
146a359b7e
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-06-14 01:14:54 +00:00
Yuri Chornoivan
596f648f6e
Fix minor typo
2021-06-13 10:56:51 +03:00
Piyush Aggarwal
d22c6641b4
contactsplugin: save vcards in Contacts folder provided by Windows
2021-06-13 06:58:12 +05:30
Piyush Aggarwal
86c12cd8e8
plugins: disable sendnotifications for Windows
2021-06-12 18:12:03 +05:30
Piyush Aggarwal
d5c1832eba
runcommands: add sample commands for Windows
2021-06-12 16:22:31 +05:30
Piyush Aggarwal
92237d416e
plugins/mousepad: wait for a microsecond to allow interpolation
2021-06-02 01:11:19 +05:30
Piyush Aggarwal
c00ea12007
plugins/mousepad: fix remote mouse movement by replacing Qt API with win32 API
2021-06-02 00:11:16 +05:30
Piyush Aggarwal
d773959a5d
remove hardcoded window icon path in favour of fromTheme call
2021-05-23 10:42:29 +05:30
l10n daemon script
e8cffe2d49
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-05-17 01:29:19 +00:00
l10n daemon script
148426ab48
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-05-10 01:18:46 +00:00
Piyush Aggarwal
3b7d51dc80
runcommand: avoid using cmd to allow better handling of quoted arguments
2021-05-09 05:11:41 +05:30
l10n daemon script
8e46bfd705
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-05-02 01:18:48 +00:00
l10n daemon script
9b3441a229
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-04-23 01:16:53 +00:00
Aleix Pol
fec500da39
mousepad: Default to scrolling up when fingers move up on the android version
...
It mimicks the behaviour of X11.
BUG: 410156
2021-04-22 14:09:12 +00:00
l10n daemon script
f4211e0431
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-04-22 01:12:28 +00:00
l10n daemon script
46a19ac6cf
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-04-19 01:18:23 +00:00
l10n daemon script
c4ffd3edb9
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-04-17 01:21:04 +00:00
Natsumi Higa
67a92451e4
Fix IPv6 address format
2021-04-13 16:51:33 +00:00
Piyush Aggarwal
80178b8ff8
clipboard: make new Wayland implementation build on non-Apple unices only
2021-04-07 17:00:50 +05:30
Aleix Pol
389a47b088
Add support for clipboard integration
...
Copies over David's implementation in Klipper and integrates it in the
plugin. To do so it splits the ClipboardListener class into 2
subclasses: one that uses QClipboard and the other that uses the
DataControl classes.
BUG: 359747
2021-04-07 00:43:51 +00:00
l10n daemon script
9a58c34abb
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-04-04 01:17:12 +00:00