yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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"
This commit is contained in:
l10n daemon script 2022-10-17 01:50:44 +00:00
parent d454a2981c
commit 0f8ec3fcd2
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.json
View file

@ -6,7 +6,7 @@
"Description[ar]": "اختر أيا من لوحات المفاتيح الافتراضية لإستعمالها",
"Description[az]": "İstifadə edəcəyiniz virtual klaviaturanı seçin",
"Description[bg]": "Избиране на виртуална клавиатура, която да се използва",
"Description[ca@valencia]": "Seleccioneu el teclat virtual que s'utilitzarà",
"Description[ca@valencia]": "Seleccioneu el teclat virtual que s'ha d'utilitzar",
"Description[ca]": "Seleccioneu el teclat virtual a usar",
"Description[de]": "Wählen Sie die zu verwendende virtuelle Tastatur",
"Description[en_GB]": "Select which virtual keyboard to use",