Skip to content
Permalink
Browse files
handle protected inheritance, rename ui class to avoid class name col…
…lision
  • Loading branch information
3nids committed May 31, 2017
1 parent 625cfc7 commit 2148fa9287b16e3ddfd5558e36e319c884add53d
Showing with 213 additions and 210 deletions.
  1. +5 −5 i18n/qgis_ar.ts
  2. +5 −5 i18n/qgis_bg.ts
  3. +5 −5 i18n/qgis_bs.ts
  4. +5 −5 i18n/qgis_ca.ts
  5. +5 −5 i18n/qgis_cs.ts
  6. +5 −5 i18n/qgis_da.ts
  7. +5 −5 i18n/qgis_de.ts
  8. +5 −5 i18n/qgis_el.ts
  9. +5 −5 i18n/qgis_en.ts
  10. +5 −5 i18n/qgis_es.ts
  11. +5 −5 i18n/qgis_et.ts
  12. +5 −5 i18n/qgis_eu.ts
  13. +5 −5 i18n/qgis_fi.ts
  14. +5 −5 i18n/qgis_fr.ts
  15. +5 −5 i18n/qgis_gl.ts
  16. +5 −5 i18n/qgis_hi.ts
  17. +5 −5 i18n/qgis_hr.ts
  18. +5 −5 i18n/qgis_hu.ts
  19. +5 −5 i18n/qgis_id.ts
  20. +5 −5 i18n/qgis_it.ts
  21. +5 −5 i18n/qgis_ja.ts
  22. +5 −5 i18n/qgis_km.ts
  23. +5 −5 i18n/qgis_ko.ts
  24. +5 −5 i18n/qgis_lt.ts
  25. +5 −5 i18n/qgis_lv.ts
  26. +5 −5 i18n/qgis_nb.ts
  27. +5 −5 i18n/qgis_nl.ts
  28. +5 −5 i18n/qgis_pl.ts
  29. +5 −5 i18n/qgis_pt_BR.ts
  30. +5 −5 i18n/qgis_pt_PT.ts
  31. +5 −5 i18n/qgis_ro.ts
  32. +5 −5 i18n/qgis_ru.ts
  33. +5 −5 i18n/qgis_sk.ts
  34. +5 −5 i18n/qgis_sl.ts
  35. +5 −5 i18n/qgis_sv.ts
  36. +5 −5 i18n/qgis_tr.ts
  37. +5 −5 i18n/qgis_vi.ts
  38. +5 −5 i18n/qgis_zh-Hans.ts
  39. +5 −5 i18n/qgis_zh-Hant.ts
  40. +6 −2 python/gui/layertree/qgslayertreeembeddedconfigwidget.sip
  41. +0 −1 python/gui/raster/qgsrasterhistogramwidget.sip
  42. +4 −3 python/gui/raster/qgssinglebandpseudocolorrendererwidget.sip
  43. +2 −2 scripts/sipify.pl
  44. +2 −2 src/gui/layertree/qgslayertreeembeddedconfigwidget.h
  45. +1 −1 src/gui/raster/qgsrasterhistogramwidget.h
  46. +1 −2 src/gui/raster/qgssinglebandpseudocolorrendererwidget.h
  47. +2 −2 src/ui/{qgslayertreeembeddedconfigwidget.ui → qgslayertreeembeddedconfigwidgetbase.ui}
