From 46ccf5bce2d897db7641d88de8bd885f41dc129f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 17 Jan 2023 02:00:55 +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 5a3089df5..782d4b51c 100755 --- a/settings/org.kde.kdeconnect-settings.desktop +++ b/settings/org.kde.kdeconnect-settings.desktop @@ -8,7 +8,7 @@ Name[ar]=إعدادات كدي المتّصل Name[az]=KDE Connect Ayarları Name[bg]=Настройки на KDE Connect Name[ca]=Arranjament del KDE Connect -Name[ca@valencia]=Configuració de KDE Connect +Name[ca@valencia]=Configureu KDE Connect Name[cs]=Nastavení KDE Connect Name[da]=Indstilling af KDE Connect Name[de]=KDE Connect-Einstellungen