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-05-31 20:22:34 +02:00
parent 70c712808f
commit f98953380f
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcm/kcm_kdeconnect.desktop
View file

@ -110,7 +110,7 @@ X-KDE-Keywords[es]=Red,Android,Dispositivos
X-KDE-Keywords[et]=Võrk,Android,Seadmed X-KDE-Keywords[et]=Võrk,Android,Seadmed
X-KDE-Keywords[eu]=Sarea,Android,Gailuak X-KDE-Keywords[eu]=Sarea,Android,Gailuak
X-KDE-Keywords[fi]=Verkko,Android,Laitteet X-KDE-Keywords[fi]=Verkko,Android,Laitteet
X-KDE-Keywords[fr]=Réseau,Android,Périphériques X-KDE-Keywords[fr]=Réseau, Android, Périphériques
X-KDE-Keywords[gl]=rede,Android,dispositivos X-KDE-Keywords[gl]=rede,Android,dispositivos
X-KDE-Keywords[he]=Network,Android,Devices,רשתות,אנדרואיד,התקנים,מכשירים X-KDE-Keywords[he]=Network,Android,Devices,רשתות,אנדרואיד,התקנים,מכשירים
X-KDE-Keywords[hu]=Hálózat,Android,Eszközök X-KDE-Keywords[hu]=Hálózat,Android,Eszközök

2
plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop
View file

@ -16,7 +16,7 @@ Name[es]=Preferencias del complemento «Encontrar este dispositivo»
Name[et]=Seadme leidmise plugina seadistused Name[et]=Seadme leidmise plugina seadistused
Name[eu]=«Aurkitu gailu hau» pluginaren ezarpenak Name[eu]=«Aurkitu gailu hau» pluginaren ezarpenak
Name[fi]=Etsi tämä laite -liitännäisen asetukset 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[gl]=Configuración do complemento de atopar o dispositivo
Name[id]=Pengesetan plugin Temukan Perangkat Ini Name[id]=Pengesetan plugin Temukan Perangkat Ini
Name[it]=Impostazioni dell'estensione Trova questo dispositivo Name[it]=Impostazioni dell'estensione Trova questo dispositivo

11
urlhandler/org.kde.kdeconnect.handler.desktop
View file

@ -1,5 +1,16 @@
[Desktop Entry] [Desktop Entry]
Name=KDE Connect URL Handler 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 Exec=kdeconnect-handler %U
Icon=kdeconnect Icon=kdeconnect
Type=Application Type=Application