Commit 126b6d40 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 7853d7fb
......@@ -860,7 +860,7 @@ Name[it]=Fonte di alimentazione scollegata
Name[ko]=외부 전원 연결 해제됨
Name[lt]=Maitinimo šaltinis atjungtas
Name[nl]=Voeding niet verbonden
Name[nn]=Stramkjelde kopla frå
Name[nn]=Straumkjelde kopla frå
Name[pa]=ਪਾਵਰ ਸਰੋਤ ਡਿਸ-ਕਨੈਕਟ ਹੈ
Name[pl]=Odłączono źródło prądu
Name[pt]=Desligado da corrente
......
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