Commit f197dca5 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 b6699357
......@@ -106,6 +106,7 @@ Comment=Opens a terminal at the current folder
Comment[ast]=Abre una terminal na carpeta actual
Comment[ca]=Obre un terminal en la carpeta actual
Comment[ca@valencia]=Obri un terminal en la carpeta actual
Comment[cs]=Otevře terminál v současné složce
Comment[da]=Åbner en terminal i den aktuelle mappe
Comment[de]=Öffnet ein Terminal in dem aktuellen Ordner
Comment[el]=Ανοίγει τερματικό στον τρέχοντα φάκελο
......
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