From 665ad78064177e61fc795a0e0b24a01e5b1cf225 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 10 Jan 2023 03:23:16 +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" --- plugins/remotecommands/kdeconnect_remotecommands.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/remotecommands/kdeconnect_remotecommands.json b/plugins/remotecommands/kdeconnect_remotecommands.json index 5bcca7b02..2ce49b776 100644 --- a/plugins/remotecommands/kdeconnect_remotecommands.json +++ b/plugins/remotecommands/kdeconnect_remotecommands.json @@ -100,7 +100,7 @@ "Name": "Host remote commands", "Name[ar]": "استضف الأوامر البعيدة", "Name[az]": "Hostun uzaq əmrləri", - "Name[bg]": "за", + "Name[bg]": "Команди на отдалечения хост", "Name[ca@valencia]": "Allotja ordres remotes", "Name[ca]": "Allotja ordres remotes", "Name[cs]": "Přijímat vzdálené příkazy",