From bf97d8f6066ea59c4f1a6d4f85fb6001bcb23b34 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 5 Feb 2017 06:01:50 +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/remotecommands/kdeconnect_remotecommands.json | 1 + plugins/telephony/kdeconnect_telephony.json | 1 + 2 files changed, 2 insertions(+) diff --git a/plugins/remotecommands/kdeconnect_remotecommands.json b/plugins/remotecommands/kdeconnect_remotecommands.json index 1663ab205..eef160dcb 100644 --- a/plugins/remotecommands/kdeconnect_remotecommands.json +++ b/plugins/remotecommands/kdeconnect_remotecommands.json @@ -35,6 +35,7 @@ "Id": "kdeconnect_remotecommands", "License": "GPL", "Name": "Host remote commands", + "Name[ar]": "استضف الأوامر البعيدة", "Name[ca@valencia]": "Allotja ordes remotes", "Name[ca]": "Allotja ordres remotes", "Name[cs]": "Přijímat vzdálené příkazy", diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json index a83e7a86b..824d0cf7c 100644 --- a/plugins/telephony/kdeconnect_telephony.json +++ b/plugins/telephony/kdeconnect_telephony.json @@ -9,6 +9,7 @@ } ], "Description": "Show notifications for calls and SMS", + "Description[ar]": "أظهر إخطارات المكالمات والرّسائل", "Description[ca@valencia]": "Mostra les notificacions de les trucades i els SMS", "Description[ca]": "Mostra les notificacions de les trucades i els SMS", "Description[cs]": "Zobrazit upozornění pro telefonáty a SMS",