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 2017-07-15 05:39:16 +02:00
parent e09da05dcc
commit d513d9e37e
4 changed files with 25 additions and 1 deletions

View file

@ -1,5 +1,11 @@
[Desktop Entry]
Name=KDE Connect Indicator
Name[ca]=Indicador del KDE Connect
Name[pt]=Indicador do KDE Connect
Name[sv]=KDE-anslut indikator
Name[tr]=KDE Connect Göstergesi
Name[uk]=Індикатор KDE Connect
Name[x-test]=xxKDE Connect Indicatorxx
Comment=Display information about your devices
Comment[ca]=Mostra la informació dels vostres dispositius
Comment[ca@valencia]=Mostra la informació dels vostres dispositius

View file

@ -46,7 +46,7 @@
"License": "GPL",
"Name": "Host remote commands",
"Name[ca@valencia]": "Ordes a la màquina remota",
"Name[ca]": "Ordres a la màquina remota",
"Name[ca]": "Allotja ordres remotes",
"Name[cs]": "Přijímat vzdálené příkazy",
"Name[da]": "Vært for eksterne kommandoer",
"Name[es]": "Órdenes en servidor remoto",

View file

@ -14,11 +14,23 @@
}
],
"Description": "Use your keyboard to send key-events to your paired device",
"Description[ca]": "Useu el vostre teclat per enviar esdeveniments de tecla al dispositiu enllaçat",
"Description[pt]": "Use o seu teclado para enviar eventos de teclado para o seu dispositivo emparelhado",
"Description[sv]": "Använd tangentbordet för att skicka tangenthändelser till den parade enheten",
"Description[tr]": "Eşleşmiş cihazınıza önemli etkinlikler göndermek için klavyenizi kullanın",
"Description[uk]": "Скористайтеся вашою клавіатурою для надсилання подій натискання клавіш на пов’язаний пристрій",
"Description[x-test]": "xxUse your keyboard to send key-events to your paired devicexx",
"EnabledByDefault": true,
"Icon": "edit-select",
"Id": "kdeconnect_remotekeyboard",
"License": "GPL",
"Name": "Remote keyboard from the desktop",
"Name[ca]": "Teclat remot des de l'escriptori",
"Name[pt]": "Teclado remoto no ecrã",
"Name[sv]": "Externt tangentbord från skrivbordet",
"Name[tr]": "Masaüstünden uzak klavye",
"Name[uk]": "Віддалена клавіатура з комп’ютера",
"Name[x-test]": "xxRemote keyboard from the desktopxx",
"ServiceTypes": [
"KdeConnect/Plugin"
],

View file

@ -1,5 +1,11 @@
[Desktop Entry]
Name=KDE Connect Phone URL Handler
Name[ca]=Gestor d'URL de telèfons del KDE Connect
Name[pt]=Tratamento de URL's no Telefone do KDE Connect
Name[sv]=KDE-anslut hanterare av telefonwebbadress
Name[tr]=KDE Connect Telefon URL İşleyici
Name[uk]=Обробник телефонних адрес KDE Connect
Name[x-test]=xxKDE Connect Phone URL Handlerxx
Exec=kdeconnect-handler %U
Icon=kdeconnect
Type=Application