Commit 73a26a93 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 101343fa
......@@ -33,7 +33,7 @@
],
"Description": "Draws any 2D graph you want",
"Description[ca@valencia]": "Dibuixa els gràfics en 2D que vulgueu",
"Description[ca]": "Dibuixa els gràfics en 2D que vulgueu",
"Description[ca]": "Dibuixa les gràfiques en 2D que vulgueu",
"Description[el]": "Σχεδιάζει όποιον γράφο θέλετε σε δύο διαστάσεις",
"Description[en_GB]": "Draws any 2D graph you want",
"Description[es]": "Dibuja cualquier gráfico 2D que desee",
......@@ -59,7 +59,7 @@
"Icon": "draw-bezier-curves",
"Name": "Graph 2D",
"Name[ca@valencia]": "Gràfics en 2D",
"Name[ca]": "Gràfics en 2D",
"Name[ca]": "Gràfica en 2D",
"Name[cs]": "Grafy 2D",
"Name[el]": "Γράφος 2D",
"Name[en_GB]": "Graph 2D",
......
......@@ -33,7 +33,7 @@
],
"Description": "Draws any 3D graph you want",
"Description[ca@valencia]": "Dibuixa els gràfics en 3D que vulgueu",
"Description[ca]": "Dibuixa els gràfics en 3D que vulgueu",
"Description[ca]": "Dibuixa les gràfiques en 3D que vulgueu",
"Description[el]": "Σχεδιάζει όποιον γράφο θέλετε σε τρεις διαστάσεις",
"Description[en_GB]": "Draws any 3D graph you want",
"Description[es]": "Dibuja cualquier gráfico 3D que desee",
......@@ -59,7 +59,7 @@
"Icon": "adjustrgb",
"Name": "Graph 3D",
"Name[ca@valencia]": "Gràfics en 3D",
"Name[ca]": "Gràfics en 3D",
"Name[ca]": "Gràfica en 3D",
"Name[cs]": "Grafy 3D",
"Name[el]": "Γράφος 3D",
"Name[en_GB]": "Graph 3D",
......
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