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
2e48bbe5dc
commit
c31895f622
1 changed files with 6 additions and 0 deletions
|
|
@ -10,8 +10,10 @@
|
|||
"Name[es]": "Sebastian Kügler",
|
||||
"Name[eu]": "Sebastian Kügler",
|
||||
"Name[he]": "סבסטיאן קיגלר",
|
||||
"Name[it]": "Sebastian Kügler",
|
||||
"Name[ka]": "სებასტიან კუგლერი",
|
||||
"Name[nl]": "Sebastian Kügler",
|
||||
"Name[pt_BR]": "Sebastian Kügler",
|
||||
"Name[sl]": "Sebastian Kügler",
|
||||
"Name[sv]": "Sebastian Kügler",
|
||||
"Name[tr]": "Sebastian Kügler",
|
||||
|
|
@ -26,8 +28,10 @@
|
|||
"Description[es]": "Ajuste rápido del OSD de configuración de pantalla para Plasma Mobile",
|
||||
"Description[eu]": "Pantaila ezarpena OSD ezarpen azkarra Plasma Mugikorrerako",
|
||||
"Description[he]": "חיווי על גבי המסך להגדרה מהירה של התצוגה לפלזמה לניידים",
|
||||
"Description[it]": "Configurazione rapida dell'OSD per Plasma Mobile",
|
||||
"Description[ka]": "ეკრანის OSD სწრაფი მორგების პარამეტრი Plasma Mobile-სთვის",
|
||||
"Description[nl]": "Snelle instelling van OSD opzet van scherm voor Plasma Mobile",
|
||||
"Description[pt_BR]": "Configurações rápidas de tela OSD para o 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",
|
||||
|
|
@ -43,8 +47,10 @@
|
|||
"Name[es]": "OSD de pantalla",
|
||||
"Name[eu]": "Pantailako OSD",
|
||||
"Name[he]": "חיווי על גבי המסך",
|
||||
"Name[it]": "OSD schermo",
|
||||
"Name[ka]": "ეკრანის OSD",
|
||||
"Name[nl]": "OSD van scherm",
|
||||
"Name[pt_BR]": "Tela OSD",
|
||||
"Name[sl]": "Zaslon na zaslonu",
|
||||
"Name[sv]": "Meddelanden på bildskärm",
|
||||
"Name[tr]": "Ekran EÜG’si",
|
||||
|
|
|
|||
Loading…
Reference in a new issue