Commit 20f0b0ec 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 20b3c686
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
"Name[gl]": "Aleix Pol Gonzalez", "Name[gl]": "Aleix Pol Gonzalez",
"Name[it]": "Aleix Pol Gonzalez", "Name[it]": "Aleix Pol Gonzalez",
"Name[nl]": "Aleix Pol Gonzalez", "Name[nl]": "Aleix Pol Gonzalez",
"Name[nn]": "Aleix Pol Gonzalez",
"Name[pl]": "Aleix Pol Gonzalez", "Name[pl]": "Aleix Pol Gonzalez",
"Name[pt]": "Aleix Pol Gonzalez", "Name[pt]": "Aleix Pol Gonzalez",
"Name[pt_BR]": "Aleix Pol Gonzalez", "Name[pt_BR]": "Aleix Pol Gonzalez",
...@@ -39,6 +40,7 @@ ...@@ -39,6 +40,7 @@
"Name[gl]": "Sobre KAlgebra", "Name[gl]": "Sobre KAlgebra",
"Name[it]": "Informazioni su KAlgebra", "Name[it]": "Informazioni su KAlgebra",
"Name[nl]": "Over KAlgebra", "Name[nl]": "Over KAlgebra",
"Name[nn]": "Om KAlgebra",
"Name[pl]": "O KAlgebrze", "Name[pl]": "O KAlgebrze",
"Name[pt]": "Acerca do KAlgebra", "Name[pt]": "Acerca do KAlgebra",
"Name[pt_BR]": "Sobre o KAlgebra", "Name[pt_BR]": "Sobre o KAlgebra",
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
"Name[gl]": "Aleix Pol Gonzalez", "Name[gl]": "Aleix Pol Gonzalez",
"Name[it]": "Aleix Pol Gonzalez", "Name[it]": "Aleix Pol Gonzalez",
"Name[nl]": "Aleix Pol Gonzalez", "Name[nl]": "Aleix Pol Gonzalez",
"Name[nn]": "Aleix Pol Gonzalez",
"Name[pl]": "Aleix Pol Gonzalez", "Name[pl]": "Aleix Pol Gonzalez",
"Name[pt]": "Aleix Pol Gonzalez", "Name[pt]": "Aleix Pol Gonzalez",
"Name[pt_BR]": "Aleix Pol Gonzalez", "Name[pt_BR]": "Aleix Pol Gonzalez",
...@@ -38,6 +39,7 @@ ...@@ -38,6 +39,7 @@
"Description[gl]": "Calculadora científica", "Description[gl]": "Calculadora científica",
"Description[it]": "Calcolatrice scientifica", "Description[it]": "Calcolatrice scientifica",
"Description[nl]": "Wetenschappelijke rekenmachine", "Description[nl]": "Wetenschappelijke rekenmachine",
"Description[nn]": "Vitskapleg kalkulator",
"Description[pl]": "Kalkulator naukowy", "Description[pl]": "Kalkulator naukowy",
"Description[pt]": "Calculadora científica", "Description[pt]": "Calculadora científica",
"Description[pt_BR]": "Calculadora científica", "Description[pt_BR]": "Calculadora científica",
...@@ -60,6 +62,7 @@ ...@@ -60,6 +62,7 @@
"Name[gl]": "Calculadora", "Name[gl]": "Calculadora",
"Name[it]": "Calcolatrice", "Name[it]": "Calcolatrice",
"Name[nl]": "Rekenmachine", "Name[nl]": "Rekenmachine",
"Name[nn]": "Kalkulator",
"Name[pl]": "Kalkulator", "Name[pl]": "Kalkulator",
"Name[pt]": "Calculadora", "Name[pt]": "Calculadora",
"Name[pt_BR]": "Calculadora", "Name[pt_BR]": "Calculadora",
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
"Name[gl]": "Artur Puzio", "Name[gl]": "Artur Puzio",
"Name[it]": "Artur Puzio", "Name[it]": "Artur Puzio",
"Name[nl]": "Artur Puzio", "Name[nl]": "Artur Puzio",
"Name[nn]": "Artur Puzio",
"Name[pl]": "Artur Puzio", "Name[pl]": "Artur Puzio",
"Name[pt]": "Artur Puzio", "Name[pt]": "Artur Puzio",
"Name[pt_BR]": "Artur Puzio", "Name[pt_BR]": "Artur Puzio",
...@@ -37,6 +38,7 @@ ...@@ -37,6 +38,7 @@
"Description[gl]": "Lista das funcións dispoñíbeis", "Description[gl]": "Lista das funcións dispoñíbeis",
"Description[it]": "Lista delle funzioni disponibili", "Description[it]": "Lista delle funzioni disponibili",
"Description[nl]": "Beschikbare functies", "Description[nl]": "Beschikbare functies",
"Description[nn]": "List over tilgjengelege funksjonar",
"Description[pl]": "Wykaz dostępnych możliwości", "Description[pl]": "Wykaz dostępnych możliwości",
"Description[pt]": "Lista de funções disponíveis", "Description[pt]": "Lista de funções disponíveis",
"Description[pt_BR]": "Lista das funções disponíveis", "Description[pt_BR]": "Lista das funções disponíveis",
...@@ -58,6 +60,7 @@ ...@@ -58,6 +60,7 @@
"Name[gl]": "Dicionario", "Name[gl]": "Dicionario",
"Name[it]": "Dizionario", "Name[it]": "Dizionario",
"Name[nl]": "Woordenboek", "Name[nl]": "Woordenboek",
"Name[nn]": "Ordliste",
"Name[pl]": "Słownik", "Name[pl]": "Słownik",
"Name[pt]": "Dicionário", "Name[pt]": "Dicionário",
"Name[pt_BR]": "Dicionário", "Name[pt_BR]": "Dicionário",
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
"Name[gl]": "Aleix Pol Gonzalez", "Name[gl]": "Aleix Pol Gonzalez",
"Name[it]": "Aleix Pol Gonzalez", "Name[it]": "Aleix Pol Gonzalez",
"Name[nl]": "Aleix Pol Gonzalez", "Name[nl]": "Aleix Pol Gonzalez",
"Name[nn]": "Aleix Pol Gonzalez",
"Name[pl]": "Aleix Pol Gonzalez", "Name[pl]": "Aleix Pol Gonzalez",
"Name[pt]": "Aleix Pol Gonzalez", "Name[pt]": "Aleix Pol Gonzalez",
"Name[pt_BR]": "Aleix Pol Gonzalez", "Name[pt_BR]": "Aleix Pol Gonzalez",
...@@ -36,6 +37,7 @@ ...@@ -36,6 +37,7 @@
"Description[gl]": "Debuxa calquera gráfico en 2D", "Description[gl]": "Debuxa calquera gráfico en 2D",
"Description[it]": "Disegna qualsiasi grafico 2D tu voglia", "Description[it]": "Disegna qualsiasi grafico 2D tu voglia",
"Description[nl]": "Tekent elke gewenste 2D-grafiek", "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", "Description[pl]": "Rysuje wykres 2D taki jaki chcesz",
"Description[pt]": "Desenha qualquer gráfico 2D que desejar", "Description[pt]": "Desenha qualquer gráfico 2D que desejar",
"Description[pt_BR]": "Desenha qualquer gráfico 2D que você quiser", "Description[pt_BR]": "Desenha qualquer gráfico 2D que você quiser",
...@@ -56,6 +58,7 @@ ...@@ -56,6 +58,7 @@
"Name[gl]": "Gráfico en 2D", "Name[gl]": "Gráfico en 2D",
"Name[it]": "Grafico 2D", "Name[it]": "Grafico 2D",
"Name[nl]": "Grafiek 2D", "Name[nl]": "Grafiek 2D",
"Name[nn]": "2D-graf",
"Name[pl]": "Wykres 2D", "Name[pl]": "Wykres 2D",
"Name[pt]": "Gráfico 2D", "Name[pt]": "Gráfico 2D",
"Name[pt_BR]": "Gráfico 2D", "Name[pt_BR]": "Gráfico 2D",
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
"Name[gl]": "Aleix Pol Gonzalez", "Name[gl]": "Aleix Pol Gonzalez",
"Name[it]": "Aleix Pol Gonzalez", "Name[it]": "Aleix Pol Gonzalez",
"Name[nl]": "Aleix Pol Gonzalez", "Name[nl]": "Aleix Pol Gonzalez",
"Name[nn]": "Aleix Pol Gonzalez",
"Name[pl]": "Aleix Pol Gonzalez", "Name[pl]": "Aleix Pol Gonzalez",
"Name[pt]": "Aleix Pol Gonzalez", "Name[pt]": "Aleix Pol Gonzalez",
"Name[pt_BR]": "Aleix Pol Gonzalez", "Name[pt_BR]": "Aleix Pol Gonzalez",
...@@ -36,6 +37,7 @@ ...@@ -36,6 +37,7 @@
"Description[gl]": "Debuxa calquera gráfico en 3D", "Description[gl]": "Debuxa calquera gráfico en 3D",
"Description[it]": "Disegna qualsiasi grafico 3D tu voglia", "Description[it]": "Disegna qualsiasi grafico 3D tu voglia",
"Description[nl]": "Tekent elke gewenste 3D-grafiek", "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", "Description[pl]": "Rysuje wykres 3D taki jaki chcesz",
"Description[pt]": "Desenha qualquer gráfico 3D que desejar", "Description[pt]": "Desenha qualquer gráfico 3D que desejar",
"Description[pt_BR]": "Desenha qualquer gráfico 3D que você quiser", "Description[pt_BR]": "Desenha qualquer gráfico 3D que você quiser",
...@@ -56,6 +58,7 @@ ...@@ -56,6 +58,7 @@
"Name[gl]": "Gráfico en 3D", "Name[gl]": "Gráfico en 3D",
"Name[it]": "Grafico 2D", "Name[it]": "Grafico 2D",
"Name[nl]": "Grafiek 3D", "Name[nl]": "Grafiek 3D",
"Name[nn]": "3D-graf",
"Name[pl]": "Wykres 3D", "Name[pl]": "Wykres 3D",
"Name[pt]": "Gráfico 3D", "Name[pt]": "Gráfico 3D",
"Name[pt_BR]": "Gráfico 3D", "Name[pt_BR]": "Gráfico 3D",
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
"Name[gl]": "Aleix Pol Gonzalez", "Name[gl]": "Aleix Pol Gonzalez",
"Name[it]": "Aleix Pol Gonzalez", "Name[it]": "Aleix Pol Gonzalez",
"Name[nl]": "Aleix Pol Gonzalez", "Name[nl]": "Aleix Pol Gonzalez",
"Name[nn]": "Aleix Pol Gonzalez",
"Name[pl]": "Aleix Pol Gonzalez", "Name[pl]": "Aleix Pol Gonzalez",
"Name[pt]": "Aleix Pol Gonzalez", "Name[pt]": "Aleix Pol Gonzalez",
"Name[pt_BR]": "Aleix Pol Gonzalez", "Name[pt_BR]": "Aleix Pol Gonzalez",
...@@ -37,6 +38,7 @@ ...@@ -37,6 +38,7 @@
"Description[gl]": "Crear facilmente táboas de valores", "Description[gl]": "Crear facilmente táboas de valores",
"Description[it]": "Crea facilmente tabelle di valori", "Description[it]": "Crea facilmente tabelle di valori",
"Description[nl]": "Eenvoudig maken van tabellen", "Description[nl]": "Eenvoudig maken van tabellen",
"Description[nn]": "Lag verditabellar på ein enkel måte",
"Description[pl]": "Łatwe tworzenie tabel wartości", "Description[pl]": "Łatwe tworzenie tabel wartości",
"Description[pt]": "Criar facilmente tabelas de valores", "Description[pt]": "Criar facilmente tabelas de valores",
"Description[pt_BR]": "Criar facilmente tabelas de valores", "Description[pt_BR]": "Criar facilmente tabelas de valores",
...@@ -58,6 +60,7 @@ ...@@ -58,6 +60,7 @@
"Name[gl]": "Táboas de valores", "Name[gl]": "Táboas de valores",
"Name[it]": "Tabelle di valori", "Name[it]": "Tabelle di valori",
"Name[nl]": "Tabellen", "Name[nl]": "Tabellen",
"Name[nn]": "Verditabellar",
"Name[pl]": "Tabela wartości", "Name[pl]": "Tabela wartości",
"Name[pt]": "Tabelas de Valores", "Name[pt]": "Tabelas de Valores",
"Name[pt_BR]": "Tabelas de valores", "Name[pt_BR]": "Tabelas de valores",
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
"Name[gl]": "Aleix Pol Gonzalez", "Name[gl]": "Aleix Pol Gonzalez",
"Name[it]": "Aleix Pol Gonzalez", "Name[it]": "Aleix Pol Gonzalez",
"Name[nl]": "Aleix Pol Gonzalez", "Name[nl]": "Aleix Pol Gonzalez",
"Name[nn]": "Aleix Pol Gonzalez",
"Name[pl]": "Aleix Pol Gonzalez", "Name[pl]": "Aleix Pol Gonzalez",
"Name[pt]": "Aleix Pol Gonzalez", "Name[pt]": "Aleix Pol Gonzalez",
"Name[pt_BR]": "Aleix Pol Gonzalez", "Name[pt_BR]": "Aleix Pol Gonzalez",
...@@ -37,6 +38,7 @@ ...@@ -37,6 +38,7 @@
"Description[gl]": "Mostra os valores almacenados", "Description[gl]": "Mostra os valores almacenados",
"Description[it]": "Mostra i valori memorizzati", "Description[it]": "Mostra i valori memorizzati",
"Description[nl]": "Toont opgeslagen waarden", "Description[nl]": "Toont opgeslagen waarden",
"Description[nn]": "Vis lagra verdiar",
"Description[pl]": "Wyświetla przechowywane wartości", "Description[pl]": "Wyświetla przechowywane wartości",
"Description[pt]": "Mostra os valores armazenados", "Description[pt]": "Mostra os valores armazenados",
"Description[pt_BR]": "Mostra os valores armazenados", "Description[pt_BR]": "Mostra os valores armazenados",
...@@ -58,6 +60,7 @@ ...@@ -58,6 +60,7 @@
"Name[gl]": "Variábeis", "Name[gl]": "Variábeis",
"Name[it]": "Variabili", "Name[it]": "Variabili",
"Name[nl]": "Variabelen", "Name[nl]": "Variabelen",
"Name[nn]": "Variablar",
"Name[pl]": "Zmienne", "Name[pl]": "Zmienne",
"Name[pt]": "Variáveis", "Name[pt]": "Variáveis",
"Name[pt_BR]": "Variáveis", "Name[pt_BR]": "Variáveis",
......
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