From aef817e786c2dffaa541dcd3b7bb237a1089210e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 2 Jul 2020 05:57:52 +0200 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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/bigscreen/kdeconnect_bigscreen.json b/plugins/bigscreen/kdeconnect_bigscreen.json index 704bae086..dc3dc4799 100644 --- a/plugins/bigscreen/kdeconnect_bigscreen.json +++ b/plugins/bigscreen/kdeconnect_bigscreen.json @@ -13,6 +13,7 @@ "Name[fi]": "Aditya Mehra", "Name[fr]": "Aditya Mehra", "Name[it]": "Aditya Mehra", + "Name[ko]": "Aditya Mehra", "Name[lt]": "Aditya Mehra", "Name[nl]": "Aditya Mehra", "Name[nn]": "Aditya Mehra", @@ -35,6 +36,7 @@ "Description[fi]": "Bigscreen-liitännäinen", "Description[fr]": "Module externe « Bigscreen »", "Description[it]": "Estensione Bigscreen", + "Description[ko]": "큰 화면 플러그인", "Description[lt]": "Bigscreen papildinys", "Description[nl]": "Bigscreen plug-in", "Description[nn]": "Bigscreen-tillegg", @@ -59,6 +61,7 @@ "Name[fi]": "Bigscreen", "Name[fr]": "Bigscreen", "Name[it]": "Bigscreen", + "Name[ko]": "큰 화면", "Name[lt]": "Bigscreen", "Name[nl]": "Bigscreen", "Name[nn]": "Bigscreen",