From 119e750d9c9608df1e9726d0c412ebe73a265415 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 30 Dec 2022 09:50:10 +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/bluetooth/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quicksettings/bluetooth/metadata.json b/quicksettings/bluetooth/metadata.json index eb08d665..4d1553fd 100644 --- a/quicksettings/bluetooth/metadata.json +++ b/quicksettings/bluetooth/metadata.json @@ -42,7 +42,7 @@ "Description[ia]": "Preferentia rapide de Bluetooth", "Description[is]": "Flýtistilling fyrir Bluetooth", "Description[it]": "Impostazioni rapide del Bluetooth", - "Description[ka]": "BT-ის სწრაფი მორგება", + "Description[ka]": "ბლუთუზის სწრაფი მორგება", "Description[ko]": "블루투스 빠른 설정", "Description[nl]": "Snelle instelling van bluetooth", "Description[pa]": "ਬਲੂਟੁੱਥ ਫੌਰੀ ਸੈਟਿੰਗ",