Commit baad1816 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 580e5cfb
......@@ -3,6 +3,7 @@ Name=iCal Calendar File
Name[ca]=Fitxer de calendari iCal
Name[ca@valencia]=Fitxer de calendari iCal
Name[cs]=Soubor s kalendářem iCal
Name[de]=ICal-Kalenderdatei
Name[en_GB]=iCal Calendar File
Name[es]=Archivo de calendario iCal
Name[it]=File di calendario iCal
......
......@@ -3,6 +3,7 @@ Name=iCal Calendar File
Name[ca]=Fitxer de calendari iCal
Name[ca@valencia]=Fitxer de calendari iCal
Name[cs]=Soubor s kalendářem iCal
Name[de]=ICal-Kalenderdatei
Name[en_GB]=iCal Calendar File
Name[es]=Archivo de calendario iCal
Name[it]=File di calendario iCal
......
......@@ -3,6 +3,7 @@ Name=iCal Calendar Folder
Name[ca]=Carpeta de calendari iCal
Name[ca@valencia]=Carpeta de calendari iCal
Name[cs]=Složka kalendáře iCal
Name[de]=ICal-Kalenderordner
Name[en_GB]=iCal Calendar Folder
Name[es]=Carpeta de calendario iCal
Name[it]=Cartella di calendario iCal
......
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