Commit 90cf9540 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 3a3a0140
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
Name=PIM Data Exporter Name=PIM Data Exporter
Name[ca]=Exportador de les dades PIM Name[ca]=Exportador de les dades PIM
Name[ca@valencia]=Exportador de les dades PIM Name[ca@valencia]=Exportador de les dades 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[fi]=PIM-tietojen vienti Name[fi]=PIM-tietojen vienti
...@@ -22,6 +23,7 @@ Icon=kontact ...@@ -22,6 +23,7 @@ Icon=kontact
GenericName=Saves and restores all data from PIM apps GenericName=Saves and restores all data from PIM apps
GenericName[ca]=Desa i emmagatzema totes les dades de les aplicacions PIM GenericName[ca]=Desa i emmagatzema totes les dades de les aplicacions PIM
GenericName[ca@valencia]=Guarda i emmagatzema totes les dades de les aplicacions PIM GenericName[ca@valencia]=Guarda i emmagatzema totes les dades de les aplicacions PIM
GenericName[cs]=Ukládá a obnovuje všechna data z aplikací PIM
GenericName[de]=Speichert alle Daten von PIM-Anwendungen und stellt sie wieder her GenericName[de]=Speichert alle Daten von PIM-Anwendungen und stellt sie wieder her
GenericName[en_GB]=Saves and restores all data from PIM apps GenericName[en_GB]=Saves and restores all data from PIM apps
GenericName[es]=Guarda y restaura todos los datos desde aplicaciones PIM GenericName[es]=Guarda y restaura todos los datos desde aplicaciones 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