Merge with feature

--HG-- branch : develop
2015-09-22 16:12:06 +03:00 · 2015-09-22 16:12:06 +03:00 · 5df36147d3
commit 5df36147d3
parent e0cad4e732 ed373cf6c1
839 changed files with 2083611 additions and 2049830 deletions
--- a/share/translations/measurements_p0.ts
+++ b/share/translations/measurements_p0.ts
--- a/share/translations/measurements_p0_cs_CZ.ts
+++ b/share/translations/measurements_p0_cs_CZ.ts
--- a/share/translations/measurements_p0_de_DE.ts
+++ b/share/translations/measurements_p0_de_DE.ts
--- a/share/translations/measurements_p0_en_US.ts
+++ b/share/translations/measurements_p0_en_US.ts
--- a/share/translations/measurements_p0_es_ES.ts
+++ b/share/translations/measurements_p0_es_ES.ts
--- a/share/translations/measurements_p0_fi_FI.ts
+++ b/share/translations/measurements_p0_fi_FI.ts
--- a/share/translations/measurements_p0_fr_FR.ts
+++ b/share/translations/measurements_p0_fr_FR.ts
--- a/share/translations/measurements_p0_he_IL.ts
+++ b/share/translations/measurements_p0_he_IL.ts
--- a/share/translations/measurements_p0_id_ID.ts
+++ b/share/translations/measurements_p0_id_ID.ts
--- a/share/translations/measurements_p0_it_IT.ts
+++ b/share/translations/measurements_p0_it_IT.ts
--- a/share/translations/measurements_p0_nl_NL.ts
+++ b/share/translations/measurements_p0_nl_NL.ts
--- a/share/translations/measurements_p0_ru_RU.ts
+++ b/share/translations/measurements_p0_ru_RU.ts
--- a/share/translations/measurements_p0_uk_UA.ts
+++ b/share/translations/measurements_p0_uk_UA.ts
--- a/share/translations/measurements_p1.ts
+++ b/share/translations/measurements_p1.ts
--- a/share/translations/measurements_p10.ts
+++ b/share/translations/measurements_p10.ts
--- a/share/translations/measurements_p10_cs_CZ.ts
+++ b/share/translations/measurements_p10_cs_CZ.ts
--- a/share/translations/measurements_p10_de_DE.ts
+++ b/share/translations/measurements_p10_de_DE.ts
--- a/share/translations/measurements_p10_en_US.ts
+++ b/share/translations/measurements_p10_en_US.ts
--- a/share/translations/measurements_p10_es_ES.ts
+++ b/share/translations/measurements_p10_es_ES.ts
--- a/share/translations/measurements_p10_fi_FI.ts
+++ b/share/translations/measurements_p10_fi_FI.ts
--- a/share/translations/measurements_p10_fr_FR.ts
+++ b/share/translations/measurements_p10_fr_FR.ts
--- a/share/translations/measurements_p10_he_IL.ts
+++ b/share/translations/measurements_p10_he_IL.ts
--- a/share/translations/measurements_p10_id_ID.ts
+++ b/share/translations/measurements_p10_id_ID.ts
--- a/share/translations/measurements_p10_it_IT.ts
+++ b/share/translations/measurements_p10_it_IT.ts
--- a/share/translations/measurements_p10_nl_NL.ts
+++ b/share/translations/measurements_p10_nl_NL.ts
--- a/share/translations/measurements_p10_ru_RU.ts
+++ b/share/translations/measurements_p10_ru_RU.ts
--- a/share/translations/measurements_p10_uk_UA.ts
+++ b/share/translations/measurements_p10_uk_UA.ts
--- a/share/translations/measurements_p11.ts
+++ b/share/translations/measurements_p11.ts
--- a/share/translations/measurements_p11_cs_CZ.ts
+++ b/share/translations/measurements_p11_cs_CZ.ts
--- a/share/translations/measurements_p11_de_DE.ts
+++ b/share/translations/measurements_p11_de_DE.ts
--- a/share/translations/measurements_p11_en_US.ts
+++ b/share/translations/measurements_p11_en_US.ts
--- a/share/translations/measurements_p11_es_ES.ts
+++ b/share/translations/measurements_p11_es_ES.ts
--- a/share/translations/measurements_p11_fi_FI.ts
+++ b/share/translations/measurements_p11_fi_FI.ts
--- a/share/translations/measurements_p11_fr_FR.ts
+++ b/share/translations/measurements_p11_fr_FR.ts
--- a/share/translations/measurements_p11_he_IL.ts
+++ b/share/translations/measurements_p11_he_IL.ts
--- a/share/translations/measurements_p11_id_ID.ts
+++ b/share/translations/measurements_p11_id_ID.ts
--- a/share/translations/measurements_p11_it_IT.ts
+++ b/share/translations/measurements_p11_it_IT.ts
--- a/share/translations/measurements_p11_nl_NL.ts
+++ b/share/translations/measurements_p11_nl_NL.ts
--- a/share/translations/measurements_p11_ru_RU.ts
+++ b/share/translations/measurements_p11_ru_RU.ts
--- a/share/translations/measurements_p11_uk_UA.ts
+++ b/share/translations/measurements_p11_uk_UA.ts
--- a/share/translations/measurements_p12.ts
+++ b/share/translations/measurements_p12.ts
--- a/share/translations/measurements_p12_cs_CZ.ts
+++ b/share/translations/measurements_p12_cs_CZ.ts
--- a/share/translations/measurements_p12_de_DE.ts
+++ b/share/translations/measurements_p12_de_DE.ts
--- a/share/translations/measurements_p12_en_US.ts
+++ b/share/translations/measurements_p12_en_US.ts
--- a/share/translations/measurements_p12_es_ES.ts
+++ b/share/translations/measurements_p12_es_ES.ts
--- a/share/translations/measurements_p12_fi_FI.ts
+++ b/share/translations/measurements_p12_fi_FI.ts
--- a/share/translations/measurements_p12_fr_FR.ts
+++ b/share/translations/measurements_p12_fr_FR.ts
--- a/share/translations/measurements_p12_he_IL.ts
+++ b/share/translations/measurements_p12_he_IL.ts
--- a/share/translations/measurements_p12_id_ID.ts
+++ b/share/translations/measurements_p12_id_ID.ts
--- a/share/translations/measurements_p12_it_IT.ts
+++ b/share/translations/measurements_p12_it_IT.ts
--- a/share/translations/measurements_p12_nl_NL.ts
+++ b/share/translations/measurements_p12_nl_NL.ts
--- a/share/translations/measurements_p12_ru_RU.ts
+++ b/share/translations/measurements_p12_ru_RU.ts
--- a/share/translations/measurements_p12_uk_UA.ts
+++ b/share/translations/measurements_p12_uk_UA.ts
--- a/share/translations/measurements_p13.ts
+++ b/share/translations/measurements_p13.ts
--- a/share/translations/measurements_p13_cs_CZ.ts
+++ b/share/translations/measurements_p13_cs_CZ.ts
--- a/share/translations/measurements_p13_de_DE.ts
+++ b/share/translations/measurements_p13_de_DE.ts
--- a/share/translations/measurements_p13_en_US.ts
+++ b/share/translations/measurements_p13_en_US.ts
--- a/share/translations/measurements_p13_es_ES.ts
+++ b/share/translations/measurements_p13_es_ES.ts
--- a/share/translations/measurements_p13_fi_FI.ts
+++ b/share/translations/measurements_p13_fi_FI.ts
--- a/share/translations/measurements_p13_fr_FR.ts
+++ b/share/translations/measurements_p13_fr_FR.ts
--- a/share/translations/measurements_p13_he_IL.ts
+++ b/share/translations/measurements_p13_he_IL.ts
--- a/share/translations/measurements_p13_id_ID.ts
+++ b/share/translations/measurements_p13_id_ID.ts
--- a/share/translations/measurements_p13_it_IT.ts
+++ b/share/translations/measurements_p13_it_IT.ts
--- a/share/translations/measurements_p13_nl_NL.ts
+++ b/share/translations/measurements_p13_nl_NL.ts
--- a/share/translations/measurements_p13_ru_RU.ts
+++ b/share/translations/measurements_p13_ru_RU.ts
--- a/share/translations/measurements_p13_uk_UA.ts
+++ b/share/translations/measurements_p13_uk_UA.ts
--- a/share/translations/measurements_p14.ts
+++ b/share/translations/measurements_p14.ts
--- a/share/translations/measurements_p14_cs_CZ.ts
+++ b/share/translations/measurements_p14_cs_CZ.ts
--- a/share/translations/measurements_p14_de_DE.ts
+++ b/share/translations/measurements_p14_de_DE.ts
--- a/share/translations/measurements_p14_en_US.ts
+++ b/share/translations/measurements_p14_en_US.ts
--- a/share/translations/measurements_p14_es_ES.ts
+++ b/share/translations/measurements_p14_es_ES.ts
--- a/share/translations/measurements_p14_fi_FI.ts
+++ b/share/translations/measurements_p14_fi_FI.ts
--- a/share/translations/measurements_p14_fr_FR.ts
+++ b/share/translations/measurements_p14_fr_FR.ts
--- a/share/translations/measurements_p14_he_IL.ts
+++ b/share/translations/measurements_p14_he_IL.ts
--- a/share/translations/measurements_p14_id_ID.ts
+++ b/share/translations/measurements_p14_id_ID.ts
--- a/share/translations/measurements_p14_it_IT.ts
+++ b/share/translations/measurements_p14_it_IT.ts
--- a/share/translations/measurements_p14_nl_NL.ts
+++ b/share/translations/measurements_p14_nl_NL.ts
--- a/share/translations/measurements_p14_ru_RU.ts
+++ b/share/translations/measurements_p14_ru_RU.ts
--- a/share/translations/measurements_p14_uk_UA.ts
+++ b/share/translations/measurements_p14_uk_UA.ts
--- a/share/translations/measurements_p15.ts
+++ b/share/translations/measurements_p15.ts
--- a/share/translations/measurements_p15_cs_CZ.ts
+++ b/share/translations/measurements_p15_cs_CZ.ts
--- a/share/translations/measurements_p15_de_DE.ts
+++ b/share/translations/measurements_p15_de_DE.ts
--- a/share/translations/measurements_p15_en_US.ts
+++ b/share/translations/measurements_p15_en_US.ts
--- a/share/translations/measurements_p15_es_ES.ts
+++ b/share/translations/measurements_p15_es_ES.ts
--- a/share/translations/measurements_p15_fi_FI.ts
+++ b/share/translations/measurements_p15_fi_FI.ts
--- a/share/translations/measurements_p15_fr_FR.ts
+++ b/share/translations/measurements_p15_fr_FR.ts
--- a/share/translations/measurements_p15_he_IL.ts
+++ b/share/translations/measurements_p15_he_IL.ts
--- a/share/translations/measurements_p15_id_ID.ts
+++ b/share/translations/measurements_p15_id_ID.ts
--- a/share/translations/measurements_p15_it_IT.ts
+++ b/share/translations/measurements_p15_it_IT.ts
--- a/share/translations/measurements_p15_nl_NL.ts
+++ b/share/translations/measurements_p15_nl_NL.ts
--- a/share/translations/measurements_p15_ru_RU.ts
+++ b/share/translations/measurements_p15_ru_RU.ts
--- a/share/translations/measurements_p15_uk_UA.ts
+++ b/share/translations/measurements_p15_uk_UA.ts
--- a/share/translations/measurements_p16.ts
+++ b/share/translations/measurements_p16.ts
--- a/share/translations/measurements_p16_cs_CZ.ts
+++ b/share/translations/measurements_p16_cs_CZ.ts
--- a/share/translations/measurements_p16_de_DE.ts
+++ b/share/translations/measurements_p16_de_DE.ts
--- a/share/translations/measurements_p16_en_US.ts
+++ b/share/translations/measurements_p16_en_US.ts
--- a/share/translations/measurements_p16_es_ES.ts
+++ b/share/translations/measurements_p16_es_ES.ts
--- a/share/translations/measurements_p16_fi_FI.ts
+++ b/share/translations/measurements_p16_fi_FI.ts
--- a/share/translations/measurements_p16_fr_FR.ts
+++ b/share/translations/measurements_p16_fr_FR.ts
--- a/share/translations/measurements_p16_he_IL.ts
+++ b/share/translations/measurements_p16_he_IL.ts
--- a/Show More
+++ b/Show More