Commit 70c7574b 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 03c5cd25
......@@ -101,7 +101,7 @@ Comment[it]=Fornisce l'accesso ai file cestinati
Comment[ko]=휴지통에 버린 파일 접근 제공
Comment[lt]=Pateikia prieigą prie šiukšlinėje esančių failų
Comment[nl]=Biedt toegang tot de bestanden verzonden naar de prullenbak
Comment[nn]=Gjev tilgang til filer sende til papirkorga
Comment[nn]= tilgang til filer lagde i papirkorga
Comment[pl]=Zapewnia dostęp do plików w koszu
Comment[pt]=Oferece o acesso aos ficheiros enviados para o lixo
Comment[pt_BR]=Fornece acesso aos arquivos enviados para a lixeira
......
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