l10n daemon script
fbb64207eb
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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
7b692d6aa6
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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
52276c9874
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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
c56a99a0bb
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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
0848ba2125
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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
640cd297d1
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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
Ahmad Samir
5cea29ed6a
Don't install two copies of kcm_fontinst
...
This looks like an oversight after switching to use the
kcoreaddons_add_plugin macro.
(cherry picked from commit f8c6099a32 )
4 years ago
Ben Cooksley
fb5656eaf2
Use the correct endpoint for this - hosted by a CDN and therefore capable of handling much greater volumes of traffic.
...
CCMAIL: plasma-devel@kde.org
CCMAIL: distributions@kde.org
(cherry picked from commit 8c11f207e2 )
4 years ago
l10n daemon script
1f66cfd188
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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
04e25ce4f6
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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
6b947b6018
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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
181199ccbb
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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
a0a4320c6c
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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
393a8e1561
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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
8556ed8858
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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
6f5a28665c
[kcms/kfontinst] Re-enable on wayland
...
The entire KCM was diabled due to crashes:
Since c305dcd85d the relevant
section is disabled instead of crashing. This allows us to reintroduce
the KCM, albeit with previews currently disabled.
BUG: 439375
FIXED-IN: 5.24
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
Oleg Solovyov
a91ac4268c
Use KNewStuff widgets
...
We don't need to show GHNS buttons/actions when such actions are
restricted by admin
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
324516d8d4
Remove categories from KCM desktop files
...
KCMs do not show up in the categorized views of the launcher
and never did. Consequently the categories can be removed.
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
Ahmad Samir
6edabcf3f0
Fix installation location of kfontviewpart.rc
...
It looks like commit 8b297dbbb0 (spotted by Albert Astals Cid), broke
this, the KAboutData object used KFI_NAME (which is "kfontinst"), which made
KxmlGui pick kfontviewpart.rc from ${KDE_INSTALL_KXMLGUI5DIR}/kfontinst.
Change the location to ${KDE_INSTALL_KXMLGUI5DIR}/kfontview, which is where
kfontviewui.rc is installed already.
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
Alexander Lohnau
0a1cc4b624
Fix formatting of X-KDE-OnlyShowOnQtPlatforms json entry
...
We define it as an array, however we had split it with a semicolon as a separator in KService.
With this change we can correctly read it as a QJsonArray
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
Alexander Lohnau
5a3c41cce1
Remove installation of kfontviewpart file
...
We don't go through KService anywhere when loading the part
4 years ago
Alexander Lohnau
3ec42f2c73
Clean up further unneeded desktop files
4 years ago
Laurent Montel
2543f1b843
GIT_SILENT: use Q_EMIT
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
17758ca000
Align names of KCMs and their desktop files
...
The desktop file name is derived from the plugins id, without the renaming the files could not be found
4 years ago
Alexander Lohnau
5686336bf9
Install KCMs in new namespace & embed json metadata
...
This way systemmsettings/krunner does not need to query the KCMs
using the deprecated KServiceTypeTrader.
Task: https://phabricator.kde.org/T14517
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
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
Corbin Schwimmbeck
76b881b87f
kcms/kfontinst: Make opening and printing tooltip non-generic
...
Previously, the tooltips referred to generic "Open an existing document" or
"Print document", as defined in the kframework.
These descriptions now match what they do, since they are specific to font
files and printing font previews. This updates both the menubar action
tooltips as well as button tooltips.
4 years ago
Corbin Schwimmbeck
a05363886c
Replacing its with m_ to match current convention
4 years ago
Corbin Schwimmbeck
36b3208862
Fix deprecation warning
...
Addresses:
QT_DEPRECATED_SINCE(5, 15)
QT_DEPRECATED_X("Use transformed(const QTransform &matrix, Qt::TransformationMode mode)")
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
Nicolas Fella
33c4929515
Unbreak fontinst KCM
...
KCMs without JSON metadata must not be installed into <plugins>/kcms. They belong in <plugins> until they are ported
BUG: 442748
5 years ago
l10n daemon script
55000bfbca
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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
f11f4749a1
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In 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