Commit 7e7b146d 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 5cd26be2
......@@ -26,6 +26,7 @@ Name[ga]=Step
Name[gl]=Step
Name[gu]=સ્ટેપ
Name[he]=צעד
Name[hi]=चरण
Name[hne]=स्टेप
Name[hu]=Step
Name[is]=Skref
......@@ -74,6 +75,7 @@ GenericName[fr]=Simulateur physique interactif
GenericName[ga]=Insamhlóir Idirghníomhach Fisiceach
GenericName[gl]=Simulador físico interactivo
GenericName[gu]=ઇન્ટરએક્ટિવ ભૌતિકી સિમ્યુલેટર
GenericName[hi]= पारस्परिक भौतिक अनुरूपक
GenericName[hr]=Interaktivni simulator fizike
GenericName[hu]=Interaktív fizikai szimulátor
GenericName[is]=Gagnvirkur eðlisfræðihemir
......@@ -121,6 +123,7 @@ Comment[ga]=Insamhail turgnaimh fhisice
Comment[gl]=Simula experimentos físicos
Comment[gu]=ભૌતિકવિજ્ઞાનનાં પ્રયોગો કરો
Comment[he]=מדמה ניסויים פיזיקליים
Comment[hi]=भौतिकीय प्रयोग अनुकरण
Comment[hr]=Simuliraj fizičke eksperimente
Comment[hu]=Fizikai kísérletek szimulációja
Comment[is]=Líkir eftir eðlisfræðitilraunum
......
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