marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3682 commits 1 branch 0 tags 40 MiB
Commit graph

274 commits

Author SHA1 Message Date
Carl Schwan
8030c73c67
powermanagement-kcm: Port to FormCard 2023-09-21 19:37:12 +02:00
Carl Schwan
dc047a0eb9
hotspot-kcm: Port to FormCard 2023-09-21 19:30:18 +02:00
Nicolas Fella
8fc1fa5e9d Use keyword signature for target_link_libraries call 2023-09-16 21:50:18 +02:00
Nicolas Fella
a8c5ef5551 Clean up KCM metadata 2023-09-14 18:26:40 +00: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
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
Oliver Beard
2087935c05 kcms/info: Move footer actions to header 2023-07-25 18:44:56 +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
Alexey Andreyev
2275e2d7dd port QML to KSvg 
Search and replace all the occurrences of Svg/FrameSvgItem/SvgItem
to their new implementation from KSvg.
Changes only namespace, API is the same

See also:
https://invent.kde.org/frameworks/ksvg/-/issues/1
 2023-07-10 02:04:42 +03:00
Laurent Montel
0e1fb83b08 Enum is Qt.AscendingOrder 2023-07-01 17:28:17 +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
Laurent Montel
b18be53604 Fix switch identifier 2023-06-19 18:35:01 +02: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
Alexander Lohnau
5d1fb152a3 Make trivial config modules cpp file only 2023-06-10 10:53:50 +02:00
Alexander Lohnau
0989b762f1 Remove unneeded QVariantList from KCM constructor args 
The args are not needed and will be removed later in KF6
 2023-06-10 10:50:37 +02:00
Alexander Lohnau
5479e29bd6 Use org.kde.kcmutils instead of org.kde.kcm module 
The latter will be removed, because the files were moved to kcmutils
 2023-06-06 21:31:58 +02:00
Laurent Montel
0b8104a0cb echoMode is not an MobileForm.FormTextFieldDelegate enum, but a TextInput enum 2023-06-04 09:45:35 +02:00
l10n daemon script
bd586b5fc1 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-04 02:34:51 +00:00
Mikhail Vinogradov
233ccba671 power: Don't show the battery usage card if there is no data 
Hide the entire card when there is no data, not just the graph
 2023-05-30 14:35:57 +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
Devin Lin
324889ed8c Fix more cases of Kirigami.Action iconName 2023-05-12 18:48:34 -04:00
l10n daemon script
c8bb30dc0b SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-09 02:28:58 +00:00
l10n daemon script
9f6345c3f3 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-08 02:24:47 +00:00
Marco Martin
6d22b48cc4 port item delegates iconName to icon.name 2023-05-07 15:11:17 +02:00
Alexander Lohnau
739897e335 Port to kcmutils_add_qml_module 2023-05-06 12:13:12 +02:00
l10n daemon script
1ab9d8827e SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-04-24 02:56:05 +00:00
l10n daemon script
42bf272681 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-04-19 02:38:31 +00:00
l10n daemon script
b1000c31d8 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-04-17 03:43:30 +00:00
l10n daemon script
f00a1baae9 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-04-13 02:33:38 +00:00
l10n daemon script
38e235b1b0 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-04-11 03:11:36 +00:00
l10n daemon script
bea89f08c1 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-04-04 02:38:04 +00:00
l10n daemon script
4b911fa0bc SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-04-03 02:25:31 +00:00
l10n daemon script
26c7836549 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-29 02:28:37 +00:00
Seshan Ravikumar
6824569bb6 kcm/info link against qt::gui 
fixed QClipboard not find
 2023-03-28 02:41:50 -04:00
l10n daemon script
2596778cba SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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 03:54:14 +00:00
l10n daemon script
b9aad6286f SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-24 02:23:55 +00:00
l10n daemon script
c2b3e3cfc8 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-23 02:52:45 +00:00
l10n daemon script
68b94f31b3 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-21 02:44:34 +00:00
l10n daemon script
753aaa00fc SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-20 02:35:16 +00:00
Yari Polla
be7c36d0c2 kcms: port to new KCMUtils KCM classes 2023-03-19 17:15:25 +00:00
Devin Lin
79e99a9cfe shellsettingsplugin: Extract out from mobileshell component 2023-03-18 12:28:28 -07:00
l10n daemon script
6fe1c74947 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-17 02:54:12 +00:00
Devin Lin
462d99b83f quicksettings: Extract out from mobileshell into separate plugin 2023-03-16 19:44:36 -07:00
l10n daemon script
872d63c5c2 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-16 02:34:43 +00:00
Yari Polla
d1e91b1573 kcms/time: fix wrong reference 2023-03-15 14:23:19 +01:00
Devin Lin
fa2f34ca41 kcms/hotspot: Port to mobileform components 2023-03-14 22:08:01 -07:00
Devin Lin
56d530f855 kcms: Fix package format 
Fix kcm package format so that they show up in the settings.
 2023-03-14 20:56:30 -07:00
