Commit cd2f0d1d 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 6cb305b6
......@@ -12,6 +12,7 @@ Name[fr]=Export des données PIM
Name[gl]=Exportador de datos de PIM
Name[ia]=PIM Data Exporter
Name[it]=Esportatore dei dati di PIM
Name[ko]=PIM 데이터 내보내기
Name[nl]=PIM-exportprogramma van gegevens
Name[pl]=Eksportowanie danych ZIO
Name[pt]=Exportação de Dados PIM
......
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