From 916ec3a405061faa1cc2868e0c16f5ba05781a93 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 17 Jan 2020 06:12:24 +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" --- settings/org.kde.kdeconnect.settings.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/org.kde.kdeconnect.settings.desktop b/settings/org.kde.kdeconnect.settings.desktop index 7bf840838..724b2b605 100755 --- a/settings/org.kde.kdeconnect.settings.desktop +++ b/settings/org.kde.kdeconnect.settings.desktop @@ -19,7 +19,7 @@ Name[eu]=KDE Connect ezarpenak Name[fi]=KDE Connectin asetukset Name[fr]=Paramètres de KDE Connect Name[gl]=Configuración de KDE Connect -Name[he]=הגדרות KDE Connect +Name[he]=הגדרות KDE Connect Name[hu]=A KDE Connect beállításai Name[id]=Pengaturan KDE Connect Name[it]=Impostazioni di KDE Connect