From b37b5fc8a39242a664e45d0b4e119faeda0cfdb6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 27 Apr 2023 02:29:47 +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" --- containments/homescreens/folio/package/metadata.json | 1 + containments/homescreens/halcyon/package/metadata.json | 1 + initialstart/modules/cellular/package/metadata.json | 1 + initialstart/modules/finished/metadata.json | 1 + initialstart/modules/wifi/package/metadata.json | 1 + 5 files changed, 5 insertions(+) diff --git a/containments/homescreens/folio/package/metadata.json b/containments/homescreens/folio/package/metadata.json index 6b045fa2..559efed4 100644 --- a/containments/homescreens/folio/package/metadata.json +++ b/containments/homescreens/folio/package/metadata.json @@ -69,6 +69,7 @@ "Name": "Folio", "Name[ca@valencia]": "Folio", "Name[ca]": "Folio", + "Name[de]": "Folio", "Name[en_GB]": "Folio", "Name[eo]": "Folio", "Name[es]": "Folio", diff --git a/containments/homescreens/halcyon/package/metadata.json b/containments/homescreens/halcyon/package/metadata.json index fc0041be..c26a495b 100644 --- a/containments/homescreens/halcyon/package/metadata.json +++ b/containments/homescreens/halcyon/package/metadata.json @@ -71,6 +71,7 @@ "Name[az]": "Halcyon", "Name[ca@valencia]": "Halcyon", "Name[ca]": "Halcyon", + "Name[de]": "Halcyon", "Name[en_GB]": "Halcyon", "Name[eo]": "Halcyon", "Name[es]": "Halcyon", diff --git a/initialstart/modules/cellular/package/metadata.json b/initialstart/modules/cellular/package/metadata.json index 9ab08eec..204593d2 100644 --- a/initialstart/modules/cellular/package/metadata.json +++ b/initialstart/modules/cellular/package/metadata.json @@ -61,6 +61,7 @@ "Name[ca@valencia]": "Mòbil", "Name[ca]": "Mòbil", "Name[cs]": "Mobilní", + "Name[de]": "Mobilfunk", "Name[en_GB]": "Cellular", "Name[eo]": "Ĉela", "Name[es]": "Móvil", diff --git a/initialstart/modules/finished/metadata.json b/initialstart/modules/finished/metadata.json index 4aaf6df0..e7efb9d9 100644 --- a/initialstart/modules/finished/metadata.json +++ b/initialstart/modules/finished/metadata.json @@ -61,6 +61,7 @@ "Name[ca@valencia]": "Finalitzat", "Name[ca]": "Finalitzat", "Name[cs]": "Dokončeno", + "Name[de]": "Abgeschlossen", "Name[en_GB]": "Finished", "Name[eo]": "Finita", "Name[es]": "Finalizado", diff --git a/initialstart/modules/wifi/package/metadata.json b/initialstart/modules/wifi/package/metadata.json index dea8f473..3bfb0191 100644 --- a/initialstart/modules/wifi/package/metadata.json +++ b/initialstart/modules/wifi/package/metadata.json @@ -60,6 +60,7 @@ "Name": "WiFi", "Name[ca@valencia]": "Wi-Fi", "Name[ca]": "Wi-Fi", + "Name[de]": "Wi-Fi", "Name[en_GB]": "WiFi", "Name[eo]": "WiFi", "Name[es]": "Wifi",