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
933cbd5bfd
commit
42a3029b0e
5 changed files with 27 additions and 0 deletions
|
@ -10,6 +10,7 @@ Name[en_GB]=KDE Connect Settings
|
||||||
Name[es]=Ajustes de KDE Connect
|
Name[es]=Ajustes de KDE Connect
|
||||||
Name[fi]=KDE Connectin asetukset
|
Name[fi]=KDE Connectin asetukset
|
||||||
Name[hu]=A KDE Connect beállításai
|
Name[hu]=A KDE Connect beállításai
|
||||||
|
Name[it]=Impostazioni di KDE Connect
|
||||||
Name[nl]=Instellingen van KDE Connect
|
Name[nl]=Instellingen van KDE Connect
|
||||||
Name[pl]=Ustawienia KDE Connect
|
Name[pl]=Ustawienia KDE Connect
|
||||||
Name[pt]=Configuração do KDE Connect
|
Name[pt]=Configuração do KDE Connect
|
||||||
|
|
|
@ -6,6 +6,7 @@ Name[en_GB]=KDE Connect Monitor
|
||||||
Name[es]=Monitor de KDE Connect
|
Name[es]=Monitor de KDE Connect
|
||||||
Name[fi]=KDE Connect -valvonta
|
Name[fi]=KDE Connect -valvonta
|
||||||
Name[hu]=KDE Connect monitor
|
Name[hu]=KDE Connect monitor
|
||||||
|
Name[it]=Monitor di KDE Connect
|
||||||
Name[nl]=KDE-Connectmonitor
|
Name[nl]=KDE-Connectmonitor
|
||||||
Name[pl]=Monitor KDE Connect
|
Name[pl]=Monitor KDE Connect
|
||||||
Name[pt]=Monitor do KDE Connect
|
Name[pt]=Monitor do KDE Connect
|
||||||
|
@ -22,6 +23,7 @@ Comment[en_GB]=Display information about your devices
|
||||||
Comment[es]=Mostrar información sobre sus dispositivos
|
Comment[es]=Mostrar información sobre sus dispositivos
|
||||||
Comment[fi]=Näyttää tietoa laitteistasi
|
Comment[fi]=Näyttää tietoa laitteistasi
|
||||||
Comment[hu]=Információk megjelenítése az eszközeiről
|
Comment[hu]=Információk megjelenítése az eszközeiről
|
||||||
|
Comment[it]=Visualizza informazioni sui tuoi dispositivi
|
||||||
Comment[nl]=Toon informatie over uw apparaten
|
Comment[nl]=Toon informatie over uw apparaten
|
||||||
Comment[pl]=Wyświetl informacje o twoich urządzeniach
|
Comment[pl]=Wyświetl informacje o twoich urządzeniach
|
||||||
Comment[pt]=Mostrar informações sobre os seus dispositivos
|
Comment[pt]=Mostrar informações sobre os seus dispositivos
|
||||||
|
|
|
@ -12,6 +12,9 @@
|
||||||
],
|
],
|
||||||
"Description": "Find your lost phone by making it play an alarm sound ",
|
"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[en_GB]": "Find your lost phone by making it play an alarm sound ",
|
||||||
|
"Description[fi]": "Löydä hukkaamasi puhelin laittamalla se soittamaan hälytysääntä ",
|
||||||
|
"Description[nl]": "Zoek uw verloren telefoon door het te laten een wekkersignaal te laten spelen ",
|
||||||
|
"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[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[sv]": "Hitta din förlorade telefon genom att få den att spela ett alarmljud ",
|
||||||
"Description[uk]": "Знайти загублений телефон, наказавши йому відтворити дзвінок",
|
"Description[uk]": "Знайти загублений телефон, наказавши йому відтворити дзвінок",
|
||||||
|
@ -24,6 +27,9 @@
|
||||||
"License": "GPL",
|
"License": "GPL",
|
||||||
"Name": "Find My Phone",
|
"Name": "Find My Phone",
|
||||||
"Name[en_GB]": "Find My Phone",
|
"Name[en_GB]": "Find My Phone",
|
||||||
|
"Name[fi]": "Löydä puhelimeni",
|
||||||
|
"Name[nl]": "Zoek mijn telefoon",
|
||||||
|
"Name[pt]": "Descobrir o Meu Telefone",
|
||||||
"Name[pt_BR]": "Encontrar meu telefone",
|
"Name[pt_BR]": "Encontrar meu telefone",
|
||||||
"Name[sv]": "Hitta min telefon",
|
"Name[sv]": "Hitta min telefon",
|
||||||
"Name[uk]": "Знайти телефон",
|
"Name[uk]": "Знайти телефон",
|
||||||
|
|
|
@ -12,11 +12,23 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"Description": "Execute console commands remotely",
|
"Description": "Execute console commands remotely",
|
||||||
|
"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[uk]": "Віддалене виконання консольних команд",
|
||||||
|
"Description[x-test]": "xxExecute console commands remotelyxx",
|
||||||
"EnabledByDefault": true,
|
"EnabledByDefault": true,
|
||||||
"Icon": "system-run",
|
"Icon": "system-run",
|
||||||
"Id": "kdeconnect_runcommand",
|
"Id": "kdeconnect_runcommand",
|
||||||
"License": "GPL",
|
"License": "GPL",
|
||||||
"Name": "Run commands",
|
"Name": "Run commands",
|
||||||
|
"Name[nl]": "Commando's uitvoeren",
|
||||||
|
"Name[pt]": "Executar comandos",
|
||||||
|
"Name[pt_BR]": "Executar comandos",
|
||||||
|
"Name[sv]": "Kör kommandon",
|
||||||
|
"Name[uk]": "Виконання команд",
|
||||||
|
"Name[x-test]": "xxRun commandsxx",
|
||||||
"ServiceTypes": [
|
"ServiceTypes": [
|
||||||
"KdeConnect/Plugin"
|
"KdeConnect/Plugin"
|
||||||
],
|
],
|
||||||
|
|
|
@ -6,5 +6,11 @@ X-KDE-Library=kdeconnect_runcommand_config
|
||||||
X-KDE-ParentComponents=kdeconnect_runcommand
|
X-KDE-ParentComponents=kdeconnect_runcommand
|
||||||
|
|
||||||
Name=Run Command plugin settings
|
Name=Run Command plugin settings
|
||||||
|
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[uk]=Параметри додатка запуску команд
|
||||||
|
Name[x-test]=xxRun Command plugin settingsxx
|
||||||
|
|
||||||
Categories=Qt;KDE;X-KDE-settings-kdeconnect;
|
Categories=Qt;KDE;X-KDE-settings-kdeconnect;
|
||||||
|
|
Loading…
Reference in a new issue