Commit c30fa25c 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 f9bed1b5
......@@ -4,6 +4,7 @@ Name[ca]=Cors reials
Name[ca@valencia]=Cors reials
Name[cs]=Královská srdce
Name[de]=Royal Hearts
Name[en_GB]=Royal Hearts
Name[es]=Corazones reales
Name[fi]=Royal Hearts
Name[fr]=Royal Hearts
......@@ -20,6 +21,7 @@ Description[ca]=Tema d'estil de carta
Description[ca@valencia]=Tema d'estil de carta
Description[cs]=Motiv stylu karet
Description[de]=Karten-Design
Description[en_GB]=Card style theme
Description[es]=Tema del estilo de cartas
Description[fi]=Korttiteema
Description[fr]=Thème de style de cartes.
......
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