[QGIS Commit] [qgis/Quantum-GIS] 909411: FindQsci: removed the unused exception holder vari...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: 909411ce9df1ae022adccaca3813a2dbf4ab2f45
      https://github.com/qgis/Quantum-GIS/commit/909411ce9df1ae022adccaca3813a2dbf4ab2f45
  Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M cmake/FindQsci.py

  Log Message:
  -----------
  FindQsci: removed the unused exception holder variable

master didn't build without that:
-- Found PyQt4 version: 4.10
  File "~/carina/Quantum-GIS/cmake/FindQsci.py", line 41
    except ImportError, e:
                ^
SyntaxError: invalid syntax


  Commit: 91f00f39e075ca5669b6d8457abad7e40939f43f
      https://github.com/qgis/Quantum-GIS/commit/91f00f39e075ca5669b6d8457abad7e40939f43f
  Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M src/app/qgsdecorationgriddialog.cpp

  Log Message:
  -----------
  QgsDecorationGridDialog: fixed the "Horizontal and Vertical" option

It was set with a lowercase v and then checked with an uppercase one:
qgsdecorationgriddialog.cpp:57:      tr( "Horizontal and vertical" ) );
qgsdecorationgriddialog.cpp:145:  else if ( text == tr( "Horizontal and Vertical" ) )

The lowercase variant is newer when you check the translation files - nobody
has it translated without also having the uppercase one too.


  Commit: 6cfc5f2a87c40d6f138873dbc067cbd8b014ea3a
      https://github.com/qgis/Quantum-GIS/commit/6cfc5f2a87c40d6f138873dbc067cbd8b014ea3a
  Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M i18n/qgis_sl_SI.ts

  Log Message:
  -----------
  i18n: slovenian translation update (not full)


  Commit: d3f8428c411b082cb6c7caafcd105caa965f0a13
      https://github.com/qgis/Quantum-GIS/commit/d3f8428c411b082cb6c7caafcd105caa965f0a13
  Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M i18n/qgis_sl_SI.ts

  Log Message:
  -----------
  i18n: slovenian ellipsis is "non-contact" unless used for an unfinished word


  Commit: a523fa51dc032f6b1071b199eb81b12f26587772
      https://github.com/qgis/Quantum-GIS/commit/a523fa51dc032f6b1071b199eb81b12f26587772
  Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M doc/TRANSLATORS

  Log Message:
  -----------
  doc/TRANSLATORS: added myself to the list

was "only" in CONTRIBUTORS before


  Commit: d5e2d39ad962c522ced0091ed062118e32dfbbea
      https://github.com/qgis/Quantum-GIS/commit/d5e2d39ad962c522ced0091ed062118e32dfbbea
  Author: Werner Macho <werner.macho at gmail.com>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M cmake/FindQsci.py
    M doc/TRANSLATORS
    M i18n/qgis_sl_SI.ts
    M src/app/qgsdecorationgriddialog.cpp

  Log Message:
  -----------
  Merge pull request #792 from lynxlynxlynx/master

Translation update, combobox fix and triviality


Compare: https://github.com/qgis/Quantum-GIS/compare/1a18fba2f81c...d5e2d39ad962