Skip to content

Commit

Permalink
Merge branch master of https://github.com/qgis/Quantum-GIS
Browse files Browse the repository at this point in the history
  • Loading branch information
slarosa committed Oct 19, 2012
2 parents ca20be1 + 8ca2236 commit 3fecd44
Show file tree
Hide file tree
Showing 198 changed files with 82,282 additions and 10,526 deletions.
4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@ SET (WITH_GLOBE FALSE CACHE BOOL "Determines whether Globe plugin should be buil
IF (WITH_GLOBE)
SET(QT_USE_QTOPENGL 1)
FIND_PACKAGE(OSGEARTH REQUIRED)
IF (OSGEARTHQT_LIBRARY)
# following variable is used in qgsconfig.h
SET(HAVE_OSGEARTHQT TRUE)
ENDIF (OSGEARTHQT_LIBRARY)
ENDIF (WITH_GLOBE)

# Compile flag. Make it possible to turn it off.
Expand Down
3 changes: 3 additions & 0 deletions cmake/FindOSGEARTH.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@ FIND_OSGEARTH_LIBRARY( OSGEARTHFEATURES_LIBRARY_DEBUG osgEarthFeaturesd )
FIND_OSGEARTH_LIBRARY( OSGEARTHSYMBOLOGY_LIBRARY osgEarthSymbology )
FIND_OSGEARTH_LIBRARY( OSGEARTHSYMBOLOGY_LIBRARY_DEBUG osgEarthSymbologyd )

FIND_OSGEARTH_LIBRARY( OSGEARTHQT_LIBRARY osgEarthQt )
FIND_OSGEARTH_LIBRARY( OSGEARTHQT_LIBRARY_DEBUG osgEarthQtd )


SET( OSGEARTH_FOUND "NO" )
IF( OSGEARTH_LIBRARY AND OSGEARTH_INCLUDE_DIR )
Expand Down
2 changes: 2 additions & 0 deletions cmake_templates/qgsconfig.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,7 @@

#cmakedefine HAVE_TOUCH

#cmakedefine HAVE_OSGEARTHQT

#endif

55 changes: 28 additions & 27 deletions doc/TRANSLATORS

Large diffs are not rendered by default.

1,371 changes: 703 additions & 668 deletions i18n/qgis_de.ts

Large diffs are not rendered by default.

2,987 changes: 1,639 additions & 1,348 deletions i18n/qgis_gl_ES.ts

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions i18n/qgis_it.ts
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ sono stati ridotti a %2 dopo la semplificazione</translation>
</message>
<message>
<source>Random selection within subsets</source>
<translation>Selezione causale con un sottoinsieme</translation>
<translation>Selezione casuale con un sottoinsieme</translation>
</message>
<message>
<source>Please specify input vector layer</source>
Expand Down Expand Up @@ -3252,7 +3252,8 @@ quando si preme sul bottone Aiuto del dialogo degli strumenti.</translation>
<message>
<location filename="../python/plugins/GdalTools/tools/widgetOverview.ui" line="68"/>
<source>cubic</source>
<translation type="unfinished"></translation>
<translatorcomment>cubico</translatorcomment>
<translation></translation>
</message>
<message>
<location filename="../python/plugins/GdalTools/tools/widgetOverview.ui" line="73"/>
Expand Down Expand Up @@ -4919,7 +4920,8 @@ Ctl (Cmd) increments by 15 deg.</source>
<message>
<location filename="../src/ui/qgisapp.ui" line="1091"/>
<source>Layer Labeling Options</source>
<translation type="unfinished"></translation>
<translatorcomment>Opzioni per l&apos;etichettatura del layer</translatorcomment>
<translation></translation>
</message>
<message>
<location filename="../src/ui/qgisapp.ui" line="1100"/>
Expand Down
55,238 changes: 55,238 additions & 0 deletions i18n/qgis_sr_Cyrl.ts

Large diffs are not rendered by default.

0 comments on commit 3fecd44

Please sign in to comment.