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-08-10 01:28:40 +00:00
parent 5844158f1d
commit a8f76bc536
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,6 +19,7 @@
"Description[es]": "Panel de navegación predeterminado para dispositivos móviles",
"Description[eu]": "Mugikorrerako nabigatzeko panel lehenetsia",
"Description[fr]": "Panneau par défaut de navigation pour périphériques mobiles",
"Description[gl]": "Panel de navegación predeterminado para móbil.",
"Description[he]": "לוח ניווט כברירת מחדל לנייד",
"Description[ia]": "Pannello de Navigation predefinite per mobile",
"Description[it]": "Pannello di navigazione predefinito per dispositivi mobili",
@ -43,6 +44,7 @@
"Name[es]": "Panel de navegación móvil predeterminado",
"Name[eu]": "Mugikorreko nabigatzeko panel lehenetsia",
"Name[fr]": "Panneau par défaut de navigation pour périphériques mobiles",
"Name[gl]": "Panel de navegación predeterminado para móbil",
"Name[he]": "לוח ניווט כברירת מחדל לנייד",
"Name[ia]": "Pannello de Navigation predefinite de Mobile",
"Name[it]": "Pannello di navigazione predefinito per dispositivi mobili",

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

@ -19,6 +19,7 @@
"Description[es]": "Barra de estado predeterminada para dispositivos móviles",
"Description[eu]": "Mugikorrerako egoera-barra lehenetsia",
"Description[fr]": "Barre d'état par défaut de navigation pour périphériques mobiles",
"Description[gl]": "Barra de estado predeterminada para móbil.",
"Description[he]": "מצב ברירת מחדל לנייד",
"Description[ia]": "Barra de stato predefinite per mobile",
"Description[it]": "Barra di stato predefinita per dispositivi mobili",
@ -43,6 +44,7 @@
"Name[es]": "Barra de estado móvil predeterminada",
"Name[eu]": "Mugikorreko egoera-barra lehenetsia",
"Name[fr]": "Barre d'état par défaut pour périphériques mobiles",
"Name[gl]": "Barra de estado predeterminada para móbil",
"Name[he]": "שורת מצב כברירת מחדל לנייד",
"Name[ia]": "Barra de stato predefinite de Mobile",
"Name[it]": "Barra di stato predefinita per dispositivi mobili",