Commit 302ea78d 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 7c73f4ec
Pipeline #72516 skipped
......@@ -29,6 +29,7 @@ Name[zh_CN]=KItinerary 导出工具
GenericName=KItinerary command line extractor
GenericName[ca]=Extractor del KItinerary per a la línia d'ordres
GenericName[ca@valencia]=Extractor del KItinerary per a la línia d'ordres
GenericName[cs]=Extraktor v příkazové řádce pro KItinerary
GenericName[da]=KItinerary kommandolinjeudtrækker
GenericName[en_GB]=KItinerary command line extractor
GenericName[es]=Extractor de línea de órdenes de KItinerary
......@@ -58,6 +59,7 @@ Type=Application
Comment=Command line reservation data extractor.
Comment[ca]=Extractor de les dades de reserves mitjançant la línia d'ordres.
Comment[ca@valencia]=Extractor de les dades de reserves mitjançant la línia d'ordres.
Comment[cs]=Extraktor dat rezervací v příkazové řádce.
Comment[da]=Kommandolinjeværktøj til at udtrække reservationsdata.
Comment[en_GB]=Command line reservation data extractor.
Comment[es]=Extractor de línea de órdenes de reserva de datos
......
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