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
a45395491b
commit
6d02a24dd4
1 changed files with 6 additions and 0 deletions
|
|
@ -17,8 +17,10 @@
|
|||
"Name[ia]": "Micah Stanley",
|
||||
"Name[it]": "Micah Stanley",
|
||||
"Name[ka]": "Micah Stanley",
|
||||
"Name[lv]": "Micah Stanley",
|
||||
"Name[nl]": "Micah Stanley",
|
||||
"Name[sl]": "Micah Stanley",
|
||||
"Name[sv]": "Micah Stanley",
|
||||
"Name[tr]": "Micah Stanley",
|
||||
"Name[uk]": "Micah Stanley",
|
||||
"Name[x-test]": "xxMicah Stanleyxx",
|
||||
|
|
@ -38,8 +40,10 @@
|
|||
"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[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",
|
||||
"Description[sv]": "Dölj panelernas snabbinställningar automatiskt för Plasma mobil",
|
||||
"Description[tr]": "Plasma Cep panelleri kendiliğinden gizleme tez ayarı",
|
||||
"Description[uk]": "Пункт швидкого приховування панелей для Мобільної Плазми",
|
||||
"Description[x-test]": "xxAuto Hide Panels quick setting for Plasma Mobilexx",
|
||||
|
|
@ -60,8 +64,10 @@
|
|||
"Name[ia]": "Auto-Cela Pannellos",
|
||||
"Name[it]": "Nascondi automaticamente i pannelli",
|
||||
"Name[ka]": "პანელების ავტომატური დამალვა",
|
||||
"Name[lv]": "Automātiski slēpt paneļus",
|
||||
"Name[nl]": "Panelen automatisch verbergen",
|
||||
"Name[sl]": "Samodejno skrij plošče",
|
||||
"Name[sv]": "Dölj paneler automatiskt",
|
||||
"Name[tr]": "Panelleri Kendiliğinden Gizle",
|
||||
"Name[uk]": "Автоматично ховати панелі",
|
||||
"Name[x-test]": "xxAuto Hide Panelsxx",
|
||||
|
|
|
|||
Loading…
Reference in a new issue