Commit fce636bd 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 4e727daf
......@@ -16,6 +16,7 @@ Name[fi]=KDE Marble
Name[fr]=KDE Marble
Name[gl]=KDE Marble
Name[it]=Marble KDE
Name[ko]=KDE Marble
Name[nl]=KDE Marble
Name[nn]=KDE Marble
Name[pa]=KDE ਮਾਰਬਲ
......@@ -83,6 +84,7 @@ Comment[fi]=Navigointi ja kartat
Comment[fr]=Navigation et cartes
Comment[gl]=Navegación e mapas
Comment[it]=Navigazione e mappe
Comment[ko]=내비게이션과 지도
Comment[nl]=Navigatie en kaarten
Comment[nn]=Navigasjon og kart
Comment[pa]=ਨੇਵੀਗੇਸੱਨ ਅਤੇ ਨਕਸ਼ੇ
......
......@@ -16,6 +16,7 @@ Name[fi]=Marble-kartat
Name[fr]=Cartes Marble
Name[gl]=Mapas de Marble
Name[it]=Mappe di Marble
Name[ko]=Marble 지도
Name[nl]=Kaarten van Marble
Name[nn]=Marble-kart
Name[pa]=ਮਾਰਬਲ ਨਕਸ਼ੇ
......@@ -44,6 +45,7 @@ GenericName[fi]=OpenStreetMap-navigointi
GenericName[fr]=Navigation OpenStreetMap
GenericName[gl]=Navegación con OpenStreetMap
GenericName[it]=Navigazione con OpenStreetMap
GenericName[ko]=OpenStreetMap 내비게이션
GenericName[nl]=Navigatie met OpenStreetMap
GenericName[nn]=OpenStreetMap-navigasjon
GenericName[pa]=ਓਪਨਸਟਰੀਟਮੈਪ ਨੇਵੀਗੇਸ਼ਨ
......@@ -72,6 +74,7 @@ Comment[fi]=Löydä perille
Comment[fr]=Trouvez votre chemin
Comment[gl]=Atopa o teu camiño
Comment[it]=Trova la via
Comment[ko]=길 찾기
Comment[ml]=നിങ്ങളുടെ വഴി കണ്ടെത്തുക
Comment[nl]=Uw weg vinden
Comment[nn]=Finn vegen
......
......@@ -110,6 +110,7 @@ Comment[fi]=Navigointi ja kartat
Comment[fr]=Navigation et cartes
Comment[gl]=Navegación e mapas
Comment[it]=Navigazione e mappe
Comment[ko]=내비게이션과 지도
Comment[nl]=Navigatie en kaarten
Comment[nn]=Navigasjon og kart
Comment[pa]=ਨੇਵੀਗੇਸੱਨ ਅਤੇ ਨਕਸ਼ੇ
......
......@@ -13,6 +13,7 @@ Name[fi]=Maailmankartta
Name[fr]=Carte du monde
Name[gl]=Mapa do mundo
Name[it]=Mappa del mondo
Name[ko]=세계 지도
Name[nl]=Wereldkaart
Name[nn]=Verdskart
Name[pa]=ਸੰਸਾਰ ਨਕਸ਼ਾ
......@@ -38,6 +39,7 @@ Comment[et]=Meie kaunis maakera sinu taustapildina
Comment[fr]=Notre magnifique globe comme fond d'écran
Comment[gl]=O noso fermoso globo terráqueo como fondo de escritorio
Comment[it]=Il nostro bellissimo pianeta come sfondo
Comment[ko]=세상을 배경 화면으로
Comment[nl]=Onze prachtige wereldbol als uw achtergrondafbeelding
Comment[nn]=Vår vakre planet som bakgrunnsbilete
Comment[pa]=ਤੁਹਾਡੇ ਵਾਲਪੇਪਰ ਵਰਗੀ ਸਾਡੀ ਸੋਹਣੀ ਗਲੋਬ
......
......@@ -14,6 +14,7 @@ Name[fi]=GeoJSON-paikkatieto
Name[fr]=Données géographiques GeoJSON
Name[gl]=Datos xeográficos GeoJSON
Name[it]=Dati geografici GeoJSON
Name[ko]=GeoJSON 지리 데이터
Name[nl]=GeoJSON Geografische gegevens
Name[nn]=GeoJSON-geografidata
Name[pa]=GeoJSON ਭੂਗੋਲਿਕ ਡਾਟਾ
......
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