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"
9 years ago · f197dca5a1
parent b6699357d9
commit f197dca5a1
1 changed files with 1 additions and 0 deletions
--- a/desktop/konsolehere.desktop
+++ b/desktop/konsolehere.desktop
@ -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]=Ανοίγει τερματικό στον τρέχοντα φάκελο