Commit b4ed48c2 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 e796a114
...@@ -59,6 +59,7 @@ GenericName[fi]=Kisa hyperavaruudessa ...@@ -59,6 +59,7 @@ GenericName[fi]=Kisa hyperavaruudessa
GenericName[gl]=Unha carreira no espazo exterior GenericName[gl]=Unha carreira no espazo exterior
GenericName[nl]=Een race in hyperspace GenericName[nl]=Een race in hyperspace
GenericName[nn]=Kappløp i hyperrommet GenericName[nn]=Kappløp i hyperrommet
GenericName[pl]=Wyścig w hiperprzestrzeni
GenericName[pt]=Uma corrida no hiperespaço GenericName[pt]=Uma corrida no hiperespaço
GenericName[pt_BR]=Uma corrida no hiperespaço GenericName[pt_BR]=Uma corrida no hiperespaço
GenericName[sk]=Preteky v hyperpriestore GenericName[sk]=Preteky v hyperpriestore
......
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