From 015672d98fddd41791e36c02b5a492b7c4be78fa Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 28 Oct 2019 08:52:57 +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 ab26e772d..44697a525 100644 --- a/app/org.kde.kdeconnect.app.desktop +++ b/app/org.kde.kdeconnect.app.desktop @@ -13,7 +13,7 @@ Name[et]=KDE Connecti rakendus Name[eu]=KDE Connect aplikazioa Name[fi]=KDE Connect -sovellus Name[fr]=Application KDE Connect -Name[gl]=Aplicativo de KDE Connect +Name[gl]=Aplicación de KDE Connect Name[he]=היישום KDE Connect Name[hu]=KDE Connect alkalmazás Name[id]=Aplikasi KDE Connect