From 6759ec9307bd95cbe7b426df595a5a4db31be6ab Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 28 Oct 2024 01:24: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" --- kcms/wifi/kcm_mobile_wifi.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kcms/wifi/kcm_mobile_wifi.json b/kcms/wifi/kcm_mobile_wifi.json index 5ae4377c..82b1a8a7 100644 --- a/kcms/wifi/kcm_mobile_wifi.json +++ b/kcms/wifi/kcm_mobile_wifi.json @@ -85,8 +85,8 @@ "Name[zh_TW]": "Wi-Fi" }, "X-KDE-Keywords": "wifi,network", - "X-KDE-Keywords[ca@valencia]": "wi-fi,xarxa", - "X-KDE-Keywords[ca]": "wi-fi,xarxa", + "X-KDE-Keywords[ca@valencia]": "wifi,wi-fi,xarxa", + "X-KDE-Keywords[ca]": "wifi,wi-fi,xarxa", "X-KDE-Keywords[cs]": "wifi,síť", "X-KDE-Keywords[en_GB]": "wifi,network", "X-KDE-Keywords[es]": "wifi,red",