Commit 74d2af8f 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 28ac87bc
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
Name=Airplane Mode Name=Airplane Mode
Name[ca]=Mode avió Name[ca]=Mode avió
Name[cs]=Režim v Letadle Name[cs]=Režim v Letadle
Name[en_GB]=Airplane Mode
Name[es]=Modo avión Name[es]=Modo avión
Name[eu]=Hegaldi modua Name[eu]=Hegaldi modua
Name[fr]=Mode Avion Name[fr]=Mode Avion
Supports Markdown
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