mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-29 07:03:08 +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
5ea804659d
commit
8f4c7234be
1 changed files with 3 additions and 0 deletions
|
|
@ -21,6 +21,7 @@
|
|||
"Name[ko]": "Micah Stanley",
|
||||
"Name[lv]": "Micah Stanley",
|
||||
"Name[nl]": "Micah Stanley",
|
||||
"Name[ru]": "Micah Stanley",
|
||||
"Name[sl]": "Micah Stanley",
|
||||
"Name[sv]": "Micah Stanley",
|
||||
"Name[tr]": "Micah Stanley",
|
||||
|
|
@ -46,6 +47,7 @@
|
|||
"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[ru]": "Быстрая настройка автоматического скрытия панелей для 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ı",
|
||||
|
|
@ -72,6 +74,7 @@
|
|||
"Name[ko]": "패널 자동 숨기기",
|
||||
"Name[lv]": "Automātiski slēpt paneļus",
|
||||
"Name[nl]": "Panelen automatisch verbergen",
|
||||
"Name[ru]": "Автоматическое скрытие панелей",
|
||||
"Name[sl]": "Samodejno skrij plošče",
|
||||
"Name[sv]": "Dölj paneler automatiskt",
|
||||
"Name[tr]": "Panelleri Kendiliğinden Gizle",
|
||||
|
|
|
|||
Loading…
Reference in a new issue