[QGIS Commit] [qgis/QGIS] 860a23: Fix #8769 - Missing flags for 3 locales

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/QGIS
  Commit: 860a2382b20e9f8542499e97319f7d4a860cdcfd
      https://github.com/qgis/QGIS/commit/860a2382b20e9f8542499e97319f7d4a860cdcfd
  Author: ahuarte47 <ahuarte47 at yahoo.es>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    R images/flags/sr.png
    A images/flags/sr_Cyrl.png
    A images/flags/sr_Latn.png
    M images/images.qrc
    M src/app/qgsoptions.cpp

  Log Message:
  -----------
  Fix #8769 - Missing flags for 3 locales

Fixed the images related to servian translations, ignore the 'en'
translation (overrided for 'en_US') in the load of the QsgOptions
dialog.


  Commit: f4e0c83c6e3f839e368d3bf2a0fdf3ac546134f7
      https://github.com/qgis/QGIS/commit/f4e0c83c6e3f839e368d3bf2a0fdf3ac546134f7
  Author: Werner Macho <werner.macho at gmail.com>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

  Changed paths:
    R images/flags/sr.png
    A images/flags/sr_Cyrl.png
    A images/flags/sr_Latn.png
    M images/images.qrc
    M src/app/qgsoptions.cpp

  Log Message:
  -----------
  Merge pull request #926 from ahuarte47/Issue_8769

Fix #8769 - Missing flags for 3 locales


Compare: https://github.com/qgis/QGIS/compare/572bda85ab45...f4e0c83c6e3f