Commit 1d309cdb 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 7df1ed9f
......@@ -6,6 +6,7 @@ Name[es]=KDE Itinerary
Name[fr]=KDE Itinerary
Name[gl]=KDE Itinerary
Name[it]=KDE Itinerary
Name[ko]=KDE 여행 정보
Name[nl]=KDE Itinerary
Name[pl]=KDE Itinerary
Name[pt]=KDE Itinerary
......@@ -20,6 +21,7 @@ GenericName[es]=Gestión de itinerarios
GenericName[fr]=Gestion d'itinéraires
GenericName[gl]=Xestión de itinerarios
GenericName[it]=Gestione degli itinerari
GenericName[ko]=여행 정보 관리
GenericName[nl]=Beheer van reisroute
GenericName[pl]=Zarządzanie planem podróży
GenericName[pt]=Gestão de itinerários
......@@ -38,6 +40,7 @@ Comment[es]=Aplicación de asistencia para viajes.
Comment[fr]=Application d'aide à l'organisation de trajets et voyages.
Comment[gl]=Aplicativo de asistencia de viaxe.
Comment[it]=Applicazione di assistenza dei viaggi.
Comment[ko]=여행 도우미 프로그램입니다.
Comment[nl]=Toepassing voor hulp bij reizen.
Comment[pl]=Aplikacja pomagająca w podróży.
Comment[pt]=Aplicação de assistência a viagens.
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment