Commit 1ebe7dbb 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 d0b4cac5
......@@ -14,6 +14,7 @@ Name[nl]=Klok
Name[nn]=Klokke
Name[pl]=Zegar
Name[pt]=Relógio
Name[ru]=Часы
Name[sv]=Klocka
Name[tr]=Saat
Name[uk]=Годинник
......
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