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-09-02 08:44:49 +02:00
parent c2d4424b8f
commit 01cef32d31
3 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/findmyphone/kdeconnect_findmyphone.json
View file

@ -91,6 +91,7 @@
"Description[gl]": "Reproducir un son de alarma nun teléfono móbil perdido para atopalo", "Description[gl]": "Reproducir un son de alarma nun teléfono móbil perdido para atopalo",
"Description[id]": "Temukan teleponmu yang ketlingsut dengan membuatnya memutar suara alarm", "Description[id]": "Temukan teleponmu yang ketlingsut dengan membuatnya memutar suara alarm",
"Description[it]": "Trova il tuo telefono smarrito facendogli suonare un allarme sonoro", "Description[it]": "Trova il tuo telefono smarrito facendogli suonare un allarme sonoro",
"Description[ja]": "アラーム音を鳴らしてあなたがなくした端末を探します",
"Description[ko]": "알람 소리를 울려서 잃어버린 휴대폰 찾기", "Description[ko]": "알람 소리를 울려서 잃어버린 휴대폰 찾기",
"Description[nl]": "Zoek uw verloren telefoon door het een wekkersignaal te laten spelen", "Description[nl]": "Zoek uw verloren telefoon door het een wekkersignaal te laten spelen",
"Description[nn]": "Finn telefonen ved å la han spela eit lydsignal", "Description[nn]": "Finn telefonen ved å la han spela eit lydsignal",

1
plugins/ping/kdeconnect_ping.json
View file

@ -54,6 +54,7 @@
"Description[hu]": "Pingek küldése és fogadása", "Description[hu]": "Pingek küldése és fogadása",
"Description[id]": "Kirim dan terima ping", "Description[id]": "Kirim dan terima ping",
"Description[it]": "Invia e ricevi ping", "Description[it]": "Invia e ricevi ping",
"Description[ja]": "Ping を送受信",
"Description[ko]": "핑 보내고 받기", "Description[ko]": "핑 보내고 받기",
"Description[nl]": "Pings verzenden en ontvangen", "Description[nl]": "Pings verzenden en ontvangen",
"Description[nn]": "Send og ta imot pingsignal", "Description[nn]": "Send og ta imot pingsignal",

1
plugins/sftp/kdeconnect_sftp.json
View file

@ -94,6 +94,7 @@
"Name[hu]": "Távoli fájlrendszer-böngésző", "Name[hu]": "Távoli fájlrendszer-böngésző",
"Name[id]": "Remote filesystem browser", "Name[id]": "Remote filesystem browser",
"Name[it]": "Sfoglia il filesystem remoto", "Name[it]": "Sfoglia il filesystem remoto",
"Name[ja]": "リモートファイルシステムブラウザ",
"Name[ko]": "원격 파일 시스템 탐색기", "Name[ko]": "원격 파일 시스템 탐색기",
"Name[nl]": "Bestandssysteembrowser op afstand", "Name[nl]": "Bestandssysteembrowser op afstand",
"Name[nn]": "Bla gjennom eksternt filsystem", "Name[nn]": "Bla gjennom eksternt filsystem",