marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 15:03: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 2023-02-26 02:03:06 +00:00
parent e3af537eee
commit 1278d98617
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kded/kded_plasma-mobile-start.json
View file

@ -3,6 +3,7 @@
"Description": "Run initial tasks for Plasma Mobile during session startup",
"Description[ca]": "Executa les tasques inicials del Plasma Mobile durant l'inici de sessió",
"Description[es]": "Ejecutar tareas iniciales para Plasma Mobile durante el inicio de sesión",
"Description[fr]": "Lancer les tâches initiales pour la session Plasma Mobile durant le démarrage de session",
"Description[ia]": "Executa cargas initial per Plasma Mobile durante initio de session",
"Description[ka]": "Plasma Mobile-ის საწყისი ამოცანების შესრულება სესიის გაშვებისას",
"Description[nl]": "Initiële taken voor Plasma Mobile uitvoeren tijdens opstarten van sessie",
@ -13,6 +14,7 @@
"Name": "Plasma Mobile Start",
"Name[ca]": "Inici del Plasma Mobile",
"Name[es]": "Inicio de Plasma Mobile",
"Name[fr]": "Démarrage de Plasma Mobile",
"Name[ia]": "Initio de Plasma Mobile",
"Name[ka]": "Plasma Mobile-ის გაშვება",
"Name[nl]": "Begin van Plasma Mobile",