@@ -58353,27 +58353,27 @@ This may be a problem in your network connection or at the WMS server.</source>
<context>
<name>QgsLayerTreeEmbeddedConfigWidget</name>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="14"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="14"/>
<source>Form</source>
<translation>شكل</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="20"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="20"/>
<source>Available widgets</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="27"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="27"/>
<source>Used widgets</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="52"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="52"/>
<source>-&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="63"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="63"/>
<source>&lt;-</source>
<translation type="unfinished"></translation>
</message>
@@ -58389,27 +58389,27 @@ This may be a problem in your network connection or at the WMS server.</source>
<context>
<name>QgsLayerTreeEmbeddedConfigWidget</name>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="14"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="14"/>
<source>Form</source>
<translation>Форма</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="20"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="20"/>
<source>Available widgets</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="27"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="27"/>
<source>Used widgets</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="52"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="52"/>
<source>-&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="63"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="63"/>
<source>&lt;-</source>
<translation type="unfinished"></translation>
</message>
@@ -59037,27 +59037,27 @@ Ovo može biti problem do vaše mrežne konekcije ili na WMS serveru.</numerusfo
<context>
<name>QgsLayerTreeEmbeddedConfigWidget</name>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="14"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="14"/>
<source>Form</source>
<translation>Forma</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="20"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="20"/>
<source>Available widgets</source>
<translation>Dostupni widgeti</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="27"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="27"/>
<source>Used widgets</source>
<translation>Korišteni widgeti</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="52"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="52"/>
<source>-&gt;</source>
<translation>-&gt;</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="63"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="63"/>
<source>&lt;-</source>
<translation>&lt;-</translation>
</message>
@@ -58450,27 +58450,27 @@ This may be a problem in your network connection or at the WMS server.</source>
<context>
<name>QgsLayerTreeEmbeddedConfigWidget</name>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="14"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="14"/>
<source>Form</source>
<translation>Formulari</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="20"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="20"/>
<source>Available widgets</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="27"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="27"/>
<source>Used widgets</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="52"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="52"/>
<source>-&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="63"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="63"/>
<source>&lt;-</source>
<translation type="unfinished"></translation>
</message>
@@ -58428,27 +58428,27 @@ To může být problém vašeho síťového nastavení nebo WMS serveru.</numeru
<context>
<name>QgsLayerTreeEmbeddedConfigWidget</name>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="14"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="14"/>
<source>Form</source>
<translation>Formulář</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="20"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="20"/>
<source>Available widgets</source>
<translation>Dostupné widgety</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="27"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="27"/>
<source>Used widgets</source>
<translation>Použité widgety</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="52"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="52"/>
<source>-&gt;</source>
<translation>-&gt;</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="63"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="63"/>
<source>&lt;-</source>
<translation>&lt;-</translation>
</message>
@@ -58777,27 +58777,27 @@ Der er måske et problem med din netværksforbindelse, eller på WMS-serveren.</
<context>
<name>QgsLayerTreeEmbeddedConfigWidget</name>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="14"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="14"/>
<source>Form</source>
<translation>Formular</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="20"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="20"/>
<source>Available widgets</source>
<translation>Tilgængelige widgets</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="27"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="27"/>
<source>Used widgets</source>
<translation>Benyttede widgets</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="52"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="52"/>
<source>-&gt;</source>
<translation>-&gt;</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="63"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="63"/>
<source>&lt;-</source>
<translation>&lt;-</translation>
</message>
@@ -59091,27 +59091,27 @@ Die könnte auf ein Netzwerkproblem oder ein Problem des WMS-Server hindeuten.</
<context>
<name>QgsLayerTreeEmbeddedConfigWidget</name>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="14"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="14"/>
<source>Form</source>
<translation>Form</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="20"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="20"/>
<source>Available widgets</source>
<translation>Verfügbare Element</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="27"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="27"/>
<source>Used widgets</source>
<translation>Verwendete Elemente</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="52"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="52"/>
<source>-&gt;</source>
<translation>-&gt;</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="63"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="63"/>
<source>&lt;-</source>
<translation>&lt;-</translation>
</message>
@@ -58305,27 +58305,27 @@ This may be a problem in your network connection or at the WMS server.</source>
<context>
<name>QgsLayerTreeEmbeddedConfigWidget</name>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="14"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="14"/>
<source>Form</source>
<translation>Φόρμα</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="20"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="20"/>
<source>Available widgets</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="27"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="27"/>
<source>Used widgets</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="52"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="52"/>
<source>-&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="63"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="63"/>
<source>&lt;-</source>
<translation type="unfinished"></translation>
</message>
@@ -59013,27 +59013,27 @@ This may be a problem in your network connection or at the WMS server.</numerusf
<context>
<name>QgsLayerTreeEmbeddedConfigWidget</name>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="14"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="14"/>
<source>Form</source>
<translation>Form</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="20"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="20"/>
<source>Available widgets</source>
<translation>Available widgets</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="27"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="27"/>
<source>Used widgets</source>
<translation>Used widgets</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="52"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="52"/>
<source>-&gt;</source>
<translation>-&gt;</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="63"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="63"/>
<source>&lt;-</source>
<translation>&lt;-</translation>
</message>
@@ -58668,27 +58668,27 @@ Puede haber un problema en su conexión a la red o en el servidor WMS.</numerusf
<context>
<name>QgsLayerTreeEmbeddedConfigWidget</name>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="14"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="14"/>
<source>Form</source>
<translation>Formulario</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="20"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="20"/>
<source>Available widgets</source>
<translation>Controles disponibles</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="27"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="27"/>
<source>Used widgets</source>
<translation>Controles usados</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="52"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="52"/>
<source>-&gt;</source>
<translation>-&gt;</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="63"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="63"/>
<source>&lt;-</source>
<translation>&lt;-</translation>
</message>
@@ -58423,27 +58423,27 @@ Kaardus</translation>
<context>
<name>QgsLayerTreeEmbeddedConfigWidget</name>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="14"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="14"/>
<source>Form</source>
<translation>Vorm</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="20"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="20"/>
<source>Available widgets</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="27"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="27"/>
<source>Used widgets</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="52"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="52"/>
<source>-&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="63"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="63"/>
<source>&lt;-</source>
<translation type="unfinished"></translation>
</message>
@@ -58974,27 +58974,27 @@ Zure sare-konexioaren arazo bat izan daiteke, edo WMS zerbitzariarena.</numerusf
<context>
<name>QgsLayerTreeEmbeddedConfigWidget</name>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="14"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="14"/>
<source>Form</source>
<translation>Inprimakia</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="20"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="20"/>
<source>Available widgets</source>
<translation>Widget erabilgarriak</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="27"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="27"/>
<source>Used widgets</source>
<translation>Erabilitako widgetak</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="52"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="52"/>
<source>-&gt;</source>
<translation>-&gt;</translation>
</message>
<message>
<location filename="../src/ui/qgslayertreeembeddedconfigwidget.ui" line="63"/>
<location filename="../src/ui/qgslayertreeembeddedconfigwidgetbase.ui" line="63"/>
<source>&lt;-</source>
<translation>&lt;-</translation>
</message>

0 comments on commit 2148fa9

Please sign in to comment.