Commit 613556c9 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 2188c8b9
......@@ -235,7 +235,7 @@ Comment[it]=Aggiornamento di sistema non riuscito
Comment[ja]=システムの更新に失敗しました
Comment[nl]=Systeem bijwerken is mislukt
Comment[nn]=Systemoppdateringa var mislukka
Comment[pa]=ਸਿਸਮ ਅੱਪਡੇਟ ਅਸਫ਼ਲ ਹੈ
Comment[pa]=ਸਿਸਮ ਅੱਪਡੇਟ ਅਸਫ਼ਲ ਹੈ
Comment[pl]=Nie udało się uaktualnić systemu
Comment[pt]=Não foi possível actualizar o sistema
Comment[pt_BR]=Falha na atualização do sistema
......@@ -284,7 +284,7 @@ Comment[it]=Riparazione non riuscita dopo l'aggiornamento non in linea
Comment[ja]=オフラインの更新後の修復に失敗しました
Comment[nl]=Herstellen na offline bijwerken is mislukt
Comment[nn]=Mislukka reparering etter forsøk på avlogga systemoppdatering
Comment[pa]=ਆਫਲਾਈਨ ਅੱਪਡੇਟ ਦੇ ਬਾਅਦ ਅਸਫ਼ਲਾਂ ਦੀ ਮੁਰੰਮਤ ਕਰੋ
Comment[pa]=ਆਫਲਾਈਨ ਅੱਪਡੇਟ ਦੇ ਬਾਅਦ ਅਸਫ਼ਲ ਦੀ ਮੁਰੰਮਤ ਕਰੋ
Comment[pl]=Nie udało się naprawić po uaktualnieniu bez dostępu do sieci
Comment[pt]=Problemas na reparação após uma actualização desligada da rede
Comment[pt_BR]=Falha no reparo após a atualização offline
......
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