From 86cea76edd575d60d5a3b457a8830a32b855a809 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 6 Apr 2026 01:38:32 +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/wifi/package/metadata.json | 2 +- quicksettings/wifi/metadata.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/initialstart/modules/wifi/package/metadata.json b/initialstart/modules/wifi/package/metadata.json index 6c3eac8f..e1eae5b6 100644 --- a/initialstart/modules/wifi/package/metadata.json +++ b/initialstart/modules/wifi/package/metadata.json @@ -92,7 +92,7 @@ "Name[es]": "Wifi", "Name[eu]": "Wi-Fi", "Name[fi]": "Langaton verkko", - "Name[fr]": "WiFi", + "Name[fr]": "Wifi", "Name[gl]": "Rede sen fíos", "Name[he]": "רשת אלחוטית", "Name[hu]": "WiFi", diff --git a/quicksettings/wifi/metadata.json b/quicksettings/wifi/metadata.json index cd10dc06..350367b6 100644 --- a/quicksettings/wifi/metadata.json +++ b/quicksettings/wifi/metadata.json @@ -95,7 +95,7 @@ "Name[es]": "Wifi", "Name[eu]": "Wi-Fi", "Name[fi]": "Langaton verkko", - "Name[fr]": "Wi-Fi", + "Name[fr]": "Wifi", "Name[gl]": "Redes sen fíos", "Name[he]": "רשת אלחוטית", "Name[hu]": "Wi-Fi",