Commit d7c68684 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 443d26fb
......@@ -7,6 +7,7 @@
"Name[ca]": "Aleix Pol Gonzalez",
"Name[cs]": "Aleix Pol Gonzalez",
"Name[de]": "Aleix Pol Gonzalez",
"Name[el]": "Aleix Pol Gonzalez",
"Name[en_GB]": "Aleix Pol Gonzalez",
"Name[es]": "Aleix Pol Gonzalez",
"Name[et]": "Aleix Pol Gonzalez",
......@@ -36,6 +37,7 @@
"Name[ca]": "Quant al KAlgebra",
"Name[cs]": "O aplikaci KAlgebra",
"Name[de]": "Über KAlgebra",
"Name[el]": "Σχετικά με το KAlgebra",
"Name[en_GB]": "About KAlgebra",
"Name[es]": "Acerca de KAlgebra",
"Name[et]": "KAlgebra teave",
......
......@@ -7,6 +7,7 @@
"Name[ca]": "Aleix Pol Gonzalez",
"Name[cs]": "Aleix Pol Gonzalez",
"Name[de]": "Aleix Pol Gonzalez",
"Name[el]": "Aleix Pol Gonzalez",
"Name[en_GB]": "Aleix Pol Gonzalez",
"Name[es]": "Aleix Pol Gonzalez",
"Name[et]": "Aleix Pol Gonzalez",
......@@ -35,6 +36,7 @@
"Description[ca]": "Calculadora científica",
"Description[cs]": "Vědecká kalkulačka",
"Description[de]": "Wissenschaftlicher Taschenrechner",
"Description[el]": "Επιστημονική αριθμομηχανή",
"Description[en_GB]": "Scientific calculator",
"Description[es]": "Calculadora científica",
"Description[et]": "Teaduslik kalkulaator",
......@@ -61,6 +63,7 @@
"Name[ca]": "Calculadora",
"Name[cs]": "Kalkulačka",
"Name[de]": "Rechner",
"Name[el]": "Αριθμομηχανή",
"Name[en_GB]": "Calculator",
"Name[es]": "Calculadora",
"Name[et]": "Kalkulaator",
......
......@@ -7,6 +7,7 @@
"Name[ca]": "Artur Puzio",
"Name[cs]": "Artur Puzio",
"Name[de]": "Artur Puzio",
"Name[el]": "Artur Puzio",
"Name[en_GB]": "Artur Puzio",
"Name[es]": "Artur Puzio",
"Name[et]": "Artur Puzio",
......@@ -35,6 +36,7 @@
"Description[ca@valencia]": "Llista de funcions disponibles",
"Description[ca]": "Llista de funcions disponibles",
"Description[de]": "Liste aller vorhandenen Funktionen",
"Description[el]": "Λίστα διαθέσιμων συναρτήσεων",
"Description[en_GB]": "List of available functions",
"Description[es]": "Lista de funciones disponibles",
"Description[et]": "Saadaolevate funktsioonide loend",
......@@ -61,6 +63,7 @@
"Name[ca]": "Diccionari",
"Name[cs]": "Slovník",
"Name[de]": "Funktionen",
"Name[el]": "Λεξικό",
"Name[en_GB]": "Dictionary",
"Name[es]": "Diccionario",
"Name[et]": "Sõnastik",
......
......@@ -7,6 +7,7 @@
"Name[ca]": "Aleix Pol Gonzalez",
"Name[cs]": "Aleix Pol Gonzalez",
"Name[de]": "Aleix Pol Gonzalez",
"Name[el]": "Aleix Pol Gonzalez",
"Name[en_GB]": "Aleix Pol Gonzalez",
"Name[es]": "Aleix Pol Gonzalez",
"Name[et]": "Aleix Pol Gonzalez",
......@@ -33,6 +34,7 @@
"Description": "Draws any 2D graph you want",
"Description[ca@valencia]": "Dibuixa els gràfics 2D que tu vulgues",
"Description[ca]": "Dibuixa els gràfics 2D que tu vulguis",
"Description[el]": "Σχεδιάζει όποιον γράφο θέλετε σε δύο διαστάσεις",
"Description[en_GB]": "Draws any 2D graph you want",
"Description[es]": "Dibuja cualquier gráfico 2D que desee",
"Description[et]": "Mis tahes 2D graafi kuvamine",
......@@ -58,6 +60,7 @@
"Name[ca@valencia]": "Gràfics 2D",
"Name[ca]": "Gràfics 2D",
"Name[cs]": "Grafy 2D",
"Name[el]": "Γράφος 2D",
"Name[en_GB]": "Graph 2D",
"Name[es]": "Gráfico 2D",
"Name[et]": "2D graafid",
......
......@@ -7,6 +7,7 @@
"Name[ca]": "Aleix Pol Gonzalez",
"Name[cs]": "Aleix Pol Gonzalez",
"Name[de]": "Aleix Pol Gonzalez",
"Name[el]": "Aleix Pol Gonzalez",
"Name[en_GB]": "Aleix Pol Gonzalez",
"Name[es]": "Aleix Pol Gonzalez",
"Name[et]": "Aleix Pol Gonzalez",
......@@ -33,6 +34,7 @@
"Description": "Draws any 3D graph you want",
"Description[ca@valencia]": "Dibuixa els gràfics 3D que tu vulgues",
"Description[ca]": "Dibuixa els gràfics 3D que tu vulguis",
"Description[el]": "Σχεδιάζει όποιον γράφο θέλετε σε τρεις διαστάσεις",
"Description[en_GB]": "Draws any 3D graph you want",
"Description[es]": "Dibuja cualquier gráfico 3D que desee",
"Description[et]": "Mis tahes 3D graafi kuvamine",
......@@ -58,6 +60,7 @@
"Name[ca@valencia]": "Gràfics 3D",
"Name[ca]": "Gràfics 3D",
"Name[cs]": "Grafy 3D",
"Name[el]": "Γράφος 3D",
"Name[en_GB]": "Graph 3D",
"Name[es]": "Gráfico 3D",
"Name[et]": "3D graafid",
......
......@@ -7,6 +7,7 @@
"Name[ca]": "Aleix Pol Gonzalez",
"Name[cs]": "Aleix Pol Gonzalez",
"Name[de]": "Aleix Pol Gonzalez",
"Name[el]": "Aleix Pol Gonzalez",
"Name[en_GB]": "Aleix Pol Gonzalez",
"Name[es]": "Aleix Pol Gonzalez",
"Name[et]": "Aleix Pol Gonzalez",
......@@ -34,6 +35,7 @@
"Description[ca@valencia]": "Crea fàcilment taules de valors",
"Description[ca]": "Crea fàcilment taules de valors",
"Description[de]": "Wertetabellen einfach erstellen",
"Description[el]": "Εύκολη δημιουργία πινάκων τιμών",
"Description[en_GB]": "Easily create value tables",
"Description[es]": "Crear tablas de valores con facilidad",
"Description[et]": "Väärtustabelite hõlpus loomine",
......@@ -60,6 +62,7 @@
"Name[ca]": "Taula de valors",
"Name[cs]": "Tabulky hodnot",
"Name[de]": "Wertetabellen",
"Name[el]": "Πίνακες τιμών",
"Name[en_GB]": "Value Tables",
"Name[es]": "Tablas de valores",
"Name[et]": "Väärtustabelid",
......
......@@ -7,6 +7,7 @@
"Name[ca]": "Aleix Pol Gonzalez",
"Name[cs]": "Aleix Pol Gonzalez",
"Name[de]": "Aleix Pol Gonzalez",
"Name[el]": "Aleix Pol Gonzalez",
"Name[en_GB]": "Aleix Pol Gonzalez",
"Name[es]": "Aleix Pol Gonzalez",
"Name[et]": "Aleix Pol Gonzalez",
......@@ -34,6 +35,7 @@
"Description[ca@valencia]": "Ensenya les variables que hagueu guardat",
"Description[ca]": "Ensenya les variables que hagueu desat",
"Description[de]": "Anzeige der gespeicherten Werte",
"Description[el]": "Εμφανίζει τις αποθηκευμένες τιμές",
"Description[en_GB]": "Displays the stored values",
"Description[es]": "Muestra los valores almacenados",
"Description[et]": "Salvestatud väärtuste näitamine",
......@@ -60,6 +62,7 @@
"Name[ca]": "Variables",
"Name[cs]": "Proměnné",
"Name[de]": "Variablen",
"Name[el]": "Μεταβλητές",
"Name[en_GB]": "Variables",
"Name[es]": "Variables",
"Name[et]": "Muutujad",
......
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