mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-26 14:23: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
0f46dc92f5
commit
07784b7500
1 changed files with 2 additions and 0 deletions
|
|
@ -52,6 +52,7 @@
|
|||
"Description[nl]": "Snelle instelling van OSD opzet van scherm voor Plasma Mobile",
|
||||
"Description[pl]": "Szybkie ustawienia okien na ekranie dla Przenośnej Plazmy",
|
||||
"Description[pt_BR]": "Configurações rápidas de tela OSD para o Plasma Mobile",
|
||||
"Description[ru]": "Экранная подсказка настройки экрана для Plasma Mobile",
|
||||
"Description[sl]": "Hitra nastavitev zaslona na zaslonu za Plasma Mobile",
|
||||
"Description[sv]": "Snabbinställning av meddelanden på bildskärm för Plasma mobil",
|
||||
"Description[tr]": "Plasma Cep ekran ayarları için tez ayar",
|
||||
|
|
@ -80,6 +81,7 @@
|
|||
"Name[nl]": "OSD van scherm",
|
||||
"Name[pl]": "Okna na ekranie",
|
||||
"Name[pt_BR]": "Tela OSD",
|
||||
"Name[ru]": "Экранные подсказки",
|
||||
"Name[sl]": "Zaslon na zaslonu",
|
||||
"Name[sv]": "Meddelanden på bildskärm",
|
||||
"Name[tr]": "Ekran EÜG’si",
|
||||
|
|
|
|||
Loading…
Reference in a new issue