From 2cabd89b4d47ced6859a5276a4de4c4cbefef1cf Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 6 Apr 2023 02:19:44 +0000 Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve ours 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" --- initialstart/modules/cellular/package/metadata.json | 2 ++ initialstart/modules/finished/metadata.json | 2 ++ initialstart/modules/prepare/package/metadata.json | 2 ++ initialstart/modules/time/package/metadata.json | 3 +++ initialstart/modules/wifi/package/metadata.json | 2 ++ 5 files changed, 11 insertions(+) diff --git a/initialstart/modules/cellular/package/metadata.json b/initialstart/modules/cellular/package/metadata.json index c2af610b..73840ded 100644 --- a/initialstart/modules/cellular/package/metadata.json +++ b/initialstart/modules/cellular/package/metadata.json @@ -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[fr]": "Module « initialstart » de réseau cellulaire pour Plasma Mobile", "Description[ia]": "Modulo initialstart de Cellular per Plasma Mobile", "Description[it]": "Modulo di avvio iniziale della rete cellulare per Plasma Mobile", "Description[ka]": "Plasma Mobile-ის ფიჭური სწრაფი გაშვების მოდული", @@ -54,6 +55,7 @@ "Name[ca]": "Mòbil", "Name[cs]": "Mobilní", "Name[es]": "Móvil", + "Name[fr]": "Réseau cellulaire", "Name[ia]": "Cellular", "Name[it]": "Rete cellulare", "Name[ka]": "ფიჭური ქსელი", diff --git a/initialstart/modules/finished/metadata.json b/initialstart/modules/finished/metadata.json index 4cfd0a2a..9cf8d425 100644 --- a/initialstart/modules/finished/metadata.json +++ b/initialstart/modules/finished/metadata.json @@ -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[fr]": "Exécution terminée du module « initialstart » pour Plasma Mobile", "Description[ia]": "Modulo initialstart terminate per Plasma Mobile", "Description[it]": "Modulo di avvio iniziale completato per Plasma Mobile", "Description[ka]": "Plasma Mobile-ის საწყისი გაშვების მოდულის მომზადება დასრულდა", @@ -53,6 +54,7 @@ "Name[ca@valencia]": "Finalitzat", "Name[ca]": "Finalitzat", "Name[cs]": "Dokončeno", + "Name[fr]": "Terminé", "Name[ia]": "Terminate", "Name[it]": "Finito", "Name[ka]": "დასრულდა", diff --git a/initialstart/modules/prepare/package/metadata.json b/initialstart/modules/prepare/package/metadata.json index fab1c918..427393f2 100644 --- a/initialstart/modules/prepare/package/metadata.json +++ b/initialstart/modules/prepare/package/metadata.json @@ -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[fr]": "Préparer le module « initialstart » pour Plasma Mobile", "Description[ia]": "Prepara modulo initialstart per Plasma Mobile", "Description[it]": "Modulo di avvio iniziale di preparazione per Plasma Mobile", "Description[ka]": "Plasma Mobile-ის საწყისი გაშვების მომზადება", @@ -53,6 +54,7 @@ "Name[ca@valencia]": "Preparació", "Name[ca]": "Preparació", "Name[cs]": "Připravit", + "Name[fr]": "Préparer", "Name[ia]": "Prepara...", "Name[it]": "Prepara", "Name[ka]": "მომზადება", diff --git a/initialstart/modules/time/package/metadata.json b/initialstart/modules/time/package/metadata.json index a498a464..288a1e16 100644 --- a/initialstart/modules/time/package/metadata.json +++ b/initialstart/modules/time/package/metadata.json @@ -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[fr]": "Module « initialstart » d'heure pour Plasma Mobile", "Description[ia]": "Modulo initialstar de tempore per Plasma Mobile", "Description[it]": "Modulo di avvio iniziale dell'orario per Plasma Mobile", "Description[ka]": "Plasma Mobile-ის საწყისი გაშვების მოდული", @@ -53,6 +54,8 @@ "Name[ca@valencia]": "Hora", "Name[ca]": "Hora", "Name[cs]": "Čas", + "Name[es]": "Hora", + "Name[fr]": "Heure", "Name[ia]": "Tempore", "Name[it]": "Orario", "Name[ka]": "დრო", diff --git a/initialstart/modules/wifi/package/metadata.json b/initialstart/modules/wifi/package/metadata.json index 6ae50ff4..7fdd360f 100644 --- a/initialstart/modules/wifi/package/metadata.json +++ b/initialstart/modules/wifi/package/metadata.json @@ -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[fr]": "Module « initialstart » de Wifi pour Plasma Mobile", "Description[ia]": "Modulo initialstart de WiFi per Plasma Mobile", "Description[it]": "Modulo di avvio iniziale WiFi per Plasma Mobile", "Description[ka]": "Plasma Mobile-ის WiFi-ის სწრაფი გაშვების მოდული", @@ -53,6 +54,7 @@ "Name[ca@valencia]": "Wi-Fi", "Name[ca]": "Wi-Fi", "Name[es]": "Wifi", + "Name[fr]": "WiFi", "Name[ia]": "WiFi", "Name[it]": "WiFi", "Name[ka]": "WiFi",