From 805c8135372e1b6fb0bbec724da42ba09077f57b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 3 Feb 2017 06:09:47 +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" --- app/org.kde.kdeconnect.app.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/org.kde.kdeconnect.app.desktop b/app/org.kde.kdeconnect.app.desktop index 1c1c2d02f..ade6d956d 100644 --- a/app/org.kde.kdeconnect.app.desktop +++ b/app/org.kde.kdeconnect.app.desktop @@ -13,7 +13,7 @@ Name[es]=Aplicación KDE Connect Name[et]=KDE Connecti rakendus Name[fi]=KDE Connect -sovellus Name[fr]=Application KDE Connect -Name[gl]=Programa de KDE Connect +Name[gl]=Aplicativo de KDE Connect Name[he]=היישום KDE Connect Name[hu]=KDE Connect alkalmazás Name[it]=Applicazione KDE Connect