Commit 9fa0236b 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 6bccf331
......@@ -2,6 +2,7 @@
Name=Bar Chart
Name[ca]=Diagrama de barres
Name[cs]=Sloupcový graf
Name[de]=Balkendiagramm
Name[en_GB]=Bar Chart
Name[es]=Gráfico de barras
Name[et]=Tulpdiagramm
......
......@@ -2,6 +2,7 @@
Name=Line Chart
Name[ca]=Diagrama de línies
Name[cs]=Čarový graf
Name[de]=Liniendiagramm
Name[en_GB]=Line Chart
Name[es]=Gráfico de líneas
Name[et]=Joondiagramm
......
......@@ -2,6 +2,7 @@
Name=Pie Chart
Name[ca]=Diagrama de sectors
Name[cs]=Koláčový graf
Name[de]=Tortendiagramm
Name[en_GB]=Pie Chart
Name[es]=Gráfico de tarta
Name[et]=Sektordiagramm
......
......@@ -2,6 +2,7 @@
Name=Text Only
Name[ca]=Només el text
Name[cs]=Pouze text
Name[de]=Nur Text
Name[en_GB]=Text Only
Name[es]=Solo texto
Name[et]=Ainult tekst
......
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