Skip to content

Commit 3fecd44

Browse files
committed
Merge branch master of https://github.com/qgis/Quantum-GIS
2 parents ca20be1 + 8ca2236 commit 3fecd44

File tree

198 files changed

+82282
-10526
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

198 files changed

+82282
-10526
lines changed

CMakeLists.txt

+4
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@ SET (WITH_GLOBE FALSE CACHE BOOL "Determines whether Globe plugin should be buil
9595
IF (WITH_GLOBE)
9696
SET(QT_USE_QTOPENGL 1)
9797
FIND_PACKAGE(OSGEARTH REQUIRED)
98+
IF (OSGEARTHQT_LIBRARY)
99+
# following variable is used in qgsconfig.h
100+
SET(HAVE_OSGEARTHQT TRUE)
101+
ENDIF (OSGEARTHQT_LIBRARY)
98102
ENDIF (WITH_GLOBE)
99103

100104
# Compile flag. Make it possible to turn it off.

cmake/FindOSGEARTH.cmake

+3
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@ FIND_OSGEARTH_LIBRARY( OSGEARTHFEATURES_LIBRARY_DEBUG osgEarthFeaturesd )
9292
FIND_OSGEARTH_LIBRARY( OSGEARTHSYMBOLOGY_LIBRARY osgEarthSymbology )
9393
FIND_OSGEARTH_LIBRARY( OSGEARTHSYMBOLOGY_LIBRARY_DEBUG osgEarthSymbologyd )
9494

95+
FIND_OSGEARTH_LIBRARY( OSGEARTHQT_LIBRARY osgEarthQt )
96+
FIND_OSGEARTH_LIBRARY( OSGEARTHQT_LIBRARY_DEBUG osgEarthQtd )
97+
9598

9699
SET( OSGEARTH_FOUND "NO" )
97100
IF( OSGEARTH_LIBRARY AND OSGEARTH_INCLUDE_DIR )

cmake_templates/qgsconfig.h.in

+2
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,7 @@
3838

3939
#cmakedefine HAVE_TOUCH
4040

41+
#cmakedefine HAVE_OSGEARTHQT
42+
4143
#endif
4244

doc/TRANSLATORS

+28-27
Large diffs are not rendered by default.

i18n/qgis_de.ts

+703-668
Large diffs are not rendered by default.

i18n/qgis_gl_ES.ts

+1,639-1,348
Large diffs are not rendered by default.

i18n/qgis_it.ts

+5-3
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ sono stati ridotti a %2 dopo la semplificazione</translation>
652652
</message>
653653
<message>
654654
<source>Random selection within subsets</source>
655-
<translation>Selezione causale con un sottoinsieme</translation>
655+
<translation>Selezione casuale con un sottoinsieme</translation>
656656
</message>
657657
<message>
658658
<source>Please specify input vector layer</source>
@@ -3252,7 +3252,8 @@ quando si preme sul bottone Aiuto del dialogo degli strumenti.</translation>
32523252
<message>
32533253
<location filename="../python/plugins/GdalTools/tools/widgetOverview.ui" line="68"/>
32543254
<source>cubic</source>
3255-
<translation type="unfinished"></translation>
3255+
<translatorcomment>cubico</translatorcomment>
3256+
<translation></translation>
32563257
</message>
32573258
<message>
32583259
<location filename="../python/plugins/GdalTools/tools/widgetOverview.ui" line="73"/>
@@ -4919,7 +4920,8 @@ Ctl (Cmd) increments by 15 deg.</source>
49194920
<message>
49204921
<location filename="../src/ui/qgisapp.ui" line="1091"/>
49214922
<source>Layer Labeling Options</source>
4922-
<translation type="unfinished"></translation>
4923+
<translatorcomment>Opzioni per l&apos;etichettatura del layer</translatorcomment>
4924+
<translation></translation>
49234925
</message>
49244926
<message>
49254927
<location filename="../src/ui/qgisapp.ui" line="1100"/>

i18n/qgis_sr_Cyrl.ts

+55,238
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)