Commit bcc9684f 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 081a3001
......@@ -44,7 +44,7 @@ Name[nn]=Skrivebordsøkt
Name[pa]=ਡੈਸਕਟਾਪ ਸ਼ੈਸ਼ਨ
Name[pl]=Sesja pulpitu
Name[pt]=Sessão do Ambiente de Trabalho
Name[pt_BR]=Sessão da área de trabalho:
Name[pt_BR]=Sessão da área de trabalho
Name[ro]=Sesiune de birou
Name[ru]=Управление сеансами
Name[sk]=Sedenie plochy
Supports Markdown
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