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"
This commit is contained in:
l10n daemon script 2020-05-31 20:22:34 +02:00
parent 70c712808f
commit f98953380f
3 changed files with 13 additions and 2 deletions

View file

@ -16,7 +16,7 @@ Name[es]=Preferencias del complemento «Encontrar este dispositivo»
Name[et]=Seadme leidmise plugina seadistused
Name[eu]=«Aurkitu gailu hau» pluginaren ezarpenak
Name[fi]=Etsi tämä laite -liitännäisen asetukset
Name[fr]=Paramètres du module Trouver ce périphérique
Name[fr]=Paramètres du module « Trouver ce périphérique »
Name[gl]=Configuración do complemento de atopar o dispositivo
Name[id]=Pengesetan plugin Temukan Perangkat Ini
Name[it]=Impostazioni dell'estensione Trova questo dispositivo

View file

@ -1,5 +1,16 @@
[Desktop Entry]
Name=KDE Connect URL Handler
Name[ca]=Gestor d'URL del KDE Connect
Name[cs]=Nástroj pro práci s URL v KDE Connect
Name[es]=Controlador de URL de KDE Connect
Name[et]=KDE Connecti URL-ide käitleja
Name[fr]=Gestionnaire d'URL de KDE Connect
Name[lt]=KDE Connect URL doroklė
Name[nl]=URL behandelaar van KDE-Connect
Name[pt]=Tratamento de URL's do KDE Connect
Name[sv]=KDE-anslut webbadresshanterare
Name[uk]=Обробник адрес KDE Connect
Name[x-test]=xxKDE Connect URL Handlerxx
Exec=kdeconnect-handler %U
Icon=kdeconnect
Type=Application