mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-29 15:03:09 +00:00
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"
This commit is contained in:
parent
9e90eff1dd
commit
119e750d9c
1 changed files with 1 additions and 1 deletions
|
|
@ -42,7 +42,7 @@
|
|||
"Description[ia]": "Preferentia rapide de Bluetooth",
|
||||
"Description[is]": "Flýtistilling fyrir Bluetooth",
|
||||
"Description[it]": "Impostazioni rapide del Bluetooth",
|
||||
"Description[ka]": "BT-ის სწრაფი მორგება",
|
||||
"Description[ka]": "ბლუთუზის სწრაფი მორგება",
|
||||
"Description[ko]": "블루투스 빠른 설정",
|
||||
"Description[nl]": "Snelle instelling van bluetooth",
|
||||
"Description[pa]": "ਬਲੂਟੁੱਥ ਫੌਰੀ ਸੈਟਿੰਗ",
|
||||
|
|
|
|||
Loading…
Reference in a new issue