Commit 8ff1a22d 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 b961c749
......@@ -53,6 +53,7 @@ Name[sv]=Marble
Name[tr]=Marble
Name[ug]=Marble
Name[uk]=Marble
Name[x-test]=xxMarblexx
Name[zh_CN]=Marble
Name[zh_TW]=地理_Marble
MimeType=x-scheme-handler/geo;
......
......@@ -50,6 +50,7 @@ Name[sl]=Sestavni del Marble
Name[sv]=Marble-delprogram
Name[tr]=Marble Part
Name[uk]=Компонент Marble
Name[x-test]=xxMarble Partxx
Name[zh_CN]=Marble 组件
Name[zh_TW]=Marble 部件
MimeType=
......
......@@ -53,6 +53,7 @@ Name[sv]=Marble
Name[tr]=Marble
Name[ug]=Marble
Name[uk]=Marble
Name[x-test]=xxMarblexx
Name[zh_CN]=Marble
Name[zh_TW]=地理_Marble
MimeType=x-scheme-handler/worldwind;
......
......@@ -28,6 +28,7 @@ Name[sl]=KDE Marble
Name[sv]=KDE Marble
Name[tr]=KDE Marble
Name[uk]=Marble KDE
Name[x-test]=xxKDE Marblexx
Name[zh_CN]=KDE Marble
Name[zh_TW]=地理_KDE Marble
GenericName=Virtual Globe
......@@ -66,6 +67,7 @@ GenericName[sl]=Navidezni globus
GenericName[sv]=Virtuell glob
GenericName[tr]=Masaüstünde Dünya
GenericName[uk]=Віртуальний глобус
GenericName[x-test]=xxVirtual Globexx
GenericName[zh_CN]=虚拟地球仪
GenericName[zh_TW]=虛擬地球儀
Comment=Navigation and Maps
......@@ -94,6 +96,7 @@ Comment[sl]=Krmarjenje in karte
Comment[sv]=Navigering och kartor
Comment[tr]=Gezinti ve Haritalar
Comment[uk]=Навігація і карти
Comment[x-test]=xxNavigation and Mapsxx
Comment[zh_CN]=导航和地图
Comment[zh_TW]=導覽地圖
Icon=marble
......
......@@ -28,6 +28,7 @@ Name[sl]=Karte Marble
Name[sv]=Marble-kartor
Name[tr]=Marble Haritaları
Name[uk]=Карти Marble
Name[x-test]=xxMarble Mapsxx
Name[zh_CN]=Marble 地图
Name[zh_TW]=Marble 地圖
GenericName=OpenStreetMap Navigation
......@@ -56,6 +57,7 @@ GenericName[sl]=Krmarjenje z OpenStreetMap
GenericName[sv]=Navigering med OpenStreetMap
GenericName[tr]=OpenStreetMap Gezintisi
GenericName[uk]=Навігація OpenStreetMap
GenericName[x-test]=xxOpenStreetMap Navigationxx
GenericName[zh_CN]=OpenStreetMap 导航
GenericName[zh_TW]=OpenStreetMap 導覽
Comment=Find your way
......@@ -85,6 +87,7 @@ Comment[sl]=Najdite vašo pot
Comment[sv]=Hitta rätt
Comment[tr]=Yolunuzu bulun
Comment[uk]=Знайдіть ваш шлях
Comment[x-test]=xxFind your wayxx
Comment[zh_CN]=查找路线
Comment[zh_TW]=找到您的路
Icon=marble
......
......@@ -54,6 +54,7 @@ Name[sv]=Marble
Name[tr]=Marble
Name[ug]=Marble
Name[uk]=Marble
Name[x-test]=xxMarblexx
Name[zh_CN]=Marble
Name[zh_TW]=地理_Marble
GenericName=Virtual Globe
......@@ -92,6 +93,7 @@ GenericName[sl]=Navidezni globus
GenericName[sv]=Virtuell glob
GenericName[tr]=Masaüstünde Dünya
GenericName[uk]=Віртуальний глобус
GenericName[x-test]=xxVirtual Globexx
GenericName[zh_CN]=虚拟地球仪
GenericName[zh_TW]=虛擬地球儀
Comment=Navigation and Maps
......@@ -120,6 +122,7 @@ Comment[sl]=Krmarjenje in karte
Comment[sv]=Navigering och kartor
Comment[tr]=Gezinti ve Haritalar
Comment[uk]=Навігація і карти
Comment[x-test]=xxNavigation and Mapsxx
Comment[zh_CN]=导航和地图
Comment[zh_TW]=導覽地圖
Icon=marble
......
......@@ -46,6 +46,7 @@ Name[sv]=Världsklocka
Name[tr]=World Clock
Name[ug]=دۇنيا سائىتى
Name[uk]=Світовий годинник
Name[x-test]=xxWorld Clockxx
Name[zh_CN]=世界时钟
Name[zh_TW]=世界時鐘
Comment=Shows the time in different parts of the world
......@@ -93,6 +94,7 @@ Comment[sv]=Visar tiden i olika delar av världen
Comment[tr]=Dünyanın değişik bölgelerindeki saati gösterir
Comment[ug]=دۇنيادىكى ئوخشىمىغان جايلارنىڭ ۋاقتىنى كۆرسىتىدۇ
Comment[uk]=Показує вам час у різних частинах світу
Comment[x-test]=xxShows the time in different parts of the worldxx
Comment[zh_CN]=显示世界各地时间
Comment[zh_TW]=顯示世界上不同地區的時間
......
......@@ -25,6 +25,7 @@ Name[sl]=Zemljevid sveta
Name[sv]=Världskarta
Name[tr]=Dünya Haritası
Name[uk]=Карта світу
Name[x-test]=xxWorld Mapxx
Name[zh_CN]=世界地图
Name[zh_TW]=世界地圖
Comment=Our beautiful globe as your wallpaper
......@@ -50,6 +51,7 @@ Comment[sk]=Naša krásna zemeguľa ako tapeta
Comment[sl]=Naš lep globus kot vaša tapeta
Comment[sv]=Vår vackra planet som skrivbordsunderlägg
Comment[uk]=Наша чудова планета на шпалерах вашої стільниці
Comment[x-test]=xxOur beautiful globe as your wallpaperxx
Comment[zh_CN]=使用我们美丽的地球作为您的壁纸
Comment[zh_TW]=將我們漂亮的地球設為桌布
Type=Service
......
......@@ -38,6 +38,7 @@ Name[sl]=OpenStreetMap z Marble
Name[sv]=OpenStreetMap med Marble
Name[tr]=OpenStreetMap ile Marble
Name[uk]=OpenStreetMap за допомогою Marble
Name[x-test]=xxOpenStreetMap with Marblexx
Name[zh_CN]=Marble 的 OpenStreetMap
Name[zh_TW]=Marble 的 OpenStreetMap 支援
Comment=Lookup places in OpenStreetMap with Marble
......@@ -79,6 +80,7 @@ Comment[sl]=Z Marble si oglejte mesta na OpenStreetMap
Comment[sv]=Slå upp platser i OpenStreetMap med Marble
Comment[tr]=Marble ile konumları OpenStreetMap içinde arayın
Comment[uk]=Пошук місць на картах OpenStreetMap за допомогою Marble
Comment[x-test]=xxLookup places in OpenStreetMap with Marblexx
Comment[zh_CN]=在 Marble 中搜索 OpenStreetMap 中的位置
Comment[zh_TW]=使用 Marble 在 OpenStreetMap 上尋找地方
Icon=marble
......
......@@ -54,6 +54,7 @@ Name[sv]=Marble
Name[tr]=Marble
Name[ug]=Marble
Name[uk]=Marble
Name[x-test]=xxMarblexx
Name[zh_CN]=Marble
Name[zh_TW]=地理_Marble
NoDisplay=true
......@@ -93,6 +94,7 @@ GenericName[sl]=Navidezni globus
GenericName[sv]=Virtuell glob
GenericName[tr]=Masaüstünde Dünya
GenericName[uk]=Віртуальний глобус
GenericName[x-test]=xxVirtual Globexx
GenericName[zh_CN]=虚拟地球仪
GenericName[zh_TW]=虛擬地球儀
MimeType=application/x-gpx+xml;
......
......@@ -50,6 +50,7 @@ Name[sl]=Sestavni del Marble
Name[sv]=Marble-delprogram
Name[tr]=Marble Part
Name[uk]=Компонент Marble
Name[x-test]=xxMarble Partxx
Name[zh_CN]=Marble 组件
Name[zh_TW]=Marble 部件
MimeType=application/x-gpx+xml;
......
......@@ -32,6 +32,7 @@ Name[sl]=Geografski podatki GPX
Name[sv]=GPX geografisk data
Name[tr]=GPX Coğrafi Verisi
Name[uk]=географічні дані GPX
Name[x-test]=xxGPX Geographic Dataxx
Name[zh_CN]=GPX 地理数据
Name[zh_TW]=GPX 地理資料
......
......@@ -54,6 +54,7 @@ Name[sv]=Marble
Name[tr]=Marble
Name[ug]=Marble
Name[uk]=Marble
Name[x-test]=xxMarblexx
Name[zh_CN]=Marble
Name[zh_TW]=地理_Marble
GenericName=Virtual Globe
......@@ -92,6 +93,7 @@ GenericName[sl]=Navidezni globus
GenericName[sv]=Virtuell glob
GenericName[tr]=Masaüstünde Dünya
GenericName[uk]=Віртуальний глобус
GenericName[x-test]=xxVirtual Globexx
GenericName[zh_CN]=虚拟地球仪
GenericName[zh_TW]=虛擬地球儀
MimeType=application/geo+json;
......
......@@ -50,6 +50,7 @@ Name[sl]=Sestavni del Marble
Name[sv]=Marble-delprogram
Name[tr]=Marble Part
Name[uk]=Компонент Marble
Name[x-test]=xxMarble Partxx
Name[zh_CN]=Marble 组件
Name[zh_TW]=Marble 部件
MimeType=application/geo+json;
......
......@@ -26,6 +26,7 @@ Name[sl]=Geografski podatki GeoJSON
Name[sv]=GeoJSON geografisk data
Name[tr]=GeoJSON Coğrafik Verisi
Name[uk]=географічні дані GeoJSON
Name[x-test]=xxGeoJSON Geographic Dataxx
Name[zh_CN]=GeoJSON 地理数据
Name[zh_TW]=GeoJSON 地理資料
......
......@@ -54,6 +54,7 @@ Name[sv]=Marble
Name[tr]=Marble
Name[ug]=Marble
Name[uk]=Marble
Name[x-test]=xxMarblexx
Name[zh_CN]=Marble
Name[zh_TW]=地理_Marble
NoDisplay=true
......@@ -93,6 +94,7 @@ GenericName[sl]=Navidezni globus
GenericName[sv]=Virtuell glob
GenericName[tr]=Masaüstünde Dünya
GenericName[uk]=Віртуальний глобус
GenericName[x-test]=xxVirtual Globexx
GenericName[zh_CN]=虚拟地球仪
GenericName[zh_TW]=虛擬地球儀
MimeType=application/vnd.google-earth.kml+xml;
......
......@@ -54,6 +54,7 @@ Name[sv]=Marble
Name[tr]=Marble
Name[ug]=Marble
Name[uk]=Marble
Name[x-test]=xxMarblexx
Name[zh_CN]=Marble
Name[zh_TW]=地理_Marble
NoDisplay=true
......@@ -93,6 +94,7 @@ GenericName[sl]=Navidezni globus
GenericName[sv]=Virtuell glob
GenericName[tr]=Masaüstünde Dünya
GenericName[uk]=Віртуальний глобус
GenericName[x-test]=xxVirtual Globexx
GenericName[zh_CN]=虚拟地球仪
GenericName[zh_TW]=虛擬地球儀
MimeType=application/vnd.google-earth.kmz;
......
......@@ -50,6 +50,7 @@ Name[sl]=Sestavni del Marble
Name[sv]=Marble-delprogram
Name[tr]=Marble Part
Name[uk]=Компонент Marble
Name[x-test]=xxMarble Partxx
Name[zh_CN]=Marble 组件
Name[zh_TW]=Marble 部件
MimeType=application/vnd.google-earth.kml+xml;
......
......@@ -50,6 +50,7 @@ Name[sl]=Sestavni del Marble
Name[sv]=Marble-delprogram
Name[tr]=Marble Part
Name[uk]=Компонент Marble
Name[x-test]=xxMarble Partxx
Name[zh_CN]=Marble 组件
Name[zh_TW]=Marble 部件
MimeType=MimeType=application/vnd.google-earth.kmz;
......
......@@ -32,6 +32,7 @@ Name[sl]=Geografski podatki KML
Name[sv]=KML geografisk data
Name[tr]=KML Coğrafi Verisi
Name[uk]=географічні дані KML
Name[x-test]=xxKML Geographic Dataxx
Name[zh_CN]=KML 地理数据
Name[zh_TW]=KML 地理資料
......
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