From 47ff0d39bfb2883aa26a4b67f5bf3278b26230d0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 7 Apr 2022 02:54:33 +0000 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 ce87426b9..4a87f3c09 100755 --- a/settings/org.kde.kdeconnect-settings.desktop +++ b/settings/org.kde.kdeconnect-settings.desktop @@ -8,7 +8,7 @@ Name[ar]=إعدادات كدي المتّصل Name[ast]=Axustes de KDE Connect Name[az]=KDE Connect Ayarları Name[ca]=Arranjament del KDE Connect -Name[ca@valencia]=Arranjament de KDE Connect +Name[ca@valencia]=Configuració de KDE Connect Name[cs]=Nastavení KDE Connect Name[da]=Indstilling af KDE Connect Name[de]=KDE Connect-Einstellungen