From af57aca5450209cc1eb2a8f811da24c1dccd5c6c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 9 Jun 2019 05:04:22 +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/telephony/kdeconnect_telephony.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json index 7350d477e..8babfa7b5 100644 --- a/plugins/telephony/kdeconnect_telephony.json +++ b/plugins/telephony/kdeconnect_telephony.json @@ -82,7 +82,7 @@ "Name[hu]": "Telefonintegráció", "Name[id]": "Telephony integration", "Name[it]": "Integrazione telefonica", - "Name[ja]": "Telephony 統合", + "Name[ja]": "電話の統合", "Name[ko]": "전화 통합", "Name[nl]": "Telefoonintegratie", "Name[nn]": "Telefonintegrering",