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 2023-04-09 02:26:04 +00:00
parent 89d95191a7
commit e462530e0b
5 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
initialstart/modules/cellular/package/metadata.json
View file

@ -38,6 +38,7 @@
"Description": "Cellular initialstart module for Plasma Mobile",
"Description[ca@valencia]": "Mòdul de començament inicial del mòbil per a Plasma Mobile",
"Description[ca]": "Mòdul de començament inicial del mòbil per al Plasma Mobile",
"Description[en_GB]": "Cellular initial start module for Plasma Mobile",
"Description[es]": "Módulo del primer arranque del móvil para Plasma Mobile",
"Description[fr]": "Module « initialstart » de réseau cellulaire pour Plasma Mobile",
"Description[ia]": "Modulo initialstart de Cellular per Plasma Mobile",
@ -55,6 +56,7 @@
"Name[ca@valencia]": "Mòbil",
"Name[ca]": "Mòbil",
"Name[cs]": "Mobilní",
"Name[en_GB]": "Cellular",
"Name[es]": "Móvil",
"Name[fr]": "Réseau cellulaire",
"Name[ia]": "Cellular",

2
initialstart/modules/finished/metadata.json
View file

@ -38,6 +38,7 @@
"Description": "Finished initialstart module for Plasma Mobile",
"Description[ca@valencia]": "Mòdul de començament inicial finalitzat per a Plasma Mobile",
"Description[ca]": "Mòdul de començament inicial finalitzat per al Plasma Mobile",
"Description[en_GB]": "Finished initial start module for Plasma Mobile",
"Description[es]": "Módulo del primer inicio para Plasma Mobile terminado",
"Description[fr]": "Exécution terminée du module « initialstart » pour Plasma Mobile",
"Description[ia]": "Modulo initialstart terminate per Plasma Mobile",
@ -55,6 +56,7 @@
"Name[ca@valencia]": "Finalitzat",
"Name[ca]": "Finalitzat",
"Name[cs]": "Dokončeno",
"Name[en_GB]": "Finished",
"Name[es]": "Finalizado",
"Name[fr]": "Terminé",
"Name[ia]": "Terminate",

2
initialstart/modules/prepare/package/metadata.json
View file

@ -38,6 +38,7 @@
"Description": "Prepare initialstart module for Plasma Mobile",
"Description[ca@valencia]": "Mòdul de començament inicial de preparació per a Plasma Mobile",
"Description[ca]": "Mòdul de començament inicial de preparació per al Plasma Mobile",
"Description[en_GB]": "Prepare initial start module for Plasma Mobile",
"Description[es]": "Preparar el módulo del primer inicio para Plasma Mobile",
"Description[fr]": "Préparer le module « initialstart » pour Plasma Mobile",
"Description[ia]": "Prepara modulo initialstart per Plasma Mobile",
@ -55,6 +56,7 @@
"Name[ca@valencia]": "Preparació",
"Name[ca]": "Preparació",
"Name[cs]": "Připravit",
"Name[en_GB]": "Prepare",
"Name[es]": "Preparar",
"Name[fr]": "Préparer",
"Name[ia]": "Prepara...",

2
initialstart/modules/time/package/metadata.json
View file

@ -38,6 +38,7 @@
"Description": "Time initialstart module for Plasma Mobile",
"Description[ca@valencia]": "Mòdul de començament inicial de l'hora per a Plasma Mobile",
"Description[ca]": "Mòdul de començament inicial de l'hora per al Plasma Mobile",
"Description[en_GB]": "Time initial start module for Plasma Mobile",
"Description[es]": "Módulo de hora del primer inicio para Plasma Mobile",
"Description[fr]": "Module « initialstart » d'heure pour Plasma Mobile",
"Description[ia]": "Modulo initialstar de tempore per Plasma Mobile",
@ -55,6 +56,7 @@
"Name[ca@valencia]": "Hora",
"Name[ca]": "Hora",
"Name[cs]": "Čas",
"Name[en_GB]": "Time",
"Name[es]": "Hora",
"Name[fr]": "Heure",
"Name[ia]": "Tempore",

2
initialstart/modules/wifi/package/metadata.json
View file

@ -38,6 +38,7 @@
"Description": "WiFi initialstart module for Plasma Mobile",
"Description[ca@valencia]": "Mòdul de començament inicial de Wi-Fi per a Plasma Mobile",
"Description[ca]": "Mòdul de començament inicial de Wi-Fi per al Plasma Mobile",
"Description[en_GB]": "WiFi initial start module for Plasma Mobile",
"Description[es]": "Módulo de wifi del primer inicio para Plasma Mobile",
"Description[fr]": "Module « initialstart » de Wifi pour Plasma Mobile",
"Description[ia]": "Modulo initialstart de WiFi per Plasma Mobile",
@ -54,6 +55,7 @@
"Name": "WiFi",
"Name[ca@valencia]": "Wi-Fi",
"Name[ca]": "Wi-Fi",
"Name[en_GB]": "WiFi",
"Name[es]": "Wifi",
"Name[fr]": "WiFi",
"Name[ia]": "WiFi",