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 2015-06-29 10:29:47 +00:00
parent 7d6912c11f
commit f075da1eab
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/org.kde.kdeconnect.app.desktop
View file

@ -4,6 +4,7 @@ Name[ca]=Aplicació KDE Connect
Name[de]=KDE-Connect-Anwendung Name[de]=KDE-Connect-Anwendung
Name[fi]=KDE Connect -sovellus Name[fi]=KDE Connect -sovellus
Name[gl]=Programa de KDE Connect Name[gl]=Programa de KDE Connect
Name[it]=Applicazione KDE Connect
Name[nl]=KDE Connect-toepassing Name[nl]=KDE Connect-toepassing
Name[pl]=Program KDE Connect Name[pl]=Program KDE Connect
Name[pt]=Aplicação do KDE Connect Name[pt]=Aplicação do KDE Connect
@ -18,6 +19,7 @@ GenericName[ca]=Sincronització de dispositius
GenericName[de]=Geräteabgleich GenericName[de]=Geräteabgleich
GenericName[fi]=Laitteiden synkronointi GenericName[fi]=Laitteiden synkronointi
GenericName[gl]=Sincronización de dispositivos GenericName[gl]=Sincronización de dispositivos
GenericName[it]=Sincronizzazione dispositivo
GenericName[nl]=Synchronisatie van apparaat GenericName[nl]=Synchronisatie van apparaat
GenericName[pl]=Synchronizacja urządzenia GenericName[pl]=Synchronizacja urządzenia
GenericName[pt]=Sincronização de Dispositivos GenericName[pt]=Sincronização de Dispositivos
@ -31,6 +33,7 @@ Comment=Make all your devices one
Comment[ca]=Fa que tots els vostres dispositius siguin un Comment[ca]=Fa que tots els vostres dispositius siguin un
Comment[fi]=Yhdistä kaikki laitteesi toisiinsa Comment[fi]=Yhdistä kaikki laitteesi toisiinsa
Comment[gl]=Unifique os seus dispositivos. Comment[gl]=Unifique os seus dispositivos.
Comment[it]=Fai di tutti i tuoi dispositivi un solo dispositivo
Comment[nl]=Al uw apparaten een maken Comment[nl]=Al uw apparaten een maken
Comment[pl]=Uczyń wszystkie swoje urządzenia jednym Comment[pl]=Uczyń wszystkie swoje urządzenia jednym
Comment[pt]=Unifique todos os seus dispositivos Comment[pt]=Unifique todos os seus dispositivos

2
plugins/mprisremote/kdeconnect_mprisremote.json
View file

@ -11,6 +11,7 @@
"Description[ca]": "Serveis de control del MPRIS", "Description[ca]": "Serveis de control del MPRIS",
"Description[fi]": "Ohjaa MPRIS-palveluita", "Description[fi]": "Ohjaa MPRIS-palveluita",
"Description[gl]": "Controle servizos de MPRIS.", "Description[gl]": "Controle servizos de MPRIS.",
"Description[it]": "Servizi di controllo MPRIS",
"Description[nl]": "MPRIS-services besturen", "Description[nl]": "MPRIS-services besturen",
"Description[pl]": "Sterowanie usługami MPRIS", "Description[pl]": "Sterowanie usługami MPRIS",
"Description[pt]": "Controlar os serviços MPRIS", "Description[pt]": "Controlar os serviços MPRIS",
@ -28,6 +29,7 @@
"Name[ca]": "MprisRemote", "Name[ca]": "MprisRemote",
"Name[fi]": "MPRIS-kaukosäädin", "Name[fi]": "MPRIS-kaukosäädin",
"Name[gl]": "MprisRemote", "Name[gl]": "MprisRemote",
"Name[it]": "MprisRemote",
"Name[nl]": "MprisRemote", "Name[nl]": "MprisRemote",
"Name[pl]": "PilotMPRIS", "Name[pl]": "PilotMPRIS",
"Name[pt]": "Comando MPRIS", "Name[pt]": "Comando MPRIS",