Commit 40241626 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 1949d176
......@@ -14,6 +14,7 @@
"Name[fr]": "Aleix Pol Gonzalez",
"Name[gl]": "Aleix Pol Gonzalez",
"Name[it]": "Aleix Pol Gonzalez",
"Name[ko]": "Aleix Pol Gonzalez",
"Name[nl]": "Aleix Pol Gonzalez",
"Name[nn]": "Aleix Pol Gonzalez",
"Name[pl]": "Aleix Pol Gonzalez",
......@@ -42,6 +43,7 @@
"Name[fr]": "À propos de KAlgebra",
"Name[gl]": "Sobre KAlgebra",
"Name[it]": "Informazioni su KAlgebra",
"Name[ko]": "KAlgebra 정보",
"Name[nl]": "Over KAlgebra",
"Name[nn]": "Om KAlgebra",
"Name[pl]": "O KAlgebrze",
......
......@@ -14,6 +14,7 @@
"Name[fr]": "Aleix Pol Gonzalez",
"Name[gl]": "Aleix Pol Gonzalez",
"Name[it]": "Aleix Pol Gonzalez",
"Name[ko]": "Aleix Pol Gonzalez",
"Name[nl]": "Aleix Pol Gonzalez",
"Name[nn]": "Aleix Pol Gonzalez",
"Name[pl]": "Aleix Pol Gonzalez",
......@@ -41,6 +42,7 @@
"Description[fr]": "Calculatrice scientifique",
"Description[gl]": "Calculadora científica",
"Description[it]": "Calcolatrice scientifica",
"Description[ko]": "공학용 계산기",
"Description[nl]": "Wetenschappelijke rekenmachine",
"Description[nn]": "Vitskapleg kalkulator",
"Description[pl]": "Kalkulator naukowy",
......@@ -66,6 +68,7 @@
"Name[fr]": "Calculatrice",
"Name[gl]": "Calculadora",
"Name[it]": "Calcolatrice",
"Name[ko]": "계산기",
"Name[nl]": "Rekenmachine",
"Name[nn]": "Kalkulator",
"Name[pl]": "Kalkulator",
......
......@@ -14,6 +14,7 @@
"Name[fr]": "Artur Puzio",
"Name[gl]": "Artur Puzio",
"Name[it]": "Artur Puzio",
"Name[ko]": "Artur Puzio",
"Name[nl]": "Artur Puzio",
"Name[nn]": "Artur Puzio",
"Name[pl]": "Artur Puzio",
......@@ -41,6 +42,7 @@
"Description[fr]": "Liste des fonctions disponibles",
"Description[gl]": "Lista das funcións dispoñíbeis",
"Description[it]": "Lista delle funzioni disponibili",
"Description[ko]": "사용 가능한 함수 목록",
"Description[nl]": "Beschikbare functies",
"Description[nn]": "List over tilgjengelege funksjonar",
"Description[pl]": "Wykaz dostępnych możliwości",
......@@ -66,6 +68,7 @@
"Name[fr]": "Dictionnaire",
"Name[gl]": "Dicionario",
"Name[it]": "Dizionario",
"Name[ko]": "사전",
"Name[nl]": "Woordenboek",
"Name[nn]": "Ordliste",
"Name[pl]": "Słownik",
......
......@@ -14,6 +14,7 @@
"Name[fr]": "Aleix Pol Gonzalez",
"Name[gl]": "Aleix Pol Gonzalez",
"Name[it]": "Aleix Pol Gonzalez",
"Name[ko]": "Aleix Pol Gonzalez",
"Name[nl]": "Aleix Pol Gonzalez",
"Name[nn]": "Aleix Pol Gonzalez",
"Name[pl]": "Aleix Pol Gonzalez",
......@@ -39,6 +40,7 @@
"Description[fr]": "Dessine n'importe quel graphe 2D",
"Description[gl]": "Debuxa calquera gráfico en 2D",
"Description[it]": "Disegna qualsiasi grafico 2D tu voglia",
"Description[ko]": "임의의 2D 그래프 그리기",
"Description[nl]": "Tekent elke gewenste 2D-grafiek",
"Description[nn]": "Teiknar alle 2D-grafar du måtte ønskja",
"Description[pl]": "Rysuje wykres 2D taki jaki chcesz",
......@@ -63,6 +65,7 @@
"Name[fr]": "Graphe 2D",
"Name[gl]": "Gráfico en 2D",
"Name[it]": "Grafico 2D",
"Name[ko]": "2D 그래프",
"Name[nl]": "Grafiek 2D",
"Name[nn]": "2D-graf",
"Name[pl]": "Wykres 2D",
......
......@@ -14,6 +14,7 @@
"Name[fr]": "Aleix Pol Gonzalez",
"Name[gl]": "Aleix Pol Gonzalez",
"Name[it]": "Aleix Pol Gonzalez",
"Name[ko]": "Aleix Pol Gonzalez",
"Name[nl]": "Aleix Pol Gonzalez",
"Name[nn]": "Aleix Pol Gonzalez",
"Name[pl]": "Aleix Pol Gonzalez",
......@@ -39,6 +40,7 @@
"Description[fr]": "Dessine n'importe quel graphe 3D",
"Description[gl]": "Debuxa calquera gráfico en 3D",
"Description[it]": "Disegna qualsiasi grafico 3D tu voglia",
"Description[ko]": "임의의 3D 그래프 그리기",
"Description[nl]": "Tekent elke gewenste 3D-grafiek",
"Description[nn]": "Teiknar alle 3D-grafar du måtte ønskja",
"Description[pl]": "Rysuje wykres 3D taki jaki chcesz",
......@@ -63,6 +65,7 @@
"Name[fr]": "Graphe 3D",
"Name[gl]": "Gráfico en 3D",
"Name[it]": "Grafico 2D",
"Name[ko]": "3D 그래프",
"Name[nl]": "Grafiek 3D",
"Name[nn]": "3D-graf",
"Name[pl]": "Wykres 3D",
......
......@@ -14,6 +14,7 @@
"Name[fr]": "Aleix Pol Gonzalez",
"Name[gl]": "Aleix Pol Gonzalez",
"Name[it]": "Aleix Pol Gonzalez",
"Name[ko]": "Aleix Pol Gonzalez",
"Name[nl]": "Aleix Pol Gonzalez",
"Name[nn]": "Aleix Pol Gonzalez",
"Name[pl]": "Aleix Pol Gonzalez",
......@@ -40,6 +41,7 @@
"Description[fr]": "Crée facilement des tableaux de valeurs",
"Description[gl]": "Crear facilmente táboas de valores",
"Description[it]": "Crea facilmente tabelle di valori",
"Description[ko]": "쉽게 값 표 만들기",
"Description[nl]": "Eenvoudig maken van tabellen",
"Description[nn]": "Lag verditabellar på ein enkel måte",
"Description[pl]": "Łatwe tworzenie tabel wartości",
......@@ -65,6 +67,7 @@
"Name[fr]": "Tableaux de valeurs",
"Name[gl]": "Táboas de valores",
"Name[it]": "Tabelle di valori",
"Name[ko]": "값 표",
"Name[nl]": "Tabellen",
"Name[nn]": "Verditabellar",
"Name[pl]": "Tabela wartości",
......
......@@ -14,6 +14,7 @@
"Name[fr]": "Aleix Pol Gonzalez",
"Name[gl]": "Aleix Pol Gonzalez",
"Name[it]": "Aleix Pol Gonzalez",
"Name[ko]": "Aleix Pol Gonzalez",
"Name[nl]": "Aleix Pol Gonzalez",
"Name[nn]": "Aleix Pol Gonzalez",
"Name[pl]": "Aleix Pol Gonzalez",
......@@ -40,6 +41,7 @@
"Description[fr]": "Affiche les valeurs enregistrées",
"Description[gl]": "Mostra os valores almacenados",
"Description[it]": "Mostra i valori memorizzati",
"Description[ko]": "저장된 값 표시",
"Description[nl]": "Toont opgeslagen waarden",
"Description[nn]": "Vis lagra verdiar",
"Description[pl]": "Wyświetla przechowywane wartości",
......@@ -65,6 +67,7 @@
"Name[fr]": "Variables",
"Name[gl]": "Variábeis",
"Name[it]": "Variabili",
"Name[ko]": "변수",
"Name[nl]": "Variabelen",
"Name[nn]": "Variablar",
"Name[pl]": "Zmienne",
......
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