Commit 4880e682 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 c8150736
[Desktop Entry]
Name=KDE Itinerary
Name[ca]=Itinerari del KDE
Name[ca]=KDE Itinerary
Name[ca@valencia]=KDE Itinerary
Name[nl]=KDE Itinerary
Name[pl]=KDE Itinerary
Name[pt]=KDE Itinerary
Name[sv]=KDE-resplan
Name[uk]=KDE Itinerary
Name[x-test]=xxKDE Itineraryxx
GenericName=Itinerary management
GenericName[ca]=Gestió de l'itinerari
GenericName[ca@valencia]=Gestió de l'itinerari
GenericName[nl]=Beheer van reisroute
GenericName[pl]=Zarządzanie planem podróży
GenericName[pt]=Gestão de itinerários
GenericName[sv]=Hantering av resplan
GenericName[uk]=Керування маршрутом
......@@ -18,7 +22,9 @@ Icon=map-globe
Type=Application
Comment=Travel assistance application.
Comment[ca]=Aplicació per a l'assistència en viatge.
Comment[ca@valencia]=Aplicació per a l'assistència en viatge.
Comment[nl]=Toepassing voor hulp bij reizen.
Comment[pl]=Aplikacja pomagająca w podróży.
Comment[pt]=Aplicação de assistência a viagens.
Comment[sv]=Resehjälpprogram.
Comment[uk]=Програма-помічник у подорожах.
......
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