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:
parent
410d1c9d4a
commit
d33800a748
5 changed files with 10 additions and 2 deletions
|
@ -30,7 +30,7 @@ Name[zh_CN]=KDE Connect
|
|||
Comment=Show notifications from your devices using KDE Connect
|
||||
Comment[bg]=Показване на уведомления от вашите устройства чрез KDE Connect
|
||||
Comment[bs]=Prikaži obavlještenja sa uređaja koji koriste KDE konekciju
|
||||
Comment[ca]=Mostra les notificacions des dels vostres dispositius usant KDE Connect
|
||||
Comment[ca]=Mostra les notificacions dels vostres dispositius usant el KDE Connect
|
||||
Comment[cs]=Zobrazit upozornění z vašich zařízení pomocí KDE Connect
|
||||
Comment[da]=Vis bekendtgørelser fra dine enheder med KDE Connect
|
||||
Comment[de]=Zeigt Benachrichtigungen von Ihren Geräten mit KDE-Connect
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
"Description[pt]": "Descobre o seu telefone perdido, fazendo-o tocar um som de alarme",
|
||||
"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[tr]": "Bir alarm sesi çalarak kayıp telefonunuzu bulun ",
|
||||
"Description[uk]": "Знайти загублений телефон, наказавши йому відтворити дзвінок",
|
||||
"Description[x-test]": "xxFind your lost phone by making it play an alarm sound xx",
|
||||
"Description[zh_CN]": "通过播放闹铃声来找到您的手机",
|
||||
|
@ -34,6 +35,7 @@
|
|||
"Name[pt]": "Descobrir o Meu Telefone",
|
||||
"Name[pt_BR]": "Encontrar meu telefone",
|
||||
"Name[sv]": "Hitta min telefon",
|
||||
"Name[tr]": "Telefonumu Bul",
|
||||
"Name[uk]": "Знайти телефон",
|
||||
"Name[x-test]": "xxFind My Phonexx",
|
||||
"Name[zh_CN]": "找到我的手机",
|
||||
|
|
|
@ -31,7 +31,7 @@ Name[zh_CN]=KDE Connect
|
|||
Comment=Notifications from your devices
|
||||
Comment[bg]=Уведомления от устройствата ви
|
||||
Comment[bs]=Notifikacija sa Vašeg uređaja
|
||||
Comment[ca]=Notificacions des dels vostres dispositius
|
||||
Comment[ca]=Notificacions dels vostres dispositius
|
||||
Comment[cs]=Oznamování z vašich zařízení
|
||||
Comment[da]=Bekendtgørelser fra dine enheder
|
||||
Comment[de]=Benachrichtigungen von Ihren Geräten
|
||||
|
|
|
@ -13,10 +13,12 @@
|
|||
],
|
||||
"Description": "Execute console commands remotely",
|
||||
"Description[ca]": "Executa ordres de la consola de forma remota",
|
||||
"Description[fi]": "Suorita konsolikomentoja etänä",
|
||||
"Description[nl]": "Commando's in de terminal op afstand laten uitvoeren",
|
||||
"Description[pt]": "Executar de forma remota comandos da consola",
|
||||
"Description[pt_BR]": "Executa comandos do console remotamente",
|
||||
"Description[sv]": "Kör terminalkommandon på distans",
|
||||
"Description[tr]": "Konsol komutlarını uzaktan çalıştır",
|
||||
"Description[uk]": "Віддалене виконання консольних команд",
|
||||
"Description[x-test]": "xxExecute console commands remotelyxx",
|
||||
"EnabledByDefault": true,
|
||||
|
@ -25,10 +27,12 @@
|
|||
"License": "GPL",
|
||||
"Name": "Run commands",
|
||||
"Name[ca]": "Executa ordres",
|
||||
"Name[fi]": "Suorita komentoja",
|
||||
"Name[nl]": "Commando's uitvoeren",
|
||||
"Name[pt]": "Executar comandos",
|
||||
"Name[pt_BR]": "Executar comandos",
|
||||
"Name[sv]": "Kör kommandon",
|
||||
"Name[tr]": "Komut çalıştır",
|
||||
"Name[uk]": "Виконання команд",
|
||||
"Name[x-test]": "xxRun commandsxx",
|
||||
"ServiceTypes": [
|
||||
|
|
|
@ -7,10 +7,12 @@ X-KDE-ParentComponents=kdeconnect_runcommand
|
|||
|
||||
Name=Run Command plugin settings
|
||||
Name[ca]=Ajustaments del connector Executa ordres
|
||||
Name[fi]=Suorita komento -liitännäisen asetukset
|
||||
Name[nl]=Plug-in-instellingen van commando Uitvoeren
|
||||
Name[pt]=Configuração do 'plugin' de execução de comandos
|
||||
Name[pt_BR]=Configurações do plugin de execução de comandos
|
||||
Name[sv]=Inställningar av insticksprogram för kör kommando
|
||||
Name[tr]=Komut Çalıştır eklenti ayarları
|
||||
Name[uk]=Параметри додатка запуску команд
|
||||
Name[x-test]=xxRun Command plugin settingsxx
|
||||
|
||||
|
|
Loading…
Reference in a new issue