Skip to content

Commit

Permalink
Merge branch 'master' of github.com:qgis/Quantum-GIS
Browse files Browse the repository at this point in the history
  • Loading branch information
timlinux committed Aug 2, 2012
2 parents d8e918d + 28b8ab0 commit 0926c35
Show file tree
Hide file tree
Showing 59 changed files with 6,769 additions and 3,040 deletions.
66 changes: 33 additions & 33 deletions doc/TRANSLATORS

Large diffs are not rendered by default.

2,286 changes: 1,216 additions & 1,070 deletions i18n/qgis_de.ts

Large diffs are not rendered by default.

3,437 changes: 1,979 additions & 1,458 deletions i18n/qgis_gl_ES.ts

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion images/icons/mac/browser/CMakeLists.txt
Expand Up @@ -2,5 +2,9 @@
FILE (GLOB ICONS *.icns)
INSTALL (FILES ${ICONS}
DESTINATION "${CMAKE_INSTALL_PREFIX}/${QGIS_BIN_DIR}/QGIS Browser.app/Contents/Resources")
# create alias now, so alias file gets correct icon
# create alias now, so alias file gets correct icon, delete first if it exists
SET (BROWSER_ALIAS "$ENV{DESTDIR}${QGIS_INSTALL_PREFIX}/QGIS Browser.app")
IF (EXISTS ${BROWSER_ALIAS})
FILE (REMOVE ${BROWSER_ALIAS})
ENDIF ()
INSTALL (CODE "EXECUTE_PROCESS(COMMAND osascript -e \"tell application \\\"Finder\\\" to make alias file to POSIX file \\\"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${QGIS_BIN_DIR}/QGIS Browser.app\\\" at POSIX file \\\"$ENV{DESTDIR}${QGIS_INSTALL_PREFIX}/\\\"\")")
8 changes: 8 additions & 0 deletions images/images.qrc
Expand Up @@ -118,6 +118,7 @@
<file>themes/default/mActionOptions.png</file>
<file>themes/default/mActionPan.png</file>
<file>themes/default/mActionPanToSelected.png</file>
<file>themes/default/mActionPanToSelected.svg</file>
<file>themes/default/mActionShowRasterCalculator.png</file>
<file>themes/default/mAction.png</file>
<file>themes/default/mActionProjectProperties.png</file>
Expand All @@ -131,6 +132,7 @@
<file>themes/default/mActionRemoveSelectedFeature.png</file>
<file>themes/default/mActionReshape.png</file>
<file>themes/default/mActionRotateLabel.png</file>
<file>themes/default/mActionRotateLabel.svg</file>
<file>themes/default/mActionRotatePointSymbols.png</file>
<file>themes/default/mActionSaveAsPDF.png</file>
<file>themes/default/mActionSaveAsSVG.png</file>
Expand All @@ -142,6 +144,7 @@
<file>themes/default/mActionSelectPan.png</file>
<file>themes/default/mActionSelect.png</file>
<file>themes/default/mActionSelectPolygon.png</file>
<file>themes/default/mActionSelectPolygon.svg</file>
<file>themes/default/mActionSelectRadius.png</file>
<file>themes/default/mActionSelectRectangle.png</file>
<file>themes/default/mActionShowAllLayers.png</file>
Expand All @@ -150,6 +153,7 @@
<file>themes/default/mActionShowPluginManager.png</file>
<file>themes/default/mActionSimplify.png</file>
<file>themes/default/mActionSplitFeatures.png</file>
<file>themes/default/mActionSplitFeatures.svg</file>
<file>themes/default/mActionTextAnnotation.png</file>
<file>themes/default/mActionToggleEditing.png</file>
<file>themes/default/mActionUndo.png</file>
Expand Down Expand Up @@ -319,12 +323,14 @@
<file>themes/gis/mActionOpenTable.png</file>
<file>themes/gis/mActionPan.png</file>
<file>themes/gis/mActionPanToSelected.png</file>
<file>themes/gis/mActionPanToSelected.svg</file>
<file>themes/gis/mActionShowRasterCalculator.png</file>
<file>themes/gis/mActionRaiseItems.png</file>
<file>themes/gis/mActionRedo.png</file>
<file>themes/gis/mActionRemoveLayer.png</file>
<file>themes/gis/mActionReshape.png</file>
<file>themes/gis/mActionRotateLabel.png</file>
<file>themes/gis/mActionRotateLabel.svg</file>
<file>themes/gis/mActionSaveAsPDF.png</file>
<file>themes/gis/mActionSaveAsSVG.png</file>
<file>themes/gis/mActionSaveEdits.png</file>
Expand All @@ -335,12 +341,14 @@
<file>themes/gis/mActionSelectPan.png</file>
<file>themes/gis/mActionSelect.png</file>
<file>themes/gis/mActionSelectPolygon.png</file>
<file>themes/gis/mActionSelectPolygon.svg</file>
<file>themes/gis/mActionSelectRadius.png</file>
<file>themes/gis/mActionSelectRectangle.png</file>
<file>themes/gis/mActionShowAllLayers.png</file>
<file>themes/gis/mActionShowBookmarks.png</file>
<file>themes/gis/mActionSimplify.png</file>
<file>themes/gis/mActionSplitFeatures.png</file>
<file>themes/gis/mActionSplitFeatures.svg</file>
<file>themes/gis/mActionTextAnnotation.png</file>
<file>themes/gis/mActionToggleEditing.png</file>
<file>themes/gis/mActionUndo.png</file>
Expand Down
76 changes: 76 additions & 0 deletions images/themes/default/mActionPanToSelected.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
85 changes: 85 additions & 0 deletions images/themes/default/mActionRotateLabel.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
94 changes: 94 additions & 0 deletions images/themes/default/mActionSelectPolygon.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 0926c35

Please sign in to comment.