Commit a3f04132 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 833dbe09
[Desktop Entry]
Name=KItinerary Extractor
Name[ca]=KItinerary Extractor
Name[ca@valencia]=KItinerary Extractor
Name[cs]=Extraktor KItinerary
Name[en_GB]=KItinerary Extractor
Name[es]=Extractor de KItinerary
......@@ -8,7 +9,6 @@ Name[et]=KItinerary hankija
Name[fi]=KItinerary-jäsennin
Name[fr]=Extracteur KItinerary
Name[gl]=Extractor de KItinerary
Name[ia]=KItinerary Extractor
Name[it]=Estrattore di KItinerary
Name[ko]=KItinerary 추출기
Name[nl]=Extractor van KItinerary
......@@ -21,13 +21,13 @@ Name[uk]=Засіб видобування KItinerary
Name[x-test]=xxKItinerary Extractorxx
GenericName=KItinerary command line extractor
GenericName[ca]=Extractor del KItinerary de la línia d'ordres
GenericName[ca@valencia]=Extractor del KItinerary de la línia d'ordres
GenericName[en_GB]=KItinerary command line extractor
GenericName[es]=Extractor de línea de órdenes de KItinerary
GenericName[et]=KItinerary käsurea hankija
GenericName[fi]=KItineraryn komentorivijäsennin
GenericName[fr]=Extracteur KItinerary en ligne de commande
GenericName[gl]=Extractor de liña de ordes de KItinerary
GenericName[ia]=KItinerary extractor de commando in linea
GenericName[it]=Estrattore a riga di comando di KItinerary
GenericName[ko]=KItinerary 명령행 추출기
GenericName[nl]=Extractor van opdrachtregel van KItinerary
......@@ -43,13 +43,13 @@ Icon=map-globe
Type=Application
Comment=Command line reservation data extractor.
Comment[ca]=Extractor de dades de reserves de la línia d'ordres.
Comment[ca@valencia]=Extractor de dades de reserves de la línia d'ordres.
Comment[en_GB]=Command line reservation data extractor.
Comment[es]=Extractor de línea de órdenes de reserva de datos
Comment[et]=Käsurea puhkuseandmete hankija.
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[ia]=Extractor de datos de reservation como commando in linea
Comment[it]=Estrattore di dati di prenotazioni a riga di comando.
Comment[ko]=명령행 예약 데이터 추출기입니다.
Comment[nl]=Gegevensextractor van reservering op de opdrachtregel.
......
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