Commit b4970ab7 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 67c2f6aa
[Desktop Entry]
# ctxt: plasma runner
Name=Web Search Keywords
Name[ca]=Paraules clau de cerca a la web
Name[es]=Palabras clave de búsqueda web
Name[pt]=Palavras-Chave da Pesquisa Web
Name[uk]=Ключові слова пошуку в інтернеті
Name[x-test]=xxWeb Search Keywordsxx
Comment=Search the web using keywords
Comment[ca]=Cerca a la web usant paraules clau
Comment[es]=Buscar la web usando palabras clave
Comment[nl]=Op het web zoeken met trefwoorden
Comment[pt]=Pesquisar na Web com palavras-chave
Comment[sv]=Sök på webben med nyckelord
Comment[uk]=Пошук в інтернеті за допомогою ключових слів
Comment[x-test]=xxSearch the web using keywordsxx
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