Commit c1a9aa4b authored by Script Kiddy's avatar Script Kiddy

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 ccfb33f0
Pipeline #34747 skipped
......@@ -17,6 +17,7 @@ Name[nl]=Extractor van KItinerary
Name[pl]=Wydobywanie KItinerary
Name[pt]=Extracção do KItinerary
Name[pt_BR]=Extrator do KItinerary
Name[ro]=Extractor KItinerary
Name[ru]=Извлечение маршрутов KItinerary
Name[sk]=Extraktor KItinerary
Name[sl]=KItinerary Extractor
......@@ -40,6 +41,7 @@ GenericName[nl]=Extractor van opdrachtregel van KItinerary
GenericName[pl]=Wydobywane danych z wiersza poleceń KItinerary
GenericName[pt]=Extracção pela linha de comandos do KItinerary
GenericName[pt_BR]=Extrator em linha de comando do KItinerary
GenericName[ro]=Extractor KItinerary în linie de comandă
GenericName[ru]=Инструмент командной строки для извлечения данных маршрутов
GenericName[sk]=Extraktor cez príkazový riadok pre KItinerary
GenericName[sl]=KItinerary ekstraktor ukazne vrstice
......@@ -66,6 +68,7 @@ Comment[nl]=Gegevensextractor van reservering op de opdrachtregel.
Comment[pl]=Wydobywane danych o rezerwacji z wiersza poleceń.
Comment[pt]=Extracção de dados de reservas pela linha de comandos.
Comment[pt_BR]=Extrator em linha de comando de dados de reservas.
Comment[ro]=Extractor în linie de comandă pentru date despre rezervări.
Comment[ru]=Инструмент командной строки для извлечения данных маршрутов.
Comment[sk]=Extraktor dát pre rezerváciu cez príkazový riadok.
Comment[sl]=Ekstraktor podatkov o rezervaciji v ukazni vrstici.
......
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