Florian RICHER
5c93d1e77a
waydroid: Refactor with QCoro
2025-07-30 20:01:52 +02:00
l10n daemon script
4389406655
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2025-07-30 01:34:16 +00:00
l10n daemon script
8ae745aa42
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2025-07-29 01:32:54 +00:00
l10n daemon script
2e4386402b
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2025-07-27 01:33:55 +00:00
l10n daemon script
cb19e54df4
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2025-07-26 01:33:44 +00:00
l10n daemon script
eaedc79233
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2025-07-25 01:34:06 +00:00
l10n daemon script
bb333f0768
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2025-07-24 01:33:37 +00:00
Florian RICHER
c42758b335
quicksettings: Move Flashlight write to KAuth
2025-07-23 11:34:33 +02:00
l10n daemon script
b4ab75c971
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2025-07-23 01:35:20 +00:00
l10n daemon script
e499e308ea
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2025-07-22 01:36:10 +00:00
l10n daemon script
f6ecadd19a
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2025-07-18 01:33:06 +00:00
l10n daemon script
c0a0aea0ce
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2025-07-16 01:34:23 +00:00
l10n daemon script
a1ea58567d
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2025-07-15 01:36:34 +00:00
l10n daemon script
32262a9bc3
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2025-07-14 01:35:30 +00:00
l10n daemon script
d0a8e4927d
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2025-07-13 01:34:24 +00:00
Florian RICHER
91b685fee3
quicksettings: Add quicksettings for Waydroid
2025-07-12 15:08:51 +02:00
l10n daemon script
8f4c7234be
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2025-06-25 01:34:50 +00:00
Devin Lin
e4919690b4
quicksettings/record: Make it more efficient on initial load
...
Try to reduce the amount of preloaded objects that aren't needed until the quick setting is toggled. Also port the the kpipewire interaction parts to C++.
2025-06-13 21:16:20 -04:00
l10n daemon script
babb8587f8
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2025-06-13 01:33:11 +00:00
l10n daemon script
b4d6ba6fbd
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2025-06-11 01:34:46 +00:00
l10n daemon script
903a9447bb
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2025-06-07 01:33:02 +00:00
l10n daemon script
6d02a24dd4
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2025-06-01 01:35:38 +00:00
l10n daemon script
5fcb33ef67
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2025-05-26 01:32:45 +00:00
l10n daemon script
7ef80d4d6c
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2025-05-25 01:34:09 +00:00
l10n daemon script
0adcf627d8
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2025-05-19 01:32:49 +00:00
l10n daemon script
9a19db9d94
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2025-05-13 01:32:13 +00:00
l10n daemon script
c3c96f0331
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2025-05-05 01:31:43 +00:00
l10n daemon script
74303f0983
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2025-04-28 01:30:43 +00:00
l10n daemon script
efb518c817
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2025-04-27 01:31:31 +00:00
Devin Lin
0393dc8cec
quicksettings/caffeine: Port away from P5Support DataSource
...
Port away from the deprecated DataSource component in favour of the inhibition plugin.
2025-04-25 16:16:40 -04:00
Devin Lin
ee1a311af7
components/mobileshell: Introduce singleton for plasma-nm lib
...
We currently create several instances of the plasma-nm objects over the shell. Use a single singleton to avoid having to load it multiple times.
2025-04-25 14:58:18 -04:00
l10n daemon script
9b0cb6c109
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2025-04-25 01:31:19 +00:00
l10n daemon script
79eb420b56
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2025-04-23 01:31:21 +00:00
l10n daemon script
452b9102c6
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2025-04-22 01:29:51 +00:00
Micah Stanley
842354bd70
Shell: Add Setting to Auto Hide Panels so Applications Can Fill the Entire Device Screen Space
...
This merge request adds a new setting to auto hide the status and navigation panels so applications will be able to fill out the entire device screen area. Also, this adds a new quick settings toggle to quickly change this property.
2025-04-21 15:56:33 +00:00
Nicolas Fella
1a89b84917
Port record to declarative type registration
2025-04-20 18:02:19 +02:00
Nicolas Fella
f344399ae9
Port powermenu to declarative type registration
2025-04-20 18:02:19 +02:00
Nicolas Fella
c9f3d5f2ae
Port nightcolor to declarative type registration
2025-04-20 18:02:19 +02:00
Nicolas Fella
988c33a627
Port flashlight to declarative type registration
2025-04-20 18:02:19 +02:00
Devin Lin
2bf23313bc
quicksettings/docked: Fix typo in installed package path
...
This shouldn't have any ramifications on stored settings because the
kpackage id is correct, just the CMake installed path isn't.
2025-04-20 10:29:14 -04:00
Devin Lin
529940341b
quicksettings: Use symbolic monochrome icons
...
Switch the screenshot and screen record quicksettings to use monochrome
icons.
Fixes: https://invent.kde.org/plasma/plasma-mobile/-/issues/432
2025-04-06 13:03:53 -04:00
Devin Lin
65f09fa012
quicksettings/bluetooth: Add null checks
...
Fixes: https://invent.kde.org/plasma/plasma-mobile/-/issues/434
Add null checks for when the bluetooth manager is null to avoid errors
in the console.
2025-03-19 10:41:33 -04:00
l10n daemon script
fd1f5e2e60
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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-12-28 01:34:33 +00:00
l10n daemon script
b993b510a4
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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-12-15 01:40:00 +00:00
Carl Schwan
70ec403a55
Ensure directory is created
...
Fix #424
2024-11-22 01:17:16 +00:00
Devin Lin
24d3186834
quicksettings/audio: Close action drawer when opening volume osd
...
Now that the action drawer no longer takes focus, we need to manually
trigger the action drawer to close when opening the volume osd.
2024-11-14 17:20:12 +00:00
Devin Lin
a508c8d524
quicksettings/screenrotation: Nullptr check
...
Add nullptr check, since apparently it's possible for outputs to be
given as nullptr.
2024-11-09 18:45:27 +00:00
Devin Lin
5decdbe2b5
quicksettings/autorotate: Properly listen to external changes
...
This ensures that external changes to screen rotation are listened to
and updated in the quicksetting.
TODO: haven't actually tested on device yet
2024-11-09 09:39:55 +00:00
l10n daemon script
4077fb3baa
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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-10-10 01:23:11 +00:00
Devin Lin
1ac2745bfb
quicksettings/screenrotation: Don't call rotate in signal handler
...
This is a workaround for https://invent.kde.org/plasma/plasma-mobile/-/issues/405 , where if the caller gets deleted by the screen rotation, the entire shell crashes.
Eventually, we need to implement
https://invent.kde.org/plasma/plasma-mobile/-/issues/406 to reduce the
amount of oddities we have from recreating the quick settings panel
during screen rotation.
2024-10-03 22:41:29 -07:00
Marco Mattiolo
ac91c9fe11
Drop semicolon after Q_UNUSED() for consistency through the repo
2024-09-28 06:31:00 +00:00
Marco Mattiolo
bfdc6d938a
Avoid implicit capture of 'this' via '[=]' as deprecated in C++20
2024-09-28 06:31:00 +00:00
l10n daemon script
0dfa399b7b
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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-09-25 01:24:12 +00:00
l10n daemon script
62a2633f72
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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-08-28 01:30:06 +00:00
Devin Lin
eb9509ce68
Remove trailing whitespace
2024-07-26 23:47:44 -04:00
F_Chao Fengchao
fff1f1959a
Adding translation domains to some dynamic libraries to resolve untranslated issues.
2024-07-09 14:13:50 +08:00
Florian RICHER
11af97b83e
quicksettings: Fix crash when stop record
2024-07-02 22:23:51 +00:00
Mr. Athozus
49e7102f7b
quicksettings: Use adaptative icons
...
Personnaly, I don't like much those static icons which doesn't care about the situation in the quicksettings. This MR intends to use when possible and coherent what I call (not native English-speaking I recall) « adaptive » icon.
List of modified quicksettings :
- Wireless
- Bluetooth
- Flashlight
- Audio
- Airplane mode
~~Draft right now because I'm doing it quicksetting-by-quicksetting.~~
EDIT: Feel free to cherry-pick if you don't agree with all icons.
2024-07-01 01:56:48 +00:00
l10n daemon script
518b94e018
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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-06-28 01:25:09 +00:00
l10n daemon script
00edc45f4d
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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-06-22 01:21:15 +00:00
l10n daemon script
9131752fd3
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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-06-08 01:20:22 +00:00
l10n daemon script
ec8e5139e6
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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-05-15 01:18:23 +00:00
l10n daemon script
f7851a3f8f
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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-04-25 01:16:26 +00:00
l10n daemon script
704265a3d5
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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-04-04 01:15:46 +00:00
l10n daemon script
4ca3a25d4f
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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-03-09 01:15:44 +00:00
l10n daemon script
28e6d523fb
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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-03-08 01:13:51 +00:00
Alexander Lohnau
907363c594
Remove Qt module includes
2024-02-16 13:38:23 +01:00
Vlad Zahorodnii
17f0674cc2
Adapt to renamed night light d-bus interface
2024-02-08 17:04:11 +00:00
Devin Lin
fffcd04aeb
quicksettings/screenrotation: Fix initial state of quicksetting always being off
...
Fixes https://invent.kde.org/plasma/plasma-mobile/-/issues/298
2024-02-05 16:17:59 +00:00
l10n daemon script
7f1e574816
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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-29 01:12:33 +00:00
Florian RICHER
d162f96a63
Find white torch
2024-01-18 19:20:45 +00:00
l10n daemon script
bba776a5fb
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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-05 02:08:21 +00:00
Florian RICHER
5c6a97caa5
Flashlight : Use udev instead of hardcoded pinephone device file
...
# Goal of this patch
Use udev to change or detect flash device instead of hardcoded pinephone device file.
Inspired by phosh flash manager because it works in many devices. https://gitlab.gnome.org/World/Phosh/phosh/-/blob/main/src/torch-manager.c?ref_type=heads#L168-198
# Remaining work
- [x] Minimal project for testing
- [x] Try to build for pmOS to test in my device (OP6)
- [x] Need udev rules to work (Require write permission in brightness)
# Stabilization
- [x] read permission removed in max_brightness to check if no crash
> "Failed to read max_brightness from udev device" in log
- [x] read permission removed in brightness to check if no crash
> "Failed to read brightness from udev device" in log
- [x] "Break" match in my side to check if no crash occured when no device found
> "No flashlight found" in log
# Minimal project
It run in my device perfectly, it find device, get current value and max value and toggle flashlight. It require **root** permissions to write in device file.
```cpp
#include <iostream>
#include <cstring>
#include <libudev.h>
#define TORCH_SUBSYSTEM "leds"
int main() {
struct udev* udev = udev_new();
struct udev_enumerate* enumerate = udev_enumerate_new(udev);
// Use to find all devices in subsystem "leds"
// And use match sysname to filter only flash or torch
// Example:
// - /sys/devices/platform/soc@0/c440000.spmi/spmi-0/0-03/c440000.spmi:pmic@3:led-controller@d300/leds/white:flash On OP6
// - /sys/devices/platform/soc@0/c440000.spmi/spmi-0/0-03/c440000.spmi:pmic@3:led-controller@d300/leds/yellow:flash On OP6
// - /sys/devices/platform/led-controller/leds/white:flash/brightness On pinephone
udev_enumerate_add_match_subsystem(enumerate, TORCH_SUBSYSTEM);
udev_enumerate_add_match_sysname(enumerate, "*:torch");
udev_enumerate_add_match_sysname(enumerate, "*:flash");
udev_enumerate_scan_devices(enumerate);
struct udev_list_entry *devices = udev_enumerate_get_list_entry(enumerate);
struct udev_list_entry *entry = udev_list_entry_get_next(devices);
if (entry == nullptr) {
std::cout << "No flashlight found" << std::endl;
return 1;
}
const char *path = udev_list_entry_get_name(entry);
struct udev_device *torch = udev_device_new_from_syspath(udev, path);
const char *max_brightness = udev_device_get_sysattr_value(torch, "max_brightness");
const char *brightness = udev_device_get_sysattr_value(torch, "brightness");
bool enabled = std::strcmp(brightness, "0") != 0;
udev_device_set_sysattr_value(torch, "brightness", const_cast<char*>(enabled ? "0" : max_brightness));
udev_device_unref(torch);
udev_enumerate_unref(enumerate);
udev_unref(udev);
return 0;
}
```
Build with `g++ torch.cpp -ludev -o torch`
Run with `sudo ./torch`
# Important info
- **udev** dependencies added
- destructor for flashlightutil added to unref udev_device
# Require udev rules
Files `/etc/udev/rules.d/99-flashlight.rules`
```bash
# Allow everyone to set brightness of flashlight (Required for plasma-mobile flashlightplugin)
SUBSYSTEMS=="leds", KERNEL=="*:flash|*:torch", RUN+="/bin/chmod 666 %S%p/brightness"
```
pmOS : See to add depends `eudev` and makedepends `eudev-dev`
2023-12-31 17:11:28 +00:00
l10n daemon script
4d29b0f0ac
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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-12-22 02:13:13 +00:00
Devin Lin
f2836a81d7
quicksettings/screenrotation: Ensure that state is up to date when screens are added
2023-12-17 17:46:40 -08:00
l10n daemon script
dbe069edfa
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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-12-17 02:07:26 +00:00
Devin Lin
9ee734689c
quicksetting/record: Disable for now
...
The quick setting causes the shell to crash https://invent.kde.org/plasma/plasma-mobile/-/issues/210
2023-12-08 19:17:07 -08:00
l10n daemon script
1a44c570f6
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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-10 02:17:56 +00:00
Devin Lin
5b429b49d1
quicksettings/screenrotation: Ensure save
...
Ensures that https://invent.kde.org/plasma/plasma-mobile/-/merge_requests/390 saves the setting
2023-11-05 18:56:50 -08:00
Devin Lin
a0b9c2c569
quicksettings/screenrotation: Fix it by porting to changed API
...
It appears that the screen rotation DBus API was dropped with https://invent.kde.org/plasma/kscreen/-/merge_requests/237
Port to the new API.
Fixes https://invent.kde.org/plasma/plasma-mobile/-/issues/257
2023-11-05 15:09:33 -08:00
David Edmundson
ed37efdca3
Port from deprecated KWorkspace
2023-11-05 21:38:31 +00:00
Yari Polla
4f45654af6
Port mobileshell plugins to ecm_add_qml_module
2023-11-02 11:08:17 +00:00
l10n daemon script
6341f6619c
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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-22 02:34:49 +00:00
Yari Polla
72657628b6
dataproviders: declare BatteryInfo as singleton
2023-10-21 11:32:41 +02:00
Yari Polla
73e020e448
dataproviders: declare AudioInfo as singleton
2023-10-21 11:32:41 +02:00
Alexander Lohnau
45072177d5
Remove unneeded entries from metadata files
2023-10-17 05:14:04 +00:00
Devin Lin
f9cc52aa9f
quicksettings/nightcolor: Remove unnecessary and not working import
2023-09-26 22:42:48 -07:00
l10n daemon script
04dfd341fa
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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 02:08:01 +00:00
Nicolas Fella
a75c95237e
Remove import versions from networkmanager imports
2023-09-24 20:47:29 +00:00
Nicolas Fella
2a3f66f199
Remove QML import version
2023-09-19 22:43:53 +02:00
l10n daemon script
f2cedc32b6
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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-15 02:14:27 +00:00
l10n daemon script
1eee8e5e8f
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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 02:22:33 +00:00
l10n daemon script
c9ff39a26f
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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-26 02:17:02 +00:00
Alexey Andreyev
127bbdf653
Port away from PlasmaCore and PlasmaExtras to Kirigami
...
See also:
https://pointieststick.com/2023/06/14/call-to-action-easy-porting-opportunity-in-plasma/
2023-07-25 01:13:52 +00:00
Nicolas Fella
93f1aa0310
Adapt to kded5->kded6 renaming
2023-06-27 22:15:18 +02:00
l10n daemon script
a80d7a1bea
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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-06-21 02:20:37 +00:00
l10n daemon script
ead62a26cc
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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-06-18 03:45:48 +00:00
l10n daemon script
06f7460c15
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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-05-28 02:34:37 +00:00
l10n daemon script
a9bab2af9d
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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-05-23 03:30:47 +00:00
l10n daemon script
2f53c54157
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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-05-21 02:19:12 +00:00