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 2017-07-23 05:44:59 +02:00
parent 6d4bb21655
commit 9f313f94c2
3 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
indicator/org.kde.kdeconnect.nonplasma.desktop
View file

@ -6,6 +6,7 @@ Name[es]=Indicador de KDE Connect
Name[fr]=Indicateur de KDE Connect
Name[it]=Indicatore di KDE Connect
Name[nl]=KDE-Connect-indicator
Name[nn]=KDE Connect-indikator
Name[pl]=Wskaźnik KDE Connect
Name[pt]=Indicador do KDE Connect
Name[sk]=KDE Connect indikátor

2
plugins/remotekeyboard/kdeconnect_remotekeyboard.json
View file

@ -20,6 +20,7 @@
"Description[fr]": "Utiliser votre clavier pour envoyer des évènements de touche au périphérique associé",
"Description[it]": "Utilizza la tua tastiera per inviare eventi di pressione dei tasti al dispositivo associato",
"Description[nl]": "Uw toetsenbord gebruiken om toetsgebeurtenissen naar uw gepaarde apparaat te verzenden",
"Description[nn]": "Bruk tastaturet til å senda tastetrykk til den para eininga",
"Description[pl]": "Użyj swojej klawiatury do wysyłania naciśnięć klawiszy do swojego sparowanego urządzenia",
"Description[pt]": "Use o seu teclado para enviar eventos de teclado para o seu dispositivo emparelhado",
"Description[sk]": "Použite vašu klávesnicu na posielanie klávesových udalostí vášmu spárovanému zariadeniu",
@ -42,6 +43,7 @@
"Name[fr]": "Clavier distant depuis le bureau",
"Name[it]": "Tastiera remota dal desktop",
"Name[nl]": "Toetsenbord op afstand vanaf het bureaublad",
"Name[nn]": "Fjerntastatur frå skrivebordet",
"Name[pl]": "Zdalna klawiatura z pulpitu",
"Name[pt]": "Teclado remoto no ecrã",
"Name[sk]": "Vzdialená klávesnica z plochy",

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

@ -6,6 +6,7 @@ Name[es]=Administrador de URL de KDE Connect
Name[fr]=Gestionnaire d'URL téléphoniques de KDE Connect
Name[it]=Gestore URL del telefono di KDE Connect
Name[nl]=KDE-Connect behandelaar van telefoon-URL
Name[nn]=Telefon-URL-handsamar for KDE Connect
Name[pl]=KDE Connect - obsługa URL telefonu
Name[pt]=Tratamento de URL's no Telefone do KDE Connect
Name[sk]=Spracovač KDE Connect Phone URL