Commit ec88335b 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 0eb73660
Pipeline #72004 skipped
......@@ -667,6 +667,7 @@ Name[nl]=Succes met vergrendeling op afstand
Name[pl]=Udało się zablokować zdalnie
Name[pt]=Bloqueio Remoto com Sucesso
Name[pt_BR]=Travado remotamente com sucesso
Name[ro]=Blocare distantă reușită
Name[sk]=Vzdialené uzamknutie úspešné
Name[sl]=Oddaljeni zaklep uspešen
Name[sv]=Fjärrlåsning lyckades
......@@ -690,6 +691,7 @@ Comment[nl]=Succes met vergrendeling op afstand
Comment[pl]=Udało się zablokować zdalnie
Comment[pt]=O bloqueio remoto decorreu com sucesso
Comment[pt_BR]=Travado remotamente com sucesso
Comment[ro]=Blocare distantă reușită
Comment[sk]=Vzdialené uzamknutie úspešné
Comment[sl]=Oddaljeni zaklep uspešen
Comment[sv]=Fjärrlåsning lyckades
......@@ -716,6 +718,7 @@ Name[nl]=Mislukte vergrendeling op afstand
Name[pl]=Nie udało się zablokować zdalnie
Name[pt]=Bloqueio Remoto sem Sucesso
Name[pt_BR]=Falha ao travar remotamente
Name[ro]=Blocare distantă eșuată
Name[sk]=Vzdialené uzamknutie zlyhalo
Name[sl]=Oddaljeni zaklep ni uspel
Name[sv]=Fjärrlåsning misslyckades
......@@ -739,6 +742,7 @@ Comment[nl]=Vergrendeling op afstand is mislukt
Comment[pl]=Nie udało się zablokować zdalnie
Comment[pt]=Não foi possível concluir o bloqueio remoto
Comment[pt_BR]=Falha ao travar remotamente
Comment[ro]=Blocarea distantă a eșuat
Comment[sk]=Vzdialené uzamknutie zlyhalo
Comment[sl]=Oddaljeni zaklep ni uspel
Comment[sv]=Fjärrlåsning misslyckades
......
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