From 0c6ac8972899686509b81b84ee63d07ee5a554e9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 26 Aug 2024 01:22:46 +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 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/initialstart/modules/wifi/package/metadata.json b/initialstart/modules/wifi/package/metadata.json index 6d25d690..8c1a8db6 100644 --- a/initialstart/modules/wifi/package/metadata.json +++ b/initialstart/modules/wifi/package/metadata.json @@ -49,7 +49,7 @@ "Name[ast]": "Wi-Fi", "Name[ca@valencia]": "Wi-Fi", "Name[ca]": "Wi-Fi", - "Name[de]": "Wi-Fi", + "Name[de]": "WLAN", "Name[es]": "Wifi", "Name[eu]": "Wi-Fi", "Name[fi]": "Langaton verkko",