Commit 1949d176 authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent 16149c31
......@@ -21,6 +21,7 @@
"Name[pt_BR]": "Aleix Pol Gonzalez",
"Name[ru]": "Aleix Pol Gonzalez",
"Name[sk]": "Aleix Pol Gonzalez",
"Name[sl]": "Aleix Pol Gonzalez",
"Name[sv]": "Aleix Pol Gonzalez",
"Name[uk]": "Aleix Pol Gonzalez",
"Name[x-test]": "xxAleix Pol Gonzalezxx",
......@@ -47,6 +48,7 @@
"Name[pt]": "Acerca do KAlgebra",
"Name[pt_BR]": "Sobre o KAlgebra",
"Name[sk]": "O KAlgebra",
"Name[sl]": "O KAlgebri",
"Name[sv]": "Om Kalgebra",
"Name[uk]": "Про KAlgebra",
"Name[x-test]": "xxAbout KAlgebraxx",
......
......@@ -21,6 +21,7 @@
"Name[pt_BR]": "Aleix Pol Gonzalez",
"Name[ru]": "Aleix Pol Gonzalez",
"Name[sk]": "Aleix Pol Gonzalez",
"Name[sl]": "Aleix Pol Gonzalez",
"Name[sv]": "Aleix Pol Gonzalez",
"Name[uk]": "Aleix Pol Gonzalez",
"Name[x-test]": "xxAleix Pol Gonzalezxx",
......@@ -46,6 +47,7 @@
"Description[pt]": "Calculadora científica",
"Description[pt_BR]": "Calculadora científica",
"Description[sk]": "Vedecká kalkulačka",
"Description[sl]": "Znanstveno računalo",
"Description[sv]": "Vetenskaplig räknare",
"Description[uk]": "Інженерний калькулятор",
"Description[x-test]": "xxScientific calculatorxx",
......@@ -70,6 +72,7 @@
"Name[pt]": "Calculadora",
"Name[pt_BR]": "Calculadora",
"Name[sk]": "Kalkulačka",
"Name[sl]": "Računalo",
"Name[sv]": "Räknare",
"Name[uk]": "Калькулятор",
"Name[x-test]": "xxCalculatorxx",
......
......@@ -21,6 +21,7 @@
"Name[pt_BR]": "Artur Puzio",
"Name[ru]": "Artur Puzio",
"Name[sk]": "Artur Puzio",
"Name[sl]": "Artur Puzio",
"Name[sv]": "Artur Puzio",
"Name[uk]": "Artur Puzio",
"Name[x-test]": "xxArtur Puzioxx",
......@@ -46,6 +47,7 @@
"Description[pt]": "Lista de funções disponíveis",
"Description[pt_BR]": "Lista das funções disponíveis",
"Description[sk]": "Zoznam dostupných funkcií",
"Description[sl]": "Seznam funkcij, ki so na voljo",
"Description[sv]": "Lista över tillgängliga funktioner",
"Description[uk]": "Список доступних функцій",
"Description[x-test]": "xxList of available functionsxx",
......@@ -70,6 +72,7 @@
"Name[pt]": "Dicionário",
"Name[pt_BR]": "Dicionário",
"Name[sk]": "Slovník",
"Name[sl]": "Slovar",
"Name[sv]": "Ordlista",
"Name[uk]": "Словник",
"Name[x-test]": "xxDictionaryxx",
......
......@@ -21,6 +21,7 @@
"Name[pt_BR]": "Aleix Pol Gonzalez",
"Name[ru]": "Aleix Pol Gonzalez",
"Name[sk]": "Aleix Pol Gonzalez",
"Name[sl]": "Aleix Pol Gonzalez",
"Name[sv]": "Aleix Pol Gonzalez",
"Name[uk]": "Aleix Pol Gonzalez",
"Name[x-test]": "xxAleix Pol Gonzalezxx",
......@@ -44,6 +45,7 @@
"Description[pt]": "Desenha qualquer gráfico 2D que desejar",
"Description[pt_BR]": "Desenha qualquer gráfico 2D que você quiser",
"Description[sk]": "Nakreslí akýkoľvek požadovaný 2D graf",
"Description[sl]": "Nariše katerikoli želeni 2D graf",
"Description[sv]": "Ritar vilken tvådimensionell graf som helst",
"Description[uk]": "Креслить будь-який потрібний вам двовимірний графік",
"Description[x-test]": "xxDraws any 2D graph you wantxx",
......@@ -67,6 +69,7 @@
"Name[pt]": "Gráfico 2D",
"Name[pt_BR]": "Gráfico 2D",
"Name[sk]": "Graf 2D",
"Name[sl]": "Graf 2D",
"Name[sv]": "Tvådimensionella grafer",
"Name[uk]": "Двовимірний графік",
"Name[x-test]": "xxGraph 2Dxx",
......
......@@ -21,6 +21,7 @@
"Name[pt_BR]": "Aleix Pol Gonzalez",
"Name[ru]": "Aleix Pol Gonzalez",
"Name[sk]": "Aleix Pol Gonzalez",
"Name[sl]": "Aleix Pol Gonzalez",
"Name[sv]": "Aleix Pol Gonzalez",
"Name[uk]": "Aleix Pol Gonzalez",
"Name[x-test]": "xxAleix Pol Gonzalezxx",
......@@ -44,6 +45,7 @@
"Description[pt]": "Desenha qualquer gráfico 3D que desejar",
"Description[pt_BR]": "Desenha qualquer gráfico 3D que você quiser",
"Description[sk]": "Nakreslí akýkoľvek požadovaný 3D graf",
"Description[sl]": "Nariše katerikoli želeni 3D graf",
"Description[sv]": "Ritar vilken tredimensionell graf som helst",
"Description[uk]": "Креслить будь-який потрібний вам просторовий графік",
"Description[x-test]": "xxDraws any 3D graph you wantxx",
......@@ -67,6 +69,7 @@
"Name[pt]": "Gráfico 3D",
"Name[pt_BR]": "Gráfico 3D",
"Name[sk]": "Graf 3D",
"Name[sl]": "Graf 3D",
"Name[sv]": "Tredimensionella grafer",
"Name[uk]": "Просторовий графік",
"Name[x-test]": "xxGraph 3Dxx",
......
......@@ -21,6 +21,7 @@
"Name[pt_BR]": "Aleix Pol Gonzalez",
"Name[ru]": "Aleix Pol Gonzalez",
"Name[sk]": "Aleix Pol Gonzalez",
"Name[sl]": "Aleix Pol Gonzalez",
"Name[sv]": "Aleix Pol Gonzalez",
"Name[uk]": "Aleix Pol Gonzalez",
"Name[x-test]": "xxAleix Pol Gonzalezxx",
......@@ -45,6 +46,7 @@
"Description[pt]": "Criar facilmente tabelas de valores",
"Description[pt_BR]": "Criar facilmente tabelas de valores",
"Description[sk]": "Ľahko vytvárajte tabuľky s hodnotami",
"Description[sl]": "Enostavna tvorba tabel vrednosti",
"Description[sv]": "Enkelt skapade värdetabeller",
"Description[uk]": "Просте створення таблиць значень",
"Description[x-test]": "xxEasily create value tablesxx",
......@@ -69,6 +71,7 @@
"Name[pt]": "Tabelas de Valores",
"Name[pt_BR]": "Tabelas de valores",
"Name[sk]": "Tabuľky s hodnotami",
"Name[sl]": "Tabele vrednosti",
"Name[sv]": "Värdetabeller",
"Name[uk]": "Таблиці значень",
"Name[x-test]": "xxValue Tablesxx",
......
......@@ -21,6 +21,7 @@
"Name[pt_BR]": "Aleix Pol Gonzalez",
"Name[ru]": "Aleix Pol Gonzalez",
"Name[sk]": "Aleix Pol Gonzalez",
"Name[sl]": "Aleix Pol Gonzalez",
"Name[sv]": "Aleix Pol Gonzalez",
"Name[uk]": "Aleix Pol Gonzalez",
"Name[x-test]": "xxAleix Pol Gonzalezxx",
......@@ -45,6 +46,7 @@
"Description[pt]": "Mostra os valores armazenados",
"Description[pt_BR]": "Mostra os valores armazenados",
"Description[sk]": "Zobrazuje uložené hodnoty",
"Description[sl]": "Prikaže shranjene vrednosti",
"Description[sv]": "Visar de lagrade värdena",
"Description[uk]": "Показує збережені значення",
"Description[x-test]": "xxDisplays the stored valuesxx",
......@@ -69,6 +71,7 @@
"Name[pt]": "Variáveis",
"Name[pt_BR]": "Variáveis",
"Name[sk]": "Premenné",
"Name[sl]": "Spremenljivke",
"Name[sv]": "Variabler",
"Name[uk]": "Змінні",
"Name[x-test]": "xxVariablesxx",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment