Commit 5a9539ed 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 9d8adb79
......@@ -54,6 +54,7 @@ Name[sv]=Step
Name[tr]=Step
Name[ug]=Step
Name[uk]=Step
Name[x-test]=xxStepxx
Name[zh_CN]=步长
Name[zh_TW]=物理_Step
GenericName=Interactive Physical Simulator
......@@ -98,6 +99,7 @@ GenericName[sl]=Interaktivni fizikalni simulator
GenericName[sv]=Interaktiv fysiksimulator
GenericName[tr]=Etkileşimli Fizik Öykünücüsü
GenericName[uk]=Інтерактивний фізичний імітатор
GenericName[x-test]=xxInteractive Physical Simulatorxx
GenericName[zh_CN]=交互式物理模拟器
GenericName[zh_TW]=互動式物理模擬器
Comment=Simulate physics experiments
......@@ -147,6 +149,7 @@ Comment[sv]=Simulera fysikexperiment
Comment[tr]=Fizik deneylerine öykün
Comment[ug]=فىزىكا تەجرىبىسىنى تەقلىدلەش
Comment[uk]=Імітує фізичні досліди
Comment[x-test]=xxSimulate physics experimentsxx
Comment[zh_CN]=物理实验模拟
Comment[zh_TW]=模擬物理實驗
Categories=Qt;KDE;Education;Physics;
......
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