Commit 32ad395d 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 48128750
...@@ -32,7 +32,7 @@ Name[fi]=Sovellukset ...@@ -32,7 +32,7 @@ Name[fi]=Sovellukset
Name[fr]=Applications Name[fr]=Applications
Name[fy]=Programma's Name[fy]=Programma's
Name[ga]=Feidhmchláir Name[ga]=Feidhmchláir
Name[gl]=Aplicativos Name[gl]=Aplicacións
Name[gu]=કાર્યક્રમો Name[gu]=કાર્યક્રમો
Name[he]=תוכניות Name[he]=תוכניות
Name[hi]=अनुप्रयोग Name[hi]=अनुप्रयोग
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