l10n daemon script
1428eac1d1
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
Ömer Fadıl Usta
107e5c235a
Portaway from ERR_SLAVE_DEFINED
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
7bb5f17a92
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
c2576f8a1f
Adapt to Qt6's removal of Qt::X11Extras
4 years ago
Volker Krause
bf529ccd47
Port fonts KCM to KLazyLocalizedString
...
I18N_NOOP is deprecated and gone in KF6.
4 years ago
Laurent Montel
c2c3a2d6b7
Install in kf<version>
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
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
Laurent Montel
2543f1b843
GIT_SILENT: use Q_EMIT
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
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
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
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
Ahmad Samir
6ae36d4b50
kio_fonts: fix the thumbnails creation by tweaking the USEntry fields
...
- Set the fancy name, e.g. "Foo, Bold Italic", as UDS_DISPLAY_NAME
- Set the actual file name, e.g. foo-bold.ttf, as UDS_NAME
- Set the actual file url, e.g. /usr/share/fonts/truetype/foo-bold.ttf as UDS_URL
Setting the UDS_URL fixes font thumbnail creation when using kio_fonts.
And IIUC, also avoids calling get() on "font:/" urls, the files are already
local; setting the UDS_URL makes all the font previews work on my system
at least.
BUG: 234754
FIXED-IN: 5.23
5 years ago
Ahmad Samir
ffa1baa6d4
kio_fonts: always add a UDSEntry for own "."
5 years ago
Ahmad Samir
104fea4ec3
kfontinst: less macros; use logging categories
...
And comment out the qDebug() calls (the ones without a logging category),
useful for debugging but they spam the terminal output if you e.g. start
systemsettings from terminal.
Also don't print time with debug statements, useful for benchmarking, but
too much output in terminal otherwise.
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
7a28ad5ab0
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
178a4f8756
Use version-less qt DBus macros
...
They work with both Qt5 and Qt6
5 years ago
Alexander Lohnau
46c784099d
Embed JSON metadata in KIOSlaves
...
Task: https://phabricator.kde.org/T14518
5 years ago
Alexander Lohnau
e900f43b62
Remove old .protocol files
5 years ago
Alexander Lohnau
42efaf445f
Convert protocol files to JSON
...
This was done using the protocoltojson utility from KIO.
Task: https://phabricator.kde.org/T14518
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
Nicolas Fella
78f04b5813
Port from QString::SkipEmptyParts to Qt::SkipEmptyParts
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
1a07220843
Use versionless Qt cmake target
...
This makes it easier to build against both Qt5 and Qt6
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
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
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
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
l10n daemon script
d414d9699f
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"
6 years ago
Ahmad Samir
3c7d853d02
kio_fonts: remove test_kio_fonts, it's become redundant
...
This tested the old behaviour where kio_fonts used "fonts://", i.e. setting
the host part of the URL, this isn't the case anymore and just "fonts:/" is
used.
ACK'ed by dfaure:
https://invent.kde.org/frameworks/kio/-/merge_requests/127#note_117004
6 years ago
l10n daemon script
fc4bfe569f
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"
6 years ago
l10n daemon script
180ebece57
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"
6 years ago
l10n daemon script
7371158329
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"
6 years ago
l10n daemon script
6f229f5684
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"
6 years ago
l10n daemon script
1d0a9cbcb7
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"
6 years ago
l10n daemon script
2aecf659a6
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"
6 years ago