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-05-01 05:56:02 +02:00
parent 595e8d9a35
commit 58e2f142e0
3 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/share/kdeconnect_share.json
View file

@ -97,7 +97,6 @@
"Name[fr]": "Partager et recevoir", "Name[fr]": "Partager et recevoir",
"Name[gl]": "Compartir e recibir", "Name[gl]": "Compartir e recibir",
"Name[hu]": "Megosztás és fogadás", "Name[hu]": "Megosztás és fogadás",
"Name[id]": "Share and receive",
"Name[it]": "Condividi e ricevi", "Name[it]": "Condividi e ricevi",
"Name[ja]": "共有と受信", "Name[ja]": "共有と受信",
"Name[ko]": "공유하고 받기", "Name[ko]": "공유하고 받기",

1
plugins/sms/kdeconnect_sms.json
View file

@ -41,6 +41,7 @@
"Description[fi]": "Lähetä ja vastaanota tekstiviestejä", "Description[fi]": "Lähetä ja vastaanota tekstiviestejä",
"Description[fr]": "Envoyer et recevoir des SMS", "Description[fr]": "Envoyer et recevoir des SMS",
"Description[gl]": "Enviar e recibir SMS", "Description[gl]": "Enviar e recibir SMS",
"Description[id]": "Kirim dan terima SMS",
"Description[it]": "Invia e riceve SMS", "Description[it]": "Invia e riceve SMS",
"Description[ja]": "SMS を送受信", "Description[ja]": "SMS を送受信",
"Description[nl]": "SMS verzenden en ontvangen", "Description[nl]": "SMS verzenden en ontvangen",

1
urlhandler/org.kde.kdeconnect.smshandler.desktop
View file

@ -6,6 +6,7 @@ Name[en_GB]=KDE Connect SMS URL Handler
Name[es]=Controlador de URL de SMS de KDE Connect Name[es]=Controlador de URL de SMS de KDE Connect
Name[gl]=Xestor de URL de SMS de KDE Connect Name[gl]=Xestor de URL de SMS de KDE Connect
Name[nl]=URL behandelaar van KDE-Connect-SMS Name[nl]=URL behandelaar van KDE-Connect-SMS
Name[nn]=SMS-URL-handsamar for KDE Connect
Name[pt]=Tratamento de URL's de SMS do KDE Connect Name[pt]=Tratamento de URL's de SMS do KDE Connect
Name[pt_BR]=Tratamento de URLs de SMS do KDE Connect Name[pt_BR]=Tratamento de URLs de SMS do KDE Connect
Name[sv]=KDE-anslut hanterare av SMS-webbadress Name[sv]=KDE-anslut hanterare av SMS-webbadress