marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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:
l10n daemon script 2024-07-18 01:19:02 +00:00
parent 9e8f0a0c74
commit 6835f49d8c
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
layout-templates/org.kde.plasma.mobile.defaultNavigationPanel/metadata.json
View file

@ -13,8 +13,11 @@
],
"Category": "",
"Description": "Default navigation panel for mobile",
"Description[ca@valencia]": "Quadro de navegació predeterminat per al mòbil",
"Description[ca]": "Plafó de navegació predeterminat per al mòbil",
"Description[es]": "Panel de navegación predeterminado para dispositivos móviles",
"Description[eu]": "Mugikorrerako nabigatzeko panel lehenetsia",
"Description[he]": "לוח ניווט כברירת מחדל לנייד",
"Description[ia]": "Pannello de Navigation predefinite per mobile",
"Description[ka]": "ნაგულისხმევი ნავიგაციის პანელი მობილური მოწყობილობებისთვის",
"Description[nl]": "Standaard navigatiepaneel voor mobiel",
@ -26,8 +29,11 @@
"Id": "org.kde.plasma.mobile.defaultNavigationPanel",
"License": "LGPLv2+",
"Name": "Default Mobile Navigation Panel",
"Name[ca@valencia]": "Quadro de navegació predeterminat del mòbil",
"Name[ca]": "Plafó de navegació predeterminat del mòbil",
"Name[es]": "Panel de navegación móvil predeterminado",
"Name[eu]": "Mugikorreko nabigatzeko panel lehenetsia",
"Name[he]": "לוח ניווט כברירת מחדל לנייד",
"Name[ia]": "Pannello de Navigation predefinite de Mobile",
"Name[ka]": "ნაგულისხმევი მობილური ნავიგაციის პანელი",
"Name[nl]": "Standaard navigatiepaneel van mobiel",

6
layout-templates/org.kde.plasma.mobile.defaultStatusBar/metadata.json
View file

@ -13,8 +13,11 @@
],
"Category": "",
"Description": "Default status bar for mobile",
"Description[ca@valencia]": "Barra d'estat predeterminada per al mòbil",
"Description[ca]": "Barra d'estat predeterminada per al mòbil",
"Description[es]": "Barra de estado predeterminada para dispositivos móviles",
"Description[eu]": "Mugikorrerako egoera-barra lehenetsia",
"Description[he]": "מצב ברירת מחדל לנייד",
"Description[ia]": "Barra de stato predefinite per mobile",
"Description[ka]": "ნაგულისხმევი სტატუსი მობილური მოწყობილობებისთვის",
"Description[nl]": "Standaard statusbalk van mobiel",
@ -26,8 +29,11 @@
"Id": "org.kde.plasma.mobile.defaultStatusBar",
"License": "LGPLv2+",
"Name": "Default Mobile Status Bar",
"Name[ca@valencia]": "Barra d'estat predeterminada del mòbil",
"Name[ca]": "Barra d'estat predeterminada del mòbil",
"Name[es]": "Barra de estado móvil predeterminada",
"Name[eu]": "Mugikorreko egoera-barra lehenetsia",
"Name[he]": "שורת מצב כברירת מחדל לנייד",
"Name[ia]": "Barra de stato predefinite de Mobile",
"Name[ka]": "ნაგულისხმევი მობილური სტატუსის ზოლი",
"Name[nl]": "Standaard statusbalk van mobiel",