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 2025-04-25 01:31:19 +00:00
parent 06e5a89ca7
commit 9b0cb6c109
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
quicksettings/autohidepanels/metadata.json
View file

@ -8,6 +8,7 @@
"Name[ca@valencia]": "Micah Stanley",
"Name[ca]": "Micah Stanley",
"Name[es]": "Micah Stanley",
"Name[fr]": "Micah Stanley",
"Name[he]": "מיקה סטנלי",
"Name[ia]": "Micah Stanley",
"Name[ka]": "Micah Stanley",
@ -22,6 +23,7 @@
"Description[ca@valencia]": "Configuració ràpida per a ocultar automàticament els quadros a Plasma Mobile",
"Description[ca]": "Configuració ràpida per a ocultar automàticament els plafons al Plasma Mobile",
"Description[es]": "Ajuste rápido de ocultación automática de paneles para Plasma Mobile",
"Description[fr]": "Configuration rapide pour le masquage automatique des panneaux de Plasma Mobile",
"Description[he]": "הגדרות הסתרת לוחות אוטומטית מהירות לפלזמה לניידים",
"Description[ia]": "Auto Cela Pannellos Preferentia rapide per Plasma Mobile",
"Description[ka]": "პანელების ავტოდამალვის სწრაფად დაყენება Plasma Mobile-სთვის",
@ -37,6 +39,7 @@
"Name[ca@valencia]": "Oculta automàticament els quadros",
"Name[ca]": "Oculta automàticament els plafons",
"Name[es]": "Ocultar paneles automáticamente",
"Name[fr]": "Masquer automatiquement les panneaux",
"Name[he]": "הסתרת לוחות אוטומטית",
"Name[ia]": "Auto-Cela Pannellos",
"Name[ka]": "პანელების ავტომატური დამალვა",