tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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"
This commit is contained in:
l10n daemon script 2019-12-09 05:15:13 +01:00
parent 173e388177
commit bf0c2e54e3
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop
View file

@ -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