From 56fb96961ca87516790307ffc9cbf56aabd4ece4 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 5 Jul 2019 05:12:39 +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/share/kdeconnect_share.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/share/kdeconnect_share.json b/plugins/share/kdeconnect_share.json index 42c9afc10..15bf8f180 100644 --- a/plugins/share/kdeconnect_share.json +++ b/plugins/share/kdeconnect_share.json @@ -67,7 +67,7 @@ "Description[pl]": "Udostępniaj i otrzymuj pliki, adresy URL lub zwykły tekst z łatwością", "Description[pt]": "Receber e enviar ficheiros, URL's ou texto normal de forma simples", "Description[pt_BR]": "Recebe e envia facilmente arquivos, URLs ou texto simples", - "Description[ru]": "Получение и отправка файлов, URL адресов или простого текста", + "Description[ru]": "Получение и отправка файлов, адресов URL или простого текста", "Description[sk]": "Prijať a poslať súbory, URL alebo čisté texty jednoducho", "Description[sr@ijekavian]": "Примај и шаљи фајлове, УРЛ‑ове или обичан текст, са лакоћом", "Description[sr@ijekavianlatin]": "Primaj i šalji fajlove, URL‑ove ili običan tekst, sa lakoćom",