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 2020-01-17 06:12:24 +01:00
parent 7ce7eaced6
commit 916ec3a405
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
settings/org.kde.kdeconnect.settings.desktop
View file

@ -19,7 +19,7 @@ Name[eu]=KDE Connect ezarpenak
Name[fi]=KDE Connectin asetukset
Name[fr]=Paramètres de KDE Connect
Name[gl]=Configuración de KDE Connect
Name[he]=הגדרות KDE Connect
Name[he]=הגדרות KDE Connect
Name[hu]=A KDE Connect beállításai
Name[id]=Pengaturan KDE Connect
Name[it]=Impostazioni di KDE Connect