l10n daemon script
ce39fee584
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
d72310322f
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
7d51f1e688
Remove unused include
4 years ago
l10n daemon script
0064f7185c
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
8e7c9dbe5c
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
189ff0c175
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
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
Volker Krause
bf529ccd47
Port fonts KCM to KLazyLocalizedString
...
I18N_NOOP is deprecated and gone in KF6.
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
Laurent Montel
c2c3a2d6b7
Install in kf<version>
4 years ago
Volker Krause
9d7ed1d3d5
Port from QRegExp to QRegularExpression
4 years ago
Volker Krause
38c723e596
Use version-less Qt targets, variables and macros
...
Prepares for building against Qt6.
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
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
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
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
a05363886c
Replacing its with m_ to match current convention
4 years ago
l10n daemon script
b9a1e98742
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
Alexander Lohnau
b51fd04b89
GIT_SILENT Revert accidental changes
5 years ago
Alexander Lohnau
4df78f841c
Remove unneeded comments in license headers
5 years ago
Alexander Lohnau
fefe12dff6
Manual SPDX fixes & cleanup
5 years ago
Alexander Lohnau
c11051955d
Convert license headers to SPDX
5 years ago
Adrien Faveraux
42515d22cb
Move include guard to Pragma Once
5 years ago
Ahmad Samir
746ac95039
kcms/kfontinst: always add braces around statements
...
This was done using:
run-clang-tidy -checks='-*,readability-braces-around-statements' -j3 -fix '.*kfontinst.*'
git clang-format --force
GIT_SILENT
5 years ago
l10n daemon script
faad339db5
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
96355cd03a
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
Felipe Kinoshita
c52df1e792
Use ellipses instead of triple period
...
A real ellipsis character is better for accessibility, as screen readers
will describe it appropriately.
5 years ago
David Faure
8b297dbbb0
kfontviewpart: add JSON metadata to plugin, install into kf5/parts subdir
...
Remove call to deprecated setComponentData, this comes from the json now
(well, no version number in this specific json file, but I doubt
anything was actually showing that)
No user by direct path found in lxr:
https://lxr.kde.org/search?_string=%22kfontviewpart%22&_casesensitive=&_advanced=&_filestring=
KF6 task: https://phabricator.kde.org/T12340
5 years ago
Alexander Lohnau
f7b556dddf
GIT_SILENT Re-run clang-format
5 years ago
l10n daemon script
9f02b43f3f
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
7fb5605b5d
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
9d630a85da
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
155a3f1310
Cleanup font libraries cmake code
...
Use imported targets
separate private and public dependencies for kfontinst
5 years ago
Alexander Lohnau
823d2106ec
Run clang-format
...
If you want git blame to ignore formatting revisions run:
git config blame.ignoreRevsFile .git-blame-ignore-revs
5 years ago
Nicolas Fella
69b7aec0de
Manually prevent clang-format formatting
...
The result would be too disruptive
5 years ago
l10n daemon script
43c5ea39fc
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
Alexander Lohnau
8b4cf5a197
Remove dead code
5 years ago
l10n daemon script
133df34155
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
e6b9b04005
Remove unused includes
5 years ago
Nicolas Fella
b7869bf267
Add trailing commas to enums
...
We do this sometimes, but not consistenly.
The benefit is twofold.
First it improves the diff when adding new values since no existing line needs to be touched.
Second it prevents clang-format from collapsing the definition into a single line, which is undesired for large enums.
5 years ago
l10n daemon script
76dfcd10ae
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
David Redondo
853e135c20
Port away from QString::sprintf
5 years ago
l10n daemon script
e932eae6b6
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
11d3721ad4
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
Laurent Montel
457fd4d232
If include is define in .h remove it if it's defined in .cpp too (scripted)
5 years ago