Commit 956414d0 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 055e97c8
...@@ -5,6 +5,7 @@ Name[ca@valencia]=Exportador de les dades PIM ...@@ -5,6 +5,7 @@ Name[ca@valencia]=Exportador de les dades PIM
Name[cs]=Exportér dat PIM Name[cs]=Exportér dat PIM
Name[de]=PIM-Daten-Export Name[de]=PIM-Daten-Export
Name[en_GB]=PIM Data Exporter Name[en_GB]=PIM Data Exporter
Name[es]=Exportador de preferencias de PIM
Name[fi]=PIM-tietojen vienti Name[fi]=PIM-tietojen vienti
Name[fr]=Export des données PIM Name[fr]=Export des données PIM
Name[gl]=Exportador de datos de PIM Name[gl]=Exportador de datos de 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