Commit b79e4f30 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 a5d1f4d8
......@@ -3,6 +3,7 @@ Encoding=UTF-8
Name=Search And Run
Name[ca]=Cerca i executa
Name[cs]=Vyhledat a spustit
Name[da]=Søg og kør
Name[de]=Suchen und Ausführen
Name[en_GB]=Search And Run
Name[es]=Buscar y ejecutar
......@@ -30,6 +31,7 @@ Name[zh_TW]=搜尋並執行
Comment=Search and run Applications and services
Comment[ca]=Cerca i executa aplicacions i serveis
Comment[cs]=Vyhledat a spustit aplikace a služby
Comment[da]=Søg og kør programmer og tjenester
Comment[de]=Anwendungen und Dienste suchen und ausführen
Comment[en_GB]=Search and run Applications and services
Comment[es]=Buscar y ejecutar aplicaciones y servicios
......
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