From ba5e89f2324883854be92e2d5e81d0b62016c59f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 10 Oct 2017 04:52:00 +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" --- urlhandler/org.kde.kdeconnect.telhandler.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/urlhandler/org.kde.kdeconnect.telhandler.desktop b/urlhandler/org.kde.kdeconnect.telhandler.desktop index 6b09937fd..ded1f9983 100644 --- a/urlhandler/org.kde.kdeconnect.telhandler.desktop +++ b/urlhandler/org.kde.kdeconnect.telhandler.desktop @@ -13,6 +13,7 @@ Name[nl]=URL behandelaar van KDE-Connect-telefoon Name[nn]=Telefon-URL-handsamar for KDE Connect Name[pl]=KDE Connect - obsługa URL telefonu Name[pt]=Tratamento de URL's Telefónicos do KDE Connect +Name[ru]=Обработчик телефонных ссылок KDE Connect Name[sr]=КДЕ‑конекцијин руковалац телефонским УРЛ‑овима Name[sr@ijekavian]=КДЕ‑конекцијин руковалац телефонским УРЛ‑овима Name[sr@ijekavianlatin]=KDE‑konekcijin rukovalac telefonskim URL‑ovima