Commit fb44a8f5 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 15fe8a8d
......@@ -299,6 +299,7 @@ Name[it]=Ricerca di cartelle contenenti file sorgente...
Name[ko]=원본 파일이 있는 폴더 검사 중...
Name[nl]=Mappen scannen met bronbestanden...
Name[nn]=Søkjer gjennom mapper med kjeldefiler …
Name[pa]=ਸਰੋਤ ਫਾਇਲਾਂ ਨਾਲ ਫੋਲਡਰ ਸਕੈਨ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ...
Name[pl]=Przeszukiwanie katalogów z plikami źródłowymi...
Name[pt]=A sondar as pastas com os ficheiros de origem...
Name[pt_BR]=Analisando as pastas com os arquivos de origem...
......
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