Commit 3bb1814f authored by Script Kiddy's avatar Script Kiddy

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"
parent 173e3881
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment