Commit a35c67ba authored by Script Kiddy's avatar Script Kiddy

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 16901fde
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
} }
], ],
"Description": "Draws any 2D graph you want", "Description": "Draws any 2D graph you want",
"Description[ca@valencia]": "Dibuixa els gràfics 2D que tu vulgues", "Description[ca@valencia]": "Dibuixa els gràfics en 2D que vulgueu",
"Description[ca]": "Dibuixa els gràfics 2D que tu vulguis", "Description[ca]": "Dibuixa els gràfics en 2D que vulgueu",
"Description[el]": "Σχεδιάζει όποιον γράφο θέλετε σε δύο διαστάσεις", "Description[el]": "Σχεδιάζει όποιον γράφο θέλετε σε δύο διαστάσεις",
"Description[en_GB]": "Draws any 2D graph you want", "Description[en_GB]": "Draws any 2D graph you want",
"Description[es]": "Dibuja cualquier gráfico 2D que desee", "Description[es]": "Dibuja cualquier gráfico 2D que desee",
...@@ -57,8 +57,8 @@ ...@@ -57,8 +57,8 @@
"Description[zh_TW]": "繪製任何您想要的 2D 圖形", "Description[zh_TW]": "繪製任何您想要的 2D 圖形",
"Icon": "draw-bezier-curves", "Icon": "draw-bezier-curves",
"Name": "Graph 2D", "Name": "Graph 2D",
"Name[ca@valencia]": "Gràfics 2D", "Name[ca@valencia]": "Gràfics en 2D",
"Name[ca]": "Gràfics 2D", "Name[ca]": "Gràfics en 2D",
"Name[cs]": "Grafy 2D", "Name[cs]": "Grafy 2D",
"Name[el]": "Γράφος 2D", "Name[el]": "Γράφος 2D",
"Name[en_GB]": "Graph 2D", "Name[en_GB]": "Graph 2D",
......
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
} }
], ],
"Description": "Draws any 3D graph you want", "Description": "Draws any 3D graph you want",
"Description[ca@valencia]": "Dibuixa els gràfics 3D que tu vulgues", "Description[ca@valencia]": "Dibuixa els gràfics en 3D que vulgueu",
"Description[ca]": "Dibuixa els gràfics 3D que tu vulguis", "Description[ca]": "Dibuixa els gràfics en 3D que vulgueu",
"Description[el]": "Σχεδιάζει όποιον γράφο θέλετε σε τρεις διαστάσεις", "Description[el]": "Σχεδιάζει όποιον γράφο θέλετε σε τρεις διαστάσεις",
"Description[en_GB]": "Draws any 3D graph you want", "Description[en_GB]": "Draws any 3D graph you want",
"Description[es]": "Dibuja cualquier gráfico 3D que desee", "Description[es]": "Dibuja cualquier gráfico 3D que desee",
...@@ -57,8 +57,8 @@ ...@@ -57,8 +57,8 @@
"Description[zh_TW]": "繪製任何您想要的 3D 圖形", "Description[zh_TW]": "繪製任何您想要的 3D 圖形",
"Icon": "adjustrgb", "Icon": "adjustrgb",
"Name": "Graph 3D", "Name": "Graph 3D",
"Name[ca@valencia]": "Gràfics 3D", "Name[ca@valencia]": "Gràfics en 3D",
"Name[ca]": "Gràfics 3D", "Name[ca]": "Gràfics en 3D",
"Name[cs]": "Grafy 3D", "Name[cs]": "Grafy 3D",
"Name[el]": "Γράφος 3D", "Name[el]": "Γράφος 3D",
"Name[en_GB]": "Graph 3D", "Name[en_GB]": "Graph 3D",
......
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
} }
], ],
"Description": "Displays the stored values", "Description": "Displays the stored values",
"Description[ca@valencia]": "Ensenya les variables que hagueu guardat", "Description[ca@valencia]": "Ensenya les variables que hàgeu guardat",
"Description[ca]": "Ensenya les variables que hagueu desat", "Description[ca]": "Ensenya les variables que hàgiu desat",
"Description[de]": "Anzeige der gespeicherten Werte", "Description[de]": "Anzeige der gespeicherten Werte",
"Description[el]": "Εμφανίζει τις αποθηκευμένες τιμές", "Description[el]": "Εμφανίζει τις αποθηκευμένες τιμές",
"Description[en_GB]": "Displays the stored values", "Description[en_GB]": "Displays the stored values",
......
...@@ -4,8 +4,8 @@ Type=Service ...@@ -4,8 +4,8 @@ Type=Service
ServiceTypes=Plasma/Applet ServiceTypes=Plasma/Applet
Name=2D Plots Name=2D Plots
Name[bs]=2D crtanja Name[bs]=2D crtanja
Name[ca]=Gràfiques 2D Name[ca]=Gràfiques en 2D
Name[ca@valencia]=Gràfiques 2D Name[ca@valencia]=Gràfiques en 2D
Name[cs]=2D grafy Name[cs]=2D grafy
Name[da]=2D-plot Name[da]=2D-plot
Name[de]=2D-Plots Name[de]=2D-Plots
......
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