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
2b1f66ecdc
commit
b4d6ba6fbd
1 changed files with 3 additions and 0 deletions
|
|
@ -18,6 +18,7 @@
|
|||
"Name[ia]": "Micah Stanley",
|
||||
"Name[it]": "Micah Stanley",
|
||||
"Name[ka]": "Micah Stanley",
|
||||
"Name[ko]": "Micah Stanley",
|
||||
"Name[lv]": "Micah Stanley",
|
||||
"Name[nl]": "Micah Stanley",
|
||||
"Name[sl]": "Micah Stanley",
|
||||
|
|
@ -42,6 +43,7 @@
|
|||
"Description[ia]": "Auto Cela Pannellos Preferentia rapide per Plasma Mobile",
|
||||
"Description[it]": "Impostazione rapida Nascondi automaticamente i pannelli per Plasma Mobile",
|
||||
"Description[ka]": "პანელების ავტოდამალვის სწრაფად დაყენება Plasma Mobile-სთვის",
|
||||
"Description[ko]": "Plasma 모바일의 패널 자동 숨기기 빠른 설정",
|
||||
"Description[lv]": "„Plasma Mobile“ paneļu automātiskās slēpšanas ātrais iestatījumus",
|
||||
"Description[nl]": "Snelle instelling van automatisch panelen verbergen voor Plasma Mobile",
|
||||
"Description[sl]": "Hitre nastavitve samodejnega skrivanja plošč za Plasma Mobile",
|
||||
|
|
@ -67,6 +69,7 @@
|
|||
"Name[ia]": "Auto-Cela Pannellos",
|
||||
"Name[it]": "Nascondi automaticamente i pannelli",
|
||||
"Name[ka]": "პანელების ავტომატური დამალვა",
|
||||
"Name[ko]": "패널 자동 숨기기",
|
||||
"Name[lv]": "Automātiski slēpt paneļus",
|
||||
"Name[nl]": "Panelen automatisch verbergen",
|
||||
"Name[sl]": "Samodejno skrij plošče",
|
||||
|
|
|
|||
Loading…
Reference in a new issue