Commit 9baad0fc 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 2dfb48a5
...@@ -20,6 +20,7 @@ Name[en_GB]=Oxygen Window Decoration ...@@ -20,6 +20,7 @@ Name[en_GB]=Oxygen Window Decoration
Name[es]=Decoración de ventanas Oxígeno Name[es]=Decoración de ventanas Oxígeno
Name[eu]=Oxygen leihoen apaindura Name[eu]=Oxygen leihoen apaindura
Name[fr]=Décoration de fenêtre Oxygène Name[fr]=Décoration de fenêtre Oxygène
Name[hu]=Oxygen ablakdekoráció
Name[it]=Decorazione delle finestre di Oxygen Name[it]=Decorazione delle finestre di Oxygen
Name[ko]=Oxygen 창 장식 Name[ko]=Oxygen 창 장식
Name[nl]=Oxygen vensterdecoratie Name[nl]=Oxygen vensterdecoratie
......
...@@ -20,6 +20,7 @@ Name[en_GB]=Oxygen Widget Style ...@@ -20,6 +20,7 @@ Name[en_GB]=Oxygen Widget Style
Name[es]=Estilo de elementos gráficos Oxígeno Name[es]=Estilo de elementos gráficos Oxígeno
Name[eu]=Oxygen trepeten estiloa Name[eu]=Oxygen trepeten estiloa
Name[fr]=Style de composants graphiques Oxygène Name[fr]=Style de composants graphiques Oxygène
Name[hu]=Oxygen elemstílus
Name[it]=Stile degli oggetti di Oxygen Name[it]=Stile degli oggetti di Oxygen
Name[ko]=Oxygen 위젯 스타일 Name[ko]=Oxygen 위젯 스타일
Name[nl]=Oxygen widgetstijl Name[nl]=Oxygen widgetstijl
......
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