Commit aa9b219e 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 f64edaef
......@@ -8,6 +8,7 @@ Name[fi]=KItinerary-jäsennin
Name[fr]=Extracteur KItinerary
Name[gl]=Extractor de KItinerary
Name[it]=Estrattore di KItinerary
Name[ko]=KItinerary 추출기
Name[nl]=Extractor van KItinerary
Name[pl]=Wydobywanie KItinerary
Name[pt]=Extracção do KItinerary
......@@ -24,6 +25,7 @@ GenericName[fi]=KItineraryn komentorivijäsennin
GenericName[fr]=Extracteur KItinerary en ligne de commande
GenericName[gl]=Extractor de liña de ordes de KItinerary
GenericName[it]=Estrattore a riga di comando di KItinerary
GenericName[ko]=KItinerary 명령행 추출기
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
......@@ -43,6 +45,7 @@ Comment[fi]=Komentorivin varaustietojäsennin.
Comment[fr]=Extracteur de données de réservation en ligne de commande.
Comment[gl]=Extractor de datos de reservas de liña de ordes.
Comment[it]=Estrattore di dati di prenotazioni a riga di comando.
Comment[ko]=명령행 예약 데이터 추출기입니다.
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.
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