From bf0c2e54e3b6a7ec6a7c861f82632caeb5359123 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 9 Dec 2019 05:15:13 +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" --- plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop b/plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop index 28a801141..acd09d05f 100644 --- a/plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop +++ b/plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop @@ -6,7 +6,7 @@ X-KDE-Library=kdeconnect_findthisdevice_config X-KDE-ParentComponents=kdeconnect_findthisdevice Name=Find This Device plugin settings -Name[ca]=Troba els ajustaments d'aquest connector de dispositiu +Name[ca]=Cerca els ajustaments d'aquest connector de dispositiu Name[ca@valencia]=Troba els ajustaments d'aquest connector de dispositiu Name[cs]=Nastavení modulu Najít toto zařízení Name[de]=Modul-Einstellungen diese Geräts suchen