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 2023-03-01 23:48:05 +00:00
parent 49977d38f2
commit 24802d9d9a
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/kcms/screenedges/kcm_kwintouchscreen.json
View file

@ -21,7 +21,7 @@
"Description[it]": "Configura gesti dello schermo a sfioramento", "Description[it]": "Configura gesti dello schermo a sfioramento",
"Description[ja]": "タッチスクリーンでのスワイプジェスチャーを設定", "Description[ja]": "タッチスクリーンでのスワイプジェスチャーを設定",
"Description[ka]": "სენსორიანი ეკრანის გასმის ჟესტების მორგება", "Description[ka]": "სენსორიანი ეკრანის გასმის ჟესტების მორგება",
"Description[ko]": "터치 스크린 밀기 제스처 설정", "Description[ko]": "터치스크린 밀기 제스처 설정",
"Description[nl]": "Veeggebaren voor aanraakscherm configureren", "Description[nl]": "Veeggebaren voor aanraakscherm configureren",
"Description[nn]": "Set opp fingerrørsler på trykkskjerm", "Description[nn]": "Set opp fingerrørsler på trykkskjerm",
"Description[pl]": "Ustawienia gestów na ekranie dotykowym", "Description[pl]": "Ustawienia gestów na ekranie dotykowym",