l10n daemon script
73159a1862 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-15 02:29:39 +00:00
Devin Lin
21018b52b8 kcms/powermanagement: Make battery page localizable 2023-03-14 18:32:18 -07:00
Yari Polla
eb8a65ab45 kcms/energy: fix import 2023-03-15 00:50:53 +01:00
Yari Polla
8f4beb219f kcms/wifi: port kirigami action 2023-03-15 00:02:26 +01:00
Yari Polla
f47ba93952 kcms/hotspot: fix switch 2023-03-14 15:36:05 +01:00
Devin Lin
1e2847ef96 kcms: Import mobile network kcms 
plasma-nm currently has the mobile network KCMs, but requires having a build flag in order to have them installed. This then requires distros to have multiple versions of the plasma-nm package. I think it makes sense to move them here so that packaging and development is easier.
 2023-03-14 14:31:27 +00:00
Yari Polla
e21354bf63 quicksettings: add ability to enable/disable qs 2023-03-14 04:56:38 +00:00
l10n daemon script
4101e4ad17 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-14 02:32:23 +00:00
Devin Lin
40f4846ccf kcms: Ensure reuse headers exist 
Also relicense some of my older code to be GPL2
 2023-03-13 19:09:23 -07:00
Devin Lin
e147f98aea kcms: Move KCMs from plasma-settings 
Having the KCMs that are mobile specific here makes more sense than in the settings application. Historically plasma-settings had a faster release cycle than Plasma, but the application is now moving to the Plasma release schedule and so it makes sense do this now.
 2023-03-13 18:45:47 -07:00
Yari Polla
847529751e metadata: port to KPackageStructure 2023-03-07 00:52:30 +01:00
Devin Lin
1dbb1c78f6 Port to Qt6/KF6 2023-03-03 06:01:23 +00:00
l10n daemon script
acc6431029 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-01 23:48:55 +00:00
l10n daemon script
ccbd4d03b7 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-24 02:05:19 +00:00
l10n daemon script
9f420519b1 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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:10:12 +00:00
l10n daemon script
46ace5ee36 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-28 02:04:50 +00:00
David Redondo
750d5581ef Revert "Show all headers in qtc6" 
There was no consensus for this in Plasma.
This reverts commit c79ca828f3.
 2023-01-24 08:51:18 +01:00
Laurent Montel
c79ca828f3 Show all headers in qtc6 2023-01-22 18:30:45 +00:00
Yuri Chornoivan
6057e782af Fix minor typo 2022-12-23 13:57:50 +02:00
Devin Lin
6b843da34b Ensure all packages have translations enabled 2022-12-19 12:39:51 -05:00
l10n daemon script
1fec8612dc SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-20 01:50:06 +00:00
Devin Lin
643b684d66 kcm: Update to new usage of FormComboBoxDelegate 2022-11-15 17:02:46 +00:00
l10n daemon script
990e0b61b6 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-18 01:48:38 +00:00
Nicolas Fella
b4dd9066da Remove unneeded stuff from CMake 
This should only be at the project toplevel, not in some subfolder
 2022-10-02 17:56:55 +02:00
Devin Lin
c6feac9ce0 taskpanel: Remove keyboard button setting, only show when unsupported 2022-09-12 08:12:24 -04:00
Devin Lin
2aaf5fca98 navigationpanel: Add force keyboard toggle, and add setting 2022-09-11 21:45:12 +00:00
l10n daemon script
66e7b8cbf9 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-23 01:48:27 +00:00
Devin Lin
7a4a0dddc0 kcm: Update mobileform usage 2022-08-20 11:29:24 -04:00
l10n daemon script
2a94ef0d96 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-20 01:43:57 +00:00
l10n daemon script
7ba564fdeb SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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:49:16 +00:00
l10n daemon script
b9fbb2da57 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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:44:52 +00:00
l10n daemon script
6364578281 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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:46:56 +00:00
l10n daemon script
aeddd5ab75 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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:44:56 +00:00
l10n daemon script
93ee6189b0 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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:50:10 +00:00
l10n daemon script
4ae02a3b9c SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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:45:47 +00:00
l10n daemon script
f7de0bdd84 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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:45:42 +00:00
l10n daemon script
9655dcdc6d SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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:48:30 +00:00
l10n daemon script
32ca26c5fa SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-22 01:43:12 +00:00
Alexander Lohnau
8587c10f5f Port KCM to new namespace, new metadata approach and new namespace 
- Convert the metadata.desktop file to a json file (https://phabricator.kde.org/T14983)
- Use kcmutils_generate_desktop_file to install the kcm as a NoDisplay-application (https://phabricator.kde.org/T15609)
- Use the new install namespaces that were created for https://phabricator.kde.org/T14517
 2022-07-21 19:30:11 +00:00
Devin Lin
f9e0cb3916 kcm: Port to org.kde.kirigamiaddons.labs.mobileform 2022-06-22 13:43:39 -04:00
l10n daemon script
e4f5b54dde SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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:55:01 +00:00
l10n daemon script
99614ecbd7 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-12 01:45:23 +00:00
l10n daemon script
b9f9066880 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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:21:44 +00:00
l10n daemon script
de8b6d482a SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-05 01:44:59 +00:00
l10n daemon script
f1bce20b3e SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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:58:30 +00:00
Devin Lin
221799828d kcm: Add ability to customise mode of action drawer swipe down 2022-05-30 23:37:00 -04:00
Devin Lin
bf1704d6d0 kcm: Move quicksettings form to separate page 2022-05-30 17:53:41 -04:00
Devin Lin
2c61bb1723 kcm & taskswitcher: Add option to toggle application previews 2022-05-21 10:54:51 -04:00
l10n daemon script
4c83a3e422 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-15 01:57:29 +00:00
Devin Lin
9a575ad42e kcm: Add vibration intensity and duration 2022-05-05 21:02:18 -04:00
Devin Lin
a18313b447 kcm: Fix settings not being saved 2022-04-30 00:02:49 -04:00
Devin Lin
62e7dce24a kcm: Add reduced animation mode 
Implement #190 reduced animations mode
 2022-04-29 20:02:37 -04:00
Devin Lin
3353cfc498 kcm: Add vibration setting for shell, and add vibrations 
We can control shell vibrations from here, which can be replaced once there is a mechanism to control system-wide vibrations for QtFeedback.
 2022-04-29 16:15:59 -04:00
Laurent Montel
401620e365 Fix some qt6 compile errors 2022-04-24 13:44:41 +02:00
l10n daemon script
c6b55a9534 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-21 01:44:16 +00:00
l10n daemon script
2d6d0c6789 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-09 01:50:14 +00:00
Devin Lin
629b10486a kcm: Use MobileShellSettings rather than custom implementation 2022-04-06 22:54:35 -04:00
l10n daemon script
8e13435ccb SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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:17:10 +00:00
l10n daemon script
5f20862a3f SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-27 01:51:39 +00:00
l10n daemon script
a005e9b746 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-24 01:50:51 +00:00
Devin Lin
2f84b07bbc quicksettings: Add save and update timers so kcm ordering is always correct 2022-03-21 10:25:45 -04:00
Devin Lin
b57b26803d kcm: Fix missing property 2022-03-17 16:08:28 -04:00
Devin Lin
17b4b774a3 kcm: Add ability to reorder quicksettings 
Implements #75, reordering of quick settings, and also includes the mobile form components into the kcm.
 2022-03-17 15:34:35 -04:00
l10n daemon script
f7078d6aa5 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-16 01:44:47 +00:00
l10n daemon script
25194c1d23 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-14 01:45:26 +00:00
l10n daemon script
aa6db65cca SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-06 01:48:19 +00:00
l10n daemon script
ad3a2b2fb1 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-05 01:46:46 +00:00
l10n daemon script
f4ca3b96c7 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-28 01:41:06 +00:00
l10n daemon script
cd102c92c1 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-27 01:54:10 +00:00
l10n daemon script
48899f6e97 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-21 01:51:37 +00:00
l10n daemon script
27297c445a SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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:48:09 +00:00
l10n daemon script
badb279ab4 SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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:50:38 +00:00
l10n daemon script
0cf909d51a SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-17 01:53:49 +00:00
l10n daemon script
925fabc34c SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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-16 01:49:48 +00:00
l10n daemon script
c57b024e4d SVN_SILENT made messages (.desktop file) - always resolve ours 
In 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:48:28 +00:00
Devin Lin
8f9f722ca7 navigationpanel: Add ability to toggle between gesture only and shown navigation panel modes 
Addresses: https://invent.kde.org/plasma/plasma-phone-components/-/issues/140
 2022-02-13 04:23:57 +00:00