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-09-12 11:52:20 +00:00
parent 0f280b5345
commit 71874dbffb
3 changed files with 34 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcm/kdeconnect.desktop
View file

@ -8,7 +8,9 @@ Name[ca]=Arranjament del KDE Connect
Name[cs]=Nastavení KDE Connect
Name[es]=Ajustes de KDE Connect
Name[fi]=KDE Connectin asetukset
Name[hu]=A KDE Connect beállításai
Name[nl]=Instellingen van KDE Connect
Name[pl]=Ustawienia KDE Connect
Name[pt]=Configuração do KDE Connect
Name[pt_BR]=Configurações do KDE Connect
Name[sv]=Inställning av KDE-anslut

4
kdeconnect-non-plasma.desktop
View file

@ -4,7 +4,9 @@ Name[ca]=Controlador del KDE Connect
Name[cs]=Monitor KDE Connect
Name[es]=Monitor de KDE Connect
Name[fi]=KDE Connect -valvonta
Name[hu]=KDE Connect monitor
Name[nl]=KDE-Connectmonitor
Name[pl]=Monitor KDE Connect
Name[pt]=Monitor do KDE Connect
Name[pt_BR]=Monitor do KDE Connect
Name[sv]=KDE-anslut övervakning
@ -16,7 +18,9 @@ Comment[ca]=Mostra la informació dels vostres dispositius
Comment[cs]=Zobrazit informace o vašich zařízeních
Comment[es]=Mostrar información sobre sus dispositivos
Comment[fi]=Näyttää tietoa laitteistasi
Comment[hu]=Információk megjelenítése az eszközeiről
Comment[nl]=Toon informatie over uw apparaten
Comment[pl]=Wyświetl informacje o twoich urządzeniach
Comment[pt]=Mostrar informações sobre os seus dispositivos
Comment[pt_BR]=Mostra informações sobre seus dispositivos
Comment[sv]=Visa information om enheter

54
plugins/findmyphone/kdeconnect_findmyphone.json
View file

@ -1,29 +1,29 @@
{
"KPlugin" : {
"Encoding" : "UTF-8",
"Name" : "Find My Phone",
"Description" : "Find your lost phone by making it play an alarm sound ",
"Id" : "kdeconnect_findmyphone",
"Version" : "0.1",
"Authors" : [
{
"Name" : "Apoorv Parle",
"Email" : "apparle@gmail.com"
},
{
"Name" : "David Edmundson",
"Email" : "davidedmundson@kde.org"
}
],
"License" : "GPL",
"EnabledByDefault" : true,
"ServiceTypes" : [
"KdeConnect/Plugin"
],
"Website" : "http://kde.org",
"Icon" : "edit-find"
},
"X-KdeConnect-OutgoingPackageType" : [
"kdeconnect.findmyphone"
]
"KPlugin": {
"Authors": [
{
"Email": "apparle@gmail.com",
"Name": "Apoorv Parle"
},
{
"Email": "davidedmundson@kde.org",
"Name": "David Edmundson"
}
],
"Description": "Find your lost phone by making it play an alarm sound ",
"EnabledByDefault": true,
"Encoding": "UTF-8",
"Icon": "edit-find",
"Id": "kdeconnect_findmyphone",
"License": "GPL",
"Name": "Find My Phone",
"ServiceTypes": [
"KdeConnect/Plugin"
],
"Version": "0.1",
"Website": "http://kde.org"
},
"X-KdeConnect-OutgoingPackageType": [
"kdeconnect.findmyphone"
]
}