Commit 20f53441 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 1264d1d7
...@@ -37,6 +37,7 @@ Name[zh_CN]=LabPlot2 ...@@ -37,6 +37,7 @@ Name[zh_CN]=LabPlot2
Name[zh_TW]=LabPlot2 Name[zh_TW]=LabPlot2
GenericName=Plotting and Data Analysis Software GenericName=Plotting and Data Analysis Software
GenericName[ca]=Programari de traçat i anàlisi de dades GenericName[ca]=Programari de traçat i anàlisi de dades
GenericName[cs]=Software pro grafy a datovou analýzu
GenericName[de]=Software zur Datenauswertung und -darstellung GenericName[de]=Software zur Datenauswertung und -darstellung
GenericName[en_GB]=Plotting and Data Analysis Software GenericName[en_GB]=Plotting and Data Analysis Software
GenericName[es]=Software de análisis de datos y gráficos GenericName[es]=Software de análisis de datos y gráficos
......
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