From 067ac6372f0a2ea0b980728fad8d2367840d9b97 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 27 Sep 2025 01:34:50 +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" --- quicksettings/mobiledata/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quicksettings/mobiledata/metadata.json b/quicksettings/mobiledata/metadata.json index 8d70d689..a4ac68cf 100644 --- a/quicksettings/mobiledata/metadata.json +++ b/quicksettings/mobiledata/metadata.json @@ -116,7 +116,7 @@ "Name[sl]": "Mobilni podatki", "Name[sv]": "Mobildata", "Name[ta]": "கைபேசி தரவு", - "Name[tr]": "Taşınabilir Veri", + "Name[tr]": "Hücresel Veri", "Name[uk]": "Мобільні дані", "Name[zh_CN]": "移动数据", "Name[zh_TW]": "行動資料",