Commit 09f79487 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 fc85027f
...@@ -19,6 +19,7 @@ Name[it]=Kontrast ...@@ -19,6 +19,7 @@ Name[it]=Kontrast
Name[ko]=Kontrast Name[ko]=Kontrast
Name[nl]=Kontrast Name[nl]=Kontrast
Name[nn]=Kontrast Name[nn]=Kontrast
Name[pt]=Kontrast Name[pt]=Kontrast
Name[pt_BR]=Kontrast Name[pt_BR]=Kontrast
Name[ro]=Kontrast Name[ro]=Kontrast
...@@ -44,6 +45,7 @@ Comment[it]=Controllo del contrasto ...@@ -44,6 +45,7 @@ Comment[it]=Controllo del contrasto
Comment[ko]=대비 검사기 Comment[ko]=대비 검사기
Comment[nl]=Controleprogramma op contrast Comment[nl]=Controleprogramma op contrast
Comment[nn]=Kontrastsjekkar Comment[nn]=Kontrastsjekkar
Comment[pl]=Sprawdzanie kontrastu
Comment[pt]=Verificação de Contraste Comment[pt]=Verificação de Contraste
Comment[pt_BR]=Verificador de contraste Comment[pt_BR]=Verificador de contraste
Comment[ro]=Verificator de contrast Comment[ro]=Verificator de contrast
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