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 14:20:49 +02:00
parent 4df8dfc882
commit bc08ff79e6
2 changed files with 2 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[eu]=Sarea,Android,Gailuak
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[he]=Network,Android,Devices,רשתות,אנדרואיד,התקנים,מכשירים
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[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