Commit 14961f08 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 b95f4a31
......@@ -31,6 +31,7 @@ Name[hi]=के-मैग
Name[hne]=के-मैग
Name[hr]=KMag
Name[hu]=KMag
Name[ia]=KMag
Name[is]=KMag
Name[it]=Lente d'ingrandimento
Name[ja]=KMag
......@@ -100,6 +101,7 @@ GenericName[hi]=स्क्रीन आवर्धक
GenericName[hne]=स्क्रीन आवर्धक
GenericName[hr]=Zaslonsko povećalo
GenericName[hu]=Képernyőnagyító
GenericName[ia]=Aggranditor de schermo
GenericName[is]=Skjástækkunargler
GenericName[it]=Lente di ingrandimento per lo schermo
GenericName[ja]=画面拡大鏡
......
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