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-04-20 09:03:25 +02:00
parent 24fce12387
commit 87a8d00ddd
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/telephony/kdeconnect_telephony.json
View file

@ -49,6 +49,7 @@
"Description[fr]": "Affichez les notifications pour les appels et les SMS",
"Description[gl]": "Mostrar notificacións de chamadas e mensaxes SMS.",
"Description[it]": "Mostra notifiche per chiamate ed SMS",
"Description[ko]": "통화와 SMS 알림 표시",
"Description[nl]": "Meldingen tonen van oproepen en SMSjes",
"Description[nn]": "Vis varslingar for oppringingar og SMS",
"Description[pt]": "Mostrar notificações para as chamadas e SMS",

2
urlhandler/org.kde.kdeconnect.telhandler.desktop
View file

@ -11,7 +11,7 @@ Name[es]=Controlador de URL de teléfonos de KDE Connect
Name[eu]=KDE Connect-en telefono-URL-kudeatzailea
Name[fi]=KDE Connectin puhelinverkko-osoitekäsittelijä
Name[fr]=Gestionnaire d'URL téléphoniques de KDE Connect
Name[gl]=Manexador de URL de teléfono de KDE Connect
Name[gl]=Xestor de URL de teléfono de KDE Connect
Name[id]=Penanganan URL Phone KDE Connect
Name[it]=Gestore URL del telefono di KDE Connect
Name[ko]=KDE Connect 휴대폰 URL 처리기