l10n daemon script
a09776c06c
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
4 years ago
l10n daemon script
100aa732fa
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
4 years ago
l10n daemon script
460a6485b9
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
4 years ago
l10n daemon script
56e6f4d30b
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
4 years ago
Laurent Montel
d53aea4f66
Fix path against qt6/qt5
4 years ago
l10n daemon script
1f3a932c5e
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
4 years ago
Volker Krause
a8006e8b0b
Adapt build system to also support building against Qt6
4 years ago
Volker Krause
7616c49f17
Ensure moc sees fully qualified property types
...
Qt6 insists on that. We can do this either by including the moc files,
or by including the corresponding headers in the header defining the
properties, the former seems cleaner.
4 years ago
Volker Krause
38c723e596
Use version-less Qt targets, variables and macros
...
Prepares for building against Qt6.
4 years ago
l10n daemon script
a298977479
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
4 years ago
l10n daemon script
a7588366e6
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
4 years ago
l10n daemon script
4d532f0801
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
4 years ago
l10n daemon script
daed0461eb
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
4 years ago
l10n daemon script
2141988c3b
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
4 years ago
l10n daemon script
6721c2ec92
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
4 years ago
l10n daemon script
1c12775ec7
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
4 years ago
David Edmundson
083ef23af2
[kcms/formats] Write text codec into localerc files
...
In the port this snippet got lost. Without the suffix we lose information needed by clients.
This patch will also affect the names presented as a subtitle in the list.
If that is undesired we can introduce a new role.
BUG: 447903
4 years ago
Nate Graham
cf0df5baef
kcm/formats: change another instance of "Number" to "Numbers"
...
Like 7aacf049ef , but for the list item as
well as the page title.
4 years ago
ivan tkachenko
7aacf049ef
[kcm/formats] Reword "Number" to "Numbers"
4 years ago
l10n daemon script
0d0b713076
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
4 years ago
l10n daemon script
5259ac39ab
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
4 years ago
l10n daemon script
594b933a1e
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
4 years ago
l10n daemon script
5a792e989f
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
4 years ago
Nicolas Fella
8f4e84aa3c
[kcms/formats] Install to new namespace
...
The .desktop file got moved to the new location but not the .so file, which seems to break systemsettings
BUG: 447544
4 years ago
Alexander Lohnau
79c7c9cc12
Remove unneeded X-KDE-ParentApp definitions in json metadata
4 years ago
Alexander Lohnau
ff19a1c343
Remove unneeded ServiceType definitions in json metadata
...
We already do the filtering based on the plugin namespace and no
longer through the SevriceTyoes.
4 years ago
Alexander Lohnau
1f088b398f
Remove Comment entries from KCM desktop files
...
We do not display the comment for desktop files
in the panel, task manager or desktop.
Because we no longer depend on desktop-to-json conversion, we
can remove the entries.
4 years ago
l10n daemon script
7ebe49f96f
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
4 years ago
l10n daemon script
41e9c0e65f
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
4 years ago
l10n daemon script
b64be79def
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
4 years ago
l10n daemon script
07e7431c2a
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
4 years ago
l10n daemon script
c7689f5349
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
4 years ago
l10n daemon script
36cadc2c69
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
4 years ago
l10n daemon script
50a7069ada
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
4 years ago
Alexander Lohnau
8af527c337
kcms: Remove now unneeded kcoreaddons_desktop_to_json cmake function calls
4 years ago
Alexander Lohnau
c2c2ff6da5
Convert KCM Desktop files to JSON
...
Task: https://phabricator.kde.org/T14564
4 years ago
Nicolas Fella
7039f853d9
[kcms] Drop pointless renaming of desktop files
4 years ago
l10n daemon script
f258b6217a
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
4 years ago
Alexander Lohnau
b31115d48a
Remove X-Plasma-MainScript from KCM metadata if we only set the default value
4 years ago
l10n daemon script
0b901a227f
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
4 years ago
Nicolas Fella
0bf239c0ab
Remove unneeded X-Plasma-API from KCM metadata
...
It doesn't serve any purpose
4 years ago
Alexander Lohnau
42d074383b
Do not install metadata files for KCM kpackages
...
We can get the metadata form the C++ plugin and set that for the kpackage.
This way the files are not duplicated in source, on disk and in memory.
Task: https://phabricator.kde.org/T14983
4 years ago
Andy Gebauer
d7da2a2df6
Update optionsmodel.h to compile with clang + libcxx
4 years ago
l10n daemon script
ca4bff7255
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
4 years ago
l10n daemon script
897deee06f
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
5 years ago
Han Young
32a565bae7
kcms/formats: port to QML
...
BUG: 279658
BUG: 338599
BUG: 362865
BUG: 389529
BUG: 410606
BUG: 422467
BUG: 426313
FIXED-IN: 5.24
5 years ago
l10n daemon script
799da8be16
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
5 years ago
l10n daemon script
233e63798e
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
5 years ago
l10n daemon script
4e7892ee66
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
5 years ago
l10n daemon script
823bdd8a54
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
5 years ago