Commit d3c33408 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 0d10e958
...@@ -7,6 +7,7 @@ Name[it]=KDE Itinerary ...@@ -7,6 +7,7 @@ Name[it]=KDE Itinerary
Name[nl]=KDE Itinerary Name[nl]=KDE Itinerary
Name[pl]=KDE Itinerary Name[pl]=KDE Itinerary
Name[pt]=KDE Itinerary Name[pt]=KDE Itinerary
Name[sk]=KDE Itinerár
Name[sv]=KDE-resplan Name[sv]=KDE-resplan
Name[uk]=KDE Itinerary Name[uk]=KDE Itinerary
Name[x-test]=xxKDE Itineraryxx Name[x-test]=xxKDE Itineraryxx
...@@ -18,6 +19,7 @@ GenericName[it]=Gestione degli itinerari ...@@ -18,6 +19,7 @@ GenericName[it]=Gestione degli itinerari
GenericName[nl]=Beheer van reisroute GenericName[nl]=Beheer van reisroute
GenericName[pl]=Zarządzanie planem podróży GenericName[pl]=Zarządzanie planem podróży
GenericName[pt]=Gestão de itinerários GenericName[pt]=Gestão de itinerários
GenericName[sk]=Správa itinerára
GenericName[sv]=Hantering av resplan GenericName[sv]=Hantering av resplan
GenericName[uk]=Керування маршрутом GenericName[uk]=Керування маршрутом
GenericName[x-test]=xxItinerary managementxx GenericName[x-test]=xxItinerary managementxx
...@@ -33,6 +35,7 @@ Comment[it]=Applicazione di assistenza dei viaggi. ...@@ -33,6 +35,7 @@ Comment[it]=Applicazione di assistenza dei viaggi.
Comment[nl]=Toepassing voor hulp bij reizen. Comment[nl]=Toepassing voor hulp bij reizen.
Comment[pl]=Aplikacja pomagająca w podróży. Comment[pl]=Aplikacja pomagająca w podróży.
Comment[pt]=Aplicação de assistência a viagens. Comment[pt]=Aplicação de assistência a viagens.
Comment[sk]=Aplikácia na pomoc s cestovaním.
Comment[sv]=Resehjälpprogram. Comment[sv]=Resehjälpprogram.
Comment[uk]=Програма-помічник у подорожах. Comment[uk]=Програма-помічник у подорожах.
Comment[x-test]=xxTravel assistance application.xx Comment[x-test]=xxTravel assistance application.xx
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