Skip to content
Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information
SrNetoChan committed Mar 27, 2013
2 parents 24fedb2 + d1825ec commit af05b5f30d500d7ed096bf7e7c8361f6aa77977a
Showing 497 changed files with 104,073 additions and 34,462 deletions.
@@ -0,0 +1,61 @@
[main]
host = https://www.transifex.com

[QGIS.qgis-application]
file_filter = i18n/qgis_<lang>.ts
source_file = i18n/qgis_en.ts
source_lang = en
trans.af = i18n/qgis_af.ts
trans.ar = i18n/qgis_ar.ts
trans.bg = i18n/qgis_bg.ts
trans.ca_ES = i18n/qgis_ca_ES.ts
trans.cs_CZ = i18n/qgis_cs_CZ.ts
trans.da_DK = i18n/qgis_da_DK.ts
trans.de = i18n/qgis_de.ts
trans.el_GR = i18n/qgis_el_GR.ts
trans.es = i18n/qgis_es.ts
trans.et_EE = i18n/qgis_et_EE.ts
trans.eu_ES = i18n/qgis_eu_ES.ts
trans.fa = i18n/qgis_fa.ts
trans.fi = i18n/qgis_fi.ts
trans.fr = i18n/qgis_fr.ts
trans.gl_ES = i18n/qgis_gl_ES.ts
trans.he = i18n/qgis_he.ts
trans.hr_HR = i18n/qgis_hr_HR.ts
trans.hu = i18n/qgis_hu.ts
trans.id = i18n/qgis_id.ts
trans.is = i18n/qgis_is.ts
trans.it = i18n/qgis_it.ts
trans.ja = i18n/qgis_ja.ts
trans.ka_GE = i18n/qgis_ka_GE.ts
trans.km = i18n/qgis_km.ts
trans.ko_KR = i18n/qgis_ko_KR.ts
trans.lo = i18n/qgis_lo.ts
trans.lt = i18n/qgis_lt.ts
trans.lv = i18n/qgis_lv.ts
trans.ml_IN = i18n/qgis_ml_IN.ts
trans.mn = i18n/qgis_mn.ts
trans.nl = i18n/qgis_nl.ts
trans.no = i18n/qgis_no.ts
trans.pl_PL = i18n/qgis_pl_PL.ts
trans.pt_BR = i18n/qgis_pt_BR.ts
trans.pt_PT = i18n/qgis_pt_PT.ts
trans.ro = i18n/qgis_ro.ts
trans.ru = i18n/qgis_ru.ts
trans.sk = i18n/qgis_sk.ts
trans.sl_SI = i18n/qgis_sl_SI.ts
trans.sq_AL = i18n/qgis_sq_AL.ts
trans.sr_Cyrl = i18n/qgis_sr_Cyrl.ts
trans.sr_Latn = i18n/qgis_sr_Latn.ts
trans.sv = i18n/qgis_sv.ts
trans.sw = i18n/qgis_sw.ts
trans.ta = i18n/qgis_ta.ts
trans.th = i18n/qgis_th.ts
trans.tr = i18n/qgis_tr.ts
trans.uk = i18n/qgis_uk.ts
trans.vi = i18n/qgis_vi.ts
trans.xh = i18n/qgis_xh.ts
trans.zh_CN = i18n/qgis_zh_CN.ts
trans.zh_TW = i18n/qgis_zh_TW.ts
type = QT

@@ -125,6 +125,11 @@ SET (ENABLE_TESTS TRUE CACHE BOOL "Build unit tests?")
# if set to other directory than expected
MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH)

IF (MSVC AND CMAKE_GENERATOR MATCHES "NMake")
# following variable is also used in qgsconfig.h
SET (USING_NMAKE TRUE)
ENDIF (MSVC AND CMAKE_GENERATOR MATCHES "NMake")

#############################################################
# check if lexer and parser are not missing
# http://www.mail-archive.com/cmake@cmake.org/msg02861.html
@@ -295,7 +300,9 @@ FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
IF (PEDANTIC)
MESSAGE (STATUS "Pedantic compiler settings enabled")
IF(MSVC)
ADD_DEFINITIONS( /W4 )
IF (NOT USING_NMAKE)
ADD_DEFINITIONS( /W4 )
ENDIF (NOT USING_NMAKE)

# disable warnings
ADD_DEFINITIONS( /wd4100 ) # unused formal parameters
@@ -316,7 +323,7 @@ IF (PEDANTIC)
# ADD_DEFINITIONS( -fstrict-aliasing -Wstrict-aliasing=1 -Wredundant-decls )

IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type-c-linkage")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type-c-linkage -Wno-overloaded-virtual")
ENDIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
ENDIF (MSVC)

@@ -372,8 +379,10 @@ IF (WIN32)
ADD_DEFINITIONS(-D_CRT_NONSTDC_NO_WARNINGS)

IF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
MESSAGE (STATUS "Generating browse files")
ADD_DEFINITIONS( /FR )
IF (NOT USING_NMAKE)
MESSAGE (STATUS "Generating browse files")
ADD_DEFINITIONS( /FR )
ENDIF (NOT USING_NMAKE)
ENDIF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)

IF (INSTALL_DEPS)
@@ -32,6 +32,8 @@
//used by Mac to find system Qt plugins when bundle is run from build directory
#define QTPLUGINSDIR "${QT_PLUGINS_DIR}"

#cmakedefine USING_NMAKE

#cmakedefine HAVE_POSTGRESQL

#cmakedefine HAVE_SPATIALITE
@@ -13,8 +13,9 @@ qgis (1.9.0) UNRELEASED; urgency=low
* add support for ubuntu quantal and raring
* remove js files and add libjs-jquery/libjs-underscore dependency
* add spatialite qt sql driver
* include topology plugin

-- Jürgen E. Fischer <jef@norbit.de> Thu, 21 Feb 2013 12:11:31 +0100
-- Jürgen E. Fischer <jef@norbit.de> Wed, 27 Mar 2013 11:03:31 +0100

qgis (1.8.0) UNRELEASED; urgency=low

@@ -14,6 +14,7 @@ usr/lib/qgis/plugins/libofflineeditingplugin.so
usr/lib/qgis/plugins/libroadgraphplugin.so
usr/lib/qgis/plugins/libzonalstatisticsplugin.so
usr/lib/qgis/plugins/libheatmapplugin.so
usr/lib/qgis/plugins/libtopolplugin.so
usr/lib/qgis/qgis_help
usr/share/pixmaps/qgis-icon.xpm
usr/share/pixmaps/qgis-mime-icon.png

0 comments on commit af05b5f

Please sign in to comment.
You can’t perform that action at this time.