From 69898ca553541d76637cbd7bb942c3400c9c5b98 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 19 Feb 2021 10:36:36 +0100 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" --- plugins/bigscreen/kdeconnect_bigscreen.json | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/bigscreen/kdeconnect_bigscreen.json b/plugins/bigscreen/kdeconnect_bigscreen.json index 8e1a91445..438ea286c 100644 --- a/plugins/bigscreen/kdeconnect_bigscreen.json +++ b/plugins/bigscreen/kdeconnect_bigscreen.json @@ -28,6 +28,7 @@ "Name[pt]": "Aditya Mehra", "Name[pt_BR]": "Aditya Mehra", "Name[ro]": "Aditya Mehra", + "Name[ru]": "Aditya Mehra", "Name[sk]": "Aditya Mehra", "Name[sl]": "Aditya Mehra", "Name[sv]": "Aditya Mehra",