mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-28 06:33: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
f6bc752dbd
commit
3ae0436da1
2 changed files with 29 additions and 1 deletions
|
|
@ -39,7 +39,8 @@
|
|||
"Description[zh_CN]": "软件版本",
|
||||
"Description[zh_TW]": "軟體版本",
|
||||
"FormFactors": [
|
||||
"handset", "tablet"
|
||||
"handset",
|
||||
"tablet"
|
||||
],
|
||||
"Icon": "dialog-information",
|
||||
"Name": "Information",
|
||||
|
|
|
|||
|
|
@ -5,15 +5,42 @@
|
|||
{
|
||||
"Email": "sebas@kde.org",
|
||||
"Name": "Sebastian Kügler",
|
||||
"Name[ca]": "Sebastian Kügler",
|
||||
"Name[es]": "Sebastian Kügler",
|
||||
"Name[he]": "סבסטיאן קיגלר",
|
||||
"Name[ka]": "სებასტიან კუგლერი",
|
||||
"Name[nl]": "Sebastian Kügler",
|
||||
"Name[sl]": "Sebastian Kügler",
|
||||
"Name[sv]": "Sebastian Kügler",
|
||||
"Name[tr]": "Sebastian Kügler",
|
||||
"Name[uk]": "Sebastian Kügler",
|
||||
"Name[x-test]": "xxSebastian Küglerxx"
|
||||
}
|
||||
],
|
||||
"Description": "Screen setup OSD quick setting for Plasma Mobile",
|
||||
"Description[ca]": "Configuració ràpida de l'OSD de la pantalla per al Plasma Mobile",
|
||||
"Description[es]": "Ajuste rápido del OSD de configuración de pantalla para Plasma Mobile",
|
||||
"Description[he]": "חיווי על גבי המסך להגדרה מהירה של התצוגה לפלזמה לניידים",
|
||||
"Description[ka]": "ეკრანის OSD სწრაფი მორგების პარამეტრი Plasma Mobile-სთვის",
|
||||
"Description[nl]": "Snelle instelling van OSD opzet van scherm voor 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",
|
||||
"Description[uk]": "Параметри швидкого налаштовування екрана за допомогою панелі для Мобільної Плазми",
|
||||
"Description[x-test]": "xxScreen setup OSD quick setting for Plasma Mobilexx",
|
||||
"Icon": "osd-duplicate",
|
||||
"Id": "org.kde.plasma.quicksetting.kscreenosd",
|
||||
"License": "GPL-2.0+",
|
||||
"Name": "Screen OSD",
|
||||
"Name[ca]": "OSD de la pantalla",
|
||||
"Name[es]": "OSD de pantalla",
|
||||
"Name[he]": "חיווי על גבי המסך",
|
||||
"Name[ka]": "ეკრანის OSD",
|
||||
"Name[nl]": "OSD van scherm",
|
||||
"Name[sl]": "Zaslon na zaslonu",
|
||||
"Name[sv]": "Meddelanden på bildskärm",
|
||||
"Name[tr]": "Ekran EÜG’si",
|
||||
"Name[uk]": "Екранна панель",
|
||||
"Name[x-test]": "xxScreen OSDxx",
|
||||
"Website": "https://kde.org"
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue