Commit 2e0ac95d 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 8d4b0bdc
......@@ -128,8 +128,8 @@ Comment[be]=Праграма для вывучэння геаграфіі
Comment[bg]=Програма за изучаване на география
Comment[bn]=ভূগোল শেখার প্রোগ্রাম
Comment[bs]=Program za učenje geografije
Comment[ca]=Un programa per aprendre geografia
Comment[ca@valencia]=Un programa per aprendre geografia
Comment[ca]=Un programa per a aprendre geografia
Comment[ca@valencia]=Un programa per a aprendre geografia
Comment[cs]=Zeměpisný výukový program
Comment[csb]=Programa do naùczi geògrafiji
Comment[cy]=Rhaglen ar gyfer Dysgu Daearyddiaeth
......
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