SVN_SILENT made messages (.desktop file) - always resolve ours

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-13 10:31:01 +00:00
parent f4a3df0a26
commit 933cbd5bfd
10 changed files with 36 additions and 6 deletions

View file

@ -3,6 +3,7 @@ Name=KDE Connect Application
Name[ca]=Aplicació KDE Connect
Name[cs]=Aplikace KDE Connect
Name[de]=KDE-Connect-Anwendung
Name[en_GB]=KDE Connect Application
Name[es]=Aplicación KDE Connect
Name[fi]=KDE Connect -sovellus
Name[gl]=Programa de KDE Connect
@ -23,6 +24,7 @@ GenericName=Device Synchronization
GenericName[ca]=Sincronització de dispositius
GenericName[cs]=Synchronizace zařízení
GenericName[de]=Geräteabgleich
GenericName[en_GB]=Device Synchronisation
GenericName[es]=Sincronización de dispositivos
GenericName[fi]=Laitteiden synkronointi
GenericName[gl]=Sincronización de dispositivos
@ -43,6 +45,7 @@ Comment=Make all your devices one
Comment[ca]=Fa que tots els vostres dispositius siguin un
Comment[cs]=Sjednoťte svá zařízení
Comment[de]=Gleichen Sie alle Ihre Geräte ab
Comment[en_GB]=Make all your devices one
Comment[es]=Convertir todos sus dispositivos en uno
Comment[fi]=Yhdistä kaikki laitteesi toisiinsa
Comment[gl]=Unifique os seus dispositivos.

View file

@ -43,6 +43,7 @@ Comment=Connect and sync your devices
Comment[ca]=Connecta i sincronitza els vostres dispositius
Comment[cs]=Připojte a synchronizujte svá zařízení
Comment[de]=Verbinden und Abgleichen Ihrer Geräte
Comment[en_GB]=Connect and sync your devices
Comment[es]=Conectar y sincronizar sus dispositivos
Comment[fi]=Yhdistä ja synkronoi laitteitasi
Comment[gl]=Conecte e sincronice os seus dispositivos.

View file

@ -6,6 +6,7 @@ Exec=kcmshell5 kcm_kdeconnect
Name=KDE Connect Settings
Name[ca]=Arranjament del KDE Connect
Name[cs]=Nastavení KDE Connect
Name[en_GB]=KDE Connect Settings
Name[es]=Ajustes de KDE Connect
Name[fi]=KDE Connectin asetukset
Name[hu]=A KDE Connect beállításai
@ -17,10 +18,12 @@ Name[sv]=Inställning av KDE-anslut
Name[tr]=KDE Bağlantı Ayarları
Name[uk]=Параметри KDE Connect
Name[x-test]=xxKDE Connect Settingsxx
Name[zh_CN]=KDE Connect
GenericName=Connect and sync your devices
GenericName[ca]=Connecta i sincronitza els vostres dispositius
GenericName[cs]=Připojte a synchronizujte svá zařízení
GenericName[de]=Verbinden und Abgleichen Ihrer Geräte
GenericName[en_GB]=Connect and sync your devices
GenericName[es]=Conectar y sincronizar sus dispositivos
GenericName[fi]=Yhdistä ja synkronoi laitteitasi
GenericName[gl]=Conecte e sincronice os seus dispositivos

View file

@ -2,6 +2,7 @@
Name=KDE Connect Monitor
Name[ca]=Controlador del KDE Connect
Name[cs]=Monitor KDE Connect
Name[en_GB]=KDE Connect Monitor
Name[es]=Monitor de KDE Connect
Name[fi]=KDE Connect -valvonta
Name[hu]=KDE Connect monitor
@ -13,9 +14,11 @@ Name[sv]=KDE-anslut övervakning
Name[tr]=KDE Bağlantı İzleyicisi
Name[uk]=Монітор KDE Connect
Name[x-test]=xxKDE Connect Monitorxx
Name[zh_CN]=KDE Connect
Comment=Display information about your devices
Comment[ca]=Mostra la informació dels vostres dispositius
Comment[cs]=Zobrazit informace o vašich zařízeních
Comment[en_GB]=Display information about your devices
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
@ -27,6 +30,7 @@ Comment[sv]=Visa information om enheter
Comment[tr]=Aygıtlarınız hakkında bilgi görüntüleyin
Comment[uk]=Показати дані щодо ваших пристроїв
Comment[x-test]=xxDisplay information about your devicesxx
Comment[zh_CN]=
Exec=plasmawindowed org.kde.kdeconnect --statusnotifier
Icon=kdeconnect
Type=Application

View file

@ -11,12 +11,24 @@
}
],
"Description": "Find your lost phone by making it play an alarm sound ",
"Description[en_GB]": "Find your lost phone by making it play an alarm sound ",
"Description[pt_BR]": "Encontre seu telefone fazendo ele tocar um som ",
"Description[sv]": "Hitta din förlorade telefon genom att få den att spela ett alarmljud ",
"Description[uk]": "Знайти загублений телефон, наказавши йому відтворити дзвінок",
"Description[x-test]": "xxFind your lost phone by making it play an alarm sound xx",
"Description[zh_CN]": "通过播放闹铃声来找到您的手机",
"EnabledByDefault": true,
"Encoding": "UTF-8",
"Icon": "edit-find",
"Id": "kdeconnect_findmyphone",
"License": "GPL",
"Name": "Find My Phone",
"Name[en_GB]": "Find My Phone",
"Name[pt_BR]": "Encontrar meu telefone",
"Name[sv]": "Hitta min telefon",
"Name[uk]": "Знайти телефон",
"Name[x-test]": "xxFind My Phonexx",
"Name[zh_CN]": "找到我的手机",
"ServiceTypes": [
"KdeConnect/Plugin"
],

View file

@ -11,6 +11,7 @@
"Description[ca]": "Bloqueja els vostres sistemes",
"Description[cs]": "Zamkne vaše systémy",
"Description[de]": "Sperrt Ihre Systeme",
"Description[en_GB]": "Locks your systems",
"Description[es]": "Bloquear sus sistemas",
"Description[fi]": "Lukitsee järjestelmäsi",
"Description[gl]": "Bloquea os seus sistemas.",
@ -34,6 +35,7 @@
"Name[ca]": "Bloqueja el dispositiu",
"Name[cs]": "Uzamknout zařízení",
"Name[de]": "Gerätesperrung",
"Name[en_GB]": "LockDevice",
"Name[es]": "Bloquear dispositivo",
"Name[fi]": "Lukitse laite",
"Name[gl]": "Bloqueo do dispositivo",

View file

@ -11,6 +11,7 @@
"Description[ca]": "Serveis de control del MPRIS",
"Description[cs]": "Ovládejte služby MPRIS",
"Description[de]": "Steuerung von MPRIS-Diensten",
"Description[en_GB]": "Control MPRIS services",
"Description[es]": "Controlar los servicios MPRIS",
"Description[fi]": "Ohjaa MPRIS-palveluita",
"Description[gl]": "Controle servizos de MPRIS.",
@ -34,6 +35,7 @@
"Name[ca]": "MprisRemote",
"Name[cs]": "MprisRemote",
"Name[de]": "MprisRemote",
"Name[en_GB]": "MprisRemote",
"Name[es]": "MprisRemote",
"Name[fi]": "MPRIS-kauko-ohjain",
"Name[gl]": "MprisRemote",

View file

@ -11,6 +11,7 @@
"Description[ca]": "Mostra les notificacions del telèfon a l'ordinador i les manté sincronitzades",
"Description[cs]": "Zobrazit upozornění telefonu v počítači a udržovat je synchronizovaná",
"Description[de]": "Benachrichtigungen auf Ihren Rechner anzeigen und abgleichen",
"Description[en_GB]": "Show phone notifications on your computer and keep them in sync",
"Description[es]": "Mostrar notificaciones del teléfono en su equipo y mantenerlas en sincronía",
"Description[fi]": "Näytä puhelimen ilmoitukset tietokoneellasi ja pidä ne ajan tasalla",
"Description[gl]": "Mostre notificacións dun teléfono móbil no computador e deixe que as notificacións se sincronicen co teléfono.",

View file

@ -10,6 +10,7 @@
"Description": "Control Remote systems",
"Description[ca]": "Sistemes de control remot",
"Description[cs]": "Ovládejte vzdálené systémy",
"Description[en_GB]": "Control Remote systems",
"Description[es]": "Controlar sistemas remotos",
"Description[fi]": "Ohjaa järjestelmiä etänä",
"Description[gl]": "Controla sistemas remotos.",
@ -32,6 +33,7 @@
"Name": "RemoteControl",
"Name[ca]": "Control remot",
"Name[cs]": "Dálkové ovládání",
"Name[en_GB]": "RemoteControl",
"Name[es]": "Control remoto",
"Name[fi]": "Kauko-ohjain",
"Name[gl]": "Mando a distancia",

View file

@ -5,18 +5,18 @@
{
"Email": "albertvaka@gmail.com",
"Name": "Albert Vaca"
},
},
{
"Email": "david@davidedmundson.co.uk",
"Name": "David Edmundson"
}
],
"Description": "Execute console commands remotely",
"Description": "Execute console commands remotely",
"EnabledByDefault": true,
"Icon": "system-run",
"Id": "kdeconnect_runcommand",
"Icon": "system-run",
"Id": "kdeconnect_runcommand",
"License": "GPL",
"Name": "Run commands",
"Name": "Run commands",
"ServiceTypes": [
"KdeConnect/Plugin"
],
@ -29,4 +29,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.runcommand"
]
}
}