Commit 389b4817 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 e9187936
Pipeline #62232 skipped
......@@ -10,6 +10,7 @@ Comment[fi]=Viestinkoostamisagentti
Comment[fr]=Agent de fusion de messages
Comment[ia]=Agente de fusion de posta
Comment[it]=Agente per l'unione della posta
Comment[ko]=메일 머지 에이전트
Comment[nl]=Agent voor samenvoegen in e-mail
Comment[pl]=Usługa scalania poczty
Comment[pt]=Agente de Junção de E-mail
......
......@@ -9,6 +9,7 @@ Name[fi]=Viestinkoostamisagentti
Name[fr]=Agent de fusion de messages
Name[ia]=Agente de fusion de posta
Name[it]=Agente per l'unione della posta
Name[ko]=메일 머지 에이전트
Name[nl]=Agent voor samenvoegen in e-mail
Name[pl]=Usługa scalania poczty
Name[pt]=Agente de Junção de E-mail
......@@ -27,6 +28,7 @@ Comment[fi]=Viestinkoostamisagentti
Comment[fr]=Agent de fusion de messages
Comment[ia]=Agente de fusion de posta
Comment[it]=Agente per l'unione della posta
Comment[ko]=메일 머지 에이전트
Comment[nl]=Agent voor samenvoegen in e-mail
Comment[pl]=Usługa scalania poczty
Comment[pt]=Agente de Junção de E-mail
......
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