Changes: update widgetsgallery translations

RevBy: TrustMe

7 files changed, 1618 insertions, 1491 deletions

diff --git a/demos/widgetsgallery/translations/widgetsgallery_ar.ts b/demos/widgetsgallery/translations/widgetsgallery_ar.ts
index cd5d0df9..c0449c14 100644
--- a/demos/widgetsgallery/translations/widgetsgallery_ar.ts
+++ b/demos/widgetsgallery/translations/widgetsgallery_ar.ts
@@ -4,217 +4,217 @@
 <context>
     <name></name>
     <message id="xx_wg_categories_application_view">
-        <location filename="../mainpage.cpp" line="86"/>
+        <location filename="../mainpage.cpp" line="92"/>
         <source>Application View</source>
         <translation>طلب عرض</translation>
     </message>
     <message id="xx_wg_application_view_view_menu">
-        <location filename="../mainpage.cpp" line="88"/>
+        <location filename="../mainpage.cpp" line="94"/>
         <source>Application Menu</source>
         <translation>تطبيق قائمة</translation>
     </message>
     <message id="xx_wg_application_view_display_modes">
-        <location filename="../mainpage.cpp" line="90"/>
+        <location filename="../mainpage.cpp" line="96"/>
         <source>Display Modes</source>
         <translation>طريقة العرض</translation>
     </message>
     <message id="xx_wg_application_view_toolbar_incl_tab_bar">
-        <location filename="../mainpage.cpp" line="92"/>
+        <location filename="../mainpage.cpp" line="98"/>
         <source>Toolbar (including Tab Bar)</source>
         <translation>شريط الأدوات (بما في ذلك علامة التبويب بار)</translation>
     </message>
     <message id="xx_wg_categories_simple_widgets">
-        <location filename="../mainpage.cpp" line="96"/>
+        <location filename="../mainpage.cpp" line="102"/>
         <source>Simple Widgets</source>
         <translation>بسيطة القطع</translation>
     </message>
     <message id="xx_wg_simple_widgets_labels">
-        <location filename="../mainpage.cpp" line="98"/>
+        <location filename="../mainpage.cpp" line="104"/>
         <source>Labels</source>
         <translation>التسميات</translation>
     </message>
     <message id="xx_wg_simple_widgets_image">
-        <location filename="../mainpage.cpp" line="100"/>
+        <location filename="../mainpage.cpp" line="106"/>
         <source>Image</source>
         <translation>صورة</translation>
     </message>
     <message id="xx_wg_simple_widgets_progress_bar">
-        <location filename="../mainpage.cpp" line="102"/>
+        <location filename="../mainpage.cpp" line="108"/>
         <source>Progress Bar</source>
         <translation>التقدم بار</translation>
     </message>
     <message id="xx_wg_simple_widgets_container">
-        <location filename="../mainpage.cpp" line="104"/>
+        <location filename="../mainpage.cpp" line="110"/>
         <source>Container</source>
         <translation>حاوية</translation>
     </message>
     <message id="xx_wg_simple_widgets_spinner">
-        <location filename="../mainpage.cpp" line="106"/>
+        <location filename="../mainpage.cpp" line="112"/>
         <source>Spinner</source>
         <translation>الغزال</translation>
     </message>
     <message id="xx_wg_categories_buttons">
-        <location filename="../mainpage.cpp" line="109"/>
+        <location filename="../mainpage.cpp" line="115"/>
         <source>Buttons</source>
         <translation>أزرار</translation>
     </message>
     <message id="xx_wg_buttons_push_button">
-        <location filename="../mainpage.cpp" line="111"/>
+        <location filename="../mainpage.cpp" line="117"/>
         <source>Push Button</source>
         <translation>زر</translation>
     </message>
     <message id="xx_wg_buttons_icon_button">
-        <location filename="../mainpage.cpp" line="113"/>
+        <location filename="../mainpage.cpp" line="119"/>
         <source>Icon Button</source>
         <translation>رمز زر</translation>
     </message>
     <message id="xx_wg_buttons_switch">
-        <location filename="../mainpage.cpp" line="115"/>
+        <location filename="../mainpage.cpp" line="121"/>
         <source>Switch</source>
         <translation>تحول</translation>
     </message>
     <message id="xx_wg_buttons_checkbox">
-        <location filename="../mainpage.cpp" line="117"/>
+        <location filename="../mainpage.cpp" line="123"/>
         <source>Checkbox</source>
         <translation>مربع</translation>
     </message>
     <message id="xx_wg_buttons_buttongroup">
-        <location filename="../mainpage.cpp" line="119"/>
+        <location filename="../mainpage.cpp" line="125"/>
         <source>Button Group</source>
         <translation>زر مجموعة</translation>
     </message>
     <message id="xx_wg_categories_dialogs_and_banners">
-        <location filename="../mainpage.cpp" line="122"/>
+        <location filename="../mainpage.cpp" line="128"/>
         <source>Dialogs and Banners</source>
         <translation>الحوارات والرايات</translation>
     </message>
     <message id="xx_wg_dialogs_and_banners_single_selection_dialog">
-        <location filename="../mainpage.cpp" line="124"/>
+        <location filename="../mainpage.cpp" line="130"/>
         <source>Single Selection Dialog</source>
         <translation>اختيار واحد حوار</translation>
     </message>
     <message id="xx_wg_dialogs_and_banners_query_dialog">
-        <location filename="../mainpage.cpp" line="126"/>
+        <location filename="../mainpage.cpp" line="132"/>
         <source>Query Dialog</source>
         <translation>استعلام حوار</translation>
     </message>
     <message id="xx_wg_dialogs_and_banners_banner">
-        <location filename="../mainpage.cpp" line="128"/>
+        <location filename="../mainpage.cpp" line="134"/>
         <source>Banner</source>
         <translation>راية</translation>
     </message>
     <message id="xx_wg_categories_lists_grids_and_popups">
-        <location filename="../mainpage.cpp" line="131"/>
+        <location filename="../mainpage.cpp" line="137"/>
         <source>Lists, Grids and Popups</source>
         <translation>قوائم وشبكات وبالنوافذ</translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_list">
-        <location filename="../mainpage.cpp" line="133"/>
+        <location filename="../mainpage.cpp" line="139"/>
         <source>List</source>
         <translation>قائمة</translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_grid">
-        <location filename="../mainpage.cpp" line="135"/>
+        <location filename="../mainpage.cpp" line="141"/>
         <source>Grid</source>
         <translation>شبكة</translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_object_menu">
-        <location filename="../mainpage.cpp" line="137"/>
+        <location filename="../mainpage.cpp" line="143"/>
         <source>Object Menu</source>
         <translation>كائن قائمة</translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_combobox">
-        <location filename="../mainpage.cpp" line="139"/>
+        <location filename="../mainpage.cpp" line="145"/>
         <source>ComboBox</source>
         <translation>منسدل</translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_contentitems">
-        <location filename="../mainpage.cpp" line="141"/>
+        <location filename="../mainpage.cpp" line="147"/>
         <source>ContentItems</source>
         <translation>بنود المحتوى</translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_bubble">
-        <location filename="../mainpage.cpp" line="143"/>
+        <location filename="../mainpage.cpp" line="149"/>
         <source>Speech bubble</source>
         <translation>كلمة فقاعة</translation>
     </message>
     <message id="xx_wg_categories_user_input">
-        <location filename="../mainpage.cpp" line="146"/>
+        <location filename="../mainpage.cpp" line="152"/>
         <source>User Input</source>
         <translation>مستخدم الإدخال</translation>
     </message>
     <message id="xx_wg_user_input_text_entries">
-        <location filename="../mainpage.cpp" line="148"/>
+        <location filename="../mainpage.cpp" line="154"/>
         <source>Text Entries</source>
         <translation>نص مداخل</translation>
     </message>
     <message id="xx_wg_user_input_slider">
-        <location filename="../mainpage.cpp" line="150"/>
+        <location filename="../mainpage.cpp" line="156"/>
         <source>Slider</source>
         <translation>المتزلج</translation>
     </message>
     <message id="xx_wg_user_input_input_feedback">
-        <location filename="../mainpage.cpp" line="152"/>
+        <location filename="../mainpage.cpp" line="158"/>
         <source>Input Feedback</source>
         <translation>إدخال تعليقات</translation>
     </message>
     <message id="xx_application_title">
-        <location filename="../mainpage.cpp" line="337"/>
+        <location filename="../mainpage.cpp" line="346"/>
         <source>Widgets Gallery</source>
         <translation>معرض الحاجيات</translation>
     </message>
     <message id="xx_mainpage_themes">
-        <location filename="../mainpage.cpp" line="343"/>
+        <location filename="../mainpage.cpp" line="352"/>
         <source>Themes</source>
         <translation>المواضيع</translation>
     </message>
     <message id="xx_mainpage_orientation">
-        <location filename="../mainpage.cpp" line="345"/>
+        <location filename="../mainpage.cpp" line="354"/>
         <source>Orientation</source>
         <translation>اتجاه</translation>
     </message>
     <message id="xx_mainpage_toggle_fps">
-        <location filename="../mainpage.cpp" line="347"/>
+        <location filename="../mainpage.cpp" line="356"/>
         <source>Toggle FPS</source>
         <translation>تبديل في الثانية</translation>
     </message>
     <message id="xx_mainpage_language_settings">
-        <location filename="../mainpage.cpp" line="349"/>
+        <location filename="../mainpage.cpp" line="358"/>
         <source>Language Settings</source>
         <translation>إعدادات اللغة</translation>
     </message>
     <message id="xx_apporientation_auto">
-        <location filename="../mainpage.cpp" line="562"/>
+        <location filename="../mainpage.cpp" line="570"/>
         <source>Automatic</source>
         <translation>التلقائي</translation>
     </message>
     <message id="xx_apporientation_portrait">
-        <location filename="../mainpage.cpp" line="570"/>
+        <location filename="../mainpage.cpp" line="578"/>
         <source>Portrait</source>
         <translation>بورتريه</translation>
     </message>
     <message id="xx_apporientation_landscape">
-        <location filename="../mainpage.cpp" line="578"/>
+        <location filename="../mainpage.cpp" line="586"/>
         <source>Landscape</source>
         <translation>المشهد</translation>
     </message>
     <message id="xx_apporientation_angle0">
-        <location filename="../mainpage.cpp" line="586"/>
+        <location filename="../mainpage.cpp" line="594"/>
         <source>0 degrees</source>
         <translation>0 درجة</translation>
     </message>
     <message id="xx_apporientation_angle90">
-        <location filename="../mainpage.cpp" line="594"/>
+        <location filename="../mainpage.cpp" line="602"/>
         <source>90 degrees clockwise</source>
         <translation>90 درجة في اتجاه عقارب الساعة</translation>
     </message>
     <message id="xx_apporientation_angle180">
-        <location filename="../mainpage.cpp" line="602"/>
+        <location filename="../mainpage.cpp" line="610"/>
         <source>180 degrees clockwise</source>
         <translation>180 درجة في اتجاه عقارب الساعة</translation>
     </message>
     <message id="xx_apporientation_angle270">
-        <location filename="../mainpage.cpp" line="610"/>
+        <location filename="../mainpage.cpp" line="618"/>
         <source>270 degrees clockwise</source>
         <translation>270 درجة في اتجاه عقارب الساعة</translation>
     </message>
@@ -292,94 +292,87 @@ All Labels can be aligned left, right or center and will be automatically trunca
         <translation>حدد الطابعة</translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_stacked_dialogs">
-        <location filename="../singleselectiondialogspage.cpp" line="257"/>
+        <location filename="../singleselectiondialogspage.cpp" line="259"/>
         <source>Stacked Dialogs</source>
         <translation>مكدسة الحوارات</translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_system_dialog">
-        <location filename="../singleselectiondialogspage.cpp" line="259"/>
+        <location filename="../singleselectiondialogspage.cpp" line="261"/>
         <source>System Dialog</source>
         <translation>نظام حوار</translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_system_modal_dialog">
-        <location filename="../singleselectiondialogspage.cpp" line="261"/>
+        <location filename="../singleselectiondialogspage.cpp" line="263"/>
         <source>System Modal Dialog</source>
         <translation>نظام حوار مشروط</translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_dialog_with_progress_indicator">
-        <location filename="../singleselectiondialogspage.cpp" line="263"/>
+        <location filename="../singleselectiondialogspage.cpp" line="265"/>
         <source>Dialog with Progress Indicator</source>
         <translation>الحوار مع مؤشر التقدم</translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_message_box">
-        <location filename="../singleselectiondialogspage.cpp" line="265"/>
+        <location filename="../singleselectiondialogspage.cpp" line="267"/>
         <source>Message Box</source>
         <translation>رسالة الإطار</translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_button">
-        <location filename="../singleselectiondialogspage.cpp" line="126"/>
+        <location filename="../singleselectiondialogspage.cpp" line="128"/>
         <source>Click to spawn a nested dialog</source>
         <translation>انقر لتفرخ الحوار متداخلة</translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="128"/>
+        <location filename="../singleselectiondialogspage.cpp" line="130"/>
         <source>Stacked dialogs</source>
         <translation>حوارات مرصوف</translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_open_nested_messagebox">
-        <location filename="../singleselectiondialogspage.cpp" line="142"/>
+        <location filename="../singleselectiondialogspage.cpp" line="144"/>
         <source>Click to open a nested message box</source>
         <translation>انقر لفتح متداخلة مربع رسالة</translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_nested_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="144"/>
+        <location filename="../singleselectiondialogspage.cpp" line="146"/>
         <source>This is a nested dialog</source>
         <translation>هذا هو الحوار متداخلة</translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_messagebox_text">
-        <location filename="../singleselectiondialogspage.cpp" line="157"/>
+        <location filename="../singleselectiondialogspage.cpp" line="159"/>
         <source>I&apos;m a nested message box</source>
         <translation>أنا متداخلة مربع رسالة</translation>
     </message>
     <message id="xx_dialogs_and_notifications_system_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="168"/>
+        <location filename="../singleselectiondialogspage.cpp" line="170"/>
         <source>System Dialog</source>
         <translation>نظام حوار</translation>
     </message>
     <message id="xx_dialogs_and_notifications_system_dialog_label">
-        <location filename="../singleselectiondialogspage.cpp" line="176"/>
-        <source>I&apos;m a system dialog.&lt;br&gt;There actually is a way around me...&lt;br&gt;You can skip me with the home button, but I&apos;ll remain&lt;br&gt;alive until you make a selection.</source>
-        <translation>انا من الحوار النظام.&lt;br&gt;وهناك في الواقع وسيلة من حولي...&lt;br&gt;يمكنك القفز لي مع زر المنزل ، ولكن ما زلت وسوف&lt;br&gt;على قيد الحياة حتى تقوم بإجراء تحديد.</translation>
+        <location filename="../singleselectiondialogspage.cpp" line="178"/>
+        <source>I&apos;m a system dialog.&lt;br&gt;You can skip me with the home button.&lt;br&gt;I&apos;ll be minimised to the task switcher&lt;br&gt;but I&apos;ll remain alive until you make a selection.</source>
+        <translation>انا من الحوار النظام.&lt;br&gt;يمكنك القفز لي مع زر المنزل.&lt;br&gt;سوف يكون الحد الأدنى الأول لهذا الجلاد مهمة&lt;br&gt;ولكن انا لا تزال على قيد الحياة حتى تقوم بإجراء تحديد</translation>
     </message>
     <message id="xx_dialogs_and_notifications_system_modal_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="191"/>
+        <location filename="../singleselectiondialogspage.cpp" line="193"/>
         <source>System Modal Dialog</source>
         <translation>نافذة حوار مشروط</translation>
     </message>
     <message id="xx_dialogs_and_notifications_system_modal_dialog_label">
-        <location filename="../singleselectiondialogspage.cpp" line="198"/>
-        <source>I&apos;m a window modal dialog.
-There&apos;s no way around me!
-Muwhahaha... [evil laugh]</source>
-        <oldsource>I&apos;m a System Modal dialog.
-There&apos;s no way around me!
-Muwhahaha... [evil laugh]</oldsource>
-        <translation>أنا نافذة حوار مشروط.
-لا توجد وسيلة من حولي!
-هاهاها... [الشر الضحك]</translation>
+        <location filename="../singleselectiondialogspage.cpp" line="200"/>
+        <source>I&apos;m a system modal dialog.&lt;br&gt;You can&apos;t skip me as I&apos;m designed for&lt;br&gt;use cases that require immediate user attention.</source>
+        <translation>ابن نظام حوار مشروط.&lt;br&gt;لا يمكنك تخطي لي وأنا مصمم لابن&lt;br&gt;الحالات التي تتطلب استخدام الفوري انتباه المستخدم.</translation>
     </message>
     <message id="xx_dialogs_and_notifications_progress_indicator">
-        <location filename="../singleselectiondialogspage.cpp" line="217"/>
+        <location filename="../singleselectiondialogspage.cpp" line="219"/>
         <source>Progress Indicator</source>
         <translation>مؤشرات التقدم</translation>
     </message>
     <message id="xx_dialogs_and_notifications_message_box_text">
-        <location filename="../singleselectiondialogspage.cpp" line="237"/>
+        <location filename="../singleselectiondialogspage.cpp" line="239"/>
         <source>Hello World!</source>
         <translation>مرحبا العالم!</translation>
     </message>
     <message id="xx_single_selection_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="251"/>
+        <location filename="../singleselectiondialogspage.cpp" line="253"/>
         <source>Single Selection Dialogs</source>
         <translation>مربعات اختيار واحدة</translation>
     </message>
@@ -434,62 +427,62 @@ Muwhahaha... [evil laugh]</oldsource>
         <translation>المحاصيل</translation>
     </message>
     <message id="xx_listpage_list_remove">
-        <location filename="../mlistpage.cpp" line="634"/>
+        <location filename="../mlistpage.cpp" line="635"/>
         <source>Remove</source>
         <translation>إزالة</translation>
     </message>
     <message id="xx_listpage_list_edit">
-        <location filename="../mlistpage.cpp" line="640"/>
+        <location filename="../mlistpage.cpp" line="641"/>
         <source>Edit</source>
         <translation>عدل</translation>
     </message>
     <message id="xx_listpage_title">
-        <location filename="../mlistpage.cpp" line="658"/>
+        <location filename="../mlistpage.cpp" line="659"/>
         <source>List</source>
         <translation>قائمة</translation>
     </message>
     <message id="xx_textentry_title">
-        <location filename="../textentrypage.cpp" line="582"/>
+        <location filename="../textentrypage.cpp" line="595"/>
         <source>Text Entries</source>
         <translation>النص مداخل</translation>
     </message>
     <message id="xx_textentry_free_text">
-        <location filename="../textentrypage.cpp" line="598"/>
+        <location filename="../textentrypage.cpp" line="611"/>
         <source>Free text:</source>
         <translation>حرر النص :</translation>
     </message>
     <message id="xx_textentry_free_text_masked">
-        <location filename="../textentrypage.cpp" line="600"/>
-        <source>Free text(masked):</source>
+        <location filename="../textentrypage.cpp" line="613"/>
+        <source>Free text (masked):</source>
         <translation>نص حر (الملثمين) :</translation>
     </message>
     <message id="xx_textentry_number_text">
-        <location filename="../textentrypage.cpp" line="602"/>
+        <location filename="../textentrypage.cpp" line="615"/>
         <source>Number text:</source>
         <translation>النص المرجعي :</translation>
     </message>
     <message id="xx_textentry_phone_number">
-        <location filename="../textentrypage.cpp" line="604"/>
+        <location filename="../textentrypage.cpp" line="617"/>
         <source>Phone number:</source>
         <translation>رقم الهاتف :</translation>
     </message>
     <message id="xx_textentry_email_text">
-        <location filename="../textentrypage.cpp" line="606"/>
+        <location filename="../textentrypage.cpp" line="619"/>
         <source>Email text:</source>
         <translation>نص البريد الالكتروني :</translation>
     </message>
     <message id="xx_textentry_url_text">
-        <location filename="../textentrypage.cpp" line="608"/>
-        <source>Url text:</source>
+        <location filename="../textentrypage.cpp" line="621"/>
+        <source>URL text:</source>
         <translation>عنوان النص :</translation>
     </message>
     <message id="xx_textentry_multiline">
-        <location filename="../textentrypage.cpp" line="610"/>
+        <location filename="../textentrypage.cpp" line="623"/>
         <source>Multiline:</source>
         <translation>متعدد :</translation>
     </message>
     <message id="xx_tooltip_entry0">
-        <location filename="../textentrypage.cpp" line="586"/>
+        <location filename="../textentrypage.cpp" line="599"/>
         <source>Enter text here</source>
         <translation>أدخل النص هنا</translation>
     </message>
@@ -521,77 +514,82 @@ Muwhahaha... [evil laugh]</oldsource>
         <translation>&lt;i&gt;الافراج عن مفتاح&lt;/i&gt; مفتاح:</translation>
     </message>
     <message id="xx_tooltip_customtoolbar1">
-        <location filename="../textentrypage.cpp" line="519"/>
+        <location filename="../textentrypage.cpp" line="539"/>
         <source>Example custom toolbar 1</source>
         <translation>مثال شريط أدوات مخصص 1</translation>
     </message>
     <message id="xx_tooltip_customtoolbar2">
-        <location filename="../textentrypage.cpp" line="532"/>
+        <location filename="../textentrypage.cpp" line="552"/>
         <source>Example custom toolbar 2</source>
         <translation>مثال شريط أدوات مخصص 2</translation>
     </message>
     <message id="xx_tooltip_entry1">
-        <location filename="../textentrypage.cpp" line="589"/>
+        <location filename="../textentrypage.cpp" line="602"/>
         <source>This tooltip is quite long and will be clipped on the display</source>
         <translation>هذا توولتيب طويلة جدا ، وسيتم قص على الشاشة</translation>
     </message>
     <message id="xx_textentry_richtext_text">
-        <location filename="../textentrypage.cpp" line="616"/>
-        <source>Rich Text:</source>
+        <location filename="../textentrypage.cpp" line="629"/>
+        <source>Rich text:</source>
         <translation>الغنية النص :</translation>
     </message>
+    <message id="xx_textentry_richtext_text_multiline">
+        <location filename="../textentrypage.cpp" line="631"/>
+        <source>Rich text (multiline):</source>
+        <translation>النص الغني (متعدد) :</translation>
+    </message>
     <message id="xx_textentry_noecho">
-        <location filename="../textentrypage.cpp" line="619"/>
-        <source>No Echo mode:</source>
+        <location filename="../textentrypage.cpp" line="634"/>
+        <source>No echo mode:</source>
         <translation>أي وضع الصدى :</translation>
     </message>
     <message id="xx_textentry_echoonedit">
-        <location filename="../textentrypage.cpp" line="622"/>
+        <location filename="../textentrypage.cpp" line="637"/>
         <source>Echo on edit:</source>
         <translation>صدى على تحرير :</translation>
     </message>
     <message id="xx_textentry_direct_input_mode">
-        <location filename="../textentrypage.cpp" line="625"/>
-        <source>Direct Input Mode:</source>
+        <location filename="../textentrypage.cpp" line="640"/>
+        <source>Direct input mode:</source>
         <translation>مباشرة وضع الإدخال :</translation>
     </message>
     <message id="xx_textentry_custom_toolbar1">
-        <location filename="../textentrypage.cpp" line="628"/>
-        <source>Custom ToolBar 1:</source>
+        <location filename="../textentrypage.cpp" line="643"/>
+        <source>Custom toolbar 1:</source>
         <translation>شريط أدوات مخصص 1:</translation>
     </message>
     <message id="xx_textentry_custom_toolbar2">
-        <location filename="../textentrypage.cpp" line="630"/>
-        <source>Custom ToolBar 2:</source>
+        <location filename="../textentrypage.cpp" line="645"/>
+        <source>Custom toolbar 2:</source>
         <translation>شريط أدوات مخصص 2:</translation>
     </message>
     <message id="xx_auto_true_entry0">
-        <location filename="../textentrypage.cpp" line="663"/>
-        <source>Auto Capitalisation is active</source>
+        <location filename="../textentrypage.cpp" line="678"/>
+        <source>Auto capitalisation is active</source>
         <translation>السيارات رسملة نشط</translation>
     </message>
     <message id="xx_auto_false_entry0">
-        <location filename="../textentrypage.cpp" line="666"/>
-        <source>No Auto Capitalisation</source>
+        <location filename="../textentrypage.cpp" line="681"/>
+        <source>No auto capitalisation</source>
         <translation>لا رسملة للسيارات</translation>
     </message>
     <message id="xx_tooltip_entry6">
-        <location filename="../textentrypage.cpp" line="595"/>
+        <location filename="../textentrypage.cpp" line="608"/>
         <source>This is a multiline text entry</source>
         <translation>هذا هو إدخال نص متعدد الأسطر</translation>
     </message>
     <message id="xx_textentry_singleselectall">
-        <location filename="../textentrypage.cpp" line="612"/>
+        <location filename="../textentrypage.cpp" line="625"/>
         <source>Singleline (selectall):</source>
         <translation>سطر واحد (حدد جميع)</translation>
     </message>
     <message id="xx_auto_capitalisation">
-        <location filename="../textentrypage.cpp" line="633"/>
+        <location filename="../textentrypage.cpp" line="648"/>
         <source>Auto capitalisation</source>
         <translation>القيمة السوقية للسيارات</translation>
     </message>
     <message id="xx_error_correction">
-        <location filename="../textentrypage.cpp" line="635"/>
+        <location filename="../textentrypage.cpp" line="650"/>
         <source>Error correction</source>
         <translation>تصحيح الخطأ</translation>
     </message>
@@ -626,17 +624,17 @@ Muwhahaha... [evil laugh]</oldsource>
         <translation>نافذة أيقونة</translation>
     </message>
     <message id="xx_popup_generic_title">
-        <location filename="../comboboxpage.cpp" line="114"/>
+        <location filename="../comboboxpage.cpp" line="117"/>
         <source>Title</source>
         <translation>العنوان</translation>
     </message>
     <message id="xx_popup_sort_descending_order">
-        <location filename="../comboboxpage.cpp" line="116"/>
+        <location filename="../comboboxpage.cpp" line="119"/>
         <source>Sort - DescendingOrder</source>
         <translation>فرز -- تنازلي</translation>
     </message>
     <message id="xx_popup_time_consuming">
-        <location filename="../comboboxpage.cpp" line="118"/>
+        <location filename="../comboboxpage.cpp" line="121"/>
         <source>Time-consuming setting</source>
         <translation>إعداد الوقت طويلا</translation>
     </message>
@@ -646,52 +644,52 @@ Muwhahaha... [evil laugh]</oldsource>
         <translation>الحاوية</translation>
     </message>
     <message id="xx_progressbar_page_title">
-        <location filename="../progressbarpage.cpp" line="89"/>
+        <location filename="../progressbarpage.cpp" line="88"/>
         <source>Progress Bar</source>
         <translation>التقدم بار</translation>
     </message>
     <message id="xx_progressbar_page_info_label">
-        <location filename="../progressbarpage.cpp" line="94"/>
+        <location filename="../progressbarpage.cpp" line="93"/>
         <source>A Progress Bar can indicate an ongoing process with either known or unknown durations.</source>
         <translation>شريط تقدم يمكن أن تشير إلى عملية مستمرة سواء مع المدد معروف أو غير معروف.</translation>
     </message>
     <message id="xx_progressindicator_unknown_duration_bar">
-        <location filename="../progressbarpage.cpp" line="98"/>
+        <location filename="../progressbarpage.cpp" line="97"/>
         <source>Installing CoolApp</source>
         <translation>المدة غير معروفة -- بار</translation>
     </message>
     <message id="xx_progressindicator_known_duration_bar">
-        <location filename="../progressbarpage.cpp" line="96"/>
+        <location filename="../progressbarpage.cpp" line="95"/>
         <source>Downloading nicepic.jpg</source>
         <translation>يعرف المدة -- بار</translation>
     </message>
     <message id="xx_toolbar_page_example1">
-        <location filename="../toolbarpage.cpp" line="220"/>
+        <location filename="../toolbarpage.cpp" line="223"/>
         <source>Example 1</source>
         <translation>المثال 1</translation>
     </message>
     <message id="xx_toolbar_page_example2">
-        <location filename="../toolbarpage.cpp" line="222"/>
+        <location filename="../toolbarpage.cpp" line="225"/>
         <source>Example 2</source>
         <translation>المثال 2</translation>
     </message>
     <message id="xx_toolbar_page_defaultview">
-        <location filename="../toolbarpage.cpp" line="224"/>
+        <location filename="../toolbarpage.cpp" line="227"/>
         <source>Default View</source>
         <translation>عرض افتراضي</translation>
     </message>
     <message id="xx_toolbar_page_tabview">
-        <location filename="../toolbarpage.cpp" line="226"/>
+        <location filename="../toolbarpage.cpp" line="229"/>
         <source>Tab View</source>
         <translation>عرض التبويب</translation>
     </message>
     <message id="xx_toolbar_page_title">
-        <location filename="../toolbarpage.cpp" line="210"/>
+        <location filename="../toolbarpage.cpp" line="213"/>
         <source>ToolBar</source>
         <translation>أداة بار</translation>
     </message>
     <message id="xx_toolbar_page_info">
-        <location filename="../toolbarpage.cpp" line="217"/>
+        <location filename="../toolbarpage.cpp" line="220"/>
         <source>&lt;b&gt;Toolbar&lt;/b&gt; acts as a container for actions. Depending upon the view attached, it either acts as a tab bar or is a container for buttons and text input field. &lt;ul&gt;&lt;li&gt;Click Menu to explore the example&lt;/li&gt;&lt;/ul&gt;</source>
         <translation>شريط الأدوات هو حاوية والتي يمكن أن تحتوي على ما يصل إلى 4 دلالات أزرار (انقر فوق القائمة → مثال 1) ، أو إدخال نص الميدان مع ما يصل الى 2 دلالات أزرار (انقر فوق القائمة → مثال 2). أنه يحتوي على الإجراءات التي تكون ذات صلة وجهة النظر ولكن لا علاقة لها أي بند من البنود الفردية عرضها مباشرة داخل منطقة محتوى.</translation>
     </message>
@@ -756,197 +754,216 @@ The primary (single short tap) action of the element should not be duplicated in
         <translation>المفضلة البومات</translation>
     </message>
     <message id="xx_displaymodes_navbarcombo">
-        <location filename="../displaymodespage.cpp" line="59"/>
+        <location filename="../displaymodespage.cpp" line="68"/>
         <source>Navigation Bar</source>
         <translation>الملاحة بار</translation>
     </message>
     <message id="xx_displaymodes_escapebtncombo">
-        <location filename="../displaymodespage.cpp" line="67"/>
+        <location filename="../displaymodespage.cpp" line="76"/>
         <source>Escape Button</source>
         <translation>الهروب زر</translation>
     </message>
     <message id="xx_displaymodes_homebtncombo">
-        <location filename="../displaymodespage.cpp" line="75"/>
+        <location filename="../displaymodespage.cpp" line="84"/>
         <source>Home Button</source>
         <translation>زر الصفحة الرئيسية</translation>
     </message>
     <message id="xx_displaymodes_page_title">
-        <location filename="../displaymodespage.cpp" line="143"/>
+        <location filename="../displaymodespage.cpp" line="152"/>
         <source>Display Modes</source>
-        <oldsource>Display Modes and Full Screen</oldsource>
         <translation>أنماط العرض وملء الشاشة</translation>
     </message>
     <message id="xx_displaymodes_display_mode">
-        <location filename="../displaymodespage.cpp" line="147"/>
+        <location filename="../displaymodespage.cpp" line="156"/>
         <source>Components&apos; display mode:</source>
         <translation>الصفحة تطبيق لوضع العرض :</translation>
     </message>
     <message id="xx_displaymodes_window_state">
-        <location filename="../displaymodespage.cpp" line="150"/>
+        <location filename="../displaymodespage.cpp" line="159"/>
         <source>Window state:</source>
         <translation>نافذة الدولة :</translation>
     </message>
     <message id="xx_displaymodes_full_screen">
-        <location filename="../displaymodespage.cpp" line="153"/>
+        <location filename="../displaymodespage.cpp" line="162"/>
         <source>Full Screen</source>
         <translation>كامل الشاشة</translation>
     </message>
     <message id="xx_displaymode_show">
-        <location filename="../displaymodespage.cpp" line="166"/>
+        <location filename="../displaymodespage.cpp" line="175"/>
         <source>Show</source>
         <translation>يظهر</translation>
     </message>
     <message id="xx_displaymode_autohide">
-        <location filename="../displaymodespage.cpp" line="168"/>
+        <location filename="../displaymodespage.cpp" line="177"/>
         <source>Auto Hide</source>
         <translation>السيارات إخفاء</translation>
     </message>
     <message id="xx_displaymode_hide">
-        <location filename="../displaymodespage.cpp" line="170"/>
+        <location filename="../displaymodespage.cpp" line="179"/>
         <source>Hide</source>
         <translation>إخفاء</translation>
     </message>
     <message id="xx_language_title">
-        <location filename="../languagepage.cpp" line="118"/>
+        <location filename="../languagepage.cpp" line="122"/>
         <source>Change Language</source>
         <translation>تغيير اللغة</translation>
     </message>
     <message id="xx_locale_none">
-        <location filename="../languagepage.cpp" line="137"/>
+        <location filename="../languagepage.cpp" line="143"/>
         <source>None</source>
         <translation>عدم وجود ترجمة</translation>
     </message>
     <message id="xx_locale_ar">
-        <location filename="../languagepage.cpp" line="142"/>
+        <location filename="../languagepage.cpp" line="148"/>
         <source>Arabic</source>
         <translation>العربية</translation>
     </message>
     <message id="xx_locale_de">
-        <location filename="../languagepage.cpp" line="147"/>
+        <location filename="../languagepage.cpp" line="153"/>
         <source>German</source>
         <translation>الألمانية</translation>
     </message>
     <message id="xx_locale_de_AT">
-        <location filename="../languagepage.cpp" line="152"/>
+        <location filename="../languagepage.cpp" line="158"/>
         <source>German (Austria)</source>
         <translation>الألمانية (النمسا)</translation>
     </message>
     <message id="xx_locale_de_CH">
-        <location filename="../languagepage.cpp" line="157"/>
+        <location filename="../languagepage.cpp" line="163"/>
         <source>German (Switzerland)</source>
         <translation>الألمانية (سويسرا)</translation>
     </message>
     <message id="xx_locale_en">
-        <location filename="../languagepage.cpp" line="162"/>
+        <location filename="../languagepage.cpp" line="168"/>
         <source>English</source>
         <translation>الإنكليزية</translation>
     </message>
     <message id="xx_locale_fi">
-        <location filename="../languagepage.cpp" line="167"/>
+        <location filename="../languagepage.cpp" line="173"/>
         <source>Finnish</source>
         <translation>الفنلندية</translation>
     </message>
     <message id="xx_locale_hi">
-        <location filename="../languagepage.cpp" line="172"/>
+        <location filename="../languagepage.cpp" line="178"/>
         <source>Hindi</source>
         <translation>الهندية</translation>
     </message>
     <message id="xx_locale_hu">
-        <location filename="../languagepage.cpp" line="177"/>
+        <location filename="../languagepage.cpp" line="183"/>
         <source>Hungarian</source>
         <translation>الهنغارية</translation>
     </message>
     <message id="xx_locale_ja">
-        <location filename="../languagepage.cpp" line="182"/>
+        <location filename="../languagepage.cpp" line="188"/>
         <source>Japanese</source>
         <translation>اليابانية</translation>
     </message>
     <message id="xx_locale_ur">
-        <location filename="../languagepage.cpp" line="187"/>
+        <location filename="../languagepage.cpp" line="193"/>
         <source>Urdu</source>
         <translation>الأردية</translation>
     </message>
     <message id="xx_locale_ur_PK">
-        <location filename="../languagepage.cpp" line="192"/>
+        <location filename="../languagepage.cpp" line="198"/>
         <source>Urdu (Pakistan)</source>
         <translation>الأوردو (باكستان)</translation>
     </message>
     <message id="xx_locale_ur_IN">
-        <location filename="../languagepage.cpp" line="197"/>
+        <location filename="../languagepage.cpp" line="203"/>
         <source>Urdu (India)</source>
         <translation>الأوردو (الهند)</translation>
     </message>
     <message id="xx_locale_zh_CN">
-        <location filename="../languagepage.cpp" line="202"/>
+        <location filename="../languagepage.cpp" line="208"/>
         <source>Chinese (China)</source>
         <translation>الصينية (الصين)</translation>
     </message>
     <message id="xx_locale_zh_TW">
-        <location filename="../languagepage.cpp" line="207"/>
+        <location filename="../languagepage.cpp" line="213"/>
         <source>Chinese (Taiwan)</source>
         <translation>الصينية (تايوان)</translation>
     </message>
+    <message id="xx_timeformat24h_locale_default">
+        <location filename="../languagepage.cpp" line="223"/>
+        <source>Locale default</source>
+        <translation>اللغة الافتراضية</translation>
+    </message>
+    <message id="xx_timeformat24h_24_hour_mode">
+        <location filename="../languagepage.cpp" line="227"/>
+        <source>24 hour mode</source>
+        <translation>24 وضع ساعة</translation>
+    </message>
+    <message id="xx_timeformat24h_12_hour_mode">
+        <location filename="../languagepage.cpp" line="231"/>
+        <source>12 hour mode</source>
+        <translation>12 وضع ساعة</translation>
+    </message>
     <message id="xx_language_combobox_title">
-        <location filename="../languagepage.cpp" line="302"/>
+        <location filename="../languagepage.cpp" line="357"/>
         <source>Please select language</source>
         <translation>الرجاء اختيار لغة جديدة :</translation>
     </message>
     <message id="xx_language_combobox_lctime_title">
-        <location filename="../languagepage.cpp" line="304"/>
+        <location filename="../languagepage.cpp" line="359"/>
         <source>Locale for time</source>
         <translation>لغة للوقت</translation>
     </message>
+    <message id="xx_language_combobox_lctimeformat24h_title">
+        <location filename="../languagepage.cpp" line="361"/>
+        <source>Choose 12/24 hour mode</source>
+        <translation>اختيار وسيلة 12/24 ساعة</translation>
+    </message>
     <message id="xx_language_combobox_lccollate_title">
-        <location filename="../languagepage.cpp" line="306"/>
+        <location filename="../languagepage.cpp" line="363"/>
         <source>Locale for collation</source>
         <translation>لغة لترتيب</translation>
     </message>
     <message id="xx_language_combobox_lcnumeric_title">
-        <location filename="../languagepage.cpp" line="308"/>
+        <location filename="../languagepage.cpp" line="365"/>
         <source>Locale for numbers</source>
         <translation>للغة الأرقام</translation>
     </message>
     <message id="xx_language_combobox_lcmonetary_title">
-        <location filename="../languagepage.cpp" line="310"/>
+        <location filename="../languagepage.cpp" line="367"/>
         <source>Locale for money</source>
         <translation>لغة من أجل المال</translation>
     </message>
     <message id="qtn_comm_command_yes">
-        <location filename="../languagepage.cpp" line="314"/>
-        <location filename="../languagepage.cpp" line="321"/>
+        <location filename="../languagepage.cpp" line="371"/>
+        <location filename="../languagepage.cpp" line="378"/>
         <source>Yes</source>
         <translation>نعم</translation>
     </message>
     <message id="qtn_comm_command_no">
-        <location filename="../languagepage.cpp" line="317"/>
-        <location filename="../languagepage.cpp" line="324"/>
+        <location filename="../languagepage.cpp" line="374"/>
+        <location filename="../languagepage.cpp" line="381"/>
         <source>No</source>
         <translation>لا</translation>
     </message>
     <message id="xx_language_number_format">
-        <location filename="../languagepage.cpp" line="329"/>
+        <location filename="../languagepage.cpp" line="386"/>
         <source>Number format example: %1œ!! Number example: %1œ!! Number: %1</source>
         <translation>تنسيق رقم سبيل المثال : %1</translation>
     </message>
     <message id="xx_langage_date_time_format">
-        <location filename="../languagepage.cpp" line="344"/>
+        <location filename="../languagepage.cpp" line="401"/>
         <source>Date and time format example: %1œ!! Date and time: %1œ!! Date: %1œ!! %1</source>
         <translation>تنسيق التاريخ والوقت على سبيل المثال : %1</translation>
     </message>
     <message id="xx_language_week_number">
-        <location filename="../languagepage.cpp" line="349"/>
+        <location filename="../languagepage.cpp" line="406"/>
         <source>Week number example: %1</source>
         <translation>الأسبوع سبيل المثال عدد: %1</translation>
     </message>
     <message id="xx_language_currency_format">
-        <location filename="../languagepage.cpp" line="359"/>
+        <location filename="../languagepage.cpp" line="416"/>
         <source>Currency format example: %1 %2œ!! Currency: %1 %2</source>
         <translation>تنسيق العملة على سبيل المثال : %1 %2</translation>
     </message>
     <message id="xx_language_trans_%Ln_boxes_weight_%L1" numerus="yes">
-        <location filename="../languagepage.cpp" line="365"/>
-        <location filename="../languagepage.cpp" line="367"/>
-        <location filename="../languagepage.cpp" line="369"/>
+        <location filename="../languagepage.cpp" line="422"/>
+        <location filename="../languagepage.cpp" line="424"/>
+        <location filename="../languagepage.cpp" line="426"/>
         <source>%Ln boxes with a total weight of %L1 kilogramœ!! %Ln boxes, total weight of %L1 kg</source>
         <translation>
             <numerusform>مربعات سطر %Ln مع الوزن الكلي لل%L1 كيلو غرام</numerusform>
@@ -958,7 +975,7 @@ The primary (single short tap) action of the element should not be duplicated in
         </translation>
     </message>
     <message id="xx_language_font_test">
-        <location filename="../languagepage.cpp" line="373"/>
+        <location filename="../languagepage.cpp" line="430"/>
         <source>Font test:</source>
         <translation>اختبار الخط :</translation>
     </message>
@@ -968,33 +985,32 @@ The primary (single short tap) action of the element should not be duplicated in
         <translation>الصورة يسمح موضع الصور على واجهة المستخدم. الصور هي عموما غير عناصر تفاعلية. يمكن متنوع واحدة ومتعددة اللمس التفاعلات يمكن ان تضاف الى عنصر صورة إذا رغبت.</translation>
     </message>
     <message id="xx_sample template">
-        <location filename="../templatepage.cpp" line="107"/>
+        <location filename="../templatepage.cpp" line="108"/>
         <source>Sample template</source>
         <translation>قالب نموذج</translation>
     </message>
     <message id="xx_template_page_title">
-        <location filename="../templatepage.cpp" line="101"/>
+        <location filename="../templatepage.cpp" line="102"/>
         <source>Template</source>
         <translation>القالب</translation>
     </message>
     <message id="xx_textentry_completion_text">
-        <location filename="../textentrypage.cpp" line="614"/>
+        <location filename="../textentrypage.cpp" line="627"/>
         <source>Email suggestion text:</source>
         <translation>البريد الإلكتروني نص الاقتراح :</translation>
     </message>
     <message id="xx_combobox_page_info">
-        <location filename="../comboboxpage.cpp" line="122"/>
+        <location filename="../comboboxpage.cpp" line="125"/>
         <source>The MComboBox widget is a combined button and popup list. It is very similar to QComboBox, but does not allow editing the text.</source>
-        <oldsource>The DuiComboBox widget is a combined button and popup list. It is very similar to QComboBox, but does not allow editing the text.</oldsource>
         <translation>القطعة MComboBox هو زر مجتمعة وقائمة منبثقة. انها تشبه الى حد بعيد QComboBox ، ولكن لا يسمح بتحرير النص.</translation>
     </message>
     <message id="xx_combobox_title">
-        <location filename="../comboboxpage.cpp" line="110"/>
+        <location filename="../comboboxpage.cpp" line="113"/>
         <source>ComboBox</source>
         <translation>مربع تحرير وسرد</translation>
     </message>
     <message id="xx_tooltip_entry8">
-        <location filename="../textentrypage.cpp" line="592"/>
+        <location filename="../textentrypage.cpp" line="605"/>
         <source>Provides email address suggestions</source>
         <translation>يقدم اقتراحات عنوان البريد الإلكتروني</translation>
     </message>
@@ -1018,12 +1034,12 @@ Checkbox essentially does the same thing as the Switch button, so please conside
         <translation>لقد قرأت وفهمت التعليمات.</translation>
     </message>
     <message id="xx_icon_button_page_title">
-        <location filename="../iconbuttonpage.cpp" line="81"/>
+        <location filename="../iconbuttonpage.cpp" line="82"/>
         <source>Icon Button</source>
         <translation>رمز زر</translation>
     </message>
     <message id="xx_icon_button_page_info_label">
-        <location filename="../iconbuttonpage.cpp" line="89"/>
+        <location filename="../iconbuttonpage.cpp" line="90"/>
         <source>Icon Buttons have an icon and can have a text label. Icon button differs from push button by its visual presentation: it does not have button-style edges like a Push Button does.
 
  Icon Buttons are used in e.g. Toolbars.</source>
@@ -1032,7 +1048,7 @@ Checkbox essentially does the same thing as the Switch button, so please conside
  رمز أزرار تستخدم في مثل أشرطة الأدوات.</translation>
     </message>
     <message id="xx_icon_button_page_icon_button2">
-        <location filename="../iconbuttonpage.cpp" line="91"/>
+        <location filename="../iconbuttonpage.cpp" line="92"/>
         <source>Lorem ipsum</source>
         <translation>أبجد هوز</translation>
     </message>
@@ -1196,7 +1212,6 @@ Seekbar is a special type of Slider used for displaying playback status for mult
     <message id="xx_slider_age_label">
         <location filename="../sliderpage.cpp" line="186"/>
         <source>Please select your age:œ!! Please select your age:œ!! Please select your age:œ!! Age:</source>
-        <oldsource>Please select your age:</oldsource>
         <translation>من فضلك اختر العمر :</translation>
     </message>
     <message id="xx_slider_player_label">
@@ -1254,55 +1269,54 @@ Input feedbacks can be easily configured for different purposes using the themin
         <translation>صامت</translation>
     </message>
     <message id="xx_gridpage_configuration">
-        <location filename="../mgridpage.cpp" line="208"/>
+        <location filename="../mgridpage.cpp" line="210"/>
         <source>Configuration</source>
         <translation>التكوين</translation>
     </message>
     <message id="xx_gridpage_title">
-        <location filename="../mgridpage.cpp" line="203"/>
-        <source>ConfigurationGrid page</source>
-        <oldsource>Grid page</oldsource>
+        <location filename="../mgridpage.cpp" line="205"/>
+        <source>Grid page</source>
         <translation>شبكة الصفحة</translation>
     </message>
     <message id="xx_gridpage_set_columns">
-        <location filename="../mgridpage.cpp" line="297"/>
+        <location filename="../mgridpage.cpp" line="301"/>
         <source>Set columns</source>
         <translation>تعيين الأعمدة</translation>
     </message>
     <message id="xx_gridpage_landscape">
-        <location filename="../mgridpage.cpp" line="329"/>
-        <location filename="../mgridpage.cpp" line="339"/>
+        <location filename="../mgridpage.cpp" line="333"/>
+        <location filename="../mgridpage.cpp" line="343"/>
         <source>Landscape</source>
         <translation>المناظر الطبيعية</translation>
     </message>
     <message id="xx_gridpage_portrait">
-        <location filename="../mgridpage.cpp" line="334"/>
-        <location filename="../mgridpage.cpp" line="344"/>
+        <location filename="../mgridpage.cpp" line="338"/>
+        <location filename="../mgridpage.cpp" line="348"/>
         <source>Portrait</source>
         <translation>صورة</translation>
     </message>
     <message id="xx_bubblepage_title">
-        <location filename="../bubblepage.cpp" line="156"/>
+        <location filename="../bubblepage.cpp" line="158"/>
         <source>Speech Bubble</source>
         <translation>كلمة فقاعة</translation>
     </message>
     <message id="xx_wg_bubblepage_linkactivated">
-        <location filename="../bubblepage.cpp" line="169"/>
+        <location filename="../bubblepage.cpp" line="171"/>
         <source>Link activated</source>
         <translation>تنشيط وصلة</translation>
     </message>
     <message id="xx_wg_bubblepage_bubbleclicked">
-        <location filename="../bubblepage.cpp" line="176"/>
+        <location filename="../bubblepage.cpp" line="178"/>
         <source>Speech buuble clicked</source>
         <translation>النقر على كلمة فقاعة</translation>
     </message>
     <message id="xx_button_group_page_title">
-        <location filename="../buttongrouppage.cpp" line="156"/>
+        <location filename="../buttongrouppage.cpp" line="168"/>
         <source>Button Group</source>
         <translation>زر مجموعة</translation>
     </message>
     <message id="xx_button_group_page_info_label">
-        <location filename="../buttongrouppage.cpp" line="168"/>
+        <location filename="../buttongrouppage.cpp" line="180"/>
         <source>Buttons can be grouped together based on visual or logic requirements.
 
 The basic group is formed by placing buttons together into a layout. Depending on the theme, the buttons are typically drawn as connected with each other.
@@ -1315,62 +1329,62 @@ Logical exclusivity can be added to a group, which ensures only one of the butto
 يمكن إضافة المنطقي الحصرية لمجموعة ، والتي تضمن واحد فقط من الأزرار يمكن تحديد في وقت واحد. إذا كانت مجموعة ليست حصرية ، يمكن تحديد خيارات متعددة من المجموعة.</translation>
     </message>
     <message id="xx_button_group_page_hlabel1">
-        <location filename="../buttongrouppage.cpp" line="171"/>
+        <location filename="../buttongrouppage.cpp" line="183"/>
         <source>Horizontal group</source>
         <translation>أفقي المجموعة</translation>
     </message>
     <message id="xx_button_group_page_button1">
-        <location filename="../buttongrouppage.cpp" line="173"/>
+        <location filename="../buttongrouppage.cpp" line="185"/>
         <source>Yes</source>
         <translation>نعم</translation>
     </message>
     <message id="xx_button_group_page_button2">
-        <location filename="../buttongrouppage.cpp" line="175"/>
+        <location filename="../buttongrouppage.cpp" line="187"/>
         <source>No</source>
         <translation>لا</translation>
     </message>
     <message id="xx_button_group_page_button3">
-        <location filename="../buttongrouppage.cpp" line="177"/>
+        <location filename="../buttongrouppage.cpp" line="189"/>
         <source>Maybe</source>
         <translation>ربما</translation>
     </message>
     <message id="xx_button_group_page_vlabel2">
-        <location filename="../buttongrouppage.cpp" line="180"/>
+        <location filename="../buttongrouppage.cpp" line="192"/>
         <source>Horizontal group, exclusive</source>
         <translation>أفقي المجموعة الحصرية</translation>
     </message>
     <message id="xx_button_group_page_button4">
-        <location filename="../buttongrouppage.cpp" line="182"/>
+        <location filename="../buttongrouppage.cpp" line="194"/>
         <source>Cost</source>
         <translation>كلفة</translation>
     </message>
     <message id="xx_button_group_page_button5">
-        <location filename="../buttongrouppage.cpp" line="184"/>
+        <location filename="../buttongrouppage.cpp" line="196"/>
         <source>Quality</source>
         <translation>جودة</translation>
     </message>
     <message id="xx_button_group_page_button6">
-        <location filename="../buttongrouppage.cpp" line="186"/>
+        <location filename="../buttongrouppage.cpp" line="198"/>
         <source>Schedule</source>
         <translation>جدول</translation>
     </message>
     <message id="xx_button_group_page_vlabel">
-        <location filename="../buttongrouppage.cpp" line="189"/>
+        <location filename="../buttongrouppage.cpp" line="201"/>
         <source>Vertical group, checkable</source>
         <translation>مجموعة العمودي ، يمكن اختياره</translation>
     </message>
     <message id="xx_button_group_page_button7">
-        <location filename="../buttongrouppage.cpp" line="191"/>
+        <location filename="../buttongrouppage.cpp" line="203"/>
         <source>Milk</source>
         <translation>حليب</translation>
     </message>
     <message id="xx_button_group_page_button8">
-        <location filename="../buttongrouppage.cpp" line="193"/>
+        <location filename="../buttongrouppage.cpp" line="205"/>
         <source>Sugar</source>
         <translation>سكر</translation>
     </message>
     <message id="xx_button_group_page_button9">
-        <location filename="../buttongrouppage.cpp" line="195"/>
+        <location filename="../buttongrouppage.cpp" line="207"/>
         <source>Biscotti</source>
         <translation>بيسكوتي</translation>
     </message>
@@ -1389,57 +1403,57 @@ Logical exclusivity can be added to a group, which ensures only one of the butto
         <translation>جانب</translation>
     </message>
     <message id="xx_wg_contentitemspage_single_title">
-        <location filename="../contentitemspage.cpp" line="310"/>
+        <location filename="../contentitemspage.cpp" line="312"/>
         <source>Single Title</source>
         <translation>عنوان واحد</translation>
     </message>
     <message id="xx_wg_contentitemspage_title_with_subtitle">
-        <location filename="../contentitemspage.cpp" line="312"/>
+        <location filename="../contentitemspage.cpp" line="314"/>
         <source>Title with Subtitle</source>
         <translation>العنوان مع عنوان فرعي</translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title">
-        <location filename="../contentitemspage.cpp" line="314"/>
+        <location filename="../contentitemspage.cpp" line="316"/>
         <source>Icon with Title</source>
         <translation>أيقونة مع العنوان</translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_and_subtitle">
-        <location filename="../contentitemspage.cpp" line="316"/>
+        <location filename="../contentitemspage.cpp" line="318"/>
         <source>Icon with Title and Subtitle</source>
         <translation>أيقونة مع العنوان والعنوان الفرعي</translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_subtitle_and_two_side_icons">
-        <location filename="../contentitemspage.cpp" line="320"/>
+        <location filename="../contentitemspage.cpp" line="322"/>
         <source>Icon with Title Subtitle and Two Side Icons</source>
         <translation>رمز العنوان مع عنوان فرعي واثنين من الرموز جانبية</translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_subtitle_and_side_icon_with_label">
-        <location filename="../contentitemspage.cpp" line="323"/>
+        <location filename="../contentitemspage.cpp" line="325"/>
         <source>Icon with Title Subtitle and Side Icon with Label</source>
         <translation>رمز العنوان مع عنوان فرعي ودلالات جانبية مع تسمية</translation>
     </message>
     <message id="xx_wg_contentitemspage_thumbnail_with_title_subtitle_and_two_side_icons">
-        <location filename="../contentitemspage.cpp" line="326"/>
+        <location filename="../contentitemspage.cpp" line="328"/>
         <source>Thumbnail with Title Subtitle and Two Side Icons</source>
         <translation>مصغرة مع العنوان والعنوان الفرعي الثاني أيقونات جانبية</translation>
     </message>
     <message id="xx_wg_contentitemspage_thumbnail_with_title_and_two_side_icons">
-        <location filename="../contentitemspage.cpp" line="329"/>
+        <location filename="../contentitemspage.cpp" line="331"/>
         <source>Thumbnail with Title and Two Side Icons</source>
         <translation>مصغرة مع عنوان واثنين من الرموز جانبية</translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_progress_indicator_and_two_side_icons">
-        <location filename="../contentitemspage.cpp" line="334"/>
+        <location filename="../contentitemspage.cpp" line="336"/>
         <source>Icon with Title Progress Indicator and Two Side Icons</source>
         <translation>أيقونة مع عنوان مؤشر التقدم والرموز اثنين الجانبية</translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_progress_indicator_and_top_side_icon">
-        <location filename="../contentitemspage.cpp" line="337"/>
+        <location filename="../contentitemspage.cpp" line="339"/>
         <source>Icon with Title Progress Indicator and Top Side Icon</source>
         <translation>أيقونة مع عنوان مؤشر التقدم والجانب الأعلى أيقونة</translation>
     </message>
     <message id="xx_contentitemspage_title">
-        <location filename="../contentitemspage.cpp" line="358"/>
+        <location filename="../contentitemspage.cpp" line="359"/>
         <source>Content Items</source>
         <translation>بنود المحتوى</translation>
     </message>
diff --git a/demos/widgetsgallery/translations/widgetsgallery_de.ts b/demos/widgetsgallery/translations/widgetsgallery_de.ts
index d94e051c..098bdc26 100644
--- a/demos/widgetsgallery/translations/widgetsgallery_de.ts
+++ b/demos/widgetsgallery/translations/widgetsgallery_de.ts
@@ -4,221 +4,217 @@
 <context>
     <name></name>
     <message id="xx_wg_categories_application_view">
-        <location filename="../mainpage.cpp" line="86"/>
+        <location filename="../mainpage.cpp" line="92"/>
         <source>Application View</source>
         <translation>Applikationsansicht</translation>
     </message>
     <message id="xx_wg_application_view_view_menu">
-        <location filename="../mainpage.cpp" line="88"/>
+        <location filename="../mainpage.cpp" line="94"/>
         <source>Application Menu</source>
         <translation>Applikationsmenü</translation>
     </message>
     <message id="xx_wg_application_view_display_modes">
-        <location filename="../mainpage.cpp" line="90"/>
+        <location filename="../mainpage.cpp" line="96"/>
         <source>Display Modes</source>
         <translation>Anzeigemodi</translation>
     </message>
     <message id="xx_wg_application_view_toolbar_incl_tab_bar">
-        <location filename="../mainpage.cpp" line="92"/>
+        <location filename="../mainpage.cpp" line="98"/>
         <source>Toolbar (including Tab Bar)</source>
         <translation>Werkzeugbalken (mit Tabbalken)</translation>
     </message>
     <message id="xx_wg_categories_simple_widgets">
-        <location filename="../mainpage.cpp" line="96"/>
+        <location filename="../mainpage.cpp" line="102"/>
         <source>Simple Widgets</source>
         <translation>Einfache Widgets</translation>
     </message>
     <message id="xx_wg_simple_widgets_labels">
-        <location filename="../mainpage.cpp" line="98"/>
+        <location filename="../mainpage.cpp" line="104"/>
         <source>Labels</source>
         <translation>Label</translation>
     </message>
     <message id="xx_wg_simple_widgets_image">
-        <location filename="../mainpage.cpp" line="100"/>
+        <location filename="../mainpage.cpp" line="106"/>
         <source>Image</source>
         <translation>Bild</translation>
     </message>
     <message id="xx_wg_simple_widgets_progress_bar">
-        <location filename="../mainpage.cpp" line="102"/>
+        <location filename="../mainpage.cpp" line="108"/>
         <source>Progress Bar</source>
         <translation>Fortschrittsbalken</translation>
     </message>
     <message id="xx_wg_simple_widgets_container">
-        <location filename="../mainpage.cpp" line="104"/>
+        <location filename="../mainpage.cpp" line="110"/>
         <source>Container</source>
         <translation>Behälter</translation>
     </message>
     <message id="xx_wg_simple_widgets_spinner">
-        <location filename="../mainpage.cpp" line="106"/>
+        <location filename="../mainpage.cpp" line="112"/>
         <source>Spinner</source>
         <translation>Wirbelräder</translation>
     </message>
     <message id="xx_wg_categories_buttons">
-        <location filename="../mainpage.cpp" line="109"/>
+        <location filename="../mainpage.cpp" line="115"/>
         <source>Buttons</source>
         <translation>Knöpfe</translation>
     </message>
     <message id="xx_wg_buttons_push_button">
-        <location filename="../mainpage.cpp" line="111"/>
+        <location filename="../mainpage.cpp" line="117"/>
         <source>Push Button</source>
         <translation>Druckknopf</translation>
     </message>
     <message id="xx_wg_buttons_icon_button">
-        <location filename="../mainpage.cpp" line="113"/>
+        <location filename="../mainpage.cpp" line="119"/>
         <source>Icon Button</source>
         <translation>Pictogramm Knopf</translation>
     </message>
     <message id="xx_wg_buttons_switch">
-        <location filename="../mainpage.cpp" line="115"/>
+        <location filename="../mainpage.cpp" line="121"/>
         <source>Switch</source>
         <translation>Schalthebel</translation>
     </message>
     <message id="xx_wg_buttons_checkbox">
-        <location filename="../mainpage.cpp" line="117"/>
+        <location filename="../mainpage.cpp" line="123"/>
         <source>Checkbox</source>
         <translation>Kontrollkästchen</translation>
     </message>
     <message id="xx_wg_buttons_buttongroup">
-        <location filename="../mainpage.cpp" line="119"/>
+        <location filename="../mainpage.cpp" line="125"/>
         <source>Button Group</source>
         <translation>Knopf Gruppe</translation>
     </message>
     <message id="xx_wg_categories_dialogs_and_banners">
-        <location filename="../mainpage.cpp" line="122"/>
+        <location filename="../mainpage.cpp" line="128"/>
         <source>Dialogs and Banners</source>
         <translation>Dialoge und Banner</translation>
     </message>
     <message id="xx_wg_dialogs_and_banners_single_selection_dialog">
-        <location filename="../mainpage.cpp" line="124"/>
+        <location filename="../mainpage.cpp" line="130"/>
         <source>Single Selection Dialog</source>
         <translation>Einfacher Auswahldialog</translation>
     </message>
-    <message id="xx_wg_dialogs_and_banners_multiple_selection_dialog">
-        <source>Multiple Selection Dialog</source>
-        <translation type="obsolete">Mehrfacher Auswahldialog</translation>
-    </message>
     <message id="xx_wg_dialogs_and_banners_query_dialog">
-        <location filename="../mainpage.cpp" line="126"/>
+        <location filename="../mainpage.cpp" line="132"/>
         <source>Query Dialog</source>
         <translation>Fragedialog</translation>
     </message>
     <message id="xx_wg_dialogs_and_banners_banner">
-        <location filename="../mainpage.cpp" line="128"/>
+        <location filename="../mainpage.cpp" line="134"/>
         <source>Banner</source>
         <translation>Banner</translation>
     </message>
     <message id="xx_wg_categories_lists_grids_and_popups">
-        <location filename="../mainpage.cpp" line="131"/>
+        <location filename="../mainpage.cpp" line="137"/>
         <source>Lists, Grids and Popups</source>
         <translation>Listen, Gitter und Popups</translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_list">
-        <location filename="../mainpage.cpp" line="133"/>
+        <location filename="../mainpage.cpp" line="139"/>
         <source>List</source>
         <translation>Liste</translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_grid">
-        <location filename="../mainpage.cpp" line="135"/>
+        <location filename="../mainpage.cpp" line="141"/>
         <source>Grid</source>
         <translation>Gitter</translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_object_menu">
-        <location filename="../mainpage.cpp" line="137"/>
+        <location filename="../mainpage.cpp" line="143"/>
         <source>Object Menu</source>
         <translation>Objektmenü</translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_combobox">
-        <location filename="../mainpage.cpp" line="139"/>
+        <location filename="../mainpage.cpp" line="145"/>
         <source>ComboBox</source>
         <translation>Combobox</translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_contentitems">
-        <location filename="../mainpage.cpp" line="141"/>
+        <location filename="../mainpage.cpp" line="147"/>
         <source>ContentItems</source>
         <translation>Inhaltselement</translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_bubble">
-        <location filename="../mainpage.cpp" line="143"/>
+        <location filename="../mainpage.cpp" line="149"/>
         <source>Speech bubble</source>
         <translation>Sprechblase</translation>
     </message>
     <message id="xx_wg_categories_user_input">
-        <location filename="../mainpage.cpp" line="146"/>
+        <location filename="../mainpage.cpp" line="152"/>
         <source>User Input</source>
         <translation>Usereingaben</translation>
     </message>
     <message id="xx_wg_user_input_text_entries">
-        <location filename="../mainpage.cpp" line="148"/>
+        <location filename="../mainpage.cpp" line="154"/>
         <source>Text Entries</source>
         <translation>Texteinträge</translation>
     </message>
     <message id="xx_wg_user_input_slider">
-        <location filename="../mainpage.cpp" line="150"/>
+        <location filename="../mainpage.cpp" line="156"/>
         <source>Slider</source>
         <translation>Schieberegler</translation>
     </message>
     <message id="xx_wg_user_input_input_feedback">
-        <location filename="../mainpage.cpp" line="152"/>
+        <location filename="../mainpage.cpp" line="158"/>
         <source>Input Feedback</source>
         <translation>Eingaberückmeldung</translation>
     </message>
     <message id="xx_application_title">
-        <location filename="../mainpage.cpp" line="337"/>
+        <location filename="../mainpage.cpp" line="346"/>
         <source>Widgets Gallery</source>
         <translation>Dingsbums Galerie</translation>
     </message>
     <message id="xx_mainpage_themes">
-        <location filename="../mainpage.cpp" line="343"/>
+        <location filename="../mainpage.cpp" line="352"/>
         <source>Themes</source>
         <translation>Motive</translation>
     </message>
     <message id="xx_mainpage_orientation">
-        <location filename="../mainpage.cpp" line="345"/>
+        <location filename="../mainpage.cpp" line="354"/>
         <source>Orientation</source>
         <translation>Orientierung</translation>
     </message>
     <message id="xx_mainpage_toggle_fps">
-        <location filename="../mainpage.cpp" line="347"/>
+        <location filename="../mainpage.cpp" line="356"/>
         <source>Toggle FPS</source>
         <translation>FPS umschalten</translation>
     </message>
     <message id="xx_mainpage_language_settings">
-        <location filename="../mainpage.cpp" line="349"/>
+        <location filename="../mainpage.cpp" line="358"/>
         <source>Language Settings</source>
         <translation>Spracheinstellungen</translation>
     </message>
     <message id="xx_apporientation_auto">
-        <location filename="../mainpage.cpp" line="562"/>
+        <location filename="../mainpage.cpp" line="570"/>
         <source>Automatic</source>
         <translation>Automatisch</translation>
     </message>
     <message id="xx_apporientation_portrait">
-        <location filename="../mainpage.cpp" line="570"/>
+        <location filename="../mainpage.cpp" line="578"/>
         <source>Portrait</source>
         <translation>Hochformat</translation>
     </message>
     <message id="xx_apporientation_landscape">
-        <location filename="../mainpage.cpp" line="578"/>
+        <location filename="../mainpage.cpp" line="586"/>
         <source>Landscape</source>
         <translation>Querformat</translation>
     </message>
     <message id="xx_apporientation_angle0">
-        <location filename="../mainpage.cpp" line="586"/>
+        <location filename="../mainpage.cpp" line="594"/>
         <source>0 degrees</source>
         <translation>0 Grad</translation>
     </message>
     <message id="xx_apporientation_angle90">
-        <location filename="../mainpage.cpp" line="594"/>
+        <location filename="../mainpage.cpp" line="602"/>
         <source>90 degrees clockwise</source>
         <translation>90 Grad im Uhrzeigersinn</translation>
     </message>
     <message id="xx_apporientation_angle180">
-        <location filename="../mainpage.cpp" line="602"/>
+        <location filename="../mainpage.cpp" line="610"/>
         <source>180 degrees clockwise</source>
         <translation>180 Grad im Uhrzeigersinn</translation>
     </message>
     <message id="xx_apporientation_angle270">
-        <location filename="../mainpage.cpp" line="610"/>
+        <location filename="../mainpage.cpp" line="618"/>
         <source>270 degrees clockwise</source>
         <translation>270 Grad im Uhrzeigersinn</translation>
     </message>
@@ -292,91 +288,87 @@ All Labels can be aligned left, right or center and will be automatically trunca
         <translation>Wählen Sie einen Drucker aus</translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_stacked_dialogs">
-        <location filename="../singleselectiondialogspage.cpp" line="257"/>
+        <location filename="../singleselectiondialogspage.cpp" line="259"/>
         <source>Stacked Dialogs</source>
         <translation>Gestapelte Dialoge</translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_system_dialog">
-        <location filename="../singleselectiondialogspage.cpp" line="259"/>
+        <location filename="../singleselectiondialogspage.cpp" line="261"/>
         <source>System Dialog</source>
         <translation>Systemdialog</translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_system_modal_dialog">
-        <location filename="../singleselectiondialogspage.cpp" line="261"/>
+        <location filename="../singleselectiondialogspage.cpp" line="263"/>
         <source>System Modal Dialog</source>
         <translation>Fenster-modaler Dialog</translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_dialog_with_progress_indicator">
-        <location filename="../singleselectiondialogspage.cpp" line="263"/>
+        <location filename="../singleselectiondialogspage.cpp" line="265"/>
         <source>Dialog with Progress Indicator</source>
         <translation>Dialog mit Fortschrittsanzeige</translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_message_box">
-        <location filename="../singleselectiondialogspage.cpp" line="265"/>
+        <location filename="../singleselectiondialogspage.cpp" line="267"/>
         <source>Message Box</source>
         <translation>Meldungskasten</translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_button">
-        <location filename="../singleselectiondialogspage.cpp" line="126"/>
+        <location filename="../singleselectiondialogspage.cpp" line="128"/>
         <source>Click to spawn a nested dialog</source>
         <translation>Klicke um einen verschachtelten Dialog zu öffnen</translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="128"/>
+        <location filename="../singleselectiondialogspage.cpp" line="130"/>
         <source>Stacked dialogs</source>
         <translation>Gestapelte Dialoge</translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_open_nested_messagebox">
-        <location filename="../singleselectiondialogspage.cpp" line="142"/>
+        <location filename="../singleselectiondialogspage.cpp" line="144"/>
         <source>Click to open a nested message box</source>
         <translation>Klicke um eine verschachtelte Meldungsbox zu öffnen</translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_nested_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="144"/>
+        <location filename="../singleselectiondialogspage.cpp" line="146"/>
         <source>This is a nested dialog</source>
         <translation>Dies ist ein verschachtelter Dialog</translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_messagebox_text">
-        <location filename="../singleselectiondialogspage.cpp" line="157"/>
+        <location filename="../singleselectiondialogspage.cpp" line="159"/>
         <source>I&apos;m a nested message box</source>
         <translation>Ich bin eine verschachtelte Meldungsbox</translation>
     </message>
     <message id="xx_dialogs_and_notifications_system_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="168"/>
+        <location filename="../singleselectiondialogspage.cpp" line="170"/>
         <source>System Dialog</source>
         <translation>Systemdialog</translation>
     </message>
     <message id="xx_dialogs_and_notifications_system_dialog_label">
-        <location filename="../singleselectiondialogspage.cpp" line="176"/>
-        <source>I&apos;m a system dialog.&lt;br&gt;There actually is a way around me...&lt;br&gt;You can skip me with the home button, but I&apos;ll remain&lt;br&gt;alive until you make a selection.</source>
-        <translation type="unfinished">Ich bin ein Systemdialog.&lt;br&gt;Eigentlich gibt es einen Weg um mich herum...&lt;br&gt;Man kann mich mit dem Hausknopf überspringen,&lt;br&gt;aber ich bleibe lebending bis Sie eine Entscheidung treffen.</translation>
+        <location filename="../singleselectiondialogspage.cpp" line="178"/>
+        <source>I&apos;m a system dialog.&lt;br&gt;You can skip me with the home button.&lt;br&gt;I&apos;ll be minimised to the task switcher&lt;br&gt;but I&apos;ll remain alive until you make a selection.</source>
+        <translation>Ich bin ein Systemdialog.&lt;br&gt;Man kann mich mit dem Hausknopf überspringen.&lt;br&gt;Ich werde dann minimiert in den Taskumschalter,&lt;br&gt;aber ich bleibe lebending bis Sie eine Entscheidung treffen.</translation>
     </message>
     <message id="xx_dialogs_and_notifications_system_modal_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="191"/>
+        <location filename="../singleselectiondialogspage.cpp" line="193"/>
         <source>System Modal Dialog</source>
         <translation>Fenster-modaler Dialog</translation>
     </message>
     <message id="xx_dialogs_and_notifications_system_modal_dialog_label">
-        <location filename="../singleselectiondialogspage.cpp" line="198"/>
-        <source>I&apos;m a window modal dialog.
-There&apos;s no way around me!
-Muwhahaha... [evil laugh]</source>
-        <translation>Ich bin ein Fenster-modaler Dialog.
-Es gibt keinen Weg um mich herum!
-Hihihi...[böses Kichern]</translation>
+        <location filename="../singleselectiondialogspage.cpp" line="200"/>
+        <source>I&apos;m a system modal dialog.&lt;br&gt;You can&apos;t skip me as I&apos;m designed for&lt;br&gt;use cases that require immediate user attention.</source>
+        <translation>Ich bin ein System-modaler Dialog.&lt;br&gt;Man kann mich nicht überspringen, mein Zweck sind Fälle, die sofortige Aufmerksamkeit des Benutzers erfordern.</translation>
     </message>
     <message id="xx_dialogs_and_notifications_progress_indicator">
-        <location filename="../singleselectiondialogspage.cpp" line="217"/>
+        <location filename="../singleselectiondialogspage.cpp" line="219"/>
         <source>Progress Indicator</source>
         <translation>Fortschrittsanzeige</translation>
     </message>
     <message id="xx_dialogs_and_notifications_message_box_text">
-        <location filename="../singleselectiondialogspage.cpp" line="237"/>
+        <location filename="../singleselectiondialogspage.cpp" line="239"/>
         <source>Hello World!</source>
         <translation>Hallo Welt</translation>
     </message>
     <message id="xx_single_selection_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="251"/>
+        <location filename="../singleselectiondialogspage.cpp" line="253"/>
         <source>Single Selection Dialogs</source>
         <translation>Einfache Auswahldialoge</translation>
     </message>
@@ -400,22 +392,6 @@ Hihihi...[böses Kichern]</translation>
         <source>System Information Banner</source>
         <translation>System Informations Banner</translation>
     </message>
-    <message id="xx_dialogs_and_notifications_event_banner">
-        <source>&lt;b&gt;Ida Taipale&lt;/b&gt;&lt;br/&gt;Have you seen my dog?</source>
-        <translation type="obsolete">&lt;b&gt;Ida Taipale&lt;/b&gt;&lt;br/&gt;Hast Du meinen Hund gesehen?</translation>
-    </message>
-    <message id="xx_dialogs_and_notifications_information_banner">
-        <source>&lt;b&gt;Battery is running low&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Die Batterie ist bald leer&lt;/b&gt;</translation>
-    </message>
-    <message id="xx_dialogs_and_notifications_system_information_banner">
-        <source>&lt;b&gt;Incoming call&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Ankommendes Gespräch&lt;/b&gt;</translation>
-    </message>
-    <message id="xx_dialogs_and_notifications_system_information_banner_accept">
-        <source>Accept</source>
-        <translation type="obsolete">Annnehmen</translation>
-    </message>
     <message id="xx_Image">
         <location filename="../imagepage.cpp" line="122"/>
         <source>Image</source>
@@ -447,62 +423,63 @@ Hihihi...[böses Kichern]</translation>
         <translation>Abschneiden</translation>
     </message>
     <message id="xx_listpage_list_remove">
-        <location filename="../mlistpage.cpp" line="634"/>
+        <location filename="../mlistpage.cpp" line="635"/>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
     <message id="xx_listpage_list_edit">
-        <location filename="../mlistpage.cpp" line="640"/>
+        <location filename="../mlistpage.cpp" line="641"/>
         <source>Edit</source>
         <translation>Editieren</translation>
     </message>
     <message id="xx_listpage_title">
-        <location filename="../mlistpage.cpp" line="658"/>
+        <location filename="../mlistpage.cpp" line="659"/>
         <source>List</source>
         <translation>Liste</translation>
     </message>
     <message id="xx_textentry_title">
-        <location filename="../textentrypage.cpp" line="582"/>
+        <location filename="../textentrypage.cpp" line="595"/>
         <source>Text Entries</source>
         <translation>Texteinträge</translation>
     </message>
     <message id="xx_textentry_free_text">
-        <location filename="../textentrypage.cpp" line="598"/>
+        <location filename="../textentrypage.cpp" line="611"/>
         <source>Free text:</source>
         <translation>Freitext:</translation>
     </message>
     <message id="xx_textentry_free_text_masked">
-        <location filename="../textentrypage.cpp" line="600"/>
-        <source>Free text(masked):</source>
-        <translation>Freitext(maskiert):</translation>
+        <location filename="../textentrypage.cpp" line="613"/>
+        <source>Free text (masked):</source>
+        <translation>Freitext (maskiert):</translation>
     </message>
     <message id="xx_textentry_number_text">
-        <location filename="../textentrypage.cpp" line="602"/>
+        <location filename="../textentrypage.cpp" line="615"/>
         <source>Number text:</source>
         <translation>Numerischer Text:</translation>
     </message>
     <message id="xx_textentry_phone_number">
-        <location filename="../textentrypage.cpp" line="604"/>
+        <location filename="../textentrypage.cpp" line="617"/>
         <source>Phone number:</source>
         <translation>Telefonnummer:</translation>
     </message>
     <message id="xx_textentry_email_text">
-        <location filename="../textentrypage.cpp" line="606"/>
+        <location filename="../textentrypage.cpp" line="619"/>
         <source>Email text:</source>
         <translation>E-Mail Text:</translation>
     </message>
     <message id="xx_textentry_url_text">
-        <location filename="../textentrypage.cpp" line="608"/>
-        <source>Url text:</source>
+        <location filename="../textentrypage.cpp" line="621"/>
+        <source>URL text:</source>
+        <oldsource>Url text:</oldsource>
         <translation>URL Text:</translation>
     </message>
     <message id="xx_textentry_multiline">
-        <location filename="../textentrypage.cpp" line="610"/>
+        <location filename="../textentrypage.cpp" line="623"/>
         <source>Multiline:</source>
         <translation>Mehrzeilig:</translation>
     </message>
     <message id="xx_tooltip_entry0">
-        <location filename="../textentrypage.cpp" line="586"/>
+        <location filename="../textentrypage.cpp" line="599"/>
         <source>Enter text here</source>
         <translation>Geben Sie hier Text ein</translation>
     </message>
@@ -534,72 +511,77 @@ Hihihi...[böses Kichern]</translation>
         <translation>&lt;i&gt;Taste losgelassen&lt;/i&gt; Taste:</translation>
     </message>
     <message id="xx_tooltip_customtoolbar1">
-        <location filename="../textentrypage.cpp" line="519"/>
+        <location filename="../textentrypage.cpp" line="539"/>
         <source>Example custom toolbar 1</source>
         <translation>Beispiel 1 für maßgeschneiderten Werkzeugbalken</translation>
     </message>
     <message id="xx_tooltip_customtoolbar2">
-        <location filename="../textentrypage.cpp" line="532"/>
+        <location filename="../textentrypage.cpp" line="552"/>
         <source>Example custom toolbar 2</source>
         <translation>Beispiel 2 für maßgeschneiderten Werkzeugbalken</translation>
     </message>
     <message id="xx_tooltip_entry1">
-        <location filename="../textentrypage.cpp" line="589"/>
+        <location filename="../textentrypage.cpp" line="602"/>
         <source>This tooltip is quite long and will be clipped on the display</source>
         <translation>Dieser Tooltip ist recht lang und wird wohl abgeschnitten werden</translation>
     </message>
     <message id="xx_textentry_richtext_text">
-        <location filename="../textentrypage.cpp" line="616"/>
-        <source>Rich Text:</source>
-        <translation>Reicher Text</translation>
+        <location filename="../textentrypage.cpp" line="629"/>
+        <source>Rich text:</source>
+        <translation>Reicher Text:</translation>
+    </message>
+    <message id="xx_textentry_richtext_text_multiline">
+        <location filename="../textentrypage.cpp" line="631"/>
+        <source>Rich text (multiline):</source>
+        <translation>Reicher Text (mehrzeilig):</translation>
     </message>
     <message id="xx_textentry_noecho">
-        <location filename="../textentrypage.cpp" line="619"/>
-        <source>No Echo mode:</source>
+        <location filename="../textentrypage.cpp" line="634"/>
+        <source>No echo mode:</source>
         <translation>Kein-Echo Modus:</translation>
     </message>
     <message id="xx_textentry_echoonedit">
-        <location filename="../textentrypage.cpp" line="622"/>
+        <location filename="../textentrypage.cpp" line="637"/>
         <source>Echo on edit:</source>
         <translation>Echo beim Editieren:</translation>
     </message>
     <message id="xx_textentry_direct_input_mode">
-        <location filename="../textentrypage.cpp" line="625"/>
-        <source>Direct Input Mode:</source>
+        <location filename="../textentrypage.cpp" line="640"/>
+        <source>Direct input mode:</source>
         <translation>Direkteingabe Modus:</translation>
     </message>
     <message id="xx_textentry_custom_toolbar1">
-        <location filename="../textentrypage.cpp" line="628"/>
-        <source>Custom ToolBar 1:</source>
+        <location filename="../textentrypage.cpp" line="643"/>
+        <source>Custom toolbar 1:</source>
         <translation>Maßgeschneiderter Toolbar 1:</translation>
     </message>
     <message id="xx_textentry_custom_toolbar2">
-        <location filename="../textentrypage.cpp" line="630"/>
-        <source>Custom ToolBar 2:</source>
+        <location filename="../textentrypage.cpp" line="645"/>
+        <source>Custom toolbar 2:</source>
         <translation>Maßgeschneiderter Toolbar 2:</translation>
     </message>
     <message id="xx_auto_true_entry0">
-        <location filename="../textentrypage.cpp" line="663"/>
-        <source>Auto Capitalisation is active</source>
+        <location filename="../textentrypage.cpp" line="678"/>
+        <source>Auto capitalisation is active</source>
         <translation>Automatische Großschreibung ist aktiv</translation>
     </message>
     <message id="xx_auto_false_entry0">
-        <location filename="../textentrypage.cpp" line="666"/>
-        <source>No Auto Capitalisation</source>
+        <location filename="../textentrypage.cpp" line="681"/>
+        <source>No auto capitalisation</source>
         <translation>Keine automatische Großschreibung</translation>
     </message>
     <message id="xx_tooltip_entry6">
-        <location filename="../textentrypage.cpp" line="595"/>
+        <location filename="../textentrypage.cpp" line="608"/>
         <source>This is a multiline text entry</source>
         <translation>Dies ist eine mehrzeiliger Texteingabe</translation>
     </message>
     <message id="xx_textentry_singleselectall">
-        <location filename="../textentrypage.cpp" line="612"/>
+        <location filename="../textentrypage.cpp" line="625"/>
         <source>Singleline (selectall):</source>
         <translation>Einzelne Zeile (alles auswählen)</translation>
     </message>
     <message id="xx_auto_capitalisation">
-        <location filename="../textentrypage.cpp" line="633"/>
+        <location filename="../textentrypage.cpp" line="648"/>
         <source>Auto capitalisation</source>
         <translation variants="yes">
             <lengthvariant>Automatische Großschreibung</lengthvariant>
@@ -608,7 +590,7 @@ Hihihi...[böses Kichern]</translation>
         </translation>
     </message>
     <message id="xx_error_correction">
-        <location filename="../textentrypage.cpp" line="635"/>
+        <location filename="../textentrypage.cpp" line="650"/>
         <source>Error correction</source>
         <translation>Fehlerkorrektur</translation>
     </message>
@@ -676,17 +658,17 @@ Ein Suchbalken ist ein spezieller Typ eines Schiebereglers, der benutzt wird um
         <translation>Fensterpiktogramm</translation>
     </message>
     <message id="xx_popup_generic_title">
-        <location filename="../comboboxpage.cpp" line="114"/>
+        <location filename="../comboboxpage.cpp" line="117"/>
         <source>Title</source>
         <translation>Titel</translation>
     </message>
     <message id="xx_popup_sort_descending_order">
-        <location filename="../comboboxpage.cpp" line="116"/>
+        <location filename="../comboboxpage.cpp" line="119"/>
         <source>Sort - DescendingOrder</source>
         <translation>Sortieren — in absteigender Reihenfolge</translation>
     </message>
     <message id="xx_popup_time_consuming">
-        <location filename="../comboboxpage.cpp" line="118"/>
+        <location filename="../comboboxpage.cpp" line="121"/>
         <source>Time-consuming setting</source>
         <translation>Zeitaufwendige Einstellung</translation>
     </message>
@@ -696,52 +678,52 @@ Ein Suchbalken ist ein spezieller Typ eines Schiebereglers, der benutzt wird um
         <translation>Behälter</translation>
     </message>
     <message id="xx_progressbar_page_title">
-        <location filename="../progressbarpage.cpp" line="89"/>
+        <location filename="../progressbarpage.cpp" line="88"/>
         <source>Progress Bar</source>
         <translation>Fortschrittsbalken</translation>
     </message>
     <message id="xx_progressbar_page_info_label">
-        <location filename="../progressbarpage.cpp" line="94"/>
+        <location filename="../progressbarpage.cpp" line="93"/>
         <source>A Progress Bar can indicate an ongoing process with either known or unknown durations.</source>
         <translation>Ein Fortschrittsbalken kann zur Zeit ablaufende Vorgänge mit bekannter oder unbekannter Dauer anzeigen</translation>
     </message>
     <message id="xx_progressindicator_unknown_duration_bar">
-        <location filename="../progressbarpage.cpp" line="98"/>
+        <location filename="../progressbarpage.cpp" line="97"/>
         <source>Installing CoolApp</source>
         <translation>Installiere tolles Programm</translation>
     </message>
     <message id="xx_progressindicator_known_duration_bar">
-        <location filename="../progressbarpage.cpp" line="96"/>
+        <location filename="../progressbarpage.cpp" line="95"/>
         <source>Downloading nicepic.jpg</source>
         <translation>Download vom nettesbild.jpg</translation>
     </message>
     <message id="xx_toolbar_page_example1">
-        <location filename="../toolbarpage.cpp" line="220"/>
+        <location filename="../toolbarpage.cpp" line="223"/>
         <source>Example 1</source>
         <translation>Beispiel 1</translation>
     </message>
     <message id="xx_toolbar_page_example2">
-        <location filename="../toolbarpage.cpp" line="222"/>
+        <location filename="../toolbarpage.cpp" line="225"/>
         <source>Example 2</source>
         <translation>Beispiel 2</translation>
     </message>
     <message id="xx_toolbar_page_defaultview">
-        <location filename="../toolbarpage.cpp" line="224"/>
+        <location filename="../toolbarpage.cpp" line="227"/>
         <source>Default View</source>
         <translation>Standardansicht</translation>
     </message>
     <message id="xx_toolbar_page_tabview">
-        <location filename="../toolbarpage.cpp" line="226"/>
+        <location filename="../toolbarpage.cpp" line="229"/>
         <source>Tab View</source>
         <translation>Karteireiteransicht</translation>
     </message>
     <message id="xx_toolbar_page_title">
-        <location filename="../toolbarpage.cpp" line="210"/>
+        <location filename="../toolbarpage.cpp" line="213"/>
         <source>ToolBar</source>
         <translation>Werkzeugleiste</translation>
     </message>
     <message id="xx_toolbar_page_info">
-        <location filename="../toolbarpage.cpp" line="217"/>
+        <location filename="../toolbarpage.cpp" line="220"/>
         <source>&lt;b&gt;Toolbar&lt;/b&gt; acts as a container for actions. Depending upon the view attached, it either acts as a tab bar or is a container for buttons and text input field. &lt;ul&gt;&lt;li&gt;Click Menu to explore the example&lt;/li&gt;&lt;/ul&gt;</source>
         <translation>Die &lt;b&gt;Werkzeugleiste&lt;/b&gt; dient als ein Behälter für Aktionen. Abhängig von View, das damit verbunden ist, verhält es sich wie eine Karteireiterleiste oder als ein Behälter für Knöpfe und Texteingabefelder. &lt;ul&gt;&lt;li&gt;Klicke auf das Menü um die Beispiele anzusehen.&lt;/li&gt;&lt;/ul&gt;</translation>
     </message>
@@ -806,175 +788,195 @@ Die primäre Aktion  (kurzes Einzelklopfen) auf dieses Element sollte nicht im O
         <translation>Lieblings Alben</translation>
     </message>
     <message id="xx_displaymodes_navbarcombo">
-        <location filename="../displaymodespage.cpp" line="59"/>
+        <location filename="../displaymodespage.cpp" line="68"/>
         <source>Navigation Bar</source>
         <translation>Navigationsbalken</translation>
     </message>
     <message id="xx_displaymodes_escapebtncombo">
-        <location filename="../displaymodespage.cpp" line="67"/>
+        <location filename="../displaymodespage.cpp" line="76"/>
         <source>Escape Button</source>
         <translation>Fluchtknopf</translation>
     </message>
     <message id="xx_displaymodes_homebtncombo">
-        <location filename="../displaymodespage.cpp" line="75"/>
+        <location filename="../displaymodespage.cpp" line="84"/>
         <source>Home Button</source>
         <translation>Heimknopf</translation>
     </message>
     <message id="xx_displaymodes_page_title">
-        <location filename="../displaymodespage.cpp" line="143"/>
+        <location filename="../displaymodespage.cpp" line="152"/>
         <source>Display Modes</source>
         <oldsource>Display Modes and Full Screen</oldsource>
         <translation>Anzeigemodi und Vollbildanzeige</translation>
     </message>
     <message id="xx_displaymodes_display_mode">
-        <location filename="../displaymodespage.cpp" line="147"/>
+        <location filename="../displaymodespage.cpp" line="156"/>
         <source>Components&apos; display mode:</source>
         <translation>Anzeigemodus der Applikationsseite:</translation>
     </message>
     <message id="xx_displaymodes_window_state">
-        <location filename="../displaymodespage.cpp" line="150"/>
+        <location filename="../displaymodespage.cpp" line="159"/>
         <source>Window state:</source>
         <translation>Fensterzustand</translation>
     </message>
     <message id="xx_displaymodes_full_screen">
-        <location filename="../displaymodespage.cpp" line="153"/>
+        <location filename="../displaymodespage.cpp" line="162"/>
         <source>Full Screen</source>
         <translation>Vollbildmodus</translation>
     </message>
     <message id="xx_displaymode_show">
-        <location filename="../displaymodespage.cpp" line="166"/>
+        <location filename="../displaymodespage.cpp" line="175"/>
         <source>Show</source>
         <translation>Zeige</translation>
     </message>
     <message id="xx_displaymode_autohide">
-        <location filename="../displaymodespage.cpp" line="168"/>
+        <location filename="../displaymodespage.cpp" line="177"/>
         <source>Auto Hide</source>
         <translation>Auto-Zeigen</translation>
     </message>
     <message id="xx_displaymode_hide">
-        <location filename="../displaymodespage.cpp" line="170"/>
+        <location filename="../displaymodespage.cpp" line="179"/>
         <source>Hide</source>
         <translation>Verstecken</translation>
     </message>
     <message id="xx_language_title">
-        <location filename="../languagepage.cpp" line="118"/>
+        <location filename="../languagepage.cpp" line="122"/>
         <source>Change Language</source>
         <translation>Sprache Ändern</translation>
     </message>
     <message id="xx_locale_none">
-        <location filename="../languagepage.cpp" line="137"/>
+        <location filename="../languagepage.cpp" line="143"/>
         <source>None</source>
         <translation>Keine</translation>
     </message>
     <message id="xx_locale_ar">
-        <location filename="../languagepage.cpp" line="142"/>
+        <location filename="../languagepage.cpp" line="148"/>
         <source>Arabic</source>
         <translation>Arabisch</translation>
     </message>
     <message id="xx_locale_de">
-        <location filename="../languagepage.cpp" line="147"/>
+        <location filename="../languagepage.cpp" line="153"/>
         <source>German</source>
         <translation>Deutsch</translation>
     </message>
     <message id="xx_locale_de_AT">
-        <location filename="../languagepage.cpp" line="152"/>
+        <location filename="../languagepage.cpp" line="158"/>
         <source>German (Austria)</source>
         <translation>Deutsch (Österreich)</translation>
     </message>
     <message id="xx_locale_de_CH">
-        <location filename="../languagepage.cpp" line="157"/>
+        <location filename="../languagepage.cpp" line="163"/>
         <source>German (Switzerland)</source>
         <translation>Deutsch (Schweiz)</translation>
     </message>
     <message id="xx_locale_en">
-        <location filename="../languagepage.cpp" line="162"/>
+        <location filename="../languagepage.cpp" line="168"/>
         <source>English</source>
         <translation>Englisch</translation>
     </message>
     <message id="xx_locale_fi">
-        <location filename="../languagepage.cpp" line="167"/>
+        <location filename="../languagepage.cpp" line="173"/>
         <source>Finnish</source>
         <translation>Finnisch</translation>
     </message>
     <message id="xx_locale_hi">
-        <location filename="../languagepage.cpp" line="172"/>
+        <location filename="../languagepage.cpp" line="178"/>
         <source>Hindi</source>
         <translation>Hindi</translation>
     </message>
     <message id="xx_locale_hu">
-        <location filename="../languagepage.cpp" line="177"/>
+        <location filename="../languagepage.cpp" line="183"/>
         <source>Hungarian</source>
         <translation>Ungarisch</translation>
     </message>
     <message id="xx_locale_ja">
-        <location filename="../languagepage.cpp" line="182"/>
+        <location filename="../languagepage.cpp" line="188"/>
         <source>Japanese</source>
         <translation>Japanisch</translation>
     </message>
     <message id="xx_locale_ur">
-        <location filename="../languagepage.cpp" line="187"/>
+        <location filename="../languagepage.cpp" line="193"/>
         <source>Urdu</source>
         <translation>Urdu</translation>
     </message>
     <message id="xx_locale_ur_PK">
-        <location filename="../languagepage.cpp" line="192"/>
+        <location filename="../languagepage.cpp" line="198"/>
         <source>Urdu (Pakistan)</source>
         <translation>Urdu (Pakistan)</translation>
     </message>
     <message id="xx_locale_ur_IN">
-        <location filename="../languagepage.cpp" line="197"/>
+        <location filename="../languagepage.cpp" line="203"/>
         <source>Urdu (India)</source>
         <translation>Urdu (Indien)</translation>
     </message>
     <message id="xx_locale_zh_CN">
-        <location filename="../languagepage.cpp" line="202"/>
+        <location filename="../languagepage.cpp" line="208"/>
         <source>Chinese (China)</source>
         <translation>Vereinfachtes Chinesisch (China)</translation>
     </message>
     <message id="xx_locale_zh_TW">
-        <location filename="../languagepage.cpp" line="207"/>
+        <location filename="../languagepage.cpp" line="213"/>
         <source>Chinese (Taiwan)</source>
         <translation>Chinesisch (Taiwan)</translation>
     </message>
+    <message id="xx_timeformat24h_locale_default">
+        <location filename="../languagepage.cpp" line="223"/>
+        <source>Locale default</source>
+        <translation>Default der Locale</translation>
+    </message>
+    <message id="xx_timeformat24h_24_hour_mode">
+        <location filename="../languagepage.cpp" line="227"/>
+        <source>24 hour mode</source>
+        <translation>24 Stunden Modus</translation>
+    </message>
+    <message id="xx_timeformat24h_12_hour_mode">
+        <location filename="../languagepage.cpp" line="231"/>
+        <source>12 hour mode</source>
+        <translation>12 Stunden Modus</translation>
+    </message>
     <message id="xx_language_combobox_title">
-        <location filename="../languagepage.cpp" line="302"/>
+        <location filename="../languagepage.cpp" line="357"/>
         <source>Please select language</source>
         <translation>Bitte wählen Sie die Sprache:</translation>
     </message>
     <message id="xx_language_combobox_lctime_title">
-        <location filename="../languagepage.cpp" line="304"/>
+        <location filename="../languagepage.cpp" line="359"/>
         <source>Locale for time</source>
         <translation>Locale für Zeit</translation>
     </message>
+    <message id="xx_language_combobox_lctimeformat24h_title">
+        <location filename="../languagepage.cpp" line="361"/>
+        <source>Choose 12/24 hour mode</source>
+        <translation>Bitte wählen Sie den 12/24 Stunden Modus</translation>
+    </message>
     <message id="xx_language_combobox_lccollate_title">
-        <location filename="../languagepage.cpp" line="306"/>
+        <location filename="../languagepage.cpp" line="363"/>
         <source>Locale for collation</source>
         <translation>Locale für Sortierung</translation>
     </message>
     <message id="xx_language_combobox_lcnumeric_title">
-        <location filename="../languagepage.cpp" line="308"/>
+        <location filename="../languagepage.cpp" line="365"/>
         <source>Locale for numbers</source>
         <translation>Locale für Zahlen</translation>
     </message>
     <message id="xx_language_combobox_lcmonetary_title">
-        <location filename="../languagepage.cpp" line="310"/>
+        <location filename="../languagepage.cpp" line="367"/>
         <source>Locale for money</source>
         <translation>Locale für Geld</translation>
     </message>
     <message id="qtn_comm_command_yes">
-        <location filename="../languagepage.cpp" line="314"/>
-        <location filename="../languagepage.cpp" line="321"/>
+        <location filename="../languagepage.cpp" line="371"/>
+        <location filename="../languagepage.cpp" line="378"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message id="qtn_comm_command_no">
-        <location filename="../languagepage.cpp" line="317"/>
-        <location filename="../languagepage.cpp" line="324"/>
+        <location filename="../languagepage.cpp" line="374"/>
+        <location filename="../languagepage.cpp" line="381"/>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message id="xx_language_number_format">
-        <location filename="../languagepage.cpp" line="329"/>
+        <location filename="../languagepage.cpp" line="386"/>
         <source>Number format example: %1œ!! Number example: %1œ!! Number: %1</source>
         <translation variants="yes">
             <lengthvariant>Beispiel für Zahlenformatierung: %1</lengthvariant>
@@ -983,7 +985,7 @@ Die primäre Aktion  (kurzes Einzelklopfen) auf dieses Element sollte nicht im O
         </translation>
     </message>
     <message id="xx_langage_date_time_format">
-        <location filename="../languagepage.cpp" line="344"/>
+        <location filename="../languagepage.cpp" line="401"/>
         <source>Date and time format example: %1œ!! Date and time: %1œ!! Date: %1œ!! %1</source>
         <translation variants="yes">
             <lengthvariant>Beispiel für Datums- und Zeitformatierung: %1</lengthvariant>
@@ -994,7 +996,7 @@ Die primäre Aktion  (kurzes Einzelklopfen) auf dieses Element sollte nicht im O
         </translation>
     </message>
     <message id="xx_language_week_number">
-        <location filename="../languagepage.cpp" line="349"/>
+        <location filename="../languagepage.cpp" line="406"/>
         <source>Week number example: %1</source>
         <translation variants="yes">
             <lengthvariant>Kalenderwochennummerbeispiel: %1</lengthvariant>
@@ -1003,7 +1005,7 @@ Die primäre Aktion  (kurzes Einzelklopfen) auf dieses Element sollte nicht im O
         </translation>
     </message>
     <message id="xx_language_currency_format">
-        <location filename="../languagepage.cpp" line="359"/>
+        <location filename="../languagepage.cpp" line="416"/>
         <source>Currency format example: %1 %2œ!! Currency: %1 %2</source>
         <translation variants="yes">
             <lengthvariant>Beispiel für Geldbetragformatierung: %1 %2</lengthvariant>
@@ -1013,9 +1015,9 @@ Die primäre Aktion  (kurzes Einzelklopfen) auf dieses Element sollte nicht im O
         </translation>
     </message>
     <message id="xx_language_trans_%Ln_boxes_weight_%L1" numerus="yes">
-        <location filename="../languagepage.cpp" line="365"/>
-        <location filename="../languagepage.cpp" line="367"/>
-        <location filename="../languagepage.cpp" line="369"/>
+        <location filename="../languagepage.cpp" line="422"/>
+        <location filename="../languagepage.cpp" line="424"/>
+        <location filename="../languagepage.cpp" line="426"/>
         <source>%Ln boxes with a total weight of %L1 kilogramœ!! %Ln boxes, total weight of %L1 kg</source>
         <translation>
             <numerusform variants="yes">
@@ -1029,7 +1031,7 @@ Die primäre Aktion  (kurzes Einzelklopfen) auf dieses Element sollte nicht im O
         </translation>
     </message>
     <message id="xx_language_font_test">
-        <location filename="../languagepage.cpp" line="373"/>
+        <location filename="../languagepage.cpp" line="430"/>
         <source>Font test:</source>
         <translation>Zeichensatzprüfung:</translation>
     </message>
@@ -1039,32 +1041,32 @@ Die primäre Aktion  (kurzes Einzelklopfen) auf dieses Element sollte nicht im O
         <translation>“Image” erlaubt das Positionieren von Bildern auf die Benutzeroberfläche. Bilder sind gewöhnlich nicht-interaktive Elemente. Jedoch können auch verschiedene einfache und mehrfache Berührungsaktionen zu einer Bildkomponente hinzugefügt werden, falls gewünscht.</translation>
     </message>
     <message id="xx_sample template">
-        <location filename="../templatepage.cpp" line="107"/>
+        <location filename="../templatepage.cpp" line="108"/>
         <source>Sample template</source>
         <translation>Beispiel Vorlage</translation>
     </message>
     <message id="xx_template_page_title">
-        <location filename="../templatepage.cpp" line="101"/>
+        <location filename="../templatepage.cpp" line="102"/>
         <source>Template</source>
         <translation>Vorlage</translation>
     </message>
     <message id="xx_textentry_completion_text">
-        <location filename="../textentrypage.cpp" line="614"/>
+        <location filename="../textentrypage.cpp" line="627"/>
         <source>Email suggestion text:</source>
         <translation>E-Mail Vorschlags text:</translation>
     </message>
     <message id="xx_combobox_page_info">
-        <location filename="../comboboxpage.cpp" line="122"/>
+        <location filename="../comboboxpage.cpp" line="125"/>
         <source>The MComboBox widget is a combined button and popup list. It is very similar to QComboBox, but does not allow editing the text.</source>
         <translation>Das MComboBox Widget ist eine Kombination aus einem Knopf und einer Popup List. Es ist sehr ähnlich zur QComboBox aber erlaubt nicht den Text zu editieren.</translation>
     </message>
     <message id="xx_combobox_title">
-        <location filename="../comboboxpage.cpp" line="110"/>
+        <location filename="../comboboxpage.cpp" line="113"/>
         <source>ComboBox</source>
         <translation>Combobox</translation>
     </message>
     <message id="xx_tooltip_entry8">
-        <location filename="../textentrypage.cpp" line="592"/>
+        <location filename="../textentrypage.cpp" line="605"/>
         <source>Provides email address suggestions</source>
         <translation>Stellt Vorschläge für E-Mail Adressen zur Verfügung</translation>
     </message>
@@ -1086,19 +1088,19 @@ Checkbox essentially does the same thing as the Switch button, so please conside
         <translation>Ich habe die Anleitung gelesen und verstanden.</translation>
     </message>
     <message id="xx_icon_button_page_title">
-        <location filename="../iconbuttonpage.cpp" line="81"/>
+        <location filename="../iconbuttonpage.cpp" line="82"/>
         <source>Icon Button</source>
         <translation>Pictogramm Knopf</translation>
     </message>
     <message id="xx_icon_button_page_info_label">
-        <location filename="../iconbuttonpage.cpp" line="89"/>
+        <location filename="../iconbuttonpage.cpp" line="90"/>
         <source>Icon Buttons have an icon and can have a text label. Icon button differs from push button by its visual presentation: it does not have button-style edges like a Push Button does.
 
  Icon Buttons are used in e.g. Toolbars.</source>
         <translation>Pictogrammknöpfe haben ein Piktogramm und können auch ein Text-Label haben. Ein Pictogrammknopf unterscheidet sich von einen Druckknopf durch seine graphische Darstellung: er hat nicht die knopfartigen Ränder wie ein Druckknopf.</translation>
     </message>
     <message id="xx_icon_button_page_icon_button2">
-        <location filename="../iconbuttonpage.cpp" line="91"/>
+        <location filename="../iconbuttonpage.cpp" line="92"/>
         <source>Lorem ipsum</source>
         <translation>Lorem ipsum</translation>
     </message>
@@ -1281,58 +1283,55 @@ Eingaberückmeldungen können mit Hilfe des Theming-Systems einfach für verschi
         <translation>Stumm</translation>
     </message>
     <message id="xx_gridpage_configuration">
-        <location filename="../mgridpage.cpp" line="208"/>
+        <location filename="../mgridpage.cpp" line="210"/>
         <source>Configuration</source>
         <translation>Einstellung</translation>
     </message>
     <message id="xx_gridpage_title">
-        <location filename="../mgridpage.cpp" line="203"/>
-        <source>ConfigurationGrid page</source>
-        <translation>Konfigurationsgitter Seite</translation>
+        <location filename="../mgridpage.cpp" line="205"/>
+        <source>Grid page</source>
+        <oldsource>ConfigurationGrid page</oldsource>
+        <translation>Gitter Seite</translation>
     </message>
     <message id="xx_gridpage_set_columns">
-        <location filename="../mgridpage.cpp" line="297"/>
+        <location filename="../mgridpage.cpp" line="301"/>
         <source>Set columns</source>
         <translation>Spalten einstellen</translation>
     </message>
     <message id="xx_gridpage_landscape">
-        <location filename="../mgridpage.cpp" line="329"/>
-        <location filename="../mgridpage.cpp" line="339"/>
+        <location filename="../mgridpage.cpp" line="333"/>
+        <location filename="../mgridpage.cpp" line="343"/>
         <source>Landscape</source>
         <translation>Querformat</translation>
     </message>
     <message id="xx_gridpage_portrait">
-        <location filename="../mgridpage.cpp" line="334"/>
-        <location filename="../mgridpage.cpp" line="344"/>
+        <location filename="../mgridpage.cpp" line="338"/>
+        <location filename="../mgridpage.cpp" line="348"/>
         <source>Portrait</source>
         <translation>Hochformat</translation>
     </message>
     <message id="xx_bubblepage_title">
-        <location filename="../bubblepage.cpp" line="156"/>
+        <location filename="../bubblepage.cpp" line="158"/>
         <source>Speech Bubble</source>
         <translation>Sprechblase</translation>
     </message>
     <message id="xx_wg_bubblepage_linkactivated">
-        <location filename="../bubblepage.cpp" line="169"/>
+        <location filename="../bubblepage.cpp" line="171"/>
         <source>Link activated</source>
         <translation>Link aktiviert</translation>
     </message>
     <message id="xx_wg_bubblepage_bubbleclicked">
-        <location filename="../bubblepage.cpp" line="176"/>
+        <location filename="../bubblepage.cpp" line="178"/>
         <source>Speech buuble clicked</source>
         <translation>Sprechblase angeklickt</translation>
     </message>
-    <message id="xx_content_items_subtitle">
-        <source>Subtitle</source>
-        <translation type="obsolete">Untertitel</translation>
-    </message>
     <message id="xx_button_group_page_title">
-        <location filename="../buttongrouppage.cpp" line="156"/>
+        <location filename="../buttongrouppage.cpp" line="168"/>
         <source>Button Group</source>
         <translation>Knopfgruppe</translation>
     </message>
     <message id="xx_button_group_page_info_label">
-        <location filename="../buttongrouppage.cpp" line="168"/>
+        <location filename="../buttongrouppage.cpp" line="180"/>
         <source>Buttons can be grouped together based on visual or logic requirements.
 
 The basic group is formed by placing buttons together into a layout. Depending on the theme, the buttons are typically drawn as connected with each other.
@@ -1345,62 +1344,62 @@ Die Basisgruppe wird gebildet indem Knöpfe gemeinsam in ein Layout eingefügt w
 Logische Ausschließlichkeit kann zu einer Gruppe hinzugefügt werden. Das stellt sicher, daß nur einer der Knöpfe zu einer bestimmten Zeit ausgewählt werden kann. Wenn eine Gruppe nicht exklusiv ist, können mehrere Optionen der Gruppe gleichzeitig ausgewählt werden.</translation>
     </message>
     <message id="xx_button_group_page_hlabel1">
-        <location filename="../buttongrouppage.cpp" line="171"/>
+        <location filename="../buttongrouppage.cpp" line="183"/>
         <source>Horizontal group</source>
         <translation>Horizontale Gruppe</translation>
     </message>
     <message id="xx_button_group_page_button1">
-        <location filename="../buttongrouppage.cpp" line="173"/>
+        <location filename="../buttongrouppage.cpp" line="185"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message id="xx_button_group_page_button2">
-        <location filename="../buttongrouppage.cpp" line="175"/>
+        <location filename="../buttongrouppage.cpp" line="187"/>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message id="xx_button_group_page_button3">
-        <location filename="../buttongrouppage.cpp" line="177"/>
+        <location filename="../buttongrouppage.cpp" line="189"/>
         <source>Maybe</source>
         <translation>Vielleicht</translation>
     </message>
     <message id="xx_button_group_page_vlabel2">
-        <location filename="../buttongrouppage.cpp" line="180"/>
+        <location filename="../buttongrouppage.cpp" line="192"/>
         <source>Horizontal group, exclusive</source>
         <translation>Horizontale Gruppe, exklusiv</translation>
     </message>
     <message id="xx_button_group_page_button4">
-        <location filename="../buttongrouppage.cpp" line="182"/>
+        <location filename="../buttongrouppage.cpp" line="194"/>
         <source>Cost</source>
         <translation>Kosten</translation>
     </message>
     <message id="xx_button_group_page_button5">
-        <location filename="../buttongrouppage.cpp" line="184"/>
+        <location filename="../buttongrouppage.cpp" line="196"/>
         <source>Quality</source>
         <translation>Qualität</translation>
     </message>
     <message id="xx_button_group_page_button6">
-        <location filename="../buttongrouppage.cpp" line="186"/>
+        <location filename="../buttongrouppage.cpp" line="198"/>
         <source>Schedule</source>
         <translation>Zeitplan</translation>
     </message>
     <message id="xx_button_group_page_vlabel">
-        <location filename="../buttongrouppage.cpp" line="189"/>
+        <location filename="../buttongrouppage.cpp" line="201"/>
         <source>Vertical group, checkable</source>
         <translation>Vertikale Gruppe, auswählbar</translation>
     </message>
     <message id="xx_button_group_page_button7">
-        <location filename="../buttongrouppage.cpp" line="191"/>
+        <location filename="../buttongrouppage.cpp" line="203"/>
         <source>Milk</source>
         <translation>Milch</translation>
     </message>
     <message id="xx_button_group_page_button8">
-        <location filename="../buttongrouppage.cpp" line="193"/>
+        <location filename="../buttongrouppage.cpp" line="205"/>
         <source>Sugar</source>
         <translation>Zucker</translation>
     </message>
     <message id="xx_button_group_page_button9">
-        <location filename="../buttongrouppage.cpp" line="195"/>
+        <location filename="../buttongrouppage.cpp" line="207"/>
         <source>Biscotti</source>
         <translation>Kekse</translation>
     </message>
@@ -1419,57 +1418,57 @@ Logische Ausschließlichkeit kann zu einer Gruppe hinzugefügt werden. Das stell
         <translation>Seite</translation>
     </message>
     <message id="xx_wg_contentitemspage_single_title">
-        <location filename="../contentitemspage.cpp" line="310"/>
+        <location filename="../contentitemspage.cpp" line="312"/>
         <source>Single Title</source>
         <translation>Einzelner Titel</translation>
     </message>
     <message id="xx_wg_contentitemspage_title_with_subtitle">
-        <location filename="../contentitemspage.cpp" line="312"/>
+        <location filename="../contentitemspage.cpp" line="314"/>
         <source>Title with Subtitle</source>
         <translation>Titel mit Untertitel</translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title">
-        <location filename="../contentitemspage.cpp" line="314"/>
+        <location filename="../contentitemspage.cpp" line="316"/>
         <source>Icon with Title</source>
         <translation>Piktogramm mit Titel</translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_and_subtitle">
-        <location filename="../contentitemspage.cpp" line="316"/>
+        <location filename="../contentitemspage.cpp" line="318"/>
         <source>Icon with Title and Subtitle</source>
         <translation>Piktogramm mit Titel und Untertitel</translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_subtitle_and_two_side_icons">
-        <location filename="../contentitemspage.cpp" line="320"/>
+        <location filename="../contentitemspage.cpp" line="322"/>
         <source>Icon with Title Subtitle and Two Side Icons</source>
         <translation>Piktogramm mit Titel und Untertitel und zweiseitigen Piktogrammen</translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_subtitle_and_side_icon_with_label">
-        <location filename="../contentitemspage.cpp" line="323"/>
+        <location filename="../contentitemspage.cpp" line="325"/>
         <source>Icon with Title Subtitle and Side Icon with Label</source>
         <translation>Piktogramm mit Titel und Untertitel und Piktogramm an der Seite mit Label</translation>
     </message>
     <message id="xx_wg_contentitemspage_thumbnail_with_title_subtitle_and_two_side_icons">
-        <location filename="../contentitemspage.cpp" line="326"/>
+        <location filename="../contentitemspage.cpp" line="328"/>
         <source>Thumbnail with Title Subtitle and Two Side Icons</source>
         <translation>Thumbnail mit Titel und Untertitel und zweiseitigen Piktogrammen</translation>
     </message>
     <message id="xx_wg_contentitemspage_thumbnail_with_title_and_two_side_icons">
-        <location filename="../contentitemspage.cpp" line="329"/>
+        <location filename="../contentitemspage.cpp" line="331"/>
         <source>Thumbnail with Title and Two Side Icons</source>
         <translation>Piktogramm mit Titel und zweiseitigen Piktogrammen</translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_progress_indicator_and_two_side_icons">
-        <location filename="../contentitemspage.cpp" line="334"/>
+        <location filename="../contentitemspage.cpp" line="336"/>
         <source>Icon with Title Progress Indicator and Two Side Icons</source>
         <translation>Piktogramm mit Titel, Fortschrittsanzeige und zweiseitigen Piktogrammen</translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_progress_indicator_and_top_side_icon">
-        <location filename="../contentitemspage.cpp" line="337"/>
+        <location filename="../contentitemspage.cpp" line="339"/>
         <source>Icon with Title Progress Indicator and Top Side Icon</source>
-        <translation type="unfinished">Piktogramm mit Titel, Fortschrittsanzeige und Piktogramm auf der Oberseite </translation>
+        <translation>Piktogramm mit Titel, Fortschrittsanzeige und Piktogramm auf der Oberseite</translation>
     </message>
     <message id="xx_contentitemspage_title">
-        <location filename="../contentitemspage.cpp" line="358"/>
+        <location filename="../contentitemspage.cpp" line="359"/>
         <source>Content Items</source>
         <translation>Enthaltene Gegenstände</translation>
     </message>
diff --git a/demos/widgetsgallery/translations/widgetsgallery_en.ts b/demos/widgetsgallery/translations/widgetsgallery_en.ts
index f8df5103..747161b6 100644
--- a/demos/widgetsgallery/translations/widgetsgallery_en.ts
+++ b/demos/widgetsgallery/translations/widgetsgallery_en.ts
@@ -4,217 +4,217 @@
 <context>
     <name></name>
     <message id="xx_wg_categories_application_view">
-        <location filename="../mainpage.cpp" line="86"/>
+        <location filename="../mainpage.cpp" line="92"/>
         <source>Application View</source>
         <translation>Application View</translation>
     </message>
     <message id="xx_wg_application_view_view_menu">
-        <location filename="../mainpage.cpp" line="88"/>
+        <location filename="../mainpage.cpp" line="94"/>
         <source>Application Menu</source>
         <translation>Application Menu</translation>
     </message>
     <message id="xx_wg_application_view_display_modes">
-        <location filename="../mainpage.cpp" line="90"/>
+        <location filename="../mainpage.cpp" line="96"/>
         <source>Display Modes</source>
         <translation>Display Modes</translation>
     </message>
     <message id="xx_wg_application_view_toolbar_incl_tab_bar">
-        <location filename="../mainpage.cpp" line="92"/>
+        <location filename="../mainpage.cpp" line="98"/>
         <source>Toolbar (including Tab Bar)</source>
         <translation>Toolbar (including Tab Bar)</translation>
     </message>
     <message id="xx_wg_categories_simple_widgets">
-        <location filename="../mainpage.cpp" line="96"/>
+        <location filename="../mainpage.cpp" line="102"/>
         <source>Simple Widgets</source>
         <translation>Simple Widgets</translation>
     </message>
     <message id="xx_wg_simple_widgets_labels">
-        <location filename="../mainpage.cpp" line="98"/>
+        <location filename="../mainpage.cpp" line="104"/>
         <source>Labels</source>
         <translation>Labels</translation>
     </message>
     <message id="xx_wg_simple_widgets_image">
-        <location filename="../mainpage.cpp" line="100"/>
+        <location filename="../mainpage.cpp" line="106"/>
         <source>Image</source>
         <translation>Image</translation>
     </message>
     <message id="xx_wg_simple_widgets_progress_bar">
-        <location filename="../mainpage.cpp" line="102"/>
+        <location filename="../mainpage.cpp" line="108"/>
         <source>Progress Bar</source>
         <translation>Progress Bar</translation>
     </message>
     <message id="xx_wg_simple_widgets_container">
-        <location filename="../mainpage.cpp" line="104"/>
+        <location filename="../mainpage.cpp" line="110"/>
         <source>Container</source>
         <translation>Container</translation>
     </message>
     <message id="xx_wg_simple_widgets_spinner">
-        <location filename="../mainpage.cpp" line="106"/>
+        <location filename="../mainpage.cpp" line="112"/>
         <source>Spinner</source>
         <translation>Spinner</translation>
     </message>
     <message id="xx_wg_categories_buttons">
-        <location filename="../mainpage.cpp" line="109"/>
+        <location filename="../mainpage.cpp" line="115"/>
         <source>Buttons</source>
         <translation>Buttons</translation>
     </message>
     <message id="xx_wg_buttons_push_button">
-        <location filename="../mainpage.cpp" line="111"/>
+        <location filename="../mainpage.cpp" line="117"/>
         <source>Push Button</source>
         <translation>Push Button</translation>
     </message>
     <message id="xx_wg_buttons_icon_button">
-        <location filename="../mainpage.cpp" line="113"/>
+        <location filename="../mainpage.cpp" line="119"/>
         <source>Icon Button</source>
         <translation>Icon Button</translation>
     </message>
     <message id="xx_wg_buttons_switch">
-        <location filename="../mainpage.cpp" line="115"/>
+        <location filename="../mainpage.cpp" line="121"/>
         <source>Switch</source>
         <translation>Switch</translation>
     </message>
     <message id="xx_wg_buttons_checkbox">
-        <location filename="../mainpage.cpp" line="117"/>
+        <location filename="../mainpage.cpp" line="123"/>
         <source>Checkbox</source>
         <translation>Checkbox</translation>
     </message>
     <message id="xx_wg_buttons_buttongroup">
-        <location filename="../mainpage.cpp" line="119"/>
+        <location filename="../mainpage.cpp" line="125"/>
         <source>Button Group</source>
         <translation>Button Group</translation>
     </message>
     <message id="xx_wg_categories_dialogs_and_banners">
-        <location filename="../mainpage.cpp" line="122"/>
+        <location filename="../mainpage.cpp" line="128"/>
         <source>Dialogs and Banners</source>
         <translation>Dialogs and Banners</translation>
     </message>
     <message id="xx_wg_dialogs_and_banners_single_selection_dialog">
-        <location filename="../mainpage.cpp" line="124"/>
+        <location filename="../mainpage.cpp" line="130"/>
         <source>Single Selection Dialog</source>
         <translation>Single Selection Dialog</translation>
     </message>
     <message id="xx_wg_dialogs_and_banners_query_dialog">
-        <location filename="../mainpage.cpp" line="126"/>
+        <location filename="../mainpage.cpp" line="132"/>
         <source>Query Dialog</source>
         <translation>Query Dialog</translation>
     </message>
     <message id="xx_wg_dialogs_and_banners_banner">
-        <location filename="../mainpage.cpp" line="128"/>
+        <location filename="../mainpage.cpp" line="134"/>
         <source>Banner</source>
         <translation>Banner</translation>
     </message>
     <message id="xx_wg_categories_lists_grids_and_popups">
-        <location filename="../mainpage.cpp" line="131"/>
+        <location filename="../mainpage.cpp" line="137"/>
         <source>Lists, Grids and Popups</source>
         <translation>Lists, Grids and Popups</translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_list">
-        <location filename="../mainpage.cpp" line="133"/>
+        <location filename="../mainpage.cpp" line="139"/>
         <source>List</source>
         <translation>List</translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_grid">
-        <location filename="../mainpage.cpp" line="135"/>
+        <location filename="../mainpage.cpp" line="141"/>
         <source>Grid</source>
         <translation>Grid</translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_object_menu">
-        <location filename="../mainpage.cpp" line="137"/>
+        <location filename="../mainpage.cpp" line="143"/>
         <source>Object Menu</source>
         <translation>Object Menu</translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_combobox">
-        <location filename="../mainpage.cpp" line="139"/>
+        <location filename="../mainpage.cpp" line="145"/>
         <source>ComboBox</source>
         <translation>Combobox</translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_contentitems">
-        <location filename="../mainpage.cpp" line="141"/>
+        <location filename="../mainpage.cpp" line="147"/>
         <source>ContentItems</source>
         <translation>Content items</translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_bubble">
-        <location filename="../mainpage.cpp" line="143"/>
+        <location filename="../mainpage.cpp" line="149"/>
         <source>Speech bubble</source>
         <translation>Speech bubble</translation>
     </message>
     <message id="xx_wg_categories_user_input">
-        <location filename="../mainpage.cpp" line="146"/>
+        <location filename="../mainpage.cpp" line="152"/>
         <source>User Input</source>
         <translation>User Input</translation>
     </message>
     <message id="xx_wg_user_input_text_entries">
-        <location filename="../mainpage.cpp" line="148"/>
+        <location filename="../mainpage.cpp" line="154"/>
         <source>Text Entries</source>
         <translation>Text Entries</translation>
     </message>
     <message id="xx_wg_user_input_slider">
-        <location filename="../mainpage.cpp" line="150"/>
+        <location filename="../mainpage.cpp" line="156"/>
         <source>Slider</source>
         <translation>Slider</translation>
     </message>
     <message id="xx_wg_user_input_input_feedback">
-        <location filename="../mainpage.cpp" line="152"/>
+        <location filename="../mainpage.cpp" line="158"/>
         <source>Input Feedback</source>
         <translation>Input Feedback</translation>
     </message>
     <message id="xx_application_title">
-        <location filename="../mainpage.cpp" line="337"/>
+        <location filename="../mainpage.cpp" line="346"/>
         <source>Widgets Gallery</source>
         <translation>Widgets Gallery</translation>
     </message>
     <message id="xx_mainpage_themes">
-        <location filename="../mainpage.cpp" line="343"/>
+        <location filename="../mainpage.cpp" line="352"/>
         <source>Themes</source>
         <translation>Themes</translation>
     </message>
     <message id="xx_mainpage_orientation">
-        <location filename="../mainpage.cpp" line="345"/>
+        <location filename="../mainpage.cpp" line="354"/>
         <source>Orientation</source>
         <translation>Orientation</translation>
     </message>
     <message id="xx_mainpage_toggle_fps">
-        <location filename="../mainpage.cpp" line="347"/>
+        <location filename="../mainpage.cpp" line="356"/>
         <source>Toggle FPS</source>
         <translation>Toggle FPS</translation>
     </message>
     <message id="xx_mainpage_language_settings">
-        <location filename="../mainpage.cpp" line="349"/>
+        <location filename="../mainpage.cpp" line="358"/>
         <source>Language Settings</source>
         <translation>Language Settings</translation>
     </message>
     <message id="xx_apporientation_auto">
-        <location filename="../mainpage.cpp" line="562"/>
+        <location filename="../mainpage.cpp" line="570"/>
         <source>Automatic</source>
         <translation>Automatic</translation>
     </message>
     <message id="xx_apporientation_portrait">
-        <location filename="../mainpage.cpp" line="570"/>
+        <location filename="../mainpage.cpp" line="578"/>
         <source>Portrait</source>
         <translation>Portrait</translation>
     </message>
     <message id="xx_apporientation_landscape">
-        <location filename="../mainpage.cpp" line="578"/>
+        <location filename="../mainpage.cpp" line="586"/>
         <source>Landscape</source>
         <translation>Landscape</translation>
     </message>
     <message id="xx_apporientation_angle0">
-        <location filename="../mainpage.cpp" line="586"/>
+        <location filename="../mainpage.cpp" line="594"/>
         <source>0 degrees</source>
         <translation>0 degrees</translation>
     </message>
     <message id="xx_apporientation_angle90">
-        <location filename="../mainpage.cpp" line="594"/>
+        <location filename="../mainpage.cpp" line="602"/>
         <source>90 degrees clockwise</source>
         <translation>90 degrees clockwise</translation>
     </message>
     <message id="xx_apporientation_angle180">
-        <location filename="../mainpage.cpp" line="602"/>
+        <location filename="../mainpage.cpp" line="610"/>
         <source>180 degrees clockwise</source>
         <translation>180 degrees clockwise</translation>
     </message>
     <message id="xx_apporientation_angle270">
-        <location filename="../mainpage.cpp" line="610"/>
+        <location filename="../mainpage.cpp" line="618"/>
         <source>270 degrees clockwise</source>
         <translation>270 degrees clockwise</translation>
     </message>
@@ -292,89 +292,82 @@ All Labels can be aligned left, right or center and will be automatically trunca
         <translation>Select printer</translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_stacked_dialogs">
-        <location filename="../singleselectiondialogspage.cpp" line="257"/>
+        <location filename="../singleselectiondialogspage.cpp" line="259"/>
         <source>Stacked Dialogs</source>
         <translation>Stacked Dialogs</translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_system_dialog">
-        <location filename="../singleselectiondialogspage.cpp" line="259"/>
+        <location filename="../singleselectiondialogspage.cpp" line="261"/>
         <source>System Dialog</source>
         <translation>System Dialog</translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_system_modal_dialog">
-        <location filename="../singleselectiondialogspage.cpp" line="261"/>
+        <location filename="../singleselectiondialogspage.cpp" line="263"/>
         <source>System Modal Dialog</source>
         <translation>System Modal Dialog</translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_dialog_with_progress_indicator">
-        <location filename="../singleselectiondialogspage.cpp" line="263"/>
+        <location filename="../singleselectiondialogspage.cpp" line="265"/>
         <source>Dialog with Progress Indicator</source>
         <translation>Dialog with Progress Indicator</translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_message_box">
-        <location filename="../singleselectiondialogspage.cpp" line="265"/>
+        <location filename="../singleselectiondialogspage.cpp" line="267"/>
         <source>Message Box</source>
         <translation>Message Box</translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_button">
-        <location filename="../singleselectiondialogspage.cpp" line="126"/>
+        <location filename="../singleselectiondialogspage.cpp" line="128"/>
         <source>Click to spawn a nested dialog</source>
         <translation>Click to spawn a nested dialog</translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="128"/>
+        <location filename="../singleselectiondialogspage.cpp" line="130"/>
         <source>Stacked dialogs</source>
         <translation>Stacked dialogs</translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_open_nested_messagebox">
-        <location filename="../singleselectiondialogspage.cpp" line="142"/>
+        <location filename="../singleselectiondialogspage.cpp" line="144"/>
         <source>Click to open a nested message box</source>
         <translation>Click to open a nested message box</translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_nested_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="144"/>
+        <location filename="../singleselectiondialogspage.cpp" line="146"/>
         <source>This is a nested dialog</source>
         <translation>This is a nested dialog</translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_messagebox_text">
-        <location filename="../singleselectiondialogspage.cpp" line="157"/>
+        <location filename="../singleselectiondialogspage.cpp" line="159"/>
         <source>I&apos;m a nested message box</source>
         <translation>I’m a nested message box</translation>
     </message>
     <message id="xx_dialogs_and_notifications_system_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="168"/>
+        <location filename="../singleselectiondialogspage.cpp" line="170"/>
         <source>System Dialog</source>
         <translation>System Dialog</translation>
     </message>
     <message id="xx_dialogs_and_notifications_system_dialog_label">
-        <location filename="../singleselectiondialogspage.cpp" line="176"/>
-        <source>I&apos;m a system dialog.&lt;br&gt;There actually is a way around me...&lt;br&gt;You can skip me with the home button, but I&apos;ll remain&lt;br&gt;alive until you make a selection.</source>
-        <translation>I’m a system dialog.&lt;br&gt;There actually is a way around me...&lt;br&gt;You can skip me with the home button, but I’ll remain&lt;br&gt;alive until you make a selection.</translation>
+        <location filename="../singleselectiondialogspage.cpp" line="178"/>
+        <source>I&apos;m a system dialog.&lt;br&gt;You can skip me with the home button.&lt;br&gt;I&apos;ll be minimised to the task switcher&lt;br&gt;but I&apos;ll remain alive until you make a selection.</source>
+        <translation>I&apos;m a system dialog.&lt;br&gt;You can skip me with the home button.&lt;br&gt;I&apos;ll be minimised to the task switcher&lt;br&gt;but I&apos;ll remain alive until you make a selection.</translation>
     </message>
     <message id="xx_dialogs_and_notifications_system_modal_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="191"/>
+        <location filename="../singleselectiondialogspage.cpp" line="193"/>
         <source>System Modal Dialog</source>
         <translation>System Modal Dialog</translation>
     </message>
     <message id="xx_dialogs_and_notifications_system_modal_dialog_label">
-        <location filename="../singleselectiondialogspage.cpp" line="198"/>
-        <source>I&apos;m a window modal dialog.
-There&apos;s no way around me!
-Muwhahaha... [evil laugh]</source>
-        <oldsource>I&apos;m a System Modal dialog.
-There&apos;s no way around me!
-Muwhahaha... [evil laugh]</oldsource>
-        <translation>I&apos;m a System Modal dialog.
-There&apos;s no way around me!
-Muwhahaha... [evil laugh]</translation>
+        <location filename="../singleselectiondialogspage.cpp" line="200"/>
+        <source>I&apos;m a system modal dialog.&lt;br&gt;You can&apos;t skip me as I&apos;m designed for&lt;br&gt;use cases that require immediate user attention.</source>
+        <translation>I&apos;m a system modal dialog.&lt;br&gt;You can&apos;t skip me as I&apos;m designed for&lt;br&gt;use cases that require immediate user attention.</translation>
     </message>
     <message id="xx_dialogs_and_notifications_message_box_text">
-        <location filename="../singleselectiondialogspage.cpp" line="237"/>
+        <location filename="../singleselectiondialogspage.cpp" line="239"/>
         <source>Hello World!</source>
         <translation>Hello World!</translation>
     </message>
     <message id="xx_single_selection_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="251"/>
+        <location filename="../singleselectiondialogspage.cpp" line="253"/>
         <source>Single Selection Dialogs</source>
         <translation>Single Selection Dialogs</translation>
     </message>
@@ -399,7 +392,7 @@ Muwhahaha... [evil laugh]</translation>
         <translation>System Information Banner</translation>
     </message>
     <message id="xx_dialogs_and_notifications_progress_indicator">
-        <location filename="../singleselectiondialogspage.cpp" line="217"/>
+        <location filename="../singleselectiondialogspage.cpp" line="219"/>
         <source>Progress Indicator</source>
         <translation>Progress Indicator</translation>
     </message>
@@ -434,69 +427,74 @@ Muwhahaha... [evil laugh]</translation>
         <translation>Crop</translation>
     </message>
     <message id="xx_listpage_list_remove">
-        <location filename="../mlistpage.cpp" line="634"/>
+        <location filename="../mlistpage.cpp" line="635"/>
         <source>Remove</source>
         <translation>Remove</translation>
     </message>
     <message id="xx_listpage_list_edit">
-        <location filename="../mlistpage.cpp" line="640"/>
+        <location filename="../mlistpage.cpp" line="641"/>
         <source>Edit</source>
         <translation>Edit</translation>
     </message>
     <message id="xx_listpage_title">
-        <location filename="../mlistpage.cpp" line="658"/>
+        <location filename="../mlistpage.cpp" line="659"/>
         <source>List</source>
         <translation>List</translation>
     </message>
     <message id="xx_textentry_title">
-        <location filename="../textentrypage.cpp" line="582"/>
+        <location filename="../textentrypage.cpp" line="595"/>
         <source>Text Entries</source>
         <translation>Text Entries</translation>
     </message>
     <message id="xx_textentry_free_text">
-        <location filename="../textentrypage.cpp" line="598"/>
+        <location filename="../textentrypage.cpp" line="611"/>
         <source>Free text:</source>
         <translation>Free text:</translation>
     </message>
     <message id="xx_textentry_free_text_masked">
-        <location filename="../textentrypage.cpp" line="600"/>
-        <source>Free text(masked):</source>
-        <translation>Free text(masked):</translation>
+        <location filename="../textentrypage.cpp" line="613"/>
+        <source>Free text (masked):</source>
+        <translation>Free text (masked):</translation>
     </message>
     <message id="xx_textentry_number_text">
-        <location filename="../textentrypage.cpp" line="602"/>
+        <location filename="../textentrypage.cpp" line="615"/>
         <source>Number text:</source>
         <translation>Number text:</translation>
     </message>
     <message id="xx_textentry_phone_number">
-        <location filename="../textentrypage.cpp" line="604"/>
+        <location filename="../textentrypage.cpp" line="617"/>
         <source>Phone number:</source>
         <translation>Phone number:</translation>
     </message>
     <message id="xx_textentry_email_text">
-        <location filename="../textentrypage.cpp" line="606"/>
+        <location filename="../textentrypage.cpp" line="619"/>
         <source>Email text:</source>
         <translation>Email text:</translation>
     </message>
     <message id="xx_textentry_richtext_text">
-        <location filename="../textentrypage.cpp" line="616"/>
-        <source>Rich Text:</source>
-        <translation>Rich Text:</translation>
+        <location filename="../textentrypage.cpp" line="629"/>
+        <source>Rich text:</source>
+        <translation>Rich text:</translation>
+    </message>
+    <message id="xx_textentry_richtext_text_multiline">
+        <location filename="../textentrypage.cpp" line="631"/>
+        <source>Rich text (multiline):</source>
+        <translation>Rich text (multiline):</translation>
     </message>
     <message id="xx_textentry_noecho">
-        <location filename="../textentrypage.cpp" line="619"/>
-        <source>No Echo mode:</source>
-        <translation>No Echo mode:</translation>
+        <location filename="../textentrypage.cpp" line="634"/>
+        <source>No echo mode:</source>
+        <translation>No echo mode:</translation>
     </message>
     <message id="xx_textentry_echoonedit">
-        <location filename="../textentrypage.cpp" line="622"/>
+        <location filename="../textentrypage.cpp" line="637"/>
         <source>Echo on edit:</source>
         <translation>Echo on edit:</translation>
     </message>
     <message id="xx_textentry_direct_input_mode">
-        <location filename="../textentrypage.cpp" line="625"/>
-        <source>Direct Input Mode:</source>
-        <translation>Direct Input Mode:</translation>
+        <location filename="../textentrypage.cpp" line="640"/>
+        <source>Direct input mode:</source>
+        <translation>Direct input Mode:</translation>
     </message>
     <message id="xx_textentry_click_here">
         <location filename="../textentrypage.cpp" line="147"/>
@@ -526,57 +524,57 @@ Muwhahaha... [evil laugh]</translation>
         <translation>&lt;i&gt;Key release&lt;/i&gt; key:</translation>
     </message>
     <message id="xx_tooltip_customtoolbar1">
-        <location filename="../textentrypage.cpp" line="519"/>
+        <location filename="../textentrypage.cpp" line="539"/>
         <source>Example custom toolbar 1</source>
         <translation>Example custom toolbar 1</translation>
     </message>
     <message id="xx_tooltip_customtoolbar2">
-        <location filename="../textentrypage.cpp" line="532"/>
+        <location filename="../textentrypage.cpp" line="552"/>
         <source>Example custom toolbar 2</source>
         <translation>Example custom toolbar 2</translation>
     </message>
     <message id="xx_textentry_url_text">
-        <location filename="../textentrypage.cpp" line="608"/>
-        <source>Url text:</source>
-        <translation>Url text:</translation>
+        <location filename="../textentrypage.cpp" line="621"/>
+        <source>URL text:</source>
+        <translation>URL text:</translation>
     </message>
     <message id="xx_textentry_multiline">
-        <location filename="../textentrypage.cpp" line="610"/>
+        <location filename="../textentrypage.cpp" line="623"/>
         <source>Multiline:</source>
         <translation>Multiline:</translation>
     </message>
     <message id="xx_tooltip_entry0">
-        <location filename="../textentrypage.cpp" line="586"/>
+        <location filename="../textentrypage.cpp" line="599"/>
         <source>Enter text here</source>
         <translation>Enter text here</translation>
     </message>
     <message id="xx_tooltip_entry1">
-        <location filename="../textentrypage.cpp" line="589"/>
+        <location filename="../textentrypage.cpp" line="602"/>
         <source>This tooltip is quite long and will be clipped on the display</source>
         <translation>This tooltip is quite long and will be clipped on the display</translation>
     </message>
     <message id="xx_textentry_custom_toolbar1">
-        <location filename="../textentrypage.cpp" line="628"/>
-        <source>Custom ToolBar 1:</source>
-        <translation>Custom ToolBar 1:</translation>
+        <location filename="../textentrypage.cpp" line="643"/>
+        <source>Custom toolbar 1:</source>
+        <translation>Custom toolBar 1:</translation>
     </message>
     <message id="xx_textentry_custom_toolbar2">
-        <location filename="../textentrypage.cpp" line="630"/>
-        <source>Custom ToolBar 2:</source>
-        <translation>Custom ToolBar 2:</translation>
+        <location filename="../textentrypage.cpp" line="645"/>
+        <source>Custom toolbar 2:</source>
+        <translation>Custom toolBar 2:</translation>
     </message>
     <message id="xx_auto_true_entry0">
-        <location filename="../textentrypage.cpp" line="663"/>
-        <source>Auto Capitalisation is active</source>
-        <translation>Auto Capitalisation is active</translation>
+        <location filename="../textentrypage.cpp" line="678"/>
+        <source>Auto capitalisation is active</source>
+        <translation>Auto capitalisation is active</translation>
     </message>
     <message id="xx_auto_false_entry0">
-        <location filename="../textentrypage.cpp" line="666"/>
-        <source>No Auto Capitalisation</source>
-        <translation>No Auto Capitalisation</translation>
+        <location filename="../textentrypage.cpp" line="681"/>
+        <source>No auto capitalisation</source>
+        <translation>No auto capitalisation</translation>
     </message>
     <message id="xx_tooltip_entry6">
-        <location filename="../textentrypage.cpp" line="595"/>
+        <location filename="../textentrypage.cpp" line="608"/>
         <source>This is a multiline text entry</source>
         <oldsource>This is
 multiline
@@ -584,17 +582,17 @@ tooltip</oldsource>
         <translation>This is a multiline text entry</translation>
     </message>
     <message id="xx_textentry_singleselectall">
-        <location filename="../textentrypage.cpp" line="612"/>
+        <location filename="../textentrypage.cpp" line="625"/>
         <source>Singleline (selectall):</source>
         <translation>Singleline (selectall)</translation>
     </message>
     <message id="xx_auto_capitalisation">
-        <location filename="../textentrypage.cpp" line="633"/>
+        <location filename="../textentrypage.cpp" line="648"/>
         <source>Auto capitalisation</source>
         <translation>Auto capitalisation</translation>
     </message>
     <message id="xx_error_correction">
-        <location filename="../textentrypage.cpp" line="635"/>
+        <location filename="../textentrypage.cpp" line="650"/>
         <source>Error correction</source>
         <translation>Error correction</translation>
     </message>
@@ -662,17 +660,17 @@ Seekbar is a special type of Slider used for displaying playback status for mult
         <translation>Window Icon</translation>
     </message>
     <message id="xx_popup_generic_title">
-        <location filename="../comboboxpage.cpp" line="114"/>
+        <location filename="../comboboxpage.cpp" line="117"/>
         <source>Title</source>
         <translation>Title</translation>
     </message>
     <message id="xx_popup_sort_descending_order">
-        <location filename="../comboboxpage.cpp" line="116"/>
+        <location filename="../comboboxpage.cpp" line="119"/>
         <source>Sort - DescendingOrder</source>
         <translation>Sort — Descending order</translation>
     </message>
     <message id="xx_popup_time_consuming">
-        <location filename="../comboboxpage.cpp" line="118"/>
+        <location filename="../comboboxpage.cpp" line="121"/>
         <source>Time-consuming setting</source>
         <translation>Time consuming setting</translation>
     </message>
@@ -682,52 +680,52 @@ Seekbar is a special type of Slider used for displaying playback status for mult
         <translation>Container</translation>
     </message>
     <message id="xx_progressbar_page_title">
-        <location filename="../progressbarpage.cpp" line="89"/>
+        <location filename="../progressbarpage.cpp" line="88"/>
         <source>Progress Bar</source>
         <translation>Progress Bar</translation>
     </message>
     <message id="xx_progressbar_page_info_label">
-        <location filename="../progressbarpage.cpp" line="94"/>
+        <location filename="../progressbarpage.cpp" line="93"/>
         <source>A Progress Bar can indicate an ongoing process with either known or unknown durations.</source>
         <translation>A Progress Bar can indicate an ongoing process with either known or unknown durations.</translation>
     </message>
     <message id="xx_progressindicator_unknown_duration_bar">
-        <location filename="../progressbarpage.cpp" line="98"/>
+        <location filename="../progressbarpage.cpp" line="97"/>
         <source>Installing CoolApp</source>
         <translation>Installing CoolApp</translation>
     </message>
     <message id="xx_progressindicator_known_duration_bar">
-        <location filename="../progressbarpage.cpp" line="96"/>
+        <location filename="../progressbarpage.cpp" line="95"/>
         <source>Downloading nicepic.jpg</source>
         <translation>Downloading nicepic.jpg</translation>
     </message>
     <message id="xx_toolbar_page_example1">
-        <location filename="../toolbarpage.cpp" line="220"/>
+        <location filename="../toolbarpage.cpp" line="223"/>
         <source>Example 1</source>
         <translation>Example 1</translation>
     </message>
     <message id="xx_toolbar_page_example2">
-        <location filename="../toolbarpage.cpp" line="222"/>
+        <location filename="../toolbarpage.cpp" line="225"/>
         <source>Example 2</source>
         <translation>Example 2</translation>
     </message>
     <message id="xx_toolbar_page_defaultview">
-        <location filename="../toolbarpage.cpp" line="224"/>
+        <location filename="../toolbarpage.cpp" line="227"/>
         <source>Default View</source>
         <translation>Default View</translation>
     </message>
     <message id="xx_toolbar_page_tabview">
-        <location filename="../toolbarpage.cpp" line="226"/>
+        <location filename="../toolbarpage.cpp" line="229"/>
         <source>Tab View</source>
         <translation>Tab View</translation>
     </message>
     <message id="xx_toolbar_page_title">
-        <location filename="../toolbarpage.cpp" line="210"/>
+        <location filename="../toolbarpage.cpp" line="213"/>
         <source>ToolBar</source>
         <translation>Tool Bar</translation>
     </message>
     <message id="xx_toolbar_page_info">
-        <location filename="../toolbarpage.cpp" line="217"/>
+        <location filename="../toolbarpage.cpp" line="220"/>
         <source>&lt;b&gt;Toolbar&lt;/b&gt; acts as a container for actions. Depending upon the view attached, it either acts as a tab bar or is a container for buttons and text input field. &lt;ul&gt;&lt;li&gt;Click Menu to explore the example&lt;/li&gt;&lt;/ul&gt;</source>
         <translation>&lt;b&gt;Toolbar&lt;/b&gt; acts as a container for actions. Depending upon the view attached, it either acts as a tab bar or is a container for buttons and text input field. &lt;ul&gt;&lt;li&gt;Click Menu to explore the example&lt;/li&gt;&lt;/ul&gt;</translation>
     </message>
@@ -792,175 +790,195 @@ The primary (single short tap) action of the element should not be duplicated in
         <translation>Favorite Albums</translation>
     </message>
     <message id="xx_displaymodes_navbarcombo">
-        <location filename="../displaymodespage.cpp" line="59"/>
+        <location filename="../displaymodespage.cpp" line="68"/>
         <source>Navigation Bar</source>
         <translation>Navigation Bar</translation>
     </message>
     <message id="xx_displaymodes_escapebtncombo">
-        <location filename="../displaymodespage.cpp" line="67"/>
+        <location filename="../displaymodespage.cpp" line="76"/>
         <source>Escape Button</source>
         <translation>Escape Button</translation>
     </message>
     <message id="xx_displaymodes_homebtncombo">
-        <location filename="../displaymodespage.cpp" line="75"/>
+        <location filename="../displaymodespage.cpp" line="84"/>
         <source>Home Button</source>
         <translation>Home Button</translation>
     </message>
     <message id="xx_displaymodes_page_title">
-        <location filename="../displaymodespage.cpp" line="143"/>
+        <location filename="../displaymodespage.cpp" line="152"/>
         <source>Display Modes</source>
         <oldsource>Display Modes and Full Screen</oldsource>
         <translation>Display Modes and Full Screen</translation>
     </message>
     <message id="xx_displaymodes_display_mode">
-        <location filename="../displaymodespage.cpp" line="147"/>
+        <location filename="../displaymodespage.cpp" line="156"/>
         <source>Components&apos; display mode:</source>
         <translation>Components&apos; display mode:</translation>
     </message>
     <message id="xx_displaymodes_window_state">
-        <location filename="../displaymodespage.cpp" line="150"/>
+        <location filename="../displaymodespage.cpp" line="159"/>
         <source>Window state:</source>
         <translation>Window state:</translation>
     </message>
     <message id="xx_displaymodes_full_screen">
-        <location filename="../displaymodespage.cpp" line="153"/>
+        <location filename="../displaymodespage.cpp" line="162"/>
         <source>Full Screen</source>
         <translation>Full Screen</translation>
     </message>
     <message id="xx_displaymode_show">
-        <location filename="../displaymodespage.cpp" line="166"/>
+        <location filename="../displaymodespage.cpp" line="175"/>
         <source>Show</source>
         <translation>Show</translation>
     </message>
     <message id="xx_displaymode_autohide">
-        <location filename="../displaymodespage.cpp" line="168"/>
+        <location filename="../displaymodespage.cpp" line="177"/>
         <source>Auto Hide</source>
         <translation>Auto Hide</translation>
     </message>
     <message id="xx_displaymode_hide">
-        <location filename="../displaymodespage.cpp" line="170"/>
+        <location filename="../displaymodespage.cpp" line="179"/>
         <source>Hide</source>
         <translation>Hide</translation>
     </message>
     <message id="xx_language_title">
-        <location filename="../languagepage.cpp" line="118"/>
+        <location filename="../languagepage.cpp" line="122"/>
         <source>Change Language</source>
         <translation>Change Language</translation>
     </message>
     <message id="xx_locale_none">
-        <location filename="../languagepage.cpp" line="137"/>
+        <location filename="../languagepage.cpp" line="143"/>
         <source>None</source>
         <translation>None</translation>
     </message>
     <message id="xx_locale_ar">
-        <location filename="../languagepage.cpp" line="142"/>
+        <location filename="../languagepage.cpp" line="148"/>
         <source>Arabic</source>
         <translation>Arabic</translation>
     </message>
     <message id="xx_locale_de">
-        <location filename="../languagepage.cpp" line="147"/>
+        <location filename="../languagepage.cpp" line="153"/>
         <source>German</source>
         <translation>German</translation>
     </message>
     <message id="xx_locale_de_AT">
-        <location filename="../languagepage.cpp" line="152"/>
+        <location filename="../languagepage.cpp" line="158"/>
         <source>German (Austria)</source>
         <translation></translation>
     </message>
     <message id="xx_locale_de_CH">
-        <location filename="../languagepage.cpp" line="157"/>
+        <location filename="../languagepage.cpp" line="163"/>
         <source>German (Switzerland)</source>
         <translation></translation>
     </message>
     <message id="xx_locale_en">
-        <location filename="../languagepage.cpp" line="162"/>
+        <location filename="../languagepage.cpp" line="168"/>
         <source>English</source>
         <translation>English</translation>
     </message>
     <message id="xx_locale_fi">
-        <location filename="../languagepage.cpp" line="167"/>
+        <location filename="../languagepage.cpp" line="173"/>
         <source>Finnish</source>
         <translation>Finnish</translation>
     </message>
     <message id="xx_locale_hi">
-        <location filename="../languagepage.cpp" line="172"/>
+        <location filename="../languagepage.cpp" line="178"/>
         <source>Hindi</source>
         <translation>Hindi</translation>
     </message>
     <message id="xx_locale_hu">
-        <location filename="../languagepage.cpp" line="177"/>
+        <location filename="../languagepage.cpp" line="183"/>
         <source>Hungarian</source>
         <translation>Hungarian</translation>
     </message>
     <message id="xx_locale_ja">
-        <location filename="../languagepage.cpp" line="182"/>
+        <location filename="../languagepage.cpp" line="188"/>
         <source>Japanese</source>
         <translation>Japanese</translation>
     </message>
     <message id="xx_locale_ur">
-        <location filename="../languagepage.cpp" line="187"/>
+        <location filename="../languagepage.cpp" line="193"/>
         <source>Urdu</source>
         <translation>Urdu</translation>
     </message>
     <message id="xx_locale_ur_PK">
-        <location filename="../languagepage.cpp" line="192"/>
+        <location filename="../languagepage.cpp" line="198"/>
         <source>Urdu (Pakistan)</source>
         <translation>Urdu (Pakistan)</translation>
     </message>
     <message id="xx_locale_ur_IN">
-        <location filename="../languagepage.cpp" line="197"/>
+        <location filename="../languagepage.cpp" line="203"/>
         <source>Urdu (India)</source>
         <translation>Urdu (India)</translation>
     </message>
     <message id="xx_locale_zh_CN">
-        <location filename="../languagepage.cpp" line="202"/>
+        <location filename="../languagepage.cpp" line="208"/>
         <source>Chinese (China)</source>
         <translation>Chinese (China)</translation>
     </message>
     <message id="xx_locale_zh_TW">
-        <location filename="../languagepage.cpp" line="207"/>
+        <location filename="../languagepage.cpp" line="213"/>
         <source>Chinese (Taiwan)</source>
         <translation>Chinese Taiwan</translation>
     </message>
+    <message id="xx_timeformat24h_locale_default">
+        <location filename="../languagepage.cpp" line="223"/>
+        <source>Locale default</source>
+        <translation>Locale default</translation>
+    </message>
+    <message id="xx_timeformat24h_24_hour_mode">
+        <location filename="../languagepage.cpp" line="227"/>
+        <source>24 hour mode</source>
+        <translation>24 hour mode</translation>
+    </message>
+    <message id="xx_timeformat24h_12_hour_mode">
+        <location filename="../languagepage.cpp" line="231"/>
+        <source>12 hour mode</source>
+        <translation>12 hour mode</translation>
+    </message>
     <message id="xx_language_combobox_title">
-        <location filename="../languagepage.cpp" line="302"/>
+        <location filename="../languagepage.cpp" line="357"/>
         <source>Please select language</source>
         <translation>Please select language:</translation>
     </message>
     <message id="xx_language_combobox_lctime_title">
-        <location filename="../languagepage.cpp" line="304"/>
+        <location filename="../languagepage.cpp" line="359"/>
         <source>Locale for time</source>
         <translation>Locale for time</translation>
     </message>
+    <message id="xx_language_combobox_lctimeformat24h_title">
+        <location filename="../languagepage.cpp" line="361"/>
+        <source>Choose 12/24 hour mode</source>
+        <translation>Choose 12/24 hour mode</translation>
+    </message>
     <message id="xx_language_combobox_lccollate_title">
-        <location filename="../languagepage.cpp" line="306"/>
+        <location filename="../languagepage.cpp" line="363"/>
         <source>Locale for collation</source>
         <translation>Locale for collation</translation>
     </message>
     <message id="xx_language_combobox_lcnumeric_title">
-        <location filename="../languagepage.cpp" line="308"/>
+        <location filename="../languagepage.cpp" line="365"/>
         <source>Locale for numbers</source>
         <translation>Locale for numbers</translation>
     </message>
     <message id="xx_language_combobox_lcmonetary_title">
-        <location filename="../languagepage.cpp" line="310"/>
+        <location filename="../languagepage.cpp" line="367"/>
         <source>Locale for money</source>
         <translation>Locale for money</translation>
     </message>
     <message id="qtn_comm_command_yes">
-        <location filename="../languagepage.cpp" line="314"/>
-        <location filename="../languagepage.cpp" line="321"/>
+        <location filename="../languagepage.cpp" line="371"/>
+        <location filename="../languagepage.cpp" line="378"/>
         <source>Yes</source>
         <translation>Yes</translation>
     </message>
     <message id="qtn_comm_command_no">
-        <location filename="../languagepage.cpp" line="317"/>
-        <location filename="../languagepage.cpp" line="324"/>
+        <location filename="../languagepage.cpp" line="374"/>
+        <location filename="../languagepage.cpp" line="381"/>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message id="xx_language_number_format">
-        <location filename="../languagepage.cpp" line="329"/>
+        <location filename="../languagepage.cpp" line="386"/>
         <source>Number format example: %1œ!! Number example: %1œ!! Number: %1</source>
         <translation variants="yes">
             <lengthvariant>Number format example: %1</lengthvariant>
@@ -969,7 +987,7 @@ The primary (single short tap) action of the element should not be duplicated in
         </translation>
     </message>
     <message id="xx_langage_date_time_format">
-        <location filename="../languagepage.cpp" line="344"/>
+        <location filename="../languagepage.cpp" line="401"/>
         <source>Date and time format example: %1œ!! Date and time: %1œ!! Date: %1œ!! %1</source>
         <translation variants="yes">
             <lengthvariant>Date and time format example: %1</lengthvariant>
@@ -980,12 +998,12 @@ The primary (single short tap) action of the element should not be duplicated in
         </translation>
     </message>
     <message id="xx_language_week_number">
-        <location filename="../languagepage.cpp" line="349"/>
+        <location filename="../languagepage.cpp" line="406"/>
         <source>Week number example: %1</source>
         <translation>Week number example: %1</translation>
     </message>
     <message id="xx_language_currency_format">
-        <location filename="../languagepage.cpp" line="359"/>
+        <location filename="../languagepage.cpp" line="416"/>
         <source>Currency format example: %1 %2œ!! Currency: %1 %2</source>
         <translation variants="yes">
             <lengthvariant>Currency format example: %1 %2</lengthvariant>
@@ -994,9 +1012,9 @@ The primary (single short tap) action of the element should not be duplicated in
         </translation>
     </message>
     <message id="xx_language_trans_%Ln_boxes_weight_%L1" numerus="yes">
-        <location filename="../languagepage.cpp" line="365"/>
-        <location filename="../languagepage.cpp" line="367"/>
-        <location filename="../languagepage.cpp" line="369"/>
+        <location filename="../languagepage.cpp" line="422"/>
+        <location filename="../languagepage.cpp" line="424"/>
+        <location filename="../languagepage.cpp" line="426"/>
         <source>%Ln boxes with a total weight of %L1 kilogramœ!! %Ln boxes, total weight of %L1 kg</source>
         <translation>
             <numerusform variants="yes">
@@ -1010,7 +1028,7 @@ The primary (single short tap) action of the element should not be duplicated in
         </translation>
     </message>
     <message id="xx_language_font_test">
-        <location filename="../languagepage.cpp" line="373"/>
+        <location filename="../languagepage.cpp" line="430"/>
         <source>Font test:</source>
         <translation>Font test:</translation>
     </message>
@@ -1020,32 +1038,32 @@ The primary (single short tap) action of the element should not be duplicated in
         <translation>Image allows the placement of images onto the UI. Images are generally non-interactive elements. Various single and multiple touch interactions can be added to an Image component if desired. As an example, pinch gesture can be used in this page to zoom the image.</translation>
     </message>
     <message id="xx_sample template">
-        <location filename="../templatepage.cpp" line="107"/>
+        <location filename="../templatepage.cpp" line="108"/>
         <source>Sample template</source>
         <translation>Sample template</translation>
     </message>
     <message id="xx_template_page_title">
-        <location filename="../templatepage.cpp" line="101"/>
+        <location filename="../templatepage.cpp" line="102"/>
         <source>Template</source>
         <translation>Template</translation>
     </message>
     <message id="xx_textentry_completion_text">
-        <location filename="../textentrypage.cpp" line="614"/>
+        <location filename="../textentrypage.cpp" line="627"/>
         <source>Email suggestion text:</source>
         <translation>Email suggestion text:</translation>
     </message>
     <message id="xx_combobox_page_info">
-        <location filename="../comboboxpage.cpp" line="122"/>
+        <location filename="../comboboxpage.cpp" line="125"/>
         <source>The MComboBox widget is a combined button and popup list. It is very similar to QComboBox, but does not allow editing the text.</source>
         <translation>The MComboBox widget is a combined button and popup list. It is very similar to QComboBox, but does not allow editing the text.</translation>
     </message>
     <message id="xx_combobox_title">
-        <location filename="../comboboxpage.cpp" line="110"/>
+        <location filename="../comboboxpage.cpp" line="113"/>
         <source>ComboBox</source>
         <translation>ComboBox</translation>
     </message>
     <message id="xx_tooltip_entry8">
-        <location filename="../textentrypage.cpp" line="592"/>
+        <location filename="../textentrypage.cpp" line="605"/>
         <source>Provides email address suggestions</source>
         <translation>Provides email address suggestions</translation>
     </message>
@@ -1069,12 +1087,12 @@ Checkbox essentially does the same thing as the Switch button, so please conside
         <translation>I have read and understood the instructions.</translation>
     </message>
     <message id="xx_icon_button_page_title">
-        <location filename="../iconbuttonpage.cpp" line="81"/>
+        <location filename="../iconbuttonpage.cpp" line="82"/>
         <source>Icon Button</source>
         <translation>Icon Button</translation>
     </message>
     <message id="xx_icon_button_page_info_label">
-        <location filename="../iconbuttonpage.cpp" line="89"/>
+        <location filename="../iconbuttonpage.cpp" line="90"/>
         <source>Icon Buttons have an icon and can have a text label. Icon button differs from push button by its visual presentation: it does not have button-style edges like a Push Button does.
 
  Icon Buttons are used in e.g. Toolbars.</source>
@@ -1083,7 +1101,7 @@ Checkbox essentially does the same thing as the Switch button, so please conside
  Icon Buttons are used in e.g. Toolbars.</translation>
     </message>
     <message id="xx_icon_button_page_icon_button2">
-        <location filename="../iconbuttonpage.cpp" line="91"/>
+        <location filename="../iconbuttonpage.cpp" line="92"/>
         <source>Lorem ipsum</source>
         <translation>Lorem ipsum</translation>
     </message>
@@ -1272,55 +1290,54 @@ Input feedbacks can be easily configured for different purposes using the themin
         <translation>Silent</translation>
     </message>
     <message id="xx_gridpage_configuration">
-        <location filename="../mgridpage.cpp" line="208"/>
+        <location filename="../mgridpage.cpp" line="210"/>
         <source>Configuration</source>
         <translation>Configuration</translation>
     </message>
     <message id="xx_gridpage_title">
-        <location filename="../mgridpage.cpp" line="203"/>
-        <source>ConfigurationGrid page</source>
-        <oldsource>Grid page</oldsource>
+        <location filename="../mgridpage.cpp" line="205"/>
+        <source>Grid page</source>
         <translation>Grid page</translation>
     </message>
     <message id="xx_gridpage_set_columns">
-        <location filename="../mgridpage.cpp" line="297"/>
+        <location filename="../mgridpage.cpp" line="301"/>
         <source>Set columns</source>
         <translation>Set columns</translation>
     </message>
     <message id="xx_gridpage_landscape">
-        <location filename="../mgridpage.cpp" line="329"/>
-        <location filename="../mgridpage.cpp" line="339"/>
+        <location filename="../mgridpage.cpp" line="333"/>
+        <location filename="../mgridpage.cpp" line="343"/>
         <source>Landscape</source>
         <translation>Landscape</translation>
     </message>
     <message id="xx_gridpage_portrait">
-        <location filename="../mgridpage.cpp" line="334"/>
-        <location filename="../mgridpage.cpp" line="344"/>
+        <location filename="../mgridpage.cpp" line="338"/>
+        <location filename="../mgridpage.cpp" line="348"/>
         <source>Portrait</source>
         <translation>Portrait</translation>
     </message>
     <message id="xx_bubblepage_title">
-        <location filename="../bubblepage.cpp" line="156"/>
+        <location filename="../bubblepage.cpp" line="158"/>
         <source>Speech Bubble</source>
         <translation>Speech Bubble</translation>
     </message>
     <message id="xx_wg_bubblepage_linkactivated">
-        <location filename="../bubblepage.cpp" line="169"/>
+        <location filename="../bubblepage.cpp" line="171"/>
         <source>Link activated</source>
         <translation>Link activated</translation>
     </message>
     <message id="xx_wg_bubblepage_bubbleclicked">
-        <location filename="../bubblepage.cpp" line="176"/>
+        <location filename="../bubblepage.cpp" line="178"/>
         <source>Speech buuble clicked</source>
         <translation>Speech bubble clicked</translation>
     </message>
     <message id="xx_button_group_page_title">
-        <location filename="../buttongrouppage.cpp" line="156"/>
+        <location filename="../buttongrouppage.cpp" line="168"/>
         <source>Button Group</source>
         <translation>Button Group</translation>
     </message>
     <message id="xx_button_group_page_info_label">
-        <location filename="../buttongrouppage.cpp" line="168"/>
+        <location filename="../buttongrouppage.cpp" line="180"/>
         <source>Buttons can be grouped together based on visual or logic requirements.
 
 The basic group is formed by placing buttons together into a layout. Depending on the theme, the buttons are typically drawn as connected with each other.
@@ -1333,62 +1350,62 @@ The basic group is formed by placing buttons together into a layout. Depending o
 Logical exclusivity can be added to a group, which ensures only one of the buttons can be selected at a time. If a group is not exclusive, multiple options from the group can be selected.</translation>
     </message>
     <message id="xx_button_group_page_hlabel1">
-        <location filename="../buttongrouppage.cpp" line="171"/>
+        <location filename="../buttongrouppage.cpp" line="183"/>
         <source>Horizontal group</source>
         <translation>Horizontal group</translation>
     </message>
     <message id="xx_button_group_page_button1">
-        <location filename="../buttongrouppage.cpp" line="173"/>
+        <location filename="../buttongrouppage.cpp" line="185"/>
         <source>Yes</source>
         <translation>Yes</translation>
     </message>
     <message id="xx_button_group_page_button2">
-        <location filename="../buttongrouppage.cpp" line="175"/>
+        <location filename="../buttongrouppage.cpp" line="187"/>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message id="xx_button_group_page_button3">
-        <location filename="../buttongrouppage.cpp" line="177"/>
+        <location filename="../buttongrouppage.cpp" line="189"/>
         <source>Maybe</source>
         <translation>Maybe</translation>
     </message>
     <message id="xx_button_group_page_vlabel2">
-        <location filename="../buttongrouppage.cpp" line="180"/>
+        <location filename="../buttongrouppage.cpp" line="192"/>
         <source>Horizontal group, exclusive</source>
         <translation>Horizontal group, exclusive</translation>
     </message>
     <message id="xx_button_group_page_button4">
-        <location filename="../buttongrouppage.cpp" line="182"/>
+        <location filename="../buttongrouppage.cpp" line="194"/>
         <source>Cost</source>
         <translation>Cost</translation>
     </message>
     <message id="xx_button_group_page_button5">
-        <location filename="../buttongrouppage.cpp" line="184"/>
+        <location filename="../buttongrouppage.cpp" line="196"/>
         <source>Quality</source>
         <translation>Quality</translation>
     </message>
     <message id="xx_button_group_page_button6">
-        <location filename="../buttongrouppage.cpp" line="186"/>
+        <location filename="../buttongrouppage.cpp" line="198"/>
         <source>Schedule</source>
         <translation>Schedule</translation>
     </message>
     <message id="xx_button_group_page_vlabel">
-        <location filename="../buttongrouppage.cpp" line="189"/>
+        <location filename="../buttongrouppage.cpp" line="201"/>
         <source>Vertical group, checkable</source>
         <translation>Vertical group, checkable</translation>
     </message>
     <message id="xx_button_group_page_button7">
-        <location filename="../buttongrouppage.cpp" line="191"/>
+        <location filename="../buttongrouppage.cpp" line="203"/>
         <source>Milk</source>
         <translation>Milk</translation>
     </message>
     <message id="xx_button_group_page_button8">
-        <location filename="../buttongrouppage.cpp" line="193"/>
+        <location filename="../buttongrouppage.cpp" line="205"/>
         <source>Sugar</source>
         <translation>Sugar</translation>
     </message>
     <message id="xx_button_group_page_button9">
-        <location filename="../buttongrouppage.cpp" line="195"/>
+        <location filename="../buttongrouppage.cpp" line="207"/>
         <source>Biscotti</source>
         <translation>Biscotti</translation>
     </message>
@@ -1407,57 +1424,57 @@ Logical exclusivity can be added to a group, which ensures only one of the butto
         <translation>Side</translation>
     </message>
     <message id="xx_wg_contentitemspage_single_title">
-        <location filename="../contentitemspage.cpp" line="310"/>
+        <location filename="../contentitemspage.cpp" line="312"/>
         <source>Single Title</source>
         <translation>Single Title</translation>
     </message>
     <message id="xx_wg_contentitemspage_title_with_subtitle">
-        <location filename="../contentitemspage.cpp" line="312"/>
+        <location filename="../contentitemspage.cpp" line="314"/>
         <source>Title with Subtitle</source>
         <translation>Title with Subtitle</translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title">
-        <location filename="../contentitemspage.cpp" line="314"/>
+        <location filename="../contentitemspage.cpp" line="316"/>
         <source>Icon with Title</source>
         <translation>Icon with Title</translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_and_subtitle">
-        <location filename="../contentitemspage.cpp" line="316"/>
+        <location filename="../contentitemspage.cpp" line="318"/>
         <source>Icon with Title and Subtitle</source>
         <translation>Icon with Title and Subtitle</translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_subtitle_and_two_side_icons">
-        <location filename="../contentitemspage.cpp" line="320"/>
+        <location filename="../contentitemspage.cpp" line="322"/>
         <source>Icon with Title Subtitle and Two Side Icons</source>
         <translation>Icon with Title Subtitle and Two Side Icons</translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_subtitle_and_side_icon_with_label">
-        <location filename="../contentitemspage.cpp" line="323"/>
+        <location filename="../contentitemspage.cpp" line="325"/>
         <source>Icon with Title Subtitle and Side Icon with Label</source>
         <translation>Icon with Title Subtitle and Side Icon with Label</translation>
     </message>
     <message id="xx_wg_contentitemspage_thumbnail_with_title_subtitle_and_two_side_icons">
-        <location filename="../contentitemspage.cpp" line="326"/>
+        <location filename="../contentitemspage.cpp" line="328"/>
         <source>Thumbnail with Title Subtitle and Two Side Icons</source>
         <translation>Thumbnail with Title Subtitle and Two Side Icons</translation>
     </message>
     <message id="xx_wg_contentitemspage_thumbnail_with_title_and_two_side_icons">
-        <location filename="../contentitemspage.cpp" line="329"/>
+        <location filename="../contentitemspage.cpp" line="331"/>
         <source>Thumbnail with Title and Two Side Icons</source>
         <translation>Thumbnail with Title and Two Side Icons</translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_progress_indicator_and_two_side_icons">
-        <location filename="../contentitemspage.cpp" line="334"/>
+        <location filename="../contentitemspage.cpp" line="336"/>
         <source>Icon with Title Progress Indicator and Two Side Icons</source>
         <translation>Icon with Title Progress Indicator and Two Side Icons</translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_progress_indicator_and_top_side_icon">
-        <location filename="../contentitemspage.cpp" line="337"/>
+        <location filename="../contentitemspage.cpp" line="339"/>
         <source>Icon with Title Progress Indicator and Top Side Icon</source>
         <translation>Icon with Title Progress Indicator and Top Side Icon</translation>
     </message>
     <message id="xx_contentitemspage_title">
-        <location filename="../contentitemspage.cpp" line="358"/>
+        <location filename="../contentitemspage.cpp" line="359"/>
         <source>Content Items</source>
         <translation>Content Items</translation>
     </message>
diff --git a/demos/widgetsgallery/translations/widgetsgallery_fi.ts b/demos/widgetsgallery/translations/widgetsgallery_fi.ts
index 09c47ee2..dd31873d 100644
--- a/demos/widgetsgallery/translations/widgetsgallery_fi.ts
+++ b/demos/widgetsgallery/translations/widgetsgallery_fi.ts
@@ -4,217 +4,217 @@
 <context>
     <name></name>
     <message id="xx_wg_categories_application_view">
-        <location filename="../mainpage.cpp" line="86"/>
+        <location filename="../mainpage.cpp" line="92"/>
         <source>Application View</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_application_view_view_menu">
-        <location filename="../mainpage.cpp" line="88"/>
+        <location filename="../mainpage.cpp" line="94"/>
         <source>Application Menu</source>
         <translation type="unfinished">Valikko</translation>
     </message>
     <message id="xx_wg_application_view_display_modes">
-        <location filename="../mainpage.cpp" line="90"/>
+        <location filename="../mainpage.cpp" line="96"/>
         <source>Display Modes</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_application_view_toolbar_incl_tab_bar">
-        <location filename="../mainpage.cpp" line="92"/>
+        <location filename="../mainpage.cpp" line="98"/>
         <source>Toolbar (including Tab Bar)</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_categories_simple_widgets">
-        <location filename="../mainpage.cpp" line="96"/>
+        <location filename="../mainpage.cpp" line="102"/>
         <source>Simple Widgets</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_simple_widgets_labels">
-        <location filename="../mainpage.cpp" line="98"/>
+        <location filename="../mainpage.cpp" line="104"/>
         <source>Labels</source>
         <translation type="unfinished">Otsikoita</translation>
     </message>
     <message id="xx_wg_simple_widgets_image">
-        <location filename="../mainpage.cpp" line="100"/>
+        <location filename="../mainpage.cpp" line="106"/>
         <source>Image</source>
         <translation type="unfinished">Kuva</translation>
     </message>
     <message id="xx_wg_simple_widgets_progress_bar">
-        <location filename="../mainpage.cpp" line="102"/>
+        <location filename="../mainpage.cpp" line="108"/>
         <source>Progress Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_simple_widgets_container">
-        <location filename="../mainpage.cpp" line="104"/>
+        <location filename="../mainpage.cpp" line="110"/>
         <source>Container</source>
         <translation type="unfinished">Säiliö</translation>
     </message>
     <message id="xx_wg_simple_widgets_spinner">
-        <location filename="../mainpage.cpp" line="106"/>
+        <location filename="../mainpage.cpp" line="112"/>
         <source>Spinner</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_categories_buttons">
-        <location filename="../mainpage.cpp" line="109"/>
+        <location filename="../mainpage.cpp" line="115"/>
         <source>Buttons</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_buttons_push_button">
-        <location filename="../mainpage.cpp" line="111"/>
+        <location filename="../mainpage.cpp" line="117"/>
         <source>Push Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_buttons_icon_button">
-        <location filename="../mainpage.cpp" line="113"/>
+        <location filename="../mainpage.cpp" line="119"/>
         <source>Icon Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_buttons_switch">
-        <location filename="../mainpage.cpp" line="115"/>
+        <location filename="../mainpage.cpp" line="121"/>
         <source>Switch</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_buttons_checkbox">
-        <location filename="../mainpage.cpp" line="117"/>
+        <location filename="../mainpage.cpp" line="123"/>
         <source>Checkbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_buttons_buttongroup">
-        <location filename="../mainpage.cpp" line="119"/>
+        <location filename="../mainpage.cpp" line="125"/>
         <source>Button Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_categories_dialogs_and_banners">
-        <location filename="../mainpage.cpp" line="122"/>
+        <location filename="../mainpage.cpp" line="128"/>
         <source>Dialogs and Banners</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_dialogs_and_banners_single_selection_dialog">
-        <location filename="../mainpage.cpp" line="124"/>
+        <location filename="../mainpage.cpp" line="130"/>
         <source>Single Selection Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_dialogs_and_banners_query_dialog">
-        <location filename="../mainpage.cpp" line="126"/>
+        <location filename="../mainpage.cpp" line="132"/>
         <source>Query Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_dialogs_and_banners_banner">
-        <location filename="../mainpage.cpp" line="128"/>
+        <location filename="../mainpage.cpp" line="134"/>
         <source>Banner</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_categories_lists_grids_and_popups">
-        <location filename="../mainpage.cpp" line="131"/>
+        <location filename="../mainpage.cpp" line="137"/>
         <source>Lists, Grids and Popups</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_list">
-        <location filename="../mainpage.cpp" line="133"/>
+        <location filename="../mainpage.cpp" line="139"/>
         <source>List</source>
         <translation type="unfinished">Lista</translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_grid">
-        <location filename="../mainpage.cpp" line="135"/>
+        <location filename="../mainpage.cpp" line="141"/>
         <source>Grid</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_object_menu">
-        <location filename="../mainpage.cpp" line="137"/>
+        <location filename="../mainpage.cpp" line="143"/>
         <source>Object Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_combobox">
-        <location filename="../mainpage.cpp" line="139"/>
+        <location filename="../mainpage.cpp" line="145"/>
         <source>ComboBox</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_contentitems">
-        <location filename="../mainpage.cpp" line="141"/>
+        <location filename="../mainpage.cpp" line="147"/>
         <source>ContentItems</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_bubble">
-        <location filename="../mainpage.cpp" line="143"/>
+        <location filename="../mainpage.cpp" line="149"/>
         <source>Speech bubble</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_categories_user_input">
-        <location filename="../mainpage.cpp" line="146"/>
+        <location filename="../mainpage.cpp" line="152"/>
         <source>User Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_user_input_text_entries">
-        <location filename="../mainpage.cpp" line="148"/>
+        <location filename="../mainpage.cpp" line="154"/>
         <source>Text Entries</source>
         <translation type="unfinished">Tekstinsyöttö</translation>
     </message>
     <message id="xx_wg_user_input_slider">
-        <location filename="../mainpage.cpp" line="150"/>
+        <location filename="../mainpage.cpp" line="156"/>
         <source>Slider</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_user_input_input_feedback">
-        <location filename="../mainpage.cpp" line="152"/>
+        <location filename="../mainpage.cpp" line="158"/>
         <source>Input Feedback</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_application_title">
-        <location filename="../mainpage.cpp" line="337"/>
+        <location filename="../mainpage.cpp" line="346"/>
         <source>Widgets Gallery</source>
         <translation>Vekotinnäyttely</translation>
     </message>
     <message id="xx_mainpage_themes">
-        <location filename="../mainpage.cpp" line="343"/>
+        <location filename="../mainpage.cpp" line="352"/>
         <source>Themes</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_mainpage_orientation">
-        <location filename="../mainpage.cpp" line="345"/>
+        <location filename="../mainpage.cpp" line="354"/>
         <source>Orientation</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_mainpage_toggle_fps">
-        <location filename="../mainpage.cpp" line="347"/>
+        <location filename="../mainpage.cpp" line="356"/>
         <source>Toggle FPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_mainpage_language_settings">
-        <location filename="../mainpage.cpp" line="349"/>
+        <location filename="../mainpage.cpp" line="358"/>
         <source>Language Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_apporientation_auto">
-        <location filename="../mainpage.cpp" line="562"/>
+        <location filename="../mainpage.cpp" line="570"/>
         <source>Automatic</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_apporientation_portrait">
-        <location filename="../mainpage.cpp" line="570"/>
+        <location filename="../mainpage.cpp" line="578"/>
         <source>Portrait</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_apporientation_landscape">
-        <location filename="../mainpage.cpp" line="578"/>
+        <location filename="../mainpage.cpp" line="586"/>
         <source>Landscape</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_apporientation_angle0">
-        <location filename="../mainpage.cpp" line="586"/>
+        <location filename="../mainpage.cpp" line="594"/>
         <source>0 degrees</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_apporientation_angle90">
-        <location filename="../mainpage.cpp" line="594"/>
+        <location filename="../mainpage.cpp" line="602"/>
         <source>90 degrees clockwise</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_apporientation_angle180">
-        <location filename="../mainpage.cpp" line="602"/>
+        <location filename="../mainpage.cpp" line="610"/>
         <source>180 degrees clockwise</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_apporientation_angle270">
-        <location filename="../mainpage.cpp" line="610"/>
+        <location filename="../mainpage.cpp" line="618"/>
         <source>270 degrees clockwise</source>
         <translation type="unfinished"></translation>
     </message>
@@ -288,92 +288,91 @@ All Labels can be aligned left, right or center and will be automatically trunca
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_stacked_dialogs">
-        <location filename="../singleselectiondialogspage.cpp" line="257"/>
+        <location filename="../singleselectiondialogspage.cpp" line="259"/>
         <source>Stacked Dialogs</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_system_dialog">
-        <location filename="../singleselectiondialogspage.cpp" line="259"/>
+        <location filename="../singleselectiondialogspage.cpp" line="261"/>
         <source>System Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_system_modal_dialog">
-        <location filename="../singleselectiondialogspage.cpp" line="261"/>
+        <location filename="../singleselectiondialogspage.cpp" line="263"/>
         <source>System Modal Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_dialog_with_progress_indicator">
-        <location filename="../singleselectiondialogspage.cpp" line="263"/>
+        <location filename="../singleselectiondialogspage.cpp" line="265"/>
         <source>Dialog with Progress Indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_message_box">
-        <location filename="../singleselectiondialogspage.cpp" line="265"/>
+        <location filename="../singleselectiondialogspage.cpp" line="267"/>
         <source>Message Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_button">
-        <location filename="../singleselectiondialogspage.cpp" line="126"/>
+        <location filename="../singleselectiondialogspage.cpp" line="128"/>
         <source>Click to spawn a nested dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="128"/>
+        <location filename="../singleselectiondialogspage.cpp" line="130"/>
         <source>Stacked dialogs</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_open_nested_messagebox">
-        <location filename="../singleselectiondialogspage.cpp" line="142"/>
+        <location filename="../singleselectiondialogspage.cpp" line="144"/>
         <source>Click to open a nested message box</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_nested_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="144"/>
+        <location filename="../singleselectiondialogspage.cpp" line="146"/>
         <source>This is a nested dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_messagebox_text">
-        <location filename="../singleselectiondialogspage.cpp" line="157"/>
+        <location filename="../singleselectiondialogspage.cpp" line="159"/>
         <source>I&apos;m a nested message box</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_dialogs_and_notifications_system_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="168"/>
+        <location filename="../singleselectiondialogspage.cpp" line="170"/>
         <source>System Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_dialogs_and_notifications_system_dialog_label">
-        <location filename="../singleselectiondialogspage.cpp" line="176"/>
-        <source>I&apos;m a system dialog.&lt;br&gt;There actually is a way around me...&lt;br&gt;You can skip me with the home button, but I&apos;ll remain&lt;br&gt;alive until you make a selection.</source>
+        <location filename="../singleselectiondialogspage.cpp" line="178"/>
+        <source>I&apos;m a system dialog.&lt;br&gt;You can skip me with the home button.&lt;br&gt;I&apos;ll be minimised to the task switcher&lt;br&gt;but I&apos;ll remain alive until you make a selection.</source>
+        <oldsource>I&apos;m a system dialog.&lt;br&gt;There actually is a way around me...&lt;br&gt;You can skip me with the home button, but I&apos;ll remain&lt;br&gt;alive until you make a selection.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_dialogs_and_notifications_system_modal_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="191"/>
+        <location filename="../singleselectiondialogspage.cpp" line="193"/>
         <source>System Modal Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_dialogs_and_notifications_system_modal_dialog_label">
-        <location filename="../singleselectiondialogspage.cpp" line="198"/>
-        <source>I&apos;m a window modal dialog.
-There&apos;s no way around me!
-Muwhahaha... [evil laugh]</source>
-        <oldsource>I&apos;m a System Modal dialog.
+        <location filename="../singleselectiondialogspage.cpp" line="200"/>
+        <source>I&apos;m a system modal dialog.&lt;br&gt;You can&apos;t skip me as I&apos;m designed for&lt;br&gt;use cases that require immediate user attention.</source>
+        <oldsource>I&apos;m a window modal dialog.
 There&apos;s no way around me!
 Muwhahaha... [evil laugh]</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_dialogs_and_notifications_progress_indicator">
-        <location filename="../singleselectiondialogspage.cpp" line="217"/>
+        <location filename="../singleselectiondialogspage.cpp" line="219"/>
         <source>Progress Indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_dialogs_and_notifications_message_box_text">
-        <location filename="../singleselectiondialogspage.cpp" line="237"/>
+        <location filename="../singleselectiondialogspage.cpp" line="239"/>
         <source>Hello World!</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_single_selection_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="251"/>
+        <location filename="../singleselectiondialogspage.cpp" line="253"/>
         <source>Single Selection Dialogs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -457,37 +456,37 @@ Muwhahaha... [evil laugh]</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_listpage_list_remove">
-        <location filename="../mlistpage.cpp" line="634"/>
+        <location filename="../mlistpage.cpp" line="635"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_listpage_list_edit">
-        <location filename="../mlistpage.cpp" line="640"/>
+        <location filename="../mlistpage.cpp" line="641"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_listpage_title">
-        <location filename="../mlistpage.cpp" line="658"/>
+        <location filename="../mlistpage.cpp" line="659"/>
         <source>List</source>
         <translation>Lista</translation>
     </message>
     <message id="xx_textentry_title">
-        <location filename="../textentrypage.cpp" line="582"/>
+        <location filename="../textentrypage.cpp" line="595"/>
         <source>Text Entries</source>
         <translation>Tekstinsyöttö</translation>
     </message>
     <message id="xx_tooltip_entry0">
-        <location filename="../textentrypage.cpp" line="586"/>
+        <location filename="../textentrypage.cpp" line="599"/>
         <source>Enter text here</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_tooltip_entry1">
-        <location filename="../textentrypage.cpp" line="589"/>
+        <location filename="../textentrypage.cpp" line="602"/>
         <source>This tooltip is quite long and will be clipped on the display</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_tooltip_entry6">
-        <location filename="../textentrypage.cpp" line="595"/>
+        <location filename="../textentrypage.cpp" line="608"/>
         <source>This is a multiline text entry</source>
         <oldsource>This is
 multiline
@@ -495,7 +494,7 @@ tooltip</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_tooltip_entry8">
-        <location filename="../textentrypage.cpp" line="592"/>
+        <location filename="../textentrypage.cpp" line="605"/>
         <source>Provides email address suggestions</source>
         <translation type="unfinished"></translation>
     </message>
@@ -527,108 +526,113 @@ tooltip</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_tooltip_customtoolbar1">
-        <location filename="../textentrypage.cpp" line="519"/>
+        <location filename="../textentrypage.cpp" line="539"/>
         <source>Example custom toolbar 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_tooltip_customtoolbar2">
-        <location filename="../textentrypage.cpp" line="532"/>
+        <location filename="../textentrypage.cpp" line="552"/>
         <source>Example custom toolbar 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_textentry_free_text">
-        <location filename="../textentrypage.cpp" line="598"/>
+        <location filename="../textentrypage.cpp" line="611"/>
         <source>Free text:</source>
         <translation>Vapaa teksti</translation>
     </message>
     <message id="xx_textentry_free_text_masked">
-        <location filename="../textentrypage.cpp" line="600"/>
-        <source>Free text(masked):</source>
-        <translation>Vapaa teksti(maskattu)</translation>
+        <location filename="../textentrypage.cpp" line="613"/>
+        <source>Free text (masked):</source>
+        <translation>Vapaa teksti (maskattu)</translation>
     </message>
     <message id="xx_textentry_number_text">
-        <location filename="../textentrypage.cpp" line="602"/>
+        <location filename="../textentrypage.cpp" line="615"/>
         <source>Number text:</source>
         <translation>Numeronsyöttö</translation>
     </message>
     <message id="xx_textentry_phone_number">
-        <location filename="../textentrypage.cpp" line="604"/>
+        <location filename="../textentrypage.cpp" line="617"/>
         <source>Phone number:</source>
         <translation>Puhelinnumero</translation>
     </message>
     <message id="xx_textentry_email_text">
-        <location filename="../textentrypage.cpp" line="606"/>
+        <location filename="../textentrypage.cpp" line="619"/>
         <source>Email text:</source>
         <translation>Sähköposti</translation>
     </message>
     <message id="xx_textentry_url_text">
-        <location filename="../textentrypage.cpp" line="608"/>
-        <source>Url text:</source>
+        <location filename="../textentrypage.cpp" line="621"/>
+        <source>URL text:</source>
         <translation>Internet-osoite</translation>
     </message>
     <message id="xx_textentry_multiline">
-        <location filename="../textentrypage.cpp" line="610"/>
+        <location filename="../textentrypage.cpp" line="623"/>
         <source>Multiline:</source>
         <translation>Usean rivin teksti</translation>
     </message>
     <message id="xx_textentry_singleselectall">
-        <location filename="../textentrypage.cpp" line="612"/>
+        <location filename="../textentrypage.cpp" line="625"/>
         <source>Singleline (selectall):</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_textentry_completion_text">
-        <location filename="../textentrypage.cpp" line="614"/>
+        <location filename="../textentrypage.cpp" line="627"/>
         <source>Email suggestion text:</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_textentry_richtext_text">
-        <location filename="../textentrypage.cpp" line="616"/>
-        <source>Rich Text:</source>
+        <location filename="../textentrypage.cpp" line="629"/>
+        <source>Rich text:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message id="xx_textentry_richtext_text_multiline">
+        <location filename="../textentrypage.cpp" line="631"/>
+        <source>Rich text (multiline):</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_textentry_noecho">
-        <location filename="../textentrypage.cpp" line="619"/>
-        <source>No Echo mode:</source>
+        <location filename="../textentrypage.cpp" line="634"/>
+        <source>No echo mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_textentry_echoonedit">
-        <location filename="../textentrypage.cpp" line="622"/>
+        <location filename="../textentrypage.cpp" line="637"/>
         <source>Echo on edit:</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_textentry_direct_input_mode">
-        <location filename="../textentrypage.cpp" line="625"/>
-        <source>Direct Input Mode:</source>
+        <location filename="../textentrypage.cpp" line="640"/>
+        <source>Direct input mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_textentry_custom_toolbar1">
-        <location filename="../textentrypage.cpp" line="628"/>
-        <source>Custom ToolBar 1:</source>
+        <location filename="../textentrypage.cpp" line="643"/>
+        <source>Custom toolbar 1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_textentry_custom_toolbar2">
-        <location filename="../textentrypage.cpp" line="630"/>
-        <source>Custom ToolBar 2:</source>
+        <location filename="../textentrypage.cpp" line="645"/>
+        <source>Custom toolbar 2:</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_auto_capitalisation">
-        <location filename="../textentrypage.cpp" line="633"/>
+        <location filename="../textentrypage.cpp" line="648"/>
         <source>Auto capitalisation</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_error_correction">
-        <location filename="../textentrypage.cpp" line="635"/>
+        <location filename="../textentrypage.cpp" line="650"/>
         <source>Error correction</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_auto_true_entry0">
-        <location filename="../textentrypage.cpp" line="663"/>
-        <source>Auto Capitalisation is active</source>
+        <location filename="../textentrypage.cpp" line="678"/>
+        <source>Auto capitalisation is active</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_auto_false_entry0">
-        <location filename="../textentrypage.cpp" line="666"/>
-        <source>No Auto Capitalisation</source>
+        <location filename="../textentrypage.cpp" line="681"/>
+        <source>No auto capitalisation</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_slider_page_title">
@@ -647,8 +651,7 @@ tooltip</oldsource>
     <message id="xx_slider_age_label">
         <location filename="../sliderpage.cpp" line="186"/>
         <source>Please select your age:œ!! Please select your age:œ!! Please select your age:œ!! Age:</source>
-        <oldsource>Please select your age:</oldsource>
-        <translation type="unfinished">Valitse ikäsi:</translation>
+        <translation>Valitse ikäsi:</translation>
     </message>
     <message id="xx_slider_brightness_label">
         <location filename="../sliderpage.cpp" line="219"/>
@@ -699,27 +702,27 @@ Seekbar is a special type of Slider used for displaying playback status for mult
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_combobox_title">
-        <location filename="../comboboxpage.cpp" line="110"/>
+        <location filename="../comboboxpage.cpp" line="113"/>
         <source>ComboBox</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_popup_generic_title">
-        <location filename="../comboboxpage.cpp" line="114"/>
+        <location filename="../comboboxpage.cpp" line="117"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_popup_sort_descending_order">
-        <location filename="../comboboxpage.cpp" line="116"/>
+        <location filename="../comboboxpage.cpp" line="119"/>
         <source>Sort - DescendingOrder</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_popup_time_consuming">
-        <location filename="../comboboxpage.cpp" line="118"/>
+        <location filename="../comboboxpage.cpp" line="121"/>
         <source>Time-consuming setting</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_combobox_page_info">
-        <location filename="../comboboxpage.cpp" line="122"/>
+        <location filename="../comboboxpage.cpp" line="125"/>
         <source>The MComboBox widget is a combined button and popup list. It is very similar to QComboBox, but does not allow editing the text.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -729,166 +732,186 @@ Seekbar is a special type of Slider used for displaying playback status for mult
         <translation>Säiliö</translation>
     </message>
     <message id="xx_progressbar_page_title">
-        <location filename="../progressbarpage.cpp" line="89"/>
+        <location filename="../progressbarpage.cpp" line="88"/>
         <source>Progress Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_progressbar_page_info_label">
-        <location filename="../progressbarpage.cpp" line="94"/>
+        <location filename="../progressbarpage.cpp" line="93"/>
         <source>A Progress Bar can indicate an ongoing process with either known or unknown durations.</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_progressindicator_unknown_duration_bar">
-        <location filename="../progressbarpage.cpp" line="98"/>
+        <location filename="../progressbarpage.cpp" line="97"/>
         <source>Installing CoolApp</source>
         <translation type="unfinished">tuntematon aika - palkki</translation>
     </message>
     <message id="xx_progressindicator_known_duration_bar">
-        <location filename="../progressbarpage.cpp" line="96"/>
+        <location filename="../progressbarpage.cpp" line="95"/>
         <source>Downloading nicepic.jpg</source>
         <translation type="unfinished">tunnettu aika - palkki</translation>
     </message>
     <message id="xx_language_title">
-        <location filename="../languagepage.cpp" line="118"/>
+        <location filename="../languagepage.cpp" line="122"/>
         <source>Change Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_locale_none">
-        <location filename="../languagepage.cpp" line="137"/>
+        <location filename="../languagepage.cpp" line="143"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_locale_ar">
-        <location filename="../languagepage.cpp" line="142"/>
+        <location filename="../languagepage.cpp" line="148"/>
         <source>Arabic</source>
         <translation>Arabia</translation>
     </message>
     <message id="xx_locale_de">
-        <location filename="../languagepage.cpp" line="147"/>
+        <location filename="../languagepage.cpp" line="153"/>
         <source>German</source>
         <translation>Saksaa</translation>
     </message>
     <message id="xx_locale_de_AT">
-        <location filename="../languagepage.cpp" line="152"/>
+        <location filename="../languagepage.cpp" line="158"/>
         <source>German (Austria)</source>
         <translation>Saksaa (Itävalta)</translation>
     </message>
     <message id="xx_locale_de_CH">
-        <location filename="../languagepage.cpp" line="157"/>
+        <location filename="../languagepage.cpp" line="163"/>
         <source>German (Switzerland)</source>
         <translation>Saksaa (Sveitsi)</translation>
     </message>
     <message id="xx_locale_en">
-        <location filename="../languagepage.cpp" line="162"/>
+        <location filename="../languagepage.cpp" line="168"/>
         <source>English</source>
         <translation>Englantia</translation>
     </message>
     <message id="xx_locale_fi">
-        <location filename="../languagepage.cpp" line="167"/>
+        <location filename="../languagepage.cpp" line="173"/>
         <source>Finnish</source>
         <translation>Suomi</translation>
     </message>
     <message id="xx_locale_hi">
-        <location filename="../languagepage.cpp" line="172"/>
+        <location filename="../languagepage.cpp" line="178"/>
         <source>Hindi</source>
         <translation>Hindi</translation>
     </message>
     <message id="xx_locale_hu">
-        <location filename="../languagepage.cpp" line="177"/>
+        <location filename="../languagepage.cpp" line="183"/>
         <source>Hungarian</source>
         <translation>Unkari</translation>
     </message>
     <message id="xx_locale_ja">
-        <location filename="../languagepage.cpp" line="182"/>
+        <location filename="../languagepage.cpp" line="188"/>
         <source>Japanese</source>
         <translation>Japani</translation>
     </message>
     <message id="xx_locale_ur">
-        <location filename="../languagepage.cpp" line="187"/>
+        <location filename="../languagepage.cpp" line="193"/>
         <source>Urdu</source>
         <translation>Urduksi</translation>
     </message>
     <message id="xx_locale_ur_PK">
-        <location filename="../languagepage.cpp" line="192"/>
+        <location filename="../languagepage.cpp" line="198"/>
         <source>Urdu (Pakistan)</source>
         <translation>Urduksi (Pakistan)</translation>
     </message>
     <message id="xx_locale_ur_IN">
-        <location filename="../languagepage.cpp" line="197"/>
+        <location filename="../languagepage.cpp" line="203"/>
         <source>Urdu (India)</source>
         <translation type="unfinished">Urduksi (Intia)</translation>
     </message>
     <message id="xx_locale_zh_CN">
-        <location filename="../languagepage.cpp" line="202"/>
+        <location filename="../languagepage.cpp" line="208"/>
         <source>Chinese (China)</source>
         <translation>Kiina (Kiina)</translation>
     </message>
     <message id="xx_locale_zh_TW">
-        <location filename="../languagepage.cpp" line="207"/>
+        <location filename="../languagepage.cpp" line="213"/>
         <source>Chinese (Taiwan)</source>
         <translation>Kiina (Taiwan)</translation>
     </message>
+    <message id="xx_timeformat24h_locale_default">
+        <location filename="../languagepage.cpp" line="223"/>
+        <source>Locale default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message id="xx_timeformat24h_24_hour_mode">
+        <location filename="../languagepage.cpp" line="227"/>
+        <source>24 hour mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message id="xx_timeformat24h_12_hour_mode">
+        <location filename="../languagepage.cpp" line="231"/>
+        <source>12 hour mode</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message id="xx_language_combobox_title">
-        <location filename="../languagepage.cpp" line="302"/>
+        <location filename="../languagepage.cpp" line="357"/>
         <source>Please select language</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_language_combobox_lctime_title">
-        <location filename="../languagepage.cpp" line="304"/>
+        <location filename="../languagepage.cpp" line="359"/>
         <source>Locale for time</source>
         <translation type="unfinished"></translation>
     </message>
+    <message id="xx_language_combobox_lctimeformat24h_title">
+        <location filename="../languagepage.cpp" line="361"/>
+        <source>Choose 12/24 hour mode</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message id="xx_language_combobox_lccollate_title">
-        <location filename="../languagepage.cpp" line="306"/>
+        <location filename="../languagepage.cpp" line="363"/>
         <source>Locale for collation</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_language_combobox_lcnumeric_title">
-        <location filename="../languagepage.cpp" line="308"/>
+        <location filename="../languagepage.cpp" line="365"/>
         <source>Locale for numbers</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_language_combobox_lcmonetary_title">
-        <location filename="../languagepage.cpp" line="310"/>
+        <location filename="../languagepage.cpp" line="367"/>
         <source>Locale for money</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="qtn_comm_command_yes">
-        <location filename="../languagepage.cpp" line="314"/>
-        <location filename="../languagepage.cpp" line="321"/>
+        <location filename="../languagepage.cpp" line="371"/>
+        <location filename="../languagepage.cpp" line="378"/>
         <source>Yes</source>
         <translation>Kyllä</translation>
     </message>
     <message id="qtn_comm_command_no">
-        <location filename="../languagepage.cpp" line="317"/>
-        <location filename="../languagepage.cpp" line="324"/>
+        <location filename="../languagepage.cpp" line="374"/>
+        <location filename="../languagepage.cpp" line="381"/>
         <source>No</source>
         <translation>Ei</translation>
     </message>
     <message id="xx_language_number_format">
-        <location filename="../languagepage.cpp" line="329"/>
+        <location filename="../languagepage.cpp" line="386"/>
         <source>Number format example: %1œ!! Number example: %1œ!! Number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_langage_date_time_format">
-        <location filename="../languagepage.cpp" line="344"/>
+        <location filename="../languagepage.cpp" line="401"/>
         <source>Date and time format example: %1œ!! Date and time: %1œ!! Date: %1œ!! %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_language_week_number">
-        <location filename="../languagepage.cpp" line="349"/>
+        <location filename="../languagepage.cpp" line="406"/>
         <source>Week number example: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_language_currency_format">
-        <location filename="../languagepage.cpp" line="359"/>
+        <location filename="../languagepage.cpp" line="416"/>
         <source>Currency format example: %1 %2œ!! Currency: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_language_trans_%Ln_boxes_weight_%L1" numerus="yes">
-        <location filename="../languagepage.cpp" line="365"/>
-        <location filename="../languagepage.cpp" line="367"/>
-        <location filename="../languagepage.cpp" line="369"/>
+        <location filename="../languagepage.cpp" line="422"/>
+        <location filename="../languagepage.cpp" line="424"/>
+        <location filename="../languagepage.cpp" line="426"/>
         <source>%Ln boxes with a total weight of %L1 kilogramœ!! %Ln boxes, total weight of %L1 kg</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -896,57 +919,57 @@ Seekbar is a special type of Slider used for displaying playback status for mult
         </translation>
     </message>
     <message id="xx_language_font_test">
-        <location filename="../languagepage.cpp" line="373"/>
+        <location filename="../languagepage.cpp" line="430"/>
         <source>Font test:</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_displaymodes_navbarcombo">
-        <location filename="../displaymodespage.cpp" line="59"/>
+        <location filename="../displaymodespage.cpp" line="68"/>
         <source>Navigation Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_displaymodes_escapebtncombo">
-        <location filename="../displaymodespage.cpp" line="67"/>
+        <location filename="../displaymodespage.cpp" line="76"/>
         <source>Escape Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_displaymodes_homebtncombo">
-        <location filename="../displaymodespage.cpp" line="75"/>
+        <location filename="../displaymodespage.cpp" line="84"/>
         <source>Home Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_displaymodes_page_title">
-        <location filename="../displaymodespage.cpp" line="143"/>
+        <location filename="../displaymodespage.cpp" line="152"/>
         <source>Display Modes</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_displaymodes_display_mode">
-        <location filename="../displaymodespage.cpp" line="147"/>
+        <location filename="../displaymodespage.cpp" line="156"/>
         <source>Components&apos; display mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_displaymodes_window_state">
-        <location filename="../displaymodespage.cpp" line="150"/>
+        <location filename="../displaymodespage.cpp" line="159"/>
         <source>Window state:</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_displaymodes_full_screen">
-        <location filename="../displaymodespage.cpp" line="153"/>
+        <location filename="../displaymodespage.cpp" line="162"/>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_displaymode_show">
-        <location filename="../displaymodespage.cpp" line="166"/>
+        <location filename="../displaymodespage.cpp" line="175"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_displaymode_autohide">
-        <location filename="../displaymodespage.cpp" line="168"/>
+        <location filename="../displaymodespage.cpp" line="177"/>
         <source>Auto Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_displaymode_hide">
-        <location filename="../displaymodespage.cpp" line="170"/>
+        <location filename="../displaymodespage.cpp" line="179"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1009,42 +1032,42 @@ The primary (single short tap) action of the element should not be duplicated in
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_template_page_title">
-        <location filename="../templatepage.cpp" line="101"/>
+        <location filename="../templatepage.cpp" line="102"/>
         <source>Template</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_sample template">
-        <location filename="../templatepage.cpp" line="107"/>
+        <location filename="../templatepage.cpp" line="108"/>
         <source>Sample template</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_toolbar_page_example1">
-        <location filename="../toolbarpage.cpp" line="220"/>
+        <location filename="../toolbarpage.cpp" line="223"/>
         <source>Example 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_toolbar_page_example2">
-        <location filename="../toolbarpage.cpp" line="222"/>
+        <location filename="../toolbarpage.cpp" line="225"/>
         <source>Example 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_toolbar_page_defaultview">
-        <location filename="../toolbarpage.cpp" line="224"/>
+        <location filename="../toolbarpage.cpp" line="227"/>
         <source>Default View</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_toolbar_page_tabview">
-        <location filename="../toolbarpage.cpp" line="226"/>
+        <location filename="../toolbarpage.cpp" line="229"/>
         <source>Tab View</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_toolbar_page_title">
-        <location filename="../toolbarpage.cpp" line="210"/>
+        <location filename="../toolbarpage.cpp" line="213"/>
         <source>ToolBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_toolbar_page_info">
-        <location filename="../toolbarpage.cpp" line="217"/>
+        <location filename="../toolbarpage.cpp" line="220"/>
         <source>&lt;b&gt;Toolbar&lt;/b&gt; acts as a container for actions. Depending upon the view attached, it either acts as a tab bar or is a container for buttons and text input field. &lt;ul&gt;&lt;li&gt;Click Menu to explore the example&lt;/li&gt;&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1068,19 +1091,19 @@ instructions.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_icon_button_page_title">
-        <location filename="../iconbuttonpage.cpp" line="81"/>
+        <location filename="../iconbuttonpage.cpp" line="82"/>
         <source>Icon Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_icon_button_page_info_label">
-        <location filename="../iconbuttonpage.cpp" line="89"/>
+        <location filename="../iconbuttonpage.cpp" line="90"/>
         <source>Icon Buttons have an icon and can have a text label. Icon button differs from push button by its visual presentation: it does not have button-style edges like a Push Button does.
 
  Icon Buttons are used in e.g. Toolbars.</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_icon_button_page_icon_button2">
-        <location filename="../iconbuttonpage.cpp" line="91"/>
+        <location filename="../iconbuttonpage.cpp" line="92"/>
         <source>Lorem ipsum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1115,7 +1138,6 @@ sit amet</source>
     <message id="xx_spinner_page_application_main_area">
         <location filename="../spinnerpage.cpp" line="112"/>
         <source>In application main area</source>
-        <oldsource>In container main area</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_spinner_page_container_header">
@@ -1126,7 +1148,6 @@ sit amet</source>
     <message id="xx_spinner_page_menu">
         <location filename="../spinnerpage.cpp" line="116"/>
         <source>In application menu</source>
-        <oldsource>In view menu</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_spinner_page_dialog">
@@ -1258,55 +1279,54 @@ Input feedbacks can be easily configured for different purposes using the themin
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_gridpage_configuration">
-        <location filename="../mgridpage.cpp" line="208"/>
+        <location filename="../mgridpage.cpp" line="210"/>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_gridpage_title">
-        <location filename="../mgridpage.cpp" line="203"/>
-        <source>ConfigurationGrid page</source>
-        <oldsource>Grid page</oldsource>
+        <location filename="../mgridpage.cpp" line="205"/>
+        <source>Grid page</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_gridpage_set_columns">
-        <location filename="../mgridpage.cpp" line="297"/>
+        <location filename="../mgridpage.cpp" line="301"/>
         <source>Set columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_gridpage_landscape">
-        <location filename="../mgridpage.cpp" line="329"/>
-        <location filename="../mgridpage.cpp" line="339"/>
+        <location filename="../mgridpage.cpp" line="333"/>
+        <location filename="../mgridpage.cpp" line="343"/>
         <source>Landscape</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_gridpage_portrait">
-        <location filename="../mgridpage.cpp" line="334"/>
-        <location filename="../mgridpage.cpp" line="344"/>
+        <location filename="../mgridpage.cpp" line="338"/>
+        <location filename="../mgridpage.cpp" line="348"/>
         <source>Portrait</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_bubblepage_title">
-        <location filename="../bubblepage.cpp" line="156"/>
+        <location filename="../bubblepage.cpp" line="158"/>
         <source>Speech Bubble</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_bubblepage_linkactivated">
-        <location filename="../bubblepage.cpp" line="169"/>
+        <location filename="../bubblepage.cpp" line="171"/>
         <source>Link activated</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_bubblepage_bubbleclicked">
-        <location filename="../bubblepage.cpp" line="176"/>
+        <location filename="../bubblepage.cpp" line="178"/>
         <source>Speech buuble clicked</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_title">
-        <location filename="../buttongrouppage.cpp" line="156"/>
+        <location filename="../buttongrouppage.cpp" line="168"/>
         <source>Button Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_info_label">
-        <location filename="../buttongrouppage.cpp" line="168"/>
+        <location filename="../buttongrouppage.cpp" line="180"/>
         <source>Buttons can be grouped together based on visual or logic requirements.
 
 The basic group is formed by placing buttons together into a layout. Depending on the theme, the buttons are typically drawn as connected with each other.
@@ -1315,62 +1335,62 @@ Logical exclusivity can be added to a group, which ensures only one of the butto
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_hlabel1">
-        <location filename="../buttongrouppage.cpp" line="171"/>
+        <location filename="../buttongrouppage.cpp" line="183"/>
         <source>Horizontal group</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button1">
-        <location filename="../buttongrouppage.cpp" line="173"/>
+        <location filename="../buttongrouppage.cpp" line="185"/>
         <source>Yes</source>
         <translation type="unfinished">Kyllä</translation>
     </message>
     <message id="xx_button_group_page_button2">
-        <location filename="../buttongrouppage.cpp" line="175"/>
+        <location filename="../buttongrouppage.cpp" line="187"/>
         <source>No</source>
         <translation type="unfinished">Ei</translation>
     </message>
     <message id="xx_button_group_page_button3">
-        <location filename="../buttongrouppage.cpp" line="177"/>
+        <location filename="../buttongrouppage.cpp" line="189"/>
         <source>Maybe</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_vlabel2">
-        <location filename="../buttongrouppage.cpp" line="180"/>
+        <location filename="../buttongrouppage.cpp" line="192"/>
         <source>Horizontal group, exclusive</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button4">
-        <location filename="../buttongrouppage.cpp" line="182"/>
+        <location filename="../buttongrouppage.cpp" line="194"/>
         <source>Cost</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button5">
-        <location filename="../buttongrouppage.cpp" line="184"/>
+        <location filename="../buttongrouppage.cpp" line="196"/>
         <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button6">
-        <location filename="../buttongrouppage.cpp" line="186"/>
+        <location filename="../buttongrouppage.cpp" line="198"/>
         <source>Schedule</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_vlabel">
-        <location filename="../buttongrouppage.cpp" line="189"/>
+        <location filename="../buttongrouppage.cpp" line="201"/>
         <source>Vertical group, checkable</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button7">
-        <location filename="../buttongrouppage.cpp" line="191"/>
+        <location filename="../buttongrouppage.cpp" line="203"/>
         <source>Milk</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button8">
-        <location filename="../buttongrouppage.cpp" line="193"/>
+        <location filename="../buttongrouppage.cpp" line="205"/>
         <source>Sugar</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button9">
-        <location filename="../buttongrouppage.cpp" line="195"/>
+        <location filename="../buttongrouppage.cpp" line="207"/>
         <source>Biscotti</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1389,57 +1409,57 @@ Logical exclusivity can be added to a group, which ensures only one of the butto
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_single_title">
-        <location filename="../contentitemspage.cpp" line="310"/>
+        <location filename="../contentitemspage.cpp" line="312"/>
         <source>Single Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_title_with_subtitle">
-        <location filename="../contentitemspage.cpp" line="312"/>
+        <location filename="../contentitemspage.cpp" line="314"/>
         <source>Title with Subtitle</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title">
-        <location filename="../contentitemspage.cpp" line="314"/>
+        <location filename="../contentitemspage.cpp" line="316"/>
         <source>Icon with Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_and_subtitle">
-        <location filename="../contentitemspage.cpp" line="316"/>
+        <location filename="../contentitemspage.cpp" line="318"/>
         <source>Icon with Title and Subtitle</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_subtitle_and_two_side_icons">
-        <location filename="../contentitemspage.cpp" line="320"/>
+        <location filename="../contentitemspage.cpp" line="322"/>
         <source>Icon with Title Subtitle and Two Side Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_subtitle_and_side_icon_with_label">
-        <location filename="../contentitemspage.cpp" line="323"/>
+        <location filename="../contentitemspage.cpp" line="325"/>
         <source>Icon with Title Subtitle and Side Icon with Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_thumbnail_with_title_subtitle_and_two_side_icons">
-        <location filename="../contentitemspage.cpp" line="326"/>
+        <location filename="../contentitemspage.cpp" line="328"/>
         <source>Thumbnail with Title Subtitle and Two Side Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_thumbnail_with_title_and_two_side_icons">
-        <location filename="../contentitemspage.cpp" line="329"/>
+        <location filename="../contentitemspage.cpp" line="331"/>
         <source>Thumbnail with Title and Two Side Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_progress_indicator_and_two_side_icons">
-        <location filename="../contentitemspage.cpp" line="334"/>
+        <location filename="../contentitemspage.cpp" line="336"/>
         <source>Icon with Title Progress Indicator and Two Side Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_progress_indicator_and_top_side_icon">
-        <location filename="../contentitemspage.cpp" line="337"/>
+        <location filename="../contentitemspage.cpp" line="339"/>
         <source>Icon with Title Progress Indicator and Top Side Icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_contentitemspage_title">
-        <location filename="../contentitemspage.cpp" line="358"/>
+        <location filename="../contentitemspage.cpp" line="359"/>
         <source>Content Items</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/demos/widgetsgallery/translations/widgetsgallery_hu.ts b/demos/widgetsgallery/translations/widgetsgallery_hu.ts
index d827fb06..cd9da8dd 100644
--- a/demos/widgetsgallery/translations/widgetsgallery_hu.ts
+++ b/demos/widgetsgallery/translations/widgetsgallery_hu.ts
@@ -4,217 +4,217 @@
 <context>
     <name></name>
     <message id="xx_wg_categories_application_view">
-        <location filename="../mainpage.cpp" line="86"/>
+        <location filename="../mainpage.cpp" line="92"/>
         <source>Application View</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_application_view_view_menu">
-        <location filename="../mainpage.cpp" line="88"/>
+        <location filename="../mainpage.cpp" line="94"/>
         <source>Application Menu</source>
         <translation type="unfinished">Alkalmazás Menü</translation>
     </message>
     <message id="xx_wg_application_view_display_modes">
-        <location filename="../mainpage.cpp" line="90"/>
+        <location filename="../mainpage.cpp" line="96"/>
         <source>Display Modes</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_application_view_toolbar_incl_tab_bar">
-        <location filename="../mainpage.cpp" line="92"/>
+        <location filename="../mainpage.cpp" line="98"/>
         <source>Toolbar (including Tab Bar)</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_categories_simple_widgets">
-        <location filename="../mainpage.cpp" line="96"/>
+        <location filename="../mainpage.cpp" line="102"/>
         <source>Simple Widgets</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_simple_widgets_labels">
-        <location filename="../mainpage.cpp" line="98"/>
+        <location filename="../mainpage.cpp" line="104"/>
         <source>Labels</source>
         <translation type="unfinished">Címkék</translation>
     </message>
     <message id="xx_wg_simple_widgets_image">
-        <location filename="../mainpage.cpp" line="100"/>
+        <location filename="../mainpage.cpp" line="106"/>
         <source>Image</source>
         <translation type="unfinished">Kép</translation>
     </message>
     <message id="xx_wg_simple_widgets_progress_bar">
-        <location filename="../mainpage.cpp" line="102"/>
+        <location filename="../mainpage.cpp" line="108"/>
         <source>Progress Bar</source>
         <translation type="unfinished">Haladó Csík</translation>
     </message>
     <message id="xx_wg_simple_widgets_container">
-        <location filename="../mainpage.cpp" line="104"/>
+        <location filename="../mainpage.cpp" line="110"/>
         <source>Container</source>
         <translation type="unfinished">Tároló</translation>
     </message>
     <message id="xx_wg_simple_widgets_spinner">
-        <location filename="../mainpage.cpp" line="106"/>
+        <location filename="../mainpage.cpp" line="112"/>
         <source>Spinner</source>
         <translation type="unfinished">Tekerő</translation>
     </message>
     <message id="xx_wg_categories_buttons">
-        <location filename="../mainpage.cpp" line="109"/>
+        <location filename="../mainpage.cpp" line="115"/>
         <source>Buttons</source>
         <translation type="unfinished">Gombok</translation>
     </message>
     <message id="xx_wg_buttons_push_button">
-        <location filename="../mainpage.cpp" line="111"/>
+        <location filename="../mainpage.cpp" line="117"/>
         <source>Push Button</source>
         <translation type="unfinished">Nyomógomb</translation>
     </message>
     <message id="xx_wg_buttons_icon_button">
-        <location filename="../mainpage.cpp" line="113"/>
+        <location filename="../mainpage.cpp" line="119"/>
         <source>Icon Button</source>
         <translation type="unfinished">Ikon Gomb</translation>
     </message>
     <message id="xx_wg_buttons_switch">
-        <location filename="../mainpage.cpp" line="115"/>
+        <location filename="../mainpage.cpp" line="121"/>
         <source>Switch</source>
         <translation type="unfinished">Kapcsoló</translation>
     </message>
     <message id="xx_wg_buttons_checkbox">
-        <location filename="../mainpage.cpp" line="117"/>
+        <location filename="../mainpage.cpp" line="123"/>
         <source>Checkbox</source>
         <translation type="unfinished">Jelölőnégyzet</translation>
     </message>
     <message id="xx_wg_buttons_buttongroup">
-        <location filename="../mainpage.cpp" line="119"/>
+        <location filename="../mainpage.cpp" line="125"/>
         <source>Button Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_categories_dialogs_and_banners">
-        <location filename="../mainpage.cpp" line="122"/>
+        <location filename="../mainpage.cpp" line="128"/>
         <source>Dialogs and Banners</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_dialogs_and_banners_single_selection_dialog">
-        <location filename="../mainpage.cpp" line="124"/>
+        <location filename="../mainpage.cpp" line="130"/>
         <source>Single Selection Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_dialogs_and_banners_query_dialog">
-        <location filename="../mainpage.cpp" line="126"/>
+        <location filename="../mainpage.cpp" line="132"/>
         <source>Query Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_dialogs_and_banners_banner">
-        <location filename="../mainpage.cpp" line="128"/>
+        <location filename="../mainpage.cpp" line="134"/>
         <source>Banner</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_categories_lists_grids_and_popups">
-        <location filename="../mainpage.cpp" line="131"/>
+        <location filename="../mainpage.cpp" line="137"/>
         <source>Lists, Grids and Popups</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_list">
-        <location filename="../mainpage.cpp" line="133"/>
+        <location filename="../mainpage.cpp" line="139"/>
         <source>List</source>
         <translation type="unfinished">Lista</translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_grid">
-        <location filename="../mainpage.cpp" line="135"/>
+        <location filename="../mainpage.cpp" line="141"/>
         <source>Grid</source>
         <translation type="unfinished">Rács</translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_object_menu">
-        <location filename="../mainpage.cpp" line="137"/>
+        <location filename="../mainpage.cpp" line="143"/>
         <source>Object Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_combobox">
-        <location filename="../mainpage.cpp" line="139"/>
+        <location filename="../mainpage.cpp" line="145"/>
         <source>ComboBox</source>
         <translation type="unfinished">Kombó</translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_contentitems">
-        <location filename="../mainpage.cpp" line="141"/>
+        <location filename="../mainpage.cpp" line="147"/>
         <source>ContentItems</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_bubble">
-        <location filename="../mainpage.cpp" line="143"/>
+        <location filename="../mainpage.cpp" line="149"/>
         <source>Speech bubble</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_categories_user_input">
-        <location filename="../mainpage.cpp" line="146"/>
+        <location filename="../mainpage.cpp" line="152"/>
         <source>User Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_user_input_text_entries">
-        <location filename="../mainpage.cpp" line="148"/>
+        <location filename="../mainpage.cpp" line="154"/>
         <source>Text Entries</source>
         <translation type="unfinished">Feljegyzések</translation>
     </message>
     <message id="xx_wg_user_input_slider">
-        <location filename="../mainpage.cpp" line="150"/>
+        <location filename="../mainpage.cpp" line="156"/>
         <source>Slider</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_user_input_input_feedback">
-        <location filename="../mainpage.cpp" line="152"/>
+        <location filename="../mainpage.cpp" line="158"/>
         <source>Input Feedback</source>
         <translation type="unfinished">Visszajelzés</translation>
     </message>
     <message id="xx_application_title">
-        <location filename="../mainpage.cpp" line="337"/>
+        <location filename="../mainpage.cpp" line="346"/>
         <source>Widgets Gallery</source>
         <translation>Grafikus Elemek Tárlata</translation>
     </message>
     <message id="xx_mainpage_themes">
-        <location filename="../mainpage.cpp" line="343"/>
+        <location filename="../mainpage.cpp" line="352"/>
         <source>Themes</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_mainpage_orientation">
-        <location filename="../mainpage.cpp" line="345"/>
+        <location filename="../mainpage.cpp" line="354"/>
         <source>Orientation</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_mainpage_toggle_fps">
-        <location filename="../mainpage.cpp" line="347"/>
+        <location filename="../mainpage.cpp" line="356"/>
         <source>Toggle FPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_mainpage_language_settings">
-        <location filename="../mainpage.cpp" line="349"/>
+        <location filename="../mainpage.cpp" line="358"/>
         <source>Language Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_apporientation_auto">
-        <location filename="../mainpage.cpp" line="562"/>
+        <location filename="../mainpage.cpp" line="570"/>
         <source>Automatic</source>
         <translation>Automatikus</translation>
     </message>
     <message id="xx_apporientation_portrait">
-        <location filename="../mainpage.cpp" line="570"/>
+        <location filename="../mainpage.cpp" line="578"/>
         <source>Portrait</source>
         <translation>Álló</translation>
     </message>
     <message id="xx_apporientation_landscape">
-        <location filename="../mainpage.cpp" line="578"/>
+        <location filename="../mainpage.cpp" line="586"/>
         <source>Landscape</source>
         <translation>Fekvő</translation>
     </message>
     <message id="xx_apporientation_angle0">
-        <location filename="../mainpage.cpp" line="586"/>
+        <location filename="../mainpage.cpp" line="594"/>
         <source>0 degrees</source>
         <translation>0 fok</translation>
     </message>
     <message id="xx_apporientation_angle90">
-        <location filename="../mainpage.cpp" line="594"/>
+        <location filename="../mainpage.cpp" line="602"/>
         <source>90 degrees clockwise</source>
         <translation>90 fok óramutató irányban</translation>
     </message>
     <message id="xx_apporientation_angle180">
-        <location filename="../mainpage.cpp" line="602"/>
+        <location filename="../mainpage.cpp" line="610"/>
         <source>180 degrees clockwise</source>
         <translation>180 fok óramutató irányban</translation>
     </message>
     <message id="xx_apporientation_angle270">
-        <location filename="../mainpage.cpp" line="610"/>
+        <location filename="../mainpage.cpp" line="618"/>
         <source>270 degrees clockwise</source>
         <translation>270 fok óramutató irányban</translation>
     </message>
@@ -420,89 +420,88 @@ A Címkék balra, jobbra vagy középre lehetnek rendezve és az általuk megjel
         <translation>Válassz nyomtatót</translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_stacked_dialogs">
-        <location filename="../singleselectiondialogspage.cpp" line="257"/>
+        <location filename="../singleselectiondialogspage.cpp" line="259"/>
         <source>Stacked Dialogs</source>
         <translation type="unfinished">Egymásra helyezett dialógusok</translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_system_dialog">
-        <location filename="../singleselectiondialogspage.cpp" line="259"/>
+        <location filename="../singleselectiondialogspage.cpp" line="261"/>
         <source>System Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_system_modal_dialog">
-        <location filename="../singleselectiondialogspage.cpp" line="261"/>
+        <location filename="../singleselectiondialogspage.cpp" line="263"/>
         <source>System Modal Dialog</source>
         <translation type="unfinished">Ablak Modális Dialógus</translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_dialog_with_progress_indicator">
-        <location filename="../singleselectiondialogspage.cpp" line="263"/>
+        <location filename="../singleselectiondialogspage.cpp" line="265"/>
         <source>Dialog with Progress Indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_message_box">
-        <location filename="../singleselectiondialogspage.cpp" line="265"/>
+        <location filename="../singleselectiondialogspage.cpp" line="267"/>
         <source>Message Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_button">
-        <location filename="../singleselectiondialogspage.cpp" line="126"/>
+        <location filename="../singleselectiondialogspage.cpp" line="128"/>
         <source>Click to spawn a nested dialog</source>
         <translation>Klikkelj az egymásba helyezett dialógusok létrehozásáshoz</translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="128"/>
+        <location filename="../singleselectiondialogspage.cpp" line="130"/>
         <source>Stacked dialogs</source>
         <translation>Egymásra helyezett dialógusok</translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_open_nested_messagebox">
-        <location filename="../singleselectiondialogspage.cpp" line="142"/>
+        <location filename="../singleselectiondialogspage.cpp" line="144"/>
         <source>Click to open a nested message box</source>
         <translation>Klikkelj az egymásba helyezett üzenetek megjelenítéséhez</translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_nested_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="144"/>
+        <location filename="../singleselectiondialogspage.cpp" line="146"/>
         <source>This is a nested dialog</source>
         <translation>Egymásba helyezett dialógusok</translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_messagebox_text">
-        <location filename="../singleselectiondialogspage.cpp" line="157"/>
+        <location filename="../singleselectiondialogspage.cpp" line="159"/>
         <source>I&apos;m a nested message box</source>
         <translation>Egymásba helyezett üzenetek</translation>
     </message>
     <message id="xx_dialogs_and_notifications_system_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="168"/>
+        <location filename="../singleselectiondialogspage.cpp" line="170"/>
         <source>System Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_dialogs_and_notifications_system_dialog_label">
-        <location filename="../singleselectiondialogspage.cpp" line="176"/>
-        <source>I&apos;m a system dialog.&lt;br&gt;There actually is a way around me...&lt;br&gt;You can skip me with the home button, but I&apos;ll remain&lt;br&gt;alive until you make a selection.</source>
+        <location filename="../singleselectiondialogspage.cpp" line="178"/>
+        <source>I&apos;m a system dialog.&lt;br&gt;You can skip me with the home button.&lt;br&gt;I&apos;ll be minimised to the task switcher&lt;br&gt;but I&apos;ll remain alive until you make a selection.</source>
+        <oldsource>I&apos;m a system dialog.&lt;br&gt;There actually is a way around me...&lt;br&gt;You can skip me with the home button, but I&apos;ll remain&lt;br&gt;alive until you make a selection.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_dialogs_and_notifications_system_modal_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="191"/>
+        <location filename="../singleselectiondialogspage.cpp" line="193"/>
         <source>System Modal Dialog</source>
         <translation>Ablak Modális Dialógus</translation>
     </message>
     <message id="xx_dialogs_and_notifications_system_modal_dialog_label">
-        <location filename="../singleselectiondialogspage.cpp" line="198"/>
-        <source>I&apos;m a window modal dialog.
-There&apos;s no way around me!
-Muwhahaha... [evil laugh]</source>
-        <oldsource>I&apos;m a System Modal dialog.
+        <location filename="../singleselectiondialogspage.cpp" line="200"/>
+        <source>I&apos;m a system modal dialog.&lt;br&gt;You can&apos;t skip me as I&apos;m designed for&lt;br&gt;use cases that require immediate user attention.</source>
+        <oldsource>I&apos;m a window modal dialog.
 There&apos;s no way around me!
 Muwhahaha... [evil laugh]</oldsource>
-        <translation>Ez egy modális dialógus.
+        <translation type="unfinished">Ez egy modális dialógus.
 Nem tudsz megkerülni!
 Muwhahaha... [röhögés]</translation>
     </message>
     <message id="xx_dialogs_and_notifications_message_box_text">
-        <location filename="../singleselectiondialogspage.cpp" line="237"/>
+        <location filename="../singleselectiondialogspage.cpp" line="239"/>
         <source>Hello World!</source>
         <translation>Sziasztok!</translation>
     </message>
     <message id="xx_single_selection_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="251"/>
+        <location filename="../singleselectiondialogspage.cpp" line="253"/>
         <source>Single Selection Dialogs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -601,7 +600,7 @@ Muwhahaha... [röhögés]</translation>
         <translation type="obsolete">Rendszer Információ Szallag</translation>
     </message>
     <message id="xx_dialogs_and_notifications_progress_indicator">
-        <location filename="../singleselectiondialogspage.cpp" line="217"/>
+        <location filename="../singleselectiondialogspage.cpp" line="219"/>
         <source>Progress Indicator</source>
         <translation>Haladás Jelző</translation>
     </message>
@@ -652,17 +651,17 @@ Muwhahaha... [röhögés]</translation>
         <translation>Levág</translation>
     </message>
     <message id="xx_listpage_list_remove">
-        <location filename="../mlistpage.cpp" line="634"/>
+        <location filename="../mlistpage.cpp" line="635"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_listpage_list_edit">
-        <location filename="../mlistpage.cpp" line="640"/>
+        <location filename="../mlistpage.cpp" line="641"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_listpage_title">
-        <location filename="../mlistpage.cpp" line="658"/>
+        <location filename="../mlistpage.cpp" line="659"/>
         <source>List</source>
         <translation>Lista</translation>
     </message>
@@ -675,47 +674,47 @@ Muwhahaha... [röhögés]</translation>
         <translation type="obsolete">Egyebek</translation>
     </message>
     <message id="xx_textentry_title">
-        <location filename="../textentrypage.cpp" line="582"/>
+        <location filename="../textentrypage.cpp" line="595"/>
         <source>Text Entries</source>
         <translation>Feljegyzések</translation>
     </message>
     <message id="xx_textentry_free_text">
-        <location filename="../textentrypage.cpp" line="598"/>
+        <location filename="../textentrypage.cpp" line="611"/>
         <source>Free text:</source>
         <translation>Tetszőleges szöveg:</translation>
     </message>
     <message id="xx_textentry_free_text_masked">
-        <location filename="../textentrypage.cpp" line="600"/>
-        <source>Free text(masked):</source>
-        <translation>Tetszőleges szöveg(letakarva):</translation>
+        <location filename="../textentrypage.cpp" line="613"/>
+        <source>Free text (masked):</source>
+        <translation>Tetszőleges szöveg (letakarva):</translation>
     </message>
     <message id="xx_textentry_number_text">
-        <location filename="../textentrypage.cpp" line="602"/>
+        <location filename="../textentrypage.cpp" line="615"/>
         <source>Number text:</source>
         <translation>Szám:</translation>
     </message>
     <message id="xx_textentry_phone_number">
-        <location filename="../textentrypage.cpp" line="604"/>
+        <location filename="../textentrypage.cpp" line="617"/>
         <source>Phone number:</source>
         <translation>Telefonszám:</translation>
     </message>
     <message id="xx_textentry_email_text">
-        <location filename="../textentrypage.cpp" line="606"/>
+        <location filename="../textentrypage.cpp" line="619"/>
         <source>Email text:</source>
         <translation>Email cím:</translation>
     </message>
     <message id="xx_textentry_url_text">
-        <location filename="../textentrypage.cpp" line="608"/>
-        <source>Url text:</source>
-        <translation>Url cím:</translation>
+        <location filename="../textentrypage.cpp" line="621"/>
+        <source>URL text:</source>
+        <translation>URL cím:</translation>
     </message>
     <message id="xx_textentry_multiline">
-        <location filename="../textentrypage.cpp" line="610"/>
+        <location filename="../textentrypage.cpp" line="623"/>
         <source>Multiline:</source>
         <translation>Többsoros:</translation>
     </message>
     <message id="xx_tooltip_entry0">
-        <location filename="../textentrypage.cpp" line="586"/>
+        <location filename="../textentrypage.cpp" line="599"/>
         <source>Enter text here</source>
         <translation>Szöveg</translation>
     </message>
@@ -748,62 +747,67 @@ Muwhahaha... [röhögés]</translation>
         <translation>&lt;i&gt;Billentyű felengedés&lt;/i&gt; billentyű:</translation>
     </message>
     <message id="xx_tooltip_customtoolbar1">
-        <location filename="../textentrypage.cpp" line="519"/>
+        <location filename="../textentrypage.cpp" line="539"/>
         <source>Example custom toolbar 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_tooltip_customtoolbar2">
-        <location filename="../textentrypage.cpp" line="532"/>
+        <location filename="../textentrypage.cpp" line="552"/>
         <source>Example custom toolbar 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_tooltip_entry1">
-        <location filename="../textentrypage.cpp" line="589"/>
+        <location filename="../textentrypage.cpp" line="602"/>
         <source>This tooltip is quite long and will be clipped on the display</source>
         <translation>Ez az eszközleíró túl hosszú ezért a megjelenítés során bizonyos részei levágódnak.</translation>
     </message>
     <message id="xx_textentry_richtext_text">
-        <location filename="../textentrypage.cpp" line="616"/>
-        <source>Rich Text:</source>
+        <location filename="../textentrypage.cpp" line="629"/>
+        <source>Rich text:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message id="xx_textentry_richtext_text_multiline">
+        <location filename="../textentrypage.cpp" line="631"/>
+        <source>Rich text (multiline):</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_textentry_noecho">
-        <location filename="../textentrypage.cpp" line="619"/>
-        <source>No Echo mode:</source>
+        <location filename="../textentrypage.cpp" line="634"/>
+        <source>No echo mode:</source>
         <translation>Nincs visszajelzés szerkesztéskor:</translation>
     </message>
     <message id="xx_textentry_echoonedit">
-        <location filename="../textentrypage.cpp" line="622"/>
+        <location filename="../textentrypage.cpp" line="637"/>
         <source>Echo on edit:</source>
         <translation>Visszajelzés szerkesztéskor:</translation>
     </message>
     <message id="xx_textentry_direct_input_mode">
-        <location filename="../textentrypage.cpp" line="625"/>
-        <source>Direct Input Mode:</source>
+        <location filename="../textentrypage.cpp" line="640"/>
+        <source>Direct input mode:</source>
         <translation>Közvetlen bemenet:</translation>
     </message>
     <message id="xx_textentry_custom_toolbar1">
-        <location filename="../textentrypage.cpp" line="628"/>
-        <source>Custom ToolBar 1:</source>
+        <location filename="../textentrypage.cpp" line="643"/>
+        <source>Custom toolbar 1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_textentry_custom_toolbar2">
-        <location filename="../textentrypage.cpp" line="630"/>
-        <source>Custom ToolBar 2:</source>
+        <location filename="../textentrypage.cpp" line="645"/>
+        <source>Custom toolbar 2:</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_auto_true_entry0">
-        <location filename="../textentrypage.cpp" line="663"/>
-        <source>Auto Capitalisation is active</source>
+        <location filename="../textentrypage.cpp" line="678"/>
+        <source>Auto capitalisation is active</source>
         <translation>Automatikus nagybetűhasználat bekapcsolva</translation>
     </message>
     <message id="xx_auto_false_entry0">
-        <location filename="../textentrypage.cpp" line="666"/>
-        <source>No Auto Capitalisation</source>
+        <location filename="../textentrypage.cpp" line="681"/>
+        <source>No auto capitalisation</source>
         <translation>Automatikus nagybetűhasználat kikapcsolva</translation>
     </message>
     <message id="xx_tooltip_entry6">
-        <location filename="../textentrypage.cpp" line="595"/>
+        <location filename="../textentrypage.cpp" line="608"/>
         <source>This is a multiline text entry</source>
         <oldsource>This is
 multiline
@@ -813,17 +817,17 @@ többsoros
 eszközleíró</translation>
     </message>
     <message id="xx_textentry_singleselectall">
-        <location filename="../textentrypage.cpp" line="612"/>
+        <location filename="../textentrypage.cpp" line="625"/>
         <source>Singleline (selectall):</source>
         <translation>Egysoros (mindent kiválaszt)</translation>
     </message>
     <message id="xx_auto_capitalisation">
-        <location filename="../textentrypage.cpp" line="633"/>
+        <location filename="../textentrypage.cpp" line="648"/>
         <source>Auto capitalisation</source>
         <translation>Automatikus nagybetűhasználat</translation>
     </message>
     <message id="xx_error_correction">
-        <location filename="../textentrypage.cpp" line="635"/>
+        <location filename="../textentrypage.cpp" line="650"/>
         <source>Error correction</source>
         <translation>Hiba kijavítása</translation>
     </message>
@@ -843,7 +847,6 @@ eszközleíró</translation>
     <message id="xx_slider_age_label">
         <location filename="../sliderpage.cpp" line="186"/>
         <source>Please select your age:œ!! Please select your age:œ!! Please select your age:œ!! Age:</source>
-        <oldsource>Please select your age:</oldsource>
         <translation>Korod:</translation>
     </message>
     <message id="xx_slider_brightness_label">
@@ -1003,17 +1006,17 @@ A kereső egy olyan csúszka amelyet multimédiás tartalom lejátszásának fig
         <translation type="obsolete">Japán</translation>
     </message>
     <message id="xx_popup_generic_title">
-        <location filename="../comboboxpage.cpp" line="114"/>
+        <location filename="../comboboxpage.cpp" line="117"/>
         <source>Title</source>
         <translation>Cím</translation>
     </message>
     <message id="xx_popup_sort_descending_order">
-        <location filename="../comboboxpage.cpp" line="116"/>
+        <location filename="../comboboxpage.cpp" line="119"/>
         <source>Sort - DescendingOrder</source>
         <translation>Csökkenő sorrendbe rendezés</translation>
     </message>
     <message id="xx_popup_time_consuming">
-        <location filename="../comboboxpage.cpp" line="118"/>
+        <location filename="../comboboxpage.cpp" line="121"/>
         <source>Time-consuming setting</source>
         <translation>Időigényes beállítás</translation>
     </message>
@@ -1035,22 +1038,22 @@ A kereső egy olyan csúszka amelyet multimédiás tartalom lejátszásának fig
         </translation>
     </message>
     <message id="xx_progressbar_page_title">
-        <location filename="../progressbarpage.cpp" line="89"/>
+        <location filename="../progressbarpage.cpp" line="88"/>
         <source>Progress Bar</source>
         <translation>Haladó Csík</translation>
     </message>
     <message id="xx_progressbar_page_info_label">
-        <location filename="../progressbarpage.cpp" line="94"/>
+        <location filename="../progressbarpage.cpp" line="93"/>
         <source>A Progress Bar can indicate an ongoing process with either known or unknown durations.</source>
         <translation>Haladó csíkkal ismert vagy ismeretlen időtartamú folyamatokat lehet követni.</translation>
     </message>
     <message id="xx_progressindicator_unknown_duration_bar">
-        <location filename="../progressbarpage.cpp" line="98"/>
+        <location filename="../progressbarpage.cpp" line="97"/>
         <source>Installing CoolApp</source>
         <translation>CoolApp telepítse</translation>
     </message>
     <message id="xx_progressindicator_known_duration_bar">
-        <location filename="../progressbarpage.cpp" line="96"/>
+        <location filename="../progressbarpage.cpp" line="95"/>
         <source>Downloading nicepic.jpg</source>
         <translation>szepkep.jpg letöltése</translation>
     </message>
@@ -1079,32 +1082,32 @@ A kereső egy olyan csúszka amelyet multimédiás tartalom lejátszásának fig
         <translation type="obsolete">Rács</translation>
     </message>
     <message id="xx_toolbar_page_example1">
-        <location filename="../toolbarpage.cpp" line="220"/>
+        <location filename="../toolbarpage.cpp" line="223"/>
         <source>Example 1</source>
         <translation>1. Példa</translation>
     </message>
     <message id="xx_toolbar_page_example2">
-        <location filename="../toolbarpage.cpp" line="222"/>
+        <location filename="../toolbarpage.cpp" line="225"/>
         <source>Example 2</source>
         <translation>2. Példa</translation>
     </message>
     <message id="xx_toolbar_page_defaultview">
-        <location filename="../toolbarpage.cpp" line="224"/>
+        <location filename="../toolbarpage.cpp" line="227"/>
         <source>Default View</source>
         <translation>Alapértelmezett nézet</translation>
     </message>
     <message id="xx_toolbar_page_tabview">
-        <location filename="../toolbarpage.cpp" line="226"/>
+        <location filename="../toolbarpage.cpp" line="229"/>
         <source>Tab View</source>
         <translation>Füles nézet</translation>
     </message>
     <message id="xx_toolbar_page_title">
-        <location filename="../toolbarpage.cpp" line="210"/>
+        <location filename="../toolbarpage.cpp" line="213"/>
         <source>ToolBar</source>
         <translation>Eszköztár</translation>
     </message>
     <message id="xx_toolbar_page_info">
-        <location filename="../toolbarpage.cpp" line="217"/>
+        <location filename="../toolbarpage.cpp" line="220"/>
         <source>&lt;b&gt;Toolbar&lt;/b&gt; acts as a container for actions. Depending upon the view attached, it either acts as a tab bar or is a container for buttons and text input field. &lt;ul&gt;&lt;li&gt;Click Menu to explore the example&lt;/li&gt;&lt;/ul&gt;</source>
         <translation>&lt;b&gt;Eszköztár&lt;/b&gt; egy tároló amelyik a nézethez szempontjaból fontos parancsokat tartalmaz amelyek kötődnek közvetlenül a nézetben megjelenített grafikus elemekhez. &lt;ul&gt;&lt;li&gt;4 Ikon Gombot tartalmazhat (kattints a Menüre, majd az első példáratlmazhat egy szöveges bemeneti mezőt is 2 Ikon Gombbal (kattints a Menüre, majd az második példára)&lt;/li&gt; &lt;l&lt;/li&gt;&lt;/ul&gt;</translation>
     </message>
@@ -1232,174 +1235,194 @@ Az elsődleges (egyszeri rövid érintés) kiváltó eseményt nem lehet megism�
         <translation type="obsolete">Láthatatlan</translation>
     </message>
     <message id="xx_displaymodes_navbarcombo">
-        <location filename="../displaymodespage.cpp" line="59"/>
+        <location filename="../displaymodespage.cpp" line="68"/>
         <source>Navigation Bar</source>
         <translation type="unfinished">Tájoló Csík</translation>
     </message>
     <message id="xx_displaymodes_escapebtncombo">
-        <location filename="../displaymodespage.cpp" line="67"/>
+        <location filename="../displaymodespage.cpp" line="76"/>
         <source>Escape Button</source>
         <translation type="unfinished">Escape Gomb</translation>
     </message>
     <message id="xx_displaymodes_homebtncombo">
-        <location filename="../displaymodespage.cpp" line="75"/>
+        <location filename="../displaymodespage.cpp" line="84"/>
         <source>Home Button</source>
         <translation type="unfinished">Főoldal Gomb</translation>
     </message>
     <message id="xx_displaymodes_page_title">
-        <location filename="../displaymodespage.cpp" line="143"/>
+        <location filename="../displaymodespage.cpp" line="152"/>
         <source>Display Modes</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_displaymodes_display_mode">
-        <location filename="../displaymodespage.cpp" line="147"/>
+        <location filename="../displaymodespage.cpp" line="156"/>
         <source>Components&apos; display mode:</source>
         <translation type="unfinished">Elemek megjeleítési módja:</translation>
     </message>
     <message id="xx_displaymodes_window_state">
-        <location filename="../displaymodespage.cpp" line="150"/>
+        <location filename="../displaymodespage.cpp" line="159"/>
         <source>Window state:</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_displaymodes_full_screen">
-        <location filename="../displaymodespage.cpp" line="153"/>
+        <location filename="../displaymodespage.cpp" line="162"/>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_displaymode_show">
-        <location filename="../displaymodespage.cpp" line="166"/>
+        <location filename="../displaymodespage.cpp" line="175"/>
         <source>Show</source>
         <translation>Megjelenít</translation>
     </message>
     <message id="xx_displaymode_autohide">
-        <location filename="../displaymodespage.cpp" line="168"/>
+        <location filename="../displaymodespage.cpp" line="177"/>
         <source>Auto Hide</source>
         <translation>Automatikusan eltűntet</translation>
     </message>
     <message id="xx_displaymode_hide">
-        <location filename="../displaymodespage.cpp" line="170"/>
+        <location filename="../displaymodespage.cpp" line="179"/>
         <source>Hide</source>
         <translation>Eltűntet</translation>
     </message>
     <message id="xx_language_title">
-        <location filename="../languagepage.cpp" line="118"/>
+        <location filename="../languagepage.cpp" line="122"/>
         <source>Change Language</source>
         <translation>Változtass Nyelvet</translation>
     </message>
     <message id="xx_locale_none">
-        <location filename="../languagepage.cpp" line="137"/>
+        <location filename="../languagepage.cpp" line="143"/>
         <source>None</source>
         <translation>Semmilyen</translation>
     </message>
     <message id="xx_locale_ar">
-        <location filename="../languagepage.cpp" line="142"/>
+        <location filename="../languagepage.cpp" line="148"/>
         <source>Arabic</source>
         <translation>Arab</translation>
     </message>
     <message id="xx_locale_de">
-        <location filename="../languagepage.cpp" line="147"/>
+        <location filename="../languagepage.cpp" line="153"/>
         <source>German</source>
         <translation>Német</translation>
     </message>
     <message id="xx_locale_de_AT">
-        <location filename="../languagepage.cpp" line="152"/>
+        <location filename="../languagepage.cpp" line="158"/>
         <source>German (Austria)</source>
         <translation>Német (Ausztria)</translation>
     </message>
     <message id="xx_locale_de_CH">
-        <location filename="../languagepage.cpp" line="157"/>
+        <location filename="../languagepage.cpp" line="163"/>
         <source>German (Switzerland)</source>
         <translation>Német (Svájc)</translation>
     </message>
     <message id="xx_locale_en">
-        <location filename="../languagepage.cpp" line="162"/>
+        <location filename="../languagepage.cpp" line="168"/>
         <source>English</source>
         <translation>Angol</translation>
     </message>
     <message id="xx_locale_fi">
-        <location filename="../languagepage.cpp" line="167"/>
+        <location filename="../languagepage.cpp" line="173"/>
         <source>Finnish</source>
         <translation>Finn</translation>
     </message>
     <message id="xx_locale_hi">
-        <location filename="../languagepage.cpp" line="172"/>
+        <location filename="../languagepage.cpp" line="178"/>
         <source>Hindi</source>
         <translation>Hindu</translation>
     </message>
     <message id="xx_locale_hu">
-        <location filename="../languagepage.cpp" line="177"/>
+        <location filename="../languagepage.cpp" line="183"/>
         <source>Hungarian</source>
         <translation>Magyar</translation>
     </message>
     <message id="xx_locale_ja">
-        <location filename="../languagepage.cpp" line="182"/>
+        <location filename="../languagepage.cpp" line="188"/>
         <source>Japanese</source>
         <translation>Japán</translation>
     </message>
     <message id="xx_locale_ur">
-        <location filename="../languagepage.cpp" line="187"/>
+        <location filename="../languagepage.cpp" line="193"/>
         <source>Urdu</source>
         <translation>Urdu</translation>
     </message>
     <message id="xx_locale_ur_PK">
-        <location filename="../languagepage.cpp" line="192"/>
+        <location filename="../languagepage.cpp" line="198"/>
         <source>Urdu (Pakistan)</source>
         <translation>Urdu (Pakisztán)</translation>
     </message>
     <message id="xx_locale_ur_IN">
-        <location filename="../languagepage.cpp" line="197"/>
+        <location filename="../languagepage.cpp" line="203"/>
         <source>Urdu (India)</source>
         <translation>Urdu (India)</translation>
     </message>
     <message id="xx_locale_zh_CN">
-        <location filename="../languagepage.cpp" line="202"/>
+        <location filename="../languagepage.cpp" line="208"/>
         <source>Chinese (China)</source>
         <translation>Egyszerűsített kínai (中文)</translation>
     </message>
     <message id="xx_locale_zh_TW">
-        <location filename="../languagepage.cpp" line="207"/>
+        <location filename="../languagepage.cpp" line="213"/>
         <source>Chinese (Taiwan)</source>
         <translation>Kínai (Taiwan)</translation>
     </message>
+    <message id="xx_timeformat24h_locale_default">
+        <location filename="../languagepage.cpp" line="223"/>
+        <source>Locale default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message id="xx_timeformat24h_24_hour_mode">
+        <location filename="../languagepage.cpp" line="227"/>
+        <source>24 hour mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message id="xx_timeformat24h_12_hour_mode">
+        <location filename="../languagepage.cpp" line="231"/>
+        <source>12 hour mode</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message id="xx_language_combobox_title">
-        <location filename="../languagepage.cpp" line="302"/>
+        <location filename="../languagepage.cpp" line="357"/>
         <source>Please select language</source>
         <translation>Válaszd ki az új nyelvet:</translation>
     </message>
     <message id="xx_language_combobox_lctime_title">
-        <location filename="../languagepage.cpp" line="304"/>
+        <location filename="../languagepage.cpp" line="359"/>
         <source>Locale for time</source>
         <translation>Időformátum honosítása</translation>
     </message>
+    <message id="xx_language_combobox_lctimeformat24h_title">
+        <location filename="../languagepage.cpp" line="361"/>
+        <source>Choose 12/24 hour mode</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message id="xx_language_combobox_lccollate_title">
-        <location filename="../languagepage.cpp" line="306"/>
+        <location filename="../languagepage.cpp" line="363"/>
         <source>Locale for collation</source>
         <translation>Összeolvasás honosítása</translation>
     </message>
     <message id="xx_language_combobox_lcnumeric_title">
-        <location filename="../languagepage.cpp" line="308"/>
+        <location filename="../languagepage.cpp" line="365"/>
         <source>Locale for numbers</source>
         <translation>Számok honosítása</translation>
     </message>
     <message id="xx_language_combobox_lcmonetary_title">
-        <location filename="../languagepage.cpp" line="310"/>
+        <location filename="../languagepage.cpp" line="367"/>
         <source>Locale for money</source>
         <translation>Pénznem honosítása</translation>
     </message>
     <message id="qtn_comm_command_yes">
-        <location filename="../languagepage.cpp" line="314"/>
-        <location filename="../languagepage.cpp" line="321"/>
+        <location filename="../languagepage.cpp" line="371"/>
+        <location filename="../languagepage.cpp" line="378"/>
         <source>Yes</source>
         <translation>Igen</translation>
     </message>
     <message id="qtn_comm_command_no">
-        <location filename="../languagepage.cpp" line="317"/>
-        <location filename="../languagepage.cpp" line="324"/>
+        <location filename="../languagepage.cpp" line="374"/>
+        <location filename="../languagepage.cpp" line="381"/>
         <source>No</source>
         <translation>Nem</translation>
     </message>
     <message id="xx_language_number_format">
-        <location filename="../languagepage.cpp" line="329"/>
+        <location filename="../languagepage.cpp" line="386"/>
         <source>Number format example: %1œ!! Number example: %1œ!! Number: %1</source>
         <translation variants="yes">
             <lengthvariant>Számformátum példa: %1</lengthvariant>
@@ -1408,7 +1431,7 @@ Az elsődleges (egyszeri rövid érintés) kiváltó eseményt nem lehet megism�
         </translation>
     </message>
     <message id="xx_langage_date_time_format">
-        <location filename="../languagepage.cpp" line="344"/>
+        <location filename="../languagepage.cpp" line="401"/>
         <source>Date and time format example: %1œ!! Date and time: %1œ!! Date: %1œ!! %1</source>
         <translation variants="yes">
             <lengthvariant>Dátum- és időformátum példa: %1</lengthvariant>
@@ -1418,12 +1441,12 @@ Az elsődleges (egyszeri rövid érintés) kiváltó eseményt nem lehet megism�
         </translation>
     </message>
     <message id="xx_language_week_number">
-        <location filename="../languagepage.cpp" line="349"/>
+        <location filename="../languagepage.cpp" line="406"/>
         <source>Week number example: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_language_currency_format">
-        <location filename="../languagepage.cpp" line="359"/>
+        <location filename="../languagepage.cpp" line="416"/>
         <source>Currency format example: %1 %2œ!! Currency: %1 %2</source>
         <translation variants="yes">
             <lengthvariant>Pénznemformátum példa: %1 %2</lengthvariant>
@@ -1431,9 +1454,9 @@ Az elsődleges (egyszeri rövid érintés) kiváltó eseményt nem lehet megism�
         </translation>
     </message>
     <message id="xx_language_trans_%Ln_boxes_weight_%L1" numerus="yes">
-        <location filename="../languagepage.cpp" line="365"/>
-        <location filename="../languagepage.cpp" line="367"/>
-        <location filename="../languagepage.cpp" line="369"/>
+        <location filename="../languagepage.cpp" line="422"/>
+        <location filename="../languagepage.cpp" line="424"/>
+        <location filename="../languagepage.cpp" line="426"/>
         <source>%Ln boxes with a total weight of %L1 kilogramœ!! %Ln boxes, total weight of %L1 kg</source>
         <translation>
             <numerusform>%Ln láda %L1 kilogramm összsúllyal</numerusform>
@@ -1441,7 +1464,7 @@ Az elsődleges (egyszeri rövid érintés) kiváltó eseményt nem lehet megism�
         </translation>
     </message>
     <message id="xx_language_font_test">
-        <location filename="../languagepage.cpp" line="373"/>
+        <location filename="../languagepage.cpp" line="430"/>
         <source>Font test:</source>
         <translation>Betűtípus teszt:</translation>
     </message>
@@ -1507,33 +1530,32 @@ Az elsődleges (egyszeri rövid érintés) kiváltó eseményt nem lehet megism�
         <translation type="obsolete">A felhasználó egy felugró lista meghatározott számú előregyártott / rendszer által meghatározott lehetősége közül választhat egyet. Ezután a lista megjeleníti a kiválasztott lehetőséget. A felugró listából csakis egy lehetőséget lehet kiválasztani.</translation>
     </message>
     <message id="xx_sample template">
-        <location filename="../templatepage.cpp" line="107"/>
+        <location filename="../templatepage.cpp" line="108"/>
         <source>Sample template</source>
         <translation>Példa Sablon</translation>
     </message>
     <message id="xx_template_page_title">
-        <location filename="../templatepage.cpp" line="101"/>
+        <location filename="../templatepage.cpp" line="102"/>
         <source>Template</source>
         <translation>Sablon</translation>
     </message>
     <message id="xx_textentry_completion_text">
-        <location filename="../textentrypage.cpp" line="614"/>
+        <location filename="../textentrypage.cpp" line="627"/>
         <source>Email suggestion text:</source>
         <translation>Sugallt email cím:</translation>
     </message>
     <message id="xx_combobox_page_info">
-        <location filename="../comboboxpage.cpp" line="122"/>
+        <location filename="../comboboxpage.cpp" line="125"/>
         <source>The MComboBox widget is a combined button and popup list. It is very similar to QComboBox, but does not allow editing the text.</source>
-        <oldsource>The DuiComboBox widget is a combined button and popup list. It is very similar to QComboBox, but does not allow editing the text.</oldsource>
         <translation>A DuiComboBox elem egy gombból és egy felugró listából Nagyon hasonlít a QComboBox-ra, de nem lehet benne szöveget változtatni.</translation>
     </message>
     <message id="xx_combobox_title">
-        <location filename="../comboboxpage.cpp" line="110"/>
+        <location filename="../comboboxpage.cpp" line="113"/>
         <source>ComboBox</source>
         <translation>Kombó</translation>
     </message>
     <message id="xx_tooltip_entry8">
-        <location filename="../textentrypage.cpp" line="592"/>
+        <location filename="../textentrypage.cpp" line="605"/>
         <source>Provides email address suggestions</source>
         <translation>Sugall egy email címet</translation>
     </message>
@@ -1554,18 +1576,15 @@ A Jelölőnégyzet ugyanúgy működik mint a Kapcsoló, ezért inkább azt hasz
     <message id="xx_checkbox_page_checkbox_label">
         <location filename="../checkboxpage.cpp" line="92"/>
         <source>I have read and understood the instructions.</source>
-        <oldsource>I have read and understood the
-instructions.</oldsource>
-        <translation type="unfinished">Elolvastam és megértettem
-utasításokat.</translation>
+        <translation>Elolvastam és megértettem utasításokat.</translation>
     </message>
     <message id="xx_icon_button_page_title">
-        <location filename="../iconbuttonpage.cpp" line="81"/>
+        <location filename="../iconbuttonpage.cpp" line="82"/>
         <source>Icon Button</source>
         <translation>Ikon Gomb</translation>
     </message>
     <message id="xx_icon_button_page_info_label">
-        <location filename="../iconbuttonpage.cpp" line="89"/>
+        <location filename="../iconbuttonpage.cpp" line="90"/>
         <source>Icon Buttons have an icon and can have a text label. Icon button differs from push button by its visual presentation: it does not have button-style edges like a Push Button does.
 
  Icon Buttons are used in e.g. Toolbars.</source>
@@ -1574,7 +1593,7 @@ utasításokat.</translation>
 Ikon Gombokat használnak például az Eszköztárakban.</translation>
     </message>
     <message id="xx_icon_button_page_icon_button2">
-        <location filename="../iconbuttonpage.cpp" line="91"/>
+        <location filename="../iconbuttonpage.cpp" line="92"/>
         <source>Lorem ipsum</source>
         <translation>Lorem ipsum</translation>
     </message>
@@ -1788,30 +1807,30 @@ A visszajelzéseket a témarendszer segítségével lehet beállítani.</transla
         <translation>Csendes</translation>
     </message>
     <message id="xx_gridpage_configuration">
-        <location filename="../mgridpage.cpp" line="208"/>
+        <location filename="../mgridpage.cpp" line="210"/>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_gridpage_title">
-        <location filename="../mgridpage.cpp" line="203"/>
-        <source>ConfigurationGrid page</source>
-        <oldsource>Grid page</oldsource>
+        <location filename="../mgridpage.cpp" line="205"/>
+        <source>Grid page</source>
+        <oldsource>ConfigurationGrid page</oldsource>
         <translation type="unfinished">Rács</translation>
     </message>
     <message id="xx_gridpage_set_columns">
-        <location filename="../mgridpage.cpp" line="297"/>
+        <location filename="../mgridpage.cpp" line="301"/>
         <source>Set columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_gridpage_landscape">
-        <location filename="../mgridpage.cpp" line="329"/>
-        <location filename="../mgridpage.cpp" line="339"/>
+        <location filename="../mgridpage.cpp" line="333"/>
+        <location filename="../mgridpage.cpp" line="343"/>
         <source>Landscape</source>
         <translation type="unfinished">Fekvő</translation>
     </message>
     <message id="xx_gridpage_portrait">
-        <location filename="../mgridpage.cpp" line="334"/>
-        <location filename="../mgridpage.cpp" line="344"/>
+        <location filename="../mgridpage.cpp" line="338"/>
+        <location filename="../mgridpage.cpp" line="348"/>
         <source>Portrait</source>
         <translation type="unfinished">Álló</translation>
     </message>
@@ -1828,27 +1847,27 @@ A visszajelzéseket a témarendszer segítségével lehet beállítani.</transla
         <translation type="obsolete">Galéria</translation>
     </message>
     <message id="xx_bubblepage_title">
-        <location filename="../bubblepage.cpp" line="156"/>
+        <location filename="../bubblepage.cpp" line="158"/>
         <source>Speech Bubble</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_bubblepage_linkactivated">
-        <location filename="../bubblepage.cpp" line="169"/>
+        <location filename="../bubblepage.cpp" line="171"/>
         <source>Link activated</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_bubblepage_bubbleclicked">
-        <location filename="../bubblepage.cpp" line="176"/>
+        <location filename="../bubblepage.cpp" line="178"/>
         <source>Speech buuble clicked</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_title">
-        <location filename="../buttongrouppage.cpp" line="156"/>
+        <location filename="../buttongrouppage.cpp" line="168"/>
         <source>Button Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_info_label">
-        <location filename="../buttongrouppage.cpp" line="168"/>
+        <location filename="../buttongrouppage.cpp" line="180"/>
         <source>Buttons can be grouped together based on visual or logic requirements.
 
 The basic group is formed by placing buttons together into a layout. Depending on the theme, the buttons are typically drawn as connected with each other.
@@ -1857,62 +1876,62 @@ Logical exclusivity can be added to a group, which ensures only one of the butto
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_hlabel1">
-        <location filename="../buttongrouppage.cpp" line="171"/>
+        <location filename="../buttongrouppage.cpp" line="183"/>
         <source>Horizontal group</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button1">
-        <location filename="../buttongrouppage.cpp" line="173"/>
+        <location filename="../buttongrouppage.cpp" line="185"/>
         <source>Yes</source>
         <translation type="unfinished">Igen</translation>
     </message>
     <message id="xx_button_group_page_button2">
-        <location filename="../buttongrouppage.cpp" line="175"/>
+        <location filename="../buttongrouppage.cpp" line="187"/>
         <source>No</source>
         <translation type="unfinished">Nem</translation>
     </message>
     <message id="xx_button_group_page_button3">
-        <location filename="../buttongrouppage.cpp" line="177"/>
+        <location filename="../buttongrouppage.cpp" line="189"/>
         <source>Maybe</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_vlabel2">
-        <location filename="../buttongrouppage.cpp" line="180"/>
+        <location filename="../buttongrouppage.cpp" line="192"/>
         <source>Horizontal group, exclusive</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button4">
-        <location filename="../buttongrouppage.cpp" line="182"/>
+        <location filename="../buttongrouppage.cpp" line="194"/>
         <source>Cost</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button5">
-        <location filename="../buttongrouppage.cpp" line="184"/>
+        <location filename="../buttongrouppage.cpp" line="196"/>
         <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button6">
-        <location filename="../buttongrouppage.cpp" line="186"/>
+        <location filename="../buttongrouppage.cpp" line="198"/>
         <source>Schedule</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_vlabel">
-        <location filename="../buttongrouppage.cpp" line="189"/>
+        <location filename="../buttongrouppage.cpp" line="201"/>
         <source>Vertical group, checkable</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button7">
-        <location filename="../buttongrouppage.cpp" line="191"/>
+        <location filename="../buttongrouppage.cpp" line="203"/>
         <source>Milk</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button8">
-        <location filename="../buttongrouppage.cpp" line="193"/>
+        <location filename="../buttongrouppage.cpp" line="205"/>
         <source>Sugar</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button9">
-        <location filename="../buttongrouppage.cpp" line="195"/>
+        <location filename="../buttongrouppage.cpp" line="207"/>
         <source>Biscotti</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1931,57 +1950,57 @@ Logical exclusivity can be added to a group, which ensures only one of the butto
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_single_title">
-        <location filename="../contentitemspage.cpp" line="310"/>
+        <location filename="../contentitemspage.cpp" line="312"/>
         <source>Single Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_title_with_subtitle">
-        <location filename="../contentitemspage.cpp" line="312"/>
+        <location filename="../contentitemspage.cpp" line="314"/>
         <source>Title with Subtitle</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title">
-        <location filename="../contentitemspage.cpp" line="314"/>
+        <location filename="../contentitemspage.cpp" line="316"/>
         <source>Icon with Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_and_subtitle">
-        <location filename="../contentitemspage.cpp" line="316"/>
+        <location filename="../contentitemspage.cpp" line="318"/>
         <source>Icon with Title and Subtitle</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_subtitle_and_two_side_icons">
-        <location filename="../contentitemspage.cpp" line="320"/>
+        <location filename="../contentitemspage.cpp" line="322"/>
         <source>Icon with Title Subtitle and Two Side Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_subtitle_and_side_icon_with_label">
-        <location filename="../contentitemspage.cpp" line="323"/>
+        <location filename="../contentitemspage.cpp" line="325"/>
         <source>Icon with Title Subtitle and Side Icon with Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_thumbnail_with_title_subtitle_and_two_side_icons">
-        <location filename="../contentitemspage.cpp" line="326"/>
+        <location filename="../contentitemspage.cpp" line="328"/>
         <source>Thumbnail with Title Subtitle and Two Side Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_thumbnail_with_title_and_two_side_icons">
-        <location filename="../contentitemspage.cpp" line="329"/>
+        <location filename="../contentitemspage.cpp" line="331"/>
         <source>Thumbnail with Title and Two Side Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_progress_indicator_and_two_side_icons">
-        <location filename="../contentitemspage.cpp" line="334"/>
+        <location filename="../contentitemspage.cpp" line="336"/>
         <source>Icon with Title Progress Indicator and Two Side Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_progress_indicator_and_top_side_icon">
-        <location filename="../contentitemspage.cpp" line="337"/>
+        <location filename="../contentitemspage.cpp" line="339"/>
         <source>Icon with Title Progress Indicator and Top Side Icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_contentitemspage_title">
-        <location filename="../contentitemspage.cpp" line="358"/>
+        <location filename="../contentitemspage.cpp" line="359"/>
         <source>Content Items</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/demos/widgetsgallery/translations/widgetsgallery_ur.ts b/demos/widgetsgallery/translations/widgetsgallery_ur.ts
index 0835c5bd..e4320563 100644
--- a/demos/widgetsgallery/translations/widgetsgallery_ur.ts
+++ b/demos/widgetsgallery/translations/widgetsgallery_ur.ts
@@ -112,92 +112,91 @@ Seekbar is a special type of Slider used for displaying playback status for mult
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_stacked_dialogs">
-        <location filename="../singleselectiondialogspage.cpp" line="257"/>
+        <location filename="../singleselectiondialogspage.cpp" line="259"/>
         <source>Stacked Dialogs</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_system_dialog">
-        <location filename="../singleselectiondialogspage.cpp" line="259"/>
+        <location filename="../singleselectiondialogspage.cpp" line="261"/>
         <source>System Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_system_modal_dialog">
-        <location filename="../singleselectiondialogspage.cpp" line="261"/>
+        <location filename="../singleselectiondialogspage.cpp" line="263"/>
         <source>System Modal Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_dialog_with_progress_indicator">
-        <location filename="../singleselectiondialogspage.cpp" line="263"/>
+        <location filename="../singleselectiondialogspage.cpp" line="265"/>
         <source>Dialog with Progress Indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_message_box">
-        <location filename="../singleselectiondialogspage.cpp" line="265"/>
+        <location filename="../singleselectiondialogspage.cpp" line="267"/>
         <source>Message Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_button">
-        <location filename="../singleselectiondialogspage.cpp" line="126"/>
+        <location filename="../singleselectiondialogspage.cpp" line="128"/>
         <source>Click to spawn a nested dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="128"/>
+        <location filename="../singleselectiondialogspage.cpp" line="130"/>
         <source>Stacked dialogs</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_open_nested_messagebox">
-        <location filename="../singleselectiondialogspage.cpp" line="142"/>
+        <location filename="../singleselectiondialogspage.cpp" line="144"/>
         <source>Click to open a nested message box</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_nested_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="144"/>
+        <location filename="../singleselectiondialogspage.cpp" line="146"/>
         <source>This is a nested dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_messagebox_text">
-        <location filename="../singleselectiondialogspage.cpp" line="157"/>
+        <location filename="../singleselectiondialogspage.cpp" line="159"/>
         <source>I&apos;m a nested message box</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_dialogs_and_notifications_system_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="168"/>
+        <location filename="../singleselectiondialogspage.cpp" line="170"/>
         <source>System Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_dialogs_and_notifications_system_dialog_label">
-        <location filename="../singleselectiondialogspage.cpp" line="176"/>
-        <source>I&apos;m a system dialog.&lt;br&gt;There actually is a way around me...&lt;br&gt;You can skip me with the home button, but I&apos;ll remain&lt;br&gt;alive until you make a selection.</source>
+        <location filename="../singleselectiondialogspage.cpp" line="178"/>
+        <source>I&apos;m a system dialog.&lt;br&gt;You can skip me with the home button.&lt;br&gt;I&apos;ll be minimised to the task switcher&lt;br&gt;but I&apos;ll remain alive until you make a selection.</source>
+        <oldsource>I&apos;m a system dialog.&lt;br&gt;There actually is a way around me...&lt;br&gt;You can skip me with the home button, but I&apos;ll remain&lt;br&gt;alive until you make a selection.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_dialogs_and_notifications_system_modal_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="191"/>
+        <location filename="../singleselectiondialogspage.cpp" line="193"/>
         <source>System Modal Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_dialogs_and_notifications_system_modal_dialog_label">
-        <location filename="../singleselectiondialogspage.cpp" line="198"/>
-        <source>I&apos;m a window modal dialog.
-There&apos;s no way around me!
-Muwhahaha... [evil laugh]</source>
-        <oldsource>I&apos;m a System Modal dialog.
+        <location filename="../singleselectiondialogspage.cpp" line="200"/>
+        <source>I&apos;m a system modal dialog.&lt;br&gt;You can&apos;t skip me as I&apos;m designed for&lt;br&gt;use cases that require immediate user attention.</source>
+        <oldsource>I&apos;m a window modal dialog.
 There&apos;s no way around me!
 Muwhahaha... [evil laugh]</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_dialogs_and_notifications_progress_indicator">
-        <location filename="../singleselectiondialogspage.cpp" line="217"/>
+        <location filename="../singleselectiondialogspage.cpp" line="219"/>
         <source>Progress Indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_dialogs_and_notifications_message_box_text">
-        <location filename="../singleselectiondialogspage.cpp" line="237"/>
+        <location filename="../singleselectiondialogspage.cpp" line="239"/>
         <source>Hello World!</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_single_selection_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="251"/>
+        <location filename="../singleselectiondialogspage.cpp" line="253"/>
         <source>Single Selection Dialogs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -222,17 +221,17 @@ Muwhahaha... [evil laugh]</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_listpage_list_remove">
-        <location filename="../mlistpage.cpp" line="634"/>
+        <location filename="../mlistpage.cpp" line="635"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_listpage_list_edit">
-        <location filename="../mlistpage.cpp" line="640"/>
+        <location filename="../mlistpage.cpp" line="641"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_listpage_title">
-        <location filename="../mlistpage.cpp" line="658"/>
+        <location filename="../mlistpage.cpp" line="659"/>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
@@ -296,146 +295,166 @@ All Labels can be aligned left, right or center and will be automatically trunca
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_language_title">
-        <location filename="../languagepage.cpp" line="118"/>
+        <location filename="../languagepage.cpp" line="122"/>
         <source>Change Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_locale_none">
-        <location filename="../languagepage.cpp" line="137"/>
+        <location filename="../languagepage.cpp" line="143"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_locale_ar">
-        <location filename="../languagepage.cpp" line="142"/>
+        <location filename="../languagepage.cpp" line="148"/>
         <source>Arabic</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_locale_de">
-        <location filename="../languagepage.cpp" line="147"/>
+        <location filename="../languagepage.cpp" line="153"/>
         <source>German</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_locale_de_AT">
-        <location filename="../languagepage.cpp" line="152"/>
+        <location filename="../languagepage.cpp" line="158"/>
         <source>German (Austria)</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_locale_de_CH">
-        <location filename="../languagepage.cpp" line="157"/>
+        <location filename="../languagepage.cpp" line="163"/>
         <source>German (Switzerland)</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_locale_en">
-        <location filename="../languagepage.cpp" line="162"/>
+        <location filename="../languagepage.cpp" line="168"/>
         <source>English</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_locale_fi">
-        <location filename="../languagepage.cpp" line="167"/>
+        <location filename="../languagepage.cpp" line="173"/>
         <source>Finnish</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_locale_hi">
-        <location filename="../languagepage.cpp" line="172"/>
+        <location filename="../languagepage.cpp" line="178"/>
         <source>Hindi</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_locale_hu">
-        <location filename="../languagepage.cpp" line="177"/>
+        <location filename="../languagepage.cpp" line="183"/>
         <source>Hungarian</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_locale_ja">
-        <location filename="../languagepage.cpp" line="182"/>
+        <location filename="../languagepage.cpp" line="188"/>
         <source>Japanese</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_locale_ur">
-        <location filename="../languagepage.cpp" line="187"/>
+        <location filename="../languagepage.cpp" line="193"/>
         <source>Urdu</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_locale_ur_PK">
-        <location filename="../languagepage.cpp" line="192"/>
+        <location filename="../languagepage.cpp" line="198"/>
         <source>Urdu (Pakistan)</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_locale_ur_IN">
-        <location filename="../languagepage.cpp" line="197"/>
+        <location filename="../languagepage.cpp" line="203"/>
         <source>Urdu (India)</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_locale_zh_CN">
-        <location filename="../languagepage.cpp" line="202"/>
+        <location filename="../languagepage.cpp" line="208"/>
         <source>Chinese (China)</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_locale_zh_TW">
-        <location filename="../languagepage.cpp" line="207"/>
+        <location filename="../languagepage.cpp" line="213"/>
         <source>Chinese (Taiwan)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message id="xx_timeformat24h_locale_default">
+        <location filename="../languagepage.cpp" line="223"/>
+        <source>Locale default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message id="xx_timeformat24h_24_hour_mode">
+        <location filename="../languagepage.cpp" line="227"/>
+        <source>24 hour mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message id="xx_timeformat24h_12_hour_mode">
+        <location filename="../languagepage.cpp" line="231"/>
+        <source>12 hour mode</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message id="xx_language_combobox_title">
-        <location filename="../languagepage.cpp" line="302"/>
+        <location filename="../languagepage.cpp" line="357"/>
         <source>Please select language</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_language_combobox_lctime_title">
-        <location filename="../languagepage.cpp" line="304"/>
+        <location filename="../languagepage.cpp" line="359"/>
         <source>Locale for time</source>
         <translation type="unfinished"></translation>
     </message>
+    <message id="xx_language_combobox_lctimeformat24h_title">
+        <location filename="../languagepage.cpp" line="361"/>
+        <source>Choose 12/24 hour mode</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message id="xx_language_combobox_lccollate_title">
-        <location filename="../languagepage.cpp" line="306"/>
+        <location filename="../languagepage.cpp" line="363"/>
         <source>Locale for collation</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_language_combobox_lcnumeric_title">
-        <location filename="../languagepage.cpp" line="308"/>
+        <location filename="../languagepage.cpp" line="365"/>
         <source>Locale for numbers</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_language_combobox_lcmonetary_title">
-        <location filename="../languagepage.cpp" line="310"/>
+        <location filename="../languagepage.cpp" line="367"/>
         <source>Locale for money</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="qtn_comm_command_yes">
-        <location filename="../languagepage.cpp" line="314"/>
-        <location filename="../languagepage.cpp" line="321"/>
+        <location filename="../languagepage.cpp" line="371"/>
+        <location filename="../languagepage.cpp" line="378"/>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="qtn_comm_command_no">
-        <location filename="../languagepage.cpp" line="317"/>
-        <location filename="../languagepage.cpp" line="324"/>
+        <location filename="../languagepage.cpp" line="374"/>
+        <location filename="../languagepage.cpp" line="381"/>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_language_number_format">
-        <location filename="../languagepage.cpp" line="329"/>
+        <location filename="../languagepage.cpp" line="386"/>
         <source>Number format example: %1œ!! Number example: %1œ!! Number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_langage_date_time_format">
-        <location filename="../languagepage.cpp" line="344"/>
+        <location filename="../languagepage.cpp" line="401"/>
         <source>Date and time format example: %1œ!! Date and time: %1œ!! Date: %1œ!! %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_language_week_number">
-        <location filename="../languagepage.cpp" line="349"/>
+        <location filename="../languagepage.cpp" line="406"/>
         <source>Week number example: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_language_currency_format">
-        <location filename="../languagepage.cpp" line="359"/>
+        <location filename="../languagepage.cpp" line="416"/>
         <source>Currency format example: %1 %2œ!! Currency: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_language_trans_%Ln_boxes_weight_%L1" numerus="yes">
-        <location filename="../languagepage.cpp" line="365"/>
-        <location filename="../languagepage.cpp" line="367"/>
-        <location filename="../languagepage.cpp" line="369"/>
+        <location filename="../languagepage.cpp" line="422"/>
+        <location filename="../languagepage.cpp" line="424"/>
+        <location filename="../languagepage.cpp" line="426"/>
         <source>%Ln boxes with a total weight of %L1 kilogramœ!! %Ln boxes, total weight of %L1 kg</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -443,273 +462,273 @@ All Labels can be aligned left, right or center and will be automatically trunca
         </translation>
     </message>
     <message id="xx_language_font_test">
-        <location filename="../languagepage.cpp" line="373"/>
+        <location filename="../languagepage.cpp" line="430"/>
         <source>Font test:</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_categories_application_view">
-        <location filename="../mainpage.cpp" line="86"/>
+        <location filename="../mainpage.cpp" line="92"/>
         <source>Application View</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_application_view_view_menu">
-        <location filename="../mainpage.cpp" line="88"/>
+        <location filename="../mainpage.cpp" line="94"/>
         <source>Application Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_application_view_display_modes">
-        <location filename="../mainpage.cpp" line="90"/>
+        <location filename="../mainpage.cpp" line="96"/>
         <source>Display Modes</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_application_view_toolbar_incl_tab_bar">
-        <location filename="../mainpage.cpp" line="92"/>
+        <location filename="../mainpage.cpp" line="98"/>
         <source>Toolbar (including Tab Bar)</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_categories_simple_widgets">
-        <location filename="../mainpage.cpp" line="96"/>
+        <location filename="../mainpage.cpp" line="102"/>
         <source>Simple Widgets</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_simple_widgets_labels">
-        <location filename="../mainpage.cpp" line="98"/>
+        <location filename="../mainpage.cpp" line="104"/>
         <source>Labels</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_simple_widgets_image">
-        <location filename="../mainpage.cpp" line="100"/>
+        <location filename="../mainpage.cpp" line="106"/>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_simple_widgets_progress_bar">
-        <location filename="../mainpage.cpp" line="102"/>
+        <location filename="../mainpage.cpp" line="108"/>
         <source>Progress Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_simple_widgets_container">
-        <location filename="../mainpage.cpp" line="104"/>
+        <location filename="../mainpage.cpp" line="110"/>
         <source>Container</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_simple_widgets_spinner">
-        <location filename="../mainpage.cpp" line="106"/>
+        <location filename="../mainpage.cpp" line="112"/>
         <source>Spinner</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_categories_buttons">
-        <location filename="../mainpage.cpp" line="109"/>
+        <location filename="../mainpage.cpp" line="115"/>
         <source>Buttons</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_buttons_push_button">
-        <location filename="../mainpage.cpp" line="111"/>
+        <location filename="../mainpage.cpp" line="117"/>
         <source>Push Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_buttons_icon_button">
-        <location filename="../mainpage.cpp" line="113"/>
+        <location filename="../mainpage.cpp" line="119"/>
         <source>Icon Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_buttons_switch">
-        <location filename="../mainpage.cpp" line="115"/>
+        <location filename="../mainpage.cpp" line="121"/>
         <source>Switch</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_buttons_checkbox">
-        <location filename="../mainpage.cpp" line="117"/>
+        <location filename="../mainpage.cpp" line="123"/>
         <source>Checkbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_buttons_buttongroup">
-        <location filename="../mainpage.cpp" line="119"/>
+        <location filename="../mainpage.cpp" line="125"/>
         <source>Button Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_categories_dialogs_and_banners">
-        <location filename="../mainpage.cpp" line="122"/>
+        <location filename="../mainpage.cpp" line="128"/>
         <source>Dialogs and Banners</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_dialogs_and_banners_single_selection_dialog">
-        <location filename="../mainpage.cpp" line="124"/>
+        <location filename="../mainpage.cpp" line="130"/>
         <source>Single Selection Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_dialogs_and_banners_query_dialog">
-        <location filename="../mainpage.cpp" line="126"/>
+        <location filename="../mainpage.cpp" line="132"/>
         <source>Query Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_dialogs_and_banners_banner">
-        <location filename="../mainpage.cpp" line="128"/>
+        <location filename="../mainpage.cpp" line="134"/>
         <source>Banner</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_categories_lists_grids_and_popups">
-        <location filename="../mainpage.cpp" line="131"/>
+        <location filename="../mainpage.cpp" line="137"/>
         <source>Lists, Grids and Popups</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_list">
-        <location filename="../mainpage.cpp" line="133"/>
+        <location filename="../mainpage.cpp" line="139"/>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_grid">
-        <location filename="../mainpage.cpp" line="135"/>
+        <location filename="../mainpage.cpp" line="141"/>
         <source>Grid</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_object_menu">
-        <location filename="../mainpage.cpp" line="137"/>
+        <location filename="../mainpage.cpp" line="143"/>
         <source>Object Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_combobox">
-        <location filename="../mainpage.cpp" line="139"/>
+        <location filename="../mainpage.cpp" line="145"/>
         <source>ComboBox</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_contentitems">
-        <location filename="../mainpage.cpp" line="141"/>
+        <location filename="../mainpage.cpp" line="147"/>
         <source>ContentItems</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_bubble">
-        <location filename="../mainpage.cpp" line="143"/>
+        <location filename="../mainpage.cpp" line="149"/>
         <source>Speech bubble</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_categories_user_input">
-        <location filename="../mainpage.cpp" line="146"/>
+        <location filename="../mainpage.cpp" line="152"/>
         <source>User Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_user_input_text_entries">
-        <location filename="../mainpage.cpp" line="148"/>
+        <location filename="../mainpage.cpp" line="154"/>
         <source>Text Entries</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_user_input_slider">
-        <location filename="../mainpage.cpp" line="150"/>
+        <location filename="../mainpage.cpp" line="156"/>
         <source>Slider</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_user_input_input_feedback">
-        <location filename="../mainpage.cpp" line="152"/>
+        <location filename="../mainpage.cpp" line="158"/>
         <source>Input Feedback</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_application_title">
-        <location filename="../mainpage.cpp" line="337"/>
+        <location filename="../mainpage.cpp" line="346"/>
         <source>Widgets Gallery</source>
         <translation>WG Urdu اُردوُ</translation>
     </message>
     <message id="xx_mainpage_themes">
-        <location filename="../mainpage.cpp" line="343"/>
+        <location filename="../mainpage.cpp" line="352"/>
         <source>Themes</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_mainpage_orientation">
-        <location filename="../mainpage.cpp" line="345"/>
+        <location filename="../mainpage.cpp" line="354"/>
         <source>Orientation</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_mainpage_toggle_fps">
-        <location filename="../mainpage.cpp" line="347"/>
+        <location filename="../mainpage.cpp" line="356"/>
         <source>Toggle FPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_mainpage_language_settings">
-        <location filename="../mainpage.cpp" line="349"/>
+        <location filename="../mainpage.cpp" line="358"/>
         <source>Language Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_apporientation_auto">
-        <location filename="../mainpage.cpp" line="562"/>
+        <location filename="../mainpage.cpp" line="570"/>
         <source>Automatic</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_apporientation_portrait">
-        <location filename="../mainpage.cpp" line="570"/>
+        <location filename="../mainpage.cpp" line="578"/>
         <source>Portrait</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_apporientation_landscape">
-        <location filename="../mainpage.cpp" line="578"/>
+        <location filename="../mainpage.cpp" line="586"/>
         <source>Landscape</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_apporientation_angle0">
-        <location filename="../mainpage.cpp" line="586"/>
+        <location filename="../mainpage.cpp" line="594"/>
         <source>0 degrees</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_apporientation_angle90">
-        <location filename="../mainpage.cpp" line="594"/>
+        <location filename="../mainpage.cpp" line="602"/>
         <source>90 degrees clockwise</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_apporientation_angle180">
-        <location filename="../mainpage.cpp" line="602"/>
+        <location filename="../mainpage.cpp" line="610"/>
         <source>180 degrees clockwise</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_apporientation_angle270">
-        <location filename="../mainpage.cpp" line="610"/>
+        <location filename="../mainpage.cpp" line="618"/>
         <source>270 degrees clockwise</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_displaymodes_navbarcombo">
-        <location filename="../displaymodespage.cpp" line="59"/>
+        <location filename="../displaymodespage.cpp" line="68"/>
         <source>Navigation Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_displaymodes_escapebtncombo">
-        <location filename="../displaymodespage.cpp" line="67"/>
+        <location filename="../displaymodespage.cpp" line="76"/>
         <source>Escape Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_displaymodes_homebtncombo">
-        <location filename="../displaymodespage.cpp" line="75"/>
+        <location filename="../displaymodespage.cpp" line="84"/>
         <source>Home Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_displaymodes_page_title">
-        <location filename="../displaymodespage.cpp" line="143"/>
+        <location filename="../displaymodespage.cpp" line="152"/>
         <source>Display Modes</source>
         <oldsource>Display Modes and Full Screen</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_displaymodes_display_mode">
-        <location filename="../displaymodespage.cpp" line="147"/>
+        <location filename="../displaymodespage.cpp" line="156"/>
         <source>Components&apos; display mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_displaymodes_window_state">
-        <location filename="../displaymodespage.cpp" line="150"/>
+        <location filename="../displaymodespage.cpp" line="159"/>
         <source>Window state:</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_displaymodes_full_screen">
-        <location filename="../displaymodespage.cpp" line="153"/>
+        <location filename="../displaymodespage.cpp" line="162"/>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_displaymode_show">
-        <location filename="../displaymodespage.cpp" line="166"/>
+        <location filename="../displaymodespage.cpp" line="175"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_displaymode_autohide">
-        <location filename="../displaymodespage.cpp" line="168"/>
+        <location filename="../displaymodespage.cpp" line="177"/>
         <source>Auto Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_displaymode_hide">
-        <location filename="../displaymodespage.cpp" line="170"/>
+        <location filename="../displaymodespage.cpp" line="179"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -772,78 +791,78 @@ The primary (single short tap) action of the element should not be duplicated in
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_combobox_page_info">
-        <location filename="../comboboxpage.cpp" line="122"/>
+        <location filename="../comboboxpage.cpp" line="125"/>
         <source>The MComboBox widget is a combined button and popup list. It is very similar to QComboBox, but does not allow editing the text.</source>
         <oldsource>The DuiComboBox widget is a combined button and popup list. It is very similar to QComboBox, but does not allow editing the text.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_popup_generic_title">
-        <location filename="../comboboxpage.cpp" line="114"/>
+        <location filename="../comboboxpage.cpp" line="117"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_combobox_title">
-        <location filename="../comboboxpage.cpp" line="110"/>
+        <location filename="../comboboxpage.cpp" line="113"/>
         <source>ComboBox</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_popup_sort_descending_order">
-        <location filename="../comboboxpage.cpp" line="116"/>
+        <location filename="../comboboxpage.cpp" line="119"/>
         <source>Sort - DescendingOrder</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_popup_time_consuming">
-        <location filename="../comboboxpage.cpp" line="118"/>
+        <location filename="../comboboxpage.cpp" line="121"/>
         <source>Time-consuming setting</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_progressbar_page_title">
-        <location filename="../progressbarpage.cpp" line="89"/>
+        <location filename="../progressbarpage.cpp" line="88"/>
         <source>Progress Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_progressbar_page_info_label">
-        <location filename="../progressbarpage.cpp" line="94"/>
+        <location filename="../progressbarpage.cpp" line="93"/>
         <source>A Progress Bar can indicate an ongoing process with either known or unknown durations.</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_progressindicator_unknown_duration_bar">
-        <location filename="../progressbarpage.cpp" line="98"/>
+        <location filename="../progressbarpage.cpp" line="97"/>
         <source>Installing CoolApp</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_progressindicator_known_duration_bar">
-        <location filename="../progressbarpage.cpp" line="96"/>
+        <location filename="../progressbarpage.cpp" line="95"/>
         <source>Downloading nicepic.jpg</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_template_page_title">
-        <location filename="../templatepage.cpp" line="101"/>
+        <location filename="../templatepage.cpp" line="102"/>
         <source>Template</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_sample template">
-        <location filename="../templatepage.cpp" line="107"/>
+        <location filename="../templatepage.cpp" line="108"/>
         <source>Sample template</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_textentry_title">
-        <location filename="../textentrypage.cpp" line="582"/>
+        <location filename="../textentrypage.cpp" line="595"/>
         <source>Text Entries</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_tooltip_entry0">
-        <location filename="../textentrypage.cpp" line="586"/>
+        <location filename="../textentrypage.cpp" line="599"/>
         <source>Enter text here</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_tooltip_entry1">
-        <location filename="../textentrypage.cpp" line="589"/>
+        <location filename="../textentrypage.cpp" line="602"/>
         <source>This tooltip is quite long and will be clipped on the display</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_tooltip_entry6">
-        <location filename="../textentrypage.cpp" line="595"/>
+        <location filename="../textentrypage.cpp" line="608"/>
         <source>This is a multiline text entry</source>
         <oldsource>This is
 multiline
@@ -851,7 +870,7 @@ tooltip</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_tooltip_entry8">
-        <location filename="../textentrypage.cpp" line="592"/>
+        <location filename="../textentrypage.cpp" line="605"/>
         <source>Provides email address suggestions</source>
         <translation type="unfinished"></translation>
     </message>
@@ -883,137 +902,151 @@ tooltip</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_tooltip_customtoolbar1">
-        <location filename="../textentrypage.cpp" line="519"/>
+        <location filename="../textentrypage.cpp" line="539"/>
         <source>Example custom toolbar 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_tooltip_customtoolbar2">
-        <location filename="../textentrypage.cpp" line="532"/>
+        <location filename="../textentrypage.cpp" line="552"/>
         <source>Example custom toolbar 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_textentry_free_text">
-        <location filename="../textentrypage.cpp" line="598"/>
+        <location filename="../textentrypage.cpp" line="611"/>
         <source>Free text:</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_textentry_free_text_masked">
-        <location filename="../textentrypage.cpp" line="600"/>
-        <source>Free text(masked):</source>
+        <location filename="../textentrypage.cpp" line="613"/>
+        <source>Free text (masked):</source>
+        <oldsource>Free text(masked):</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_textentry_number_text">
-        <location filename="../textentrypage.cpp" line="602"/>
+        <location filename="../textentrypage.cpp" line="615"/>
         <source>Number text:</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_textentry_phone_number">
-        <location filename="../textentrypage.cpp" line="604"/>
+        <location filename="../textentrypage.cpp" line="617"/>
         <source>Phone number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_textentry_email_text">
-        <location filename="../textentrypage.cpp" line="606"/>
+        <location filename="../textentrypage.cpp" line="619"/>
         <source>Email text:</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_textentry_url_text">
-        <location filename="../textentrypage.cpp" line="608"/>
-        <source>Url text:</source>
+        <location filename="../textentrypage.cpp" line="621"/>
+        <source>URL text:</source>
+        <oldsource>Url text:</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_textentry_multiline">
-        <location filename="../textentrypage.cpp" line="610"/>
+        <location filename="../textentrypage.cpp" line="623"/>
         <source>Multiline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_textentry_singleselectall">
-        <location filename="../textentrypage.cpp" line="612"/>
+        <location filename="../textentrypage.cpp" line="625"/>
         <source>Singleline (selectall):</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_textentry_completion_text">
-        <location filename="../textentrypage.cpp" line="614"/>
+        <location filename="../textentrypage.cpp" line="627"/>
         <source>Email suggestion text:</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_textentry_richtext_text">
-        <location filename="../textentrypage.cpp" line="616"/>
-        <source>Rich Text:</source>
+        <location filename="../textentrypage.cpp" line="629"/>
+        <source>Rich text:</source>
+        <oldsource>Rich Text:</oldsource>
+        <translation type="unfinished"></translation>
+    </message>
+    <message id="xx_textentry_richtext_text_multiline">
+        <location filename="../textentrypage.cpp" line="631"/>
+        <source>Rich text (multiline):</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_textentry_noecho">
-        <location filename="../textentrypage.cpp" line="619"/>
-        <source>No Echo mode:</source>
+        <location filename="../textentrypage.cpp" line="634"/>
+        <source>No echo mode:</source>
+        <oldsource>No Echo mode:</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_textentry_echoonedit">
-        <location filename="../textentrypage.cpp" line="622"/>
+        <location filename="../textentrypage.cpp" line="637"/>
         <source>Echo on edit:</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_textentry_direct_input_mode">
-        <location filename="../textentrypage.cpp" line="625"/>
-        <source>Direct Input Mode:</source>
+        <location filename="../textentrypage.cpp" line="640"/>
+        <source>Direct input mode:</source>
+        <oldsource>Direct Input Mode:</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_textentry_custom_toolbar1">
-        <location filename="../textentrypage.cpp" line="628"/>
-        <source>Custom ToolBar 1:</source>
+        <location filename="../textentrypage.cpp" line="643"/>
+        <source>Custom toolbar 1:</source>
+        <oldsource>Custom ToolBar 1:</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_textentry_custom_toolbar2">
-        <location filename="../textentrypage.cpp" line="630"/>
-        <source>Custom ToolBar 2:</source>
+        <location filename="../textentrypage.cpp" line="645"/>
+        <source>Custom toolbar 2:</source>
+        <oldsource>Custom ToolBar 2:</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_auto_capitalisation">
-        <location filename="../textentrypage.cpp" line="633"/>
+        <location filename="../textentrypage.cpp" line="648"/>
         <source>Auto capitalisation</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_error_correction">
-        <location filename="../textentrypage.cpp" line="635"/>
+        <location filename="../textentrypage.cpp" line="650"/>
         <source>Error correction</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_auto_true_entry0">
-        <location filename="../textentrypage.cpp" line="663"/>
-        <source>Auto Capitalisation is active</source>
+        <location filename="../textentrypage.cpp" line="678"/>
+        <source>Auto capitalisation is active</source>
+        <oldsource>Auto Capitalisation is active</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_auto_false_entry0">
-        <location filename="../textentrypage.cpp" line="666"/>
-        <source>No Auto Capitalisation</source>
+        <location filename="../textentrypage.cpp" line="681"/>
+        <source>No auto capitalisation</source>
+        <oldsource>No Auto Capitalisation</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_toolbar_page_example1">
-        <location filename="../toolbarpage.cpp" line="220"/>
+        <location filename="../toolbarpage.cpp" line="223"/>
         <source>Example 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_toolbar_page_example2">
-        <location filename="../toolbarpage.cpp" line="222"/>
+        <location filename="../toolbarpage.cpp" line="225"/>
         <source>Example 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_toolbar_page_defaultview">
-        <location filename="../toolbarpage.cpp" line="224"/>
+        <location filename="../toolbarpage.cpp" line="227"/>
         <source>Default View</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_toolbar_page_tabview">
-        <location filename="../toolbarpage.cpp" line="226"/>
+        <location filename="../toolbarpage.cpp" line="229"/>
         <source>Tab View</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_toolbar_page_title">
-        <location filename="../toolbarpage.cpp" line="210"/>
+        <location filename="../toolbarpage.cpp" line="213"/>
         <source>ToolBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_toolbar_page_info">
-        <location filename="../toolbarpage.cpp" line="217"/>
+        <location filename="../toolbarpage.cpp" line="220"/>
         <source>&lt;b&gt;Toolbar&lt;/b&gt; acts as a container for actions. Depending upon the view attached, it either acts as a tab bar or is a container for buttons and text input field. &lt;ul&gt;&lt;li&gt;Click Menu to explore the example&lt;/li&gt;&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1037,19 +1070,19 @@ instructions.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_icon_button_page_title">
-        <location filename="../iconbuttonpage.cpp" line="81"/>
+        <location filename="../iconbuttonpage.cpp" line="82"/>
         <source>Icon Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_icon_button_page_info_label">
-        <location filename="../iconbuttonpage.cpp" line="89"/>
+        <location filename="../iconbuttonpage.cpp" line="90"/>
         <source>Icon Buttons have an icon and can have a text label. Icon button differs from push button by its visual presentation: it does not have button-style edges like a Push Button does.
 
  Icon Buttons are used in e.g. Toolbars.</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_icon_button_page_icon_button2">
-        <location filename="../iconbuttonpage.cpp" line="91"/>
+        <location filename="../iconbuttonpage.cpp" line="92"/>
         <source>Lorem ipsum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1230,55 +1263,55 @@ Input feedbacks can be easily configured for different purposes using the themin
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_gridpage_configuration">
-        <location filename="../mgridpage.cpp" line="208"/>
+        <location filename="../mgridpage.cpp" line="210"/>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_gridpage_title">
-        <location filename="../mgridpage.cpp" line="203"/>
-        <source>ConfigurationGrid page</source>
-        <oldsource>Grid page</oldsource>
+        <location filename="../mgridpage.cpp" line="205"/>
+        <source>Grid page</source>
+        <oldsource>ConfigurationGrid page</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_gridpage_set_columns">
-        <location filename="../mgridpage.cpp" line="297"/>
+        <location filename="../mgridpage.cpp" line="301"/>
         <source>Set columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_gridpage_landscape">
-        <location filename="../mgridpage.cpp" line="329"/>
-        <location filename="../mgridpage.cpp" line="339"/>
+        <location filename="../mgridpage.cpp" line="333"/>
+        <location filename="../mgridpage.cpp" line="343"/>
         <source>Landscape</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_gridpage_portrait">
-        <location filename="../mgridpage.cpp" line="334"/>
-        <location filename="../mgridpage.cpp" line="344"/>
+        <location filename="../mgridpage.cpp" line="338"/>
+        <location filename="../mgridpage.cpp" line="348"/>
         <source>Portrait</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_bubblepage_title">
-        <location filename="../bubblepage.cpp" line="156"/>
+        <location filename="../bubblepage.cpp" line="158"/>
         <source>Speech Bubble</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_bubblepage_linkactivated">
-        <location filename="../bubblepage.cpp" line="169"/>
+        <location filename="../bubblepage.cpp" line="171"/>
         <source>Link activated</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_bubblepage_bubbleclicked">
-        <location filename="../bubblepage.cpp" line="176"/>
+        <location filename="../bubblepage.cpp" line="178"/>
         <source>Speech buuble clicked</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_title">
-        <location filename="../buttongrouppage.cpp" line="156"/>
+        <location filename="../buttongrouppage.cpp" line="168"/>
         <source>Button Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_info_label">
-        <location filename="../buttongrouppage.cpp" line="168"/>
+        <location filename="../buttongrouppage.cpp" line="180"/>
         <source>Buttons can be grouped together based on visual or logic requirements.
 
 The basic group is formed by placing buttons together into a layout. Depending on the theme, the buttons are typically drawn as connected with each other.
@@ -1287,62 +1320,62 @@ Logical exclusivity can be added to a group, which ensures only one of the butto
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_hlabel1">
-        <location filename="../buttongrouppage.cpp" line="171"/>
+        <location filename="../buttongrouppage.cpp" line="183"/>
         <source>Horizontal group</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button1">
-        <location filename="../buttongrouppage.cpp" line="173"/>
+        <location filename="../buttongrouppage.cpp" line="185"/>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button2">
-        <location filename="../buttongrouppage.cpp" line="175"/>
+        <location filename="../buttongrouppage.cpp" line="187"/>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button3">
-        <location filename="../buttongrouppage.cpp" line="177"/>
+        <location filename="../buttongrouppage.cpp" line="189"/>
         <source>Maybe</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_vlabel2">
-        <location filename="../buttongrouppage.cpp" line="180"/>
+        <location filename="../buttongrouppage.cpp" line="192"/>
         <source>Horizontal group, exclusive</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button4">
-        <location filename="../buttongrouppage.cpp" line="182"/>
+        <location filename="../buttongrouppage.cpp" line="194"/>
         <source>Cost</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button5">
-        <location filename="../buttongrouppage.cpp" line="184"/>
+        <location filename="../buttongrouppage.cpp" line="196"/>
         <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button6">
-        <location filename="../buttongrouppage.cpp" line="186"/>
+        <location filename="../buttongrouppage.cpp" line="198"/>
         <source>Schedule</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_vlabel">
-        <location filename="../buttongrouppage.cpp" line="189"/>
+        <location filename="../buttongrouppage.cpp" line="201"/>
         <source>Vertical group, checkable</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button7">
-        <location filename="../buttongrouppage.cpp" line="191"/>
+        <location filename="../buttongrouppage.cpp" line="203"/>
         <source>Milk</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button8">
-        <location filename="../buttongrouppage.cpp" line="193"/>
+        <location filename="../buttongrouppage.cpp" line="205"/>
         <source>Sugar</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button9">
-        <location filename="../buttongrouppage.cpp" line="195"/>
+        <location filename="../buttongrouppage.cpp" line="207"/>
         <source>Biscotti</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1361,57 +1394,57 @@ Logical exclusivity can be added to a group, which ensures only one of the butto
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_single_title">
-        <location filename="../contentitemspage.cpp" line="310"/>
+        <location filename="../contentitemspage.cpp" line="312"/>
         <source>Single Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_title_with_subtitle">
-        <location filename="../contentitemspage.cpp" line="312"/>
+        <location filename="../contentitemspage.cpp" line="314"/>
         <source>Title with Subtitle</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title">
-        <location filename="../contentitemspage.cpp" line="314"/>
+        <location filename="../contentitemspage.cpp" line="316"/>
         <source>Icon with Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_and_subtitle">
-        <location filename="../contentitemspage.cpp" line="316"/>
+        <location filename="../contentitemspage.cpp" line="318"/>
         <source>Icon with Title and Subtitle</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_subtitle_and_two_side_icons">
-        <location filename="../contentitemspage.cpp" line="320"/>
+        <location filename="../contentitemspage.cpp" line="322"/>
         <source>Icon with Title Subtitle and Two Side Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_subtitle_and_side_icon_with_label">
-        <location filename="../contentitemspage.cpp" line="323"/>
+        <location filename="../contentitemspage.cpp" line="325"/>
         <source>Icon with Title Subtitle and Side Icon with Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_thumbnail_with_title_subtitle_and_two_side_icons">
-        <location filename="../contentitemspage.cpp" line="326"/>
+        <location filename="../contentitemspage.cpp" line="328"/>
         <source>Thumbnail with Title Subtitle and Two Side Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_thumbnail_with_title_and_two_side_icons">
-        <location filename="../contentitemspage.cpp" line="329"/>
+        <location filename="../contentitemspage.cpp" line="331"/>
         <source>Thumbnail with Title and Two Side Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_progress_indicator_and_two_side_icons">
-        <location filename="../contentitemspage.cpp" line="334"/>
+        <location filename="../contentitemspage.cpp" line="336"/>
         <source>Icon with Title Progress Indicator and Two Side Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_progress_indicator_and_top_side_icon">
-        <location filename="../contentitemspage.cpp" line="337"/>
+        <location filename="../contentitemspage.cpp" line="339"/>
         <source>Icon with Title Progress Indicator and Top Side Icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_contentitemspage_title">
-        <location filename="../contentitemspage.cpp" line="358"/>
+        <location filename="../contentitemspage.cpp" line="359"/>
         <source>Content Items</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/demos/widgetsgallery/translations/widgetsgallery_zh_CN.ts b/demos/widgetsgallery/translations/widgetsgallery_zh_CN.ts
index d024bf7b..95414a1a 100644
--- a/demos/widgetsgallery/translations/widgetsgallery_zh_CN.ts
+++ b/demos/widgetsgallery/translations/widgetsgallery_zh_CN.ts
@@ -4,217 +4,217 @@
 <context>
     <name></name>
     <message id="xx_wg_categories_application_view">
-        <location filename="../mainpage.cpp" line="86"/>
+        <location filename="../mainpage.cpp" line="92"/>
         <source>Application View</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_application_view_view_menu">
-        <location filename="../mainpage.cpp" line="88"/>
+        <location filename="../mainpage.cpp" line="94"/>
         <source>Application Menu</source>
         <translation type="unfinished">应用菜单</translation>
     </message>
     <message id="xx_wg_application_view_display_modes">
-        <location filename="../mainpage.cpp" line="90"/>
+        <location filename="../mainpage.cpp" line="96"/>
         <source>Display Modes</source>
         <translation type="unfinished">导航条</translation>
     </message>
     <message id="xx_wg_application_view_toolbar_incl_tab_bar">
-        <location filename="../mainpage.cpp" line="92"/>
+        <location filename="../mainpage.cpp" line="98"/>
         <source>Toolbar (including Tab Bar)</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_categories_simple_widgets">
-        <location filename="../mainpage.cpp" line="96"/>
+        <location filename="../mainpage.cpp" line="102"/>
         <source>Simple Widgets</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_simple_widgets_labels">
-        <location filename="../mainpage.cpp" line="98"/>
+        <location filename="../mainpage.cpp" line="104"/>
         <source>Labels</source>
         <translation type="unfinished">标签</translation>
     </message>
     <message id="xx_wg_simple_widgets_image">
-        <location filename="../mainpage.cpp" line="100"/>
+        <location filename="../mainpage.cpp" line="106"/>
         <source>Image</source>
         <translation type="unfinished">图像</translation>
     </message>
     <message id="xx_wg_simple_widgets_progress_bar">
-        <location filename="../mainpage.cpp" line="102"/>
+        <location filename="../mainpage.cpp" line="108"/>
         <source>Progress Bar</source>
         <translation type="unfinished">进度条</translation>
     </message>
     <message id="xx_wg_simple_widgets_container">
-        <location filename="../mainpage.cpp" line="104"/>
+        <location filename="../mainpage.cpp" line="110"/>
         <source>Container</source>
         <translation type="unfinished">包容器</translation>
     </message>
     <message id="xx_wg_simple_widgets_spinner">
-        <location filename="../mainpage.cpp" line="106"/>
+        <location filename="../mainpage.cpp" line="112"/>
         <source>Spinner</source>
         <translation type="unfinished">旋转进度指示</translation>
     </message>
     <message id="xx_wg_categories_buttons">
-        <location filename="../mainpage.cpp" line="109"/>
+        <location filename="../mainpage.cpp" line="115"/>
         <source>Buttons</source>
         <translation type="unfinished">按钮</translation>
     </message>
     <message id="xx_wg_buttons_push_button">
-        <location filename="../mainpage.cpp" line="111"/>
+        <location filename="../mainpage.cpp" line="117"/>
         <source>Push Button</source>
         <translation type="unfinished">按钮</translation>
     </message>
     <message id="xx_wg_buttons_icon_button">
-        <location filename="../mainpage.cpp" line="113"/>
+        <location filename="../mainpage.cpp" line="119"/>
         <source>Icon Button</source>
         <translation type="unfinished">图标按钮</translation>
     </message>
     <message id="xx_wg_buttons_switch">
-        <location filename="../mainpage.cpp" line="115"/>
+        <location filename="../mainpage.cpp" line="121"/>
         <source>Switch</source>
         <translation type="unfinished">开关</translation>
     </message>
     <message id="xx_wg_buttons_checkbox">
-        <location filename="../mainpage.cpp" line="117"/>
+        <location filename="../mainpage.cpp" line="123"/>
         <source>Checkbox</source>
         <translation type="unfinished">核选框</translation>
     </message>
     <message id="xx_wg_buttons_buttongroup">
-        <location filename="../mainpage.cpp" line="119"/>
+        <location filename="../mainpage.cpp" line="125"/>
         <source>Button Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_categories_dialogs_and_banners">
-        <location filename="../mainpage.cpp" line="122"/>
+        <location filename="../mainpage.cpp" line="128"/>
         <source>Dialogs and Banners</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_dialogs_and_banners_single_selection_dialog">
-        <location filename="../mainpage.cpp" line="124"/>
+        <location filename="../mainpage.cpp" line="130"/>
         <source>Single Selection Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_dialogs_and_banners_query_dialog">
-        <location filename="../mainpage.cpp" line="126"/>
+        <location filename="../mainpage.cpp" line="132"/>
         <source>Query Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_dialogs_and_banners_banner">
-        <location filename="../mainpage.cpp" line="128"/>
+        <location filename="../mainpage.cpp" line="134"/>
         <source>Banner</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_categories_lists_grids_and_popups">
-        <location filename="../mainpage.cpp" line="131"/>
+        <location filename="../mainpage.cpp" line="137"/>
         <source>Lists, Grids and Popups</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_list">
-        <location filename="../mainpage.cpp" line="133"/>
+        <location filename="../mainpage.cpp" line="139"/>
         <source>List</source>
         <translation type="unfinished">列表</translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_grid">
-        <location filename="../mainpage.cpp" line="135"/>
+        <location filename="../mainpage.cpp" line="141"/>
         <source>Grid</source>
         <translation type="unfinished">网格</translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_object_menu">
-        <location filename="../mainpage.cpp" line="137"/>
+        <location filename="../mainpage.cpp" line="143"/>
         <source>Object Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_combobox">
-        <location filename="../mainpage.cpp" line="139"/>
+        <location filename="../mainpage.cpp" line="145"/>
         <source>ComboBox</source>
         <translation type="unfinished">组合对话框</translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_contentitems">
-        <location filename="../mainpage.cpp" line="141"/>
+        <location filename="../mainpage.cpp" line="147"/>
         <source>ContentItems</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_lists_grids_and_popups_bubble">
-        <location filename="../mainpage.cpp" line="143"/>
+        <location filename="../mainpage.cpp" line="149"/>
         <source>Speech bubble</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_categories_user_input">
-        <location filename="../mainpage.cpp" line="146"/>
+        <location filename="../mainpage.cpp" line="152"/>
         <source>User Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_user_input_text_entries">
-        <location filename="../mainpage.cpp" line="148"/>
+        <location filename="../mainpage.cpp" line="154"/>
         <source>Text Entries</source>
         <translation type="unfinished">输入文字</translation>
     </message>
     <message id="xx_wg_user_input_slider">
-        <location filename="../mainpage.cpp" line="150"/>
+        <location filename="../mainpage.cpp" line="156"/>
         <source>Slider</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_user_input_input_feedback">
-        <location filename="../mainpage.cpp" line="152"/>
+        <location filename="../mainpage.cpp" line="158"/>
         <source>Input Feedback</source>
         <translation type="unfinished">输入反馈</translation>
     </message>
     <message id="xx_application_title">
-        <location filename="../mainpage.cpp" line="337"/>
+        <location filename="../mainpage.cpp" line="346"/>
         <source>Widgets Gallery</source>
         <translation>画廊</translation>
     </message>
     <message id="xx_mainpage_themes">
-        <location filename="../mainpage.cpp" line="343"/>
+        <location filename="../mainpage.cpp" line="352"/>
         <source>Themes</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_mainpage_orientation">
-        <location filename="../mainpage.cpp" line="345"/>
+        <location filename="../mainpage.cpp" line="354"/>
         <source>Orientation</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_mainpage_toggle_fps">
-        <location filename="../mainpage.cpp" line="347"/>
+        <location filename="../mainpage.cpp" line="356"/>
         <source>Toggle FPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_mainpage_language_settings">
-        <location filename="../mainpage.cpp" line="349"/>
+        <location filename="../mainpage.cpp" line="358"/>
         <source>Language Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_apporientation_auto">
-        <location filename="../mainpage.cpp" line="562"/>
+        <location filename="../mainpage.cpp" line="570"/>
         <source>Automatic</source>
         <translation>自动</translation>
     </message>
     <message id="xx_apporientation_portrait">
-        <location filename="../mainpage.cpp" line="570"/>
+        <location filename="../mainpage.cpp" line="578"/>
         <source>Portrait</source>
         <translation>竖屏</translation>
     </message>
     <message id="xx_apporientation_landscape">
-        <location filename="../mainpage.cpp" line="578"/>
+        <location filename="../mainpage.cpp" line="586"/>
         <source>Landscape</source>
         <translation>横屏</translation>
     </message>
     <message id="xx_apporientation_angle0">
-        <location filename="../mainpage.cpp" line="586"/>
+        <location filename="../mainpage.cpp" line="594"/>
         <source>0 degrees</source>
         <translation> 0 度</translation>
     </message>
     <message id="xx_apporientation_angle90">
-        <location filename="../mainpage.cpp" line="594"/>
+        <location filename="../mainpage.cpp" line="602"/>
         <source>90 degrees clockwise</source>
         <translation>顺时针旋转90度</translation>
     </message>
     <message id="xx_apporientation_angle180">
-        <location filename="../mainpage.cpp" line="602"/>
+        <location filename="../mainpage.cpp" line="610"/>
         <source>180 degrees clockwise</source>
         <translation>顺时针旋转180度</translation>
     </message>
     <message id="xx_apporientation_angle270">
-        <location filename="../mainpage.cpp" line="610"/>
+        <location filename="../mainpage.cpp" line="618"/>
         <source>270 degrees clockwise</source>
         <translation>顺时针旋转270度</translation>
     </message>
@@ -290,91 +290,93 @@ All Labels can be aligned left, right or center and will be automatically trunca
         <translation>请选择打印机</translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_stacked_dialogs">
-        <location filename="../singleselectiondialogspage.cpp" line="257"/>
+        <location filename="../singleselectiondialogspage.cpp" line="259"/>
         <source>Stacked Dialogs</source>
         <translation type="unfinished">对话记录框</translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_system_dialog">
-        <location filename="../singleselectiondialogspage.cpp" line="259"/>
+        <location filename="../singleselectiondialogspage.cpp" line="261"/>
         <source>System Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_system_modal_dialog">
-        <location filename="../singleselectiondialogspage.cpp" line="261"/>
+        <location filename="../singleselectiondialogspage.cpp" line="263"/>
         <source>System Modal Dialog</source>
         <translation type="unfinished">模式对话框</translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_dialog_with_progress_indicator">
-        <location filename="../singleselectiondialogspage.cpp" line="263"/>
+        <location filename="../singleselectiondialogspage.cpp" line="265"/>
         <source>Dialog with Progress Indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_single_selection_dialogs_page_message_box">
-        <location filename="../singleselectiondialogspage.cpp" line="265"/>
+        <location filename="../singleselectiondialogspage.cpp" line="267"/>
         <source>Message Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_button">
-        <location filename="../singleselectiondialogspage.cpp" line="126"/>
+        <location filename="../singleselectiondialogspage.cpp" line="128"/>
         <source>Click to spawn a nested dialog</source>
         <translation>请点按打开下级对话</translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="128"/>
+        <location filename="../singleselectiondialogspage.cpp" line="130"/>
         <source>Stacked dialogs</source>
         <translation>对话记录框</translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_open_nested_messagebox">
-        <location filename="../singleselectiondialogspage.cpp" line="142"/>
+        <location filename="../singleselectiondialogspage.cpp" line="144"/>
         <source>Click to open a nested message box</source>
         <translation>请点按打开下级消息框</translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_nested_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="144"/>
+        <location filename="../singleselectiondialogspage.cpp" line="146"/>
         <source>This is a nested dialog</source>
         <translation>这是多层对话框</translation>
     </message>
     <message id="xx_dialogs_and_notifications_stacked_dialog_messagebox_text">
-        <location filename="../singleselectiondialogspage.cpp" line="157"/>
+        <location filename="../singleselectiondialogspage.cpp" line="159"/>
         <source>I&apos;m a nested message box</source>
         <translation>我是多层对话框</translation>
     </message>
     <message id="xx_dialogs_and_notifications_system_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="168"/>
+        <location filename="../singleselectiondialogspage.cpp" line="170"/>
         <source>System Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_dialogs_and_notifications_system_dialog_label">
-        <location filename="../singleselectiondialogspage.cpp" line="176"/>
-        <source>I&apos;m a system dialog.&lt;br&gt;There actually is a way around me...&lt;br&gt;You can skip me with the home button, but I&apos;ll remain&lt;br&gt;alive until you make a selection.</source>
+        <location filename="../singleselectiondialogspage.cpp" line="178"/>
+        <source>I&apos;m a system dialog.&lt;br&gt;You can skip me with the home button.&lt;br&gt;I&apos;ll be minimised to the task switcher&lt;br&gt;but I&apos;ll remain alive until you make a selection.</source>
+        <oldsource>I&apos;m a system dialog.&lt;br&gt;There actually is a way around me...&lt;br&gt;You can skip me with the home button, but I&apos;ll remain&lt;br&gt;alive until you make a selection.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_dialogs_and_notifications_system_modal_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="191"/>
+        <location filename="../singleselectiondialogspage.cpp" line="193"/>
         <source>System Modal Dialog</source>
         <translation>模式对话框</translation>
     </message>
     <message id="xx_dialogs_and_notifications_system_modal_dialog_label">
-        <location filename="../singleselectiondialogspage.cpp" line="198"/>
-        <source>I&apos;m a window modal dialog.
+        <location filename="../singleselectiondialogspage.cpp" line="200"/>
+        <source>I&apos;m a system modal dialog.&lt;br&gt;You can&apos;t skip me as I&apos;m designed for&lt;br&gt;use cases that require immediate user attention.</source>
+        <oldsource>I&apos;m a window modal dialog.
 There&apos;s no way around me!
-Muwhahaha... [evil laugh]</source>
-        <translation>我是模式对话框。
+Muwhahaha... [evil laugh]</oldsource>
+        <translation type="unfinished">我是模式对话框。
 休想绕开我！
 哈哈哈...</translation>
     </message>
     <message id="xx_dialogs_and_notifications_progress_indicator">
-        <location filename="../singleselectiondialogspage.cpp" line="217"/>
+        <location filename="../singleselectiondialogspage.cpp" line="219"/>
         <source>Progress Indicator</source>
         <translation>进程指示</translation>
     </message>
     <message id="xx_dialogs_and_notifications_message_box_text">
-        <location filename="../singleselectiondialogspage.cpp" line="237"/>
+        <location filename="../singleselectiondialogspage.cpp" line="239"/>
         <source>Hello World!</source>
         <translation>你好世界！</translation>
     </message>
     <message id="xx_single_selection_dialog_title">
-        <location filename="../singleselectiondialogspage.cpp" line="251"/>
+        <location filename="../singleselectiondialogspage.cpp" line="253"/>
         <source>Single Selection Dialogs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -524,73 +526,78 @@ Muwhahaha... [evil laugh]</source>
         <translation>裁剪</translation>
     </message>
     <message id="xx_listpage_list_remove">
-        <location filename="../mlistpage.cpp" line="634"/>
+        <location filename="../mlistpage.cpp" line="635"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_listpage_list_edit">
-        <location filename="../mlistpage.cpp" line="640"/>
+        <location filename="../mlistpage.cpp" line="641"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_listpage_title">
-        <location filename="../mlistpage.cpp" line="658"/>
+        <location filename="../mlistpage.cpp" line="659"/>
         <source>List</source>
         <translation>列表</translation>
     </message>
     <message id="xx_textentry_title">
-        <location filename="../textentrypage.cpp" line="582"/>
+        <location filename="../textentrypage.cpp" line="595"/>
         <source>Text Entries</source>
         <translation>输入文字</translation>
     </message>
     <message id="xx_tooltip_entry8">
-        <location filename="../textentrypage.cpp" line="592"/>
+        <location filename="../textentrypage.cpp" line="605"/>
         <source>Provides email address suggestions</source>
         <translation>提供邮件地址提示</translation>
     </message>
     <message id="xx_textentry_free_text">
-        <location filename="../textentrypage.cpp" line="598"/>
+        <location filename="../textentrypage.cpp" line="611"/>
         <source>Free text:</source>
         <translation>任意文字:</translation>
     </message>
     <message id="xx_textentry_free_text_masked">
-        <location filename="../textentrypage.cpp" line="600"/>
-        <source>Free text(masked):</source>
+        <location filename="../textentrypage.cpp" line="613"/>
+        <source>Free text (masked):</source>
         <translation>密码:</translation>
     </message>
     <message id="xx_textentry_number_text">
-        <location filename="../textentrypage.cpp" line="602"/>
+        <location filename="../textentrypage.cpp" line="615"/>
         <source>Number text:</source>
         <translation>数字:</translation>
     </message>
     <message id="xx_textentry_phone_number">
-        <location filename="../textentrypage.cpp" line="604"/>
+        <location filename="../textentrypage.cpp" line="617"/>
         <source>Phone number:</source>
         <translation>电话:</translation>
     </message>
     <message id="xx_textentry_email_text">
-        <location filename="../textentrypage.cpp" line="606"/>
+        <location filename="../textentrypage.cpp" line="619"/>
         <source>Email text:</source>
         <translation>电子邮件:</translation>
     </message>
     <message id="xx_textentry_richtext_text">
-        <location filename="../textentrypage.cpp" line="616"/>
-        <source>Rich Text:</source>
+        <location filename="../textentrypage.cpp" line="629"/>
+        <source>Rich text:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message id="xx_textentry_richtext_text_multiline">
+        <location filename="../textentrypage.cpp" line="631"/>
+        <source>Rich text (multiline):</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_textentry_noecho">
-        <location filename="../textentrypage.cpp" line="619"/>
-        <source>No Echo mode:</source>
-        <translation>无回响模式</translation>
+        <location filename="../textentrypage.cpp" line="634"/>
+        <source>No echo mode:</source>
+        <translation>无回响模式:</translation>
     </message>
     <message id="xx_textentry_echoonedit">
-        <location filename="../textentrypage.cpp" line="622"/>
+        <location filename="../textentrypage.cpp" line="637"/>
         <source>Echo on edit:</source>
-        <translation>编辑回响</translation>
+        <translation>编辑回响:</translation>
     </message>
     <message id="xx_textentry_direct_input_mode">
-        <location filename="../textentrypage.cpp" line="625"/>
-        <source>Direct Input Mode:</source>
+        <location filename="../textentrypage.cpp" line="640"/>
+        <source>Direct input mode:</source>
         <translation>直接输入模式:</translation>
     </message>
     <message id="xx_textentry_click_here">
@@ -621,77 +628,77 @@ Muwhahaha... [evil laugh]</source>
         <translation>&lt;i&gt;Key release&lt;/i&gt; key:</translation>
     </message>
     <message id="xx_tooltip_customtoolbar1">
-        <location filename="../textentrypage.cpp" line="519"/>
+        <location filename="../textentrypage.cpp" line="539"/>
         <source>Example custom toolbar 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_tooltip_customtoolbar2">
-        <location filename="../textentrypage.cpp" line="532"/>
+        <location filename="../textentrypage.cpp" line="552"/>
         <source>Example custom toolbar 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_textentry_url_text">
-        <location filename="../textentrypage.cpp" line="608"/>
-        <source>Url text:</source>
+        <location filename="../textentrypage.cpp" line="621"/>
+        <source>URL text:</source>
         <translation>网址:</translation>
     </message>
     <message id="xx_textentry_multiline">
-        <location filename="../textentrypage.cpp" line="610"/>
+        <location filename="../textentrypage.cpp" line="623"/>
         <source>Multiline:</source>
         <translation>多行输入:</translation>
     </message>
     <message id="xx_tooltip_entry0">
-        <location filename="../textentrypage.cpp" line="586"/>
+        <location filename="../textentrypage.cpp" line="599"/>
         <source>Enter text here</source>
         <translation>在这里输入文字</translation>
     </message>
     <message id="xx_tooltip_entry1">
-        <location filename="../textentrypage.cpp" line="589"/>
+        <location filename="../textentrypage.cpp" line="602"/>
         <source>This tooltip is quite long and will be clipped on the display</source>
         <translation>这个提示太长显示是会被截短</translation>
     </message>
     <message id="xx_textentry_completion_text">
-        <location filename="../textentrypage.cpp" line="614"/>
+        <location filename="../textentrypage.cpp" line="627"/>
         <source>Email suggestion text:</source>
         <translation>邮件提示文字：</translation>
     </message>
     <message id="xx_textentry_custom_toolbar1">
-        <location filename="../textentrypage.cpp" line="628"/>
-        <source>Custom ToolBar 1:</source>
+        <location filename="../textentrypage.cpp" line="643"/>
+        <source>Custom toolbar 1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_textentry_custom_toolbar2">
-        <location filename="../textentrypage.cpp" line="630"/>
-        <source>Custom ToolBar 2:</source>
+        <location filename="../textentrypage.cpp" line="645"/>
+        <source>Custom toolbar 2:</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_auto_true_entry0">
-        <location filename="../textentrypage.cpp" line="663"/>
-        <source>Auto Capitalisation is active</source>
+        <location filename="../textentrypage.cpp" line="678"/>
+        <source>Auto capitalisation is active</source>
         <translation>自动大写转换已激活</translation>
     </message>
     <message id="xx_auto_false_entry0">
-        <location filename="../textentrypage.cpp" line="666"/>
-        <source>No Auto Capitalisation</source>
+        <location filename="../textentrypage.cpp" line="681"/>
+        <source>No auto capitalisation</source>
         <translation>自动大写转换关闭</translation>
     </message>
     <message id="xx_tooltip_entry6">
-        <location filename="../textentrypage.cpp" line="595"/>
+        <location filename="../textentrypage.cpp" line="608"/>
         <source>This is a multiline text entry</source>
         <translation>这是多行提示</translation>
     </message>
     <message id="xx_textentry_singleselectall">
-        <location filename="../textentrypage.cpp" line="612"/>
+        <location filename="../textentrypage.cpp" line="625"/>
         <source>Singleline (selectall):</source>
         <translation>单行 (全选)</translation>
     </message>
     <message id="xx_auto_capitalisation">
-        <location filename="../textentrypage.cpp" line="633"/>
+        <location filename="../textentrypage.cpp" line="648"/>
         <source>Auto capitalisation</source>
         <translation>自动大写转换</translation>
     </message>
     <message id="xx_error_correction">
-        <location filename="../textentrypage.cpp" line="635"/>
+        <location filename="../textentrypage.cpp" line="650"/>
         <source>Error correction</source>
         <translation>错误校正</translation>
     </message>
@@ -711,7 +718,6 @@ Muwhahaha... [evil laugh]</source>
     <message id="xx_slider_age_label">
         <location filename="../sliderpage.cpp" line="186"/>
         <source>Please select your age:œ!! Please select your age:œ!! Please select your age:œ!! Age:</source>
-        <oldsource>Please select your age:</oldsource>
         <translation>您的年龄：</translation>
     </message>
     <message id="xx_slider_brightness_label">
@@ -814,27 +820,27 @@ Seekbar is a special type of Slider used for displaying playback status for mult
         <translation type="obsolete">日本</translation>
     </message>
     <message id="xx_combobox_page_info">
-        <location filename="../comboboxpage.cpp" line="122"/>
+        <location filename="../comboboxpage.cpp" line="125"/>
         <source>The MComboBox widget is a combined button and popup list. It is very similar to QComboBox, but does not allow editing the text.</source>
         <translation>选择对话框是按钮和弹出列表的组合。它非常类似于QComboBox, 但不允许编辑文本。</translation>
     </message>
     <message id="xx_popup_generic_title">
-        <location filename="../comboboxpage.cpp" line="114"/>
+        <location filename="../comboboxpage.cpp" line="117"/>
         <source>Title</source>
         <translation>标题</translation>
     </message>
     <message id="xx_combobox_title">
-        <location filename="../comboboxpage.cpp" line="110"/>
+        <location filename="../comboboxpage.cpp" line="113"/>
         <source>ComboBox</source>
         <translation>组合对话框</translation>
     </message>
     <message id="xx_popup_sort_descending_order">
-        <location filename="../comboboxpage.cpp" line="116"/>
+        <location filename="../comboboxpage.cpp" line="119"/>
         <source>Sort - DescendingOrder</source>
         <translation>排序 — 降序</translation>
     </message>
     <message id="xx_popup_time_consuming">
-        <location filename="../comboboxpage.cpp" line="118"/>
+        <location filename="../comboboxpage.cpp" line="121"/>
         <source>Time-consuming setting</source>
         <translation type="unfinished"></translation>
     </message>
@@ -844,22 +850,22 @@ Seekbar is a special type of Slider used for displaying playback status for mult
         <translation>包容器</translation>
     </message>
     <message id="xx_progressbar_page_title">
-        <location filename="../progressbarpage.cpp" line="89"/>
+        <location filename="../progressbarpage.cpp" line="88"/>
         <source>Progress Bar</source>
         <translation>进度条</translation>
     </message>
     <message id="xx_progressbar_page_info_label">
-        <location filename="../progressbarpage.cpp" line="94"/>
+        <location filename="../progressbarpage.cpp" line="93"/>
         <source>A Progress Bar can indicate an ongoing process with either known or unknown durations.</source>
         <translation>进度条可以指示已知的或未知的正在进行的进度。</translation>
     </message>
     <message id="xx_progressindicator_unknown_duration_bar">
-        <location filename="../progressbarpage.cpp" line="98"/>
+        <location filename="../progressbarpage.cpp" line="97"/>
         <source>Installing CoolApp</source>
         <translation>正在安装 CoolApp</translation>
     </message>
     <message id="xx_progressindicator_known_duration_bar">
-        <location filename="../progressbarpage.cpp" line="96"/>
+        <location filename="../progressbarpage.cpp" line="95"/>
         <source>Downloading nicepic.jpg</source>
         <translation>正在下载 nicepic.jpg</translation>
     </message>
@@ -868,32 +874,32 @@ Seekbar is a special type of Slider used for displaying playback status for mult
         <translation type="obsolete">网格</translation>
     </message>
     <message id="xx_toolbar_page_example1">
-        <location filename="../toolbarpage.cpp" line="220"/>
+        <location filename="../toolbarpage.cpp" line="223"/>
         <source>Example 1</source>
         <translation>例子1</translation>
     </message>
     <message id="xx_toolbar_page_example2">
-        <location filename="../toolbarpage.cpp" line="222"/>
+        <location filename="../toolbarpage.cpp" line="225"/>
         <source>Example 2</source>
         <translation>例子2</translation>
     </message>
     <message id="xx_toolbar_page_defaultview">
-        <location filename="../toolbarpage.cpp" line="224"/>
+        <location filename="../toolbarpage.cpp" line="227"/>
         <source>Default View</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_toolbar_page_tabview">
-        <location filename="../toolbarpage.cpp" line="226"/>
+        <location filename="../toolbarpage.cpp" line="229"/>
         <source>Tab View</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_toolbar_page_title">
-        <location filename="../toolbarpage.cpp" line="210"/>
+        <location filename="../toolbarpage.cpp" line="213"/>
         <source>ToolBar</source>
         <translation>工具条</translation>
     </message>
     <message id="xx_toolbar_page_info">
-        <location filename="../toolbarpage.cpp" line="217"/>
+        <location filename="../toolbarpage.cpp" line="220"/>
         <source>&lt;b&gt;Toolbar&lt;/b&gt; acts as a container for actions. Depending upon the view attached, it either acts as a tab bar or is a container for buttons and text input field. &lt;ul&gt;&lt;li&gt;Click Menu to explore the example&lt;/li&gt;&lt;/ul&gt;</source>
         <translation type="unfinished">工具条包括很多</translation>
     </message>
@@ -956,204 +962,224 @@ The primary (single short tap) action of the element should not be duplicated in
         <translation>喜爱的相册</translation>
     </message>
     <message id="xx_displaymodes_navbarcombo">
-        <location filename="../displaymodespage.cpp" line="59"/>
+        <location filename="../displaymodespage.cpp" line="68"/>
         <source>Navigation Bar</source>
         <translation>导航条</translation>
     </message>
     <message id="xx_displaymodes_escapebtncombo">
-        <location filename="../displaymodespage.cpp" line="67"/>
+        <location filename="../displaymodespage.cpp" line="76"/>
         <source>Escape Button</source>
         <translation>退出按钮</translation>
     </message>
     <message id="xx_displaymodes_homebtncombo">
-        <location filename="../displaymodespage.cpp" line="75"/>
+        <location filename="../displaymodespage.cpp" line="84"/>
         <source>Home Button</source>
         <translation>返回主界面按钮</translation>
     </message>
     <message id="xx_displaymodes_page_title">
-        <location filename="../displaymodespage.cpp" line="143"/>
+        <location filename="../displaymodespage.cpp" line="152"/>
         <source>Display Modes</source>
         <oldsource>Display Modes and Full Screen</oldsource>
         <translation type="unfinished">导航条</translation>
     </message>
     <message id="xx_displaymodes_display_mode">
-        <location filename="../displaymodespage.cpp" line="147"/>
+        <location filename="../displaymodespage.cpp" line="156"/>
         <source>Components&apos; display mode:</source>
         <translation>器件显示模式:</translation>
     </message>
     <message id="xx_displaymodes_window_state">
-        <location filename="../displaymodespage.cpp" line="150"/>
+        <location filename="../displaymodespage.cpp" line="159"/>
         <source>Window state:</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_displaymodes_full_screen">
-        <location filename="../displaymodespage.cpp" line="153"/>
+        <location filename="../displaymodespage.cpp" line="162"/>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_displaymode_show">
-        <location filename="../displaymodespage.cpp" line="166"/>
+        <location filename="../displaymodespage.cpp" line="175"/>
         <source>Show</source>
         <translation>显示</translation>
     </message>
     <message id="xx_displaymode_autohide">
-        <location filename="../displaymodespage.cpp" line="168"/>
+        <location filename="../displaymodespage.cpp" line="177"/>
         <source>Auto Hide</source>
         <translation>自动隐藏</translation>
     </message>
     <message id="xx_displaymode_hide">
-        <location filename="../displaymodespage.cpp" line="170"/>
+        <location filename="../displaymodespage.cpp" line="179"/>
         <source>Hide</source>
         <translation>隐藏</translation>
     </message>
     <message id="xx_language_title">
-        <location filename="../languagepage.cpp" line="118"/>
+        <location filename="../languagepage.cpp" line="122"/>
         <source>Change Language</source>
         <translation>翻译</translation>
     </message>
     <message id="xx_locale_none">
-        <location filename="../languagepage.cpp" line="137"/>
+        <location filename="../languagepage.cpp" line="143"/>
         <source>None</source>
         <translation>默认</translation>
     </message>
     <message id="xx_locale_ar">
-        <location filename="../languagepage.cpp" line="142"/>
+        <location filename="../languagepage.cpp" line="148"/>
         <source>Arabic</source>
         <translation>阿拉伯语</translation>
     </message>
     <message id="xx_locale_de">
-        <location filename="../languagepage.cpp" line="147"/>
+        <location filename="../languagepage.cpp" line="153"/>
         <source>German</source>
         <translation>德语</translation>
     </message>
     <message id="xx_locale_de_AT">
-        <location filename="../languagepage.cpp" line="152"/>
+        <location filename="../languagepage.cpp" line="158"/>
         <source>German (Austria)</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_locale_de_CH">
-        <location filename="../languagepage.cpp" line="157"/>
+        <location filename="../languagepage.cpp" line="163"/>
         <source>German (Switzerland)</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_locale_en">
-        <location filename="../languagepage.cpp" line="162"/>
+        <location filename="../languagepage.cpp" line="168"/>
         <source>English</source>
         <translation>英语</translation>
     </message>
     <message id="xx_locale_fi">
-        <location filename="../languagepage.cpp" line="167"/>
+        <location filename="../languagepage.cpp" line="173"/>
         <source>Finnish</source>
         <translation>芬兰语</translation>
     </message>
     <message id="xx_locale_hi">
-        <location filename="../languagepage.cpp" line="172"/>
+        <location filename="../languagepage.cpp" line="178"/>
         <source>Hindi</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_locale_hu">
-        <location filename="../languagepage.cpp" line="177"/>
+        <location filename="../languagepage.cpp" line="183"/>
         <source>Hungarian</source>
         <translation>匈牙利语</translation>
     </message>
     <message id="xx_locale_ja">
-        <location filename="../languagepage.cpp" line="182"/>
+        <location filename="../languagepage.cpp" line="188"/>
         <source>Japanese</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_locale_ur">
-        <location filename="../languagepage.cpp" line="187"/>
+        <location filename="../languagepage.cpp" line="193"/>
         <source>Urdu</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_locale_ur_PK">
-        <location filename="../languagepage.cpp" line="192"/>
+        <location filename="../languagepage.cpp" line="198"/>
         <source>Urdu (Pakistan)</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_locale_ur_IN">
-        <location filename="../languagepage.cpp" line="197"/>
+        <location filename="../languagepage.cpp" line="203"/>
         <source>Urdu (India)</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_locale_zh_CN">
-        <location filename="../languagepage.cpp" line="202"/>
+        <location filename="../languagepage.cpp" line="208"/>
         <source>Chinese (China)</source>
         <translation>简体中文 (中文)</translation>
     </message>
     <message id="xx_locale_zh_TW">
-        <location filename="../languagepage.cpp" line="207"/>
+        <location filename="../languagepage.cpp" line="213"/>
         <source>Chinese (Taiwan)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message id="xx_timeformat24h_locale_default">
+        <location filename="../languagepage.cpp" line="223"/>
+        <source>Locale default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message id="xx_timeformat24h_24_hour_mode">
+        <location filename="../languagepage.cpp" line="227"/>
+        <source>24 hour mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message id="xx_timeformat24h_12_hour_mode">
+        <location filename="../languagepage.cpp" line="231"/>
+        <source>12 hour mode</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message id="xx_language_combobox_title">
-        <location filename="../languagepage.cpp" line="302"/>
+        <location filename="../languagepage.cpp" line="357"/>
         <source>Please select language</source>
         <translation>请选择翻译语言:</translation>
     </message>
     <message id="xx_language_combobox_lctime_title">
-        <location filename="../languagepage.cpp" line="304"/>
+        <location filename="../languagepage.cpp" line="359"/>
         <source>Locale for time</source>
         <translation type="unfinished"></translation>
     </message>
+    <message id="xx_language_combobox_lctimeformat24h_title">
+        <location filename="../languagepage.cpp" line="361"/>
+        <source>Choose 12/24 hour mode</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message id="xx_language_combobox_lccollate_title">
-        <location filename="../languagepage.cpp" line="306"/>
+        <location filename="../languagepage.cpp" line="363"/>
         <source>Locale for collation</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_language_combobox_lcnumeric_title">
-        <location filename="../languagepage.cpp" line="308"/>
+        <location filename="../languagepage.cpp" line="365"/>
         <source>Locale for numbers</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_language_combobox_lcmonetary_title">
-        <location filename="../languagepage.cpp" line="310"/>
+        <location filename="../languagepage.cpp" line="367"/>
         <source>Locale for money</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="qtn_comm_command_yes">
-        <location filename="../languagepage.cpp" line="314"/>
-        <location filename="../languagepage.cpp" line="321"/>
+        <location filename="../languagepage.cpp" line="371"/>
+        <location filename="../languagepage.cpp" line="378"/>
         <source>Yes</source>
         <translation>是</translation>
     </message>
     <message id="qtn_comm_command_no">
-        <location filename="../languagepage.cpp" line="317"/>
-        <location filename="../languagepage.cpp" line="324"/>
+        <location filename="../languagepage.cpp" line="374"/>
+        <location filename="../languagepage.cpp" line="381"/>
         <source>No</source>
         <translation>否</translation>
     </message>
     <message id="xx_language_number_format">
-        <location filename="../languagepage.cpp" line="329"/>
+        <location filename="../languagepage.cpp" line="386"/>
         <source>Number format example: %1œ!! Number example: %1œ!! Number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_langage_date_time_format">
-        <location filename="../languagepage.cpp" line="344"/>
+        <location filename="../languagepage.cpp" line="401"/>
         <source>Date and time format example: %1œ!! Date and time: %1œ!! Date: %1œ!! %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_language_week_number">
-        <location filename="../languagepage.cpp" line="349"/>
+        <location filename="../languagepage.cpp" line="406"/>
         <source>Week number example: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_language_currency_format">
-        <location filename="../languagepage.cpp" line="359"/>
+        <location filename="../languagepage.cpp" line="416"/>
         <source>Currency format example: %1 %2œ!! Currency: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_language_trans_%Ln_boxes_weight_%L1" numerus="yes">
-        <location filename="../languagepage.cpp" line="365"/>
-        <location filename="../languagepage.cpp" line="367"/>
-        <location filename="../languagepage.cpp" line="369"/>
+        <location filename="../languagepage.cpp" line="422"/>
+        <location filename="../languagepage.cpp" line="424"/>
+        <location filename="../languagepage.cpp" line="426"/>
         <source>%Ln boxes with a total weight of %L1 kilogramœ!! %Ln boxes, total weight of %L1 kg</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message id="xx_language_font_test">
-        <location filename="../languagepage.cpp" line="373"/>
+        <location filename="../languagepage.cpp" line="430"/>
         <source>Font test:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1218,12 +1244,12 @@ The primary (single short tap) action of the element should not be duplicated in
         <translation type="obsolete">输入反馈</translation>
     </message>
     <message id="xx_template_page_title">
-        <location filename="../templatepage.cpp" line="101"/>
+        <location filename="../templatepage.cpp" line="102"/>
         <source>Template</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_sample template">
-        <location filename="../templatepage.cpp" line="107"/>
+        <location filename="../templatepage.cpp" line="108"/>
         <source>Sample template</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1248,12 +1274,12 @@ instructions.</oldsource>
         <translation type="unfinished">我已经读过并理解了指示。</translation>
     </message>
     <message id="xx_icon_button_page_title">
-        <location filename="../iconbuttonpage.cpp" line="81"/>
+        <location filename="../iconbuttonpage.cpp" line="82"/>
         <source>Icon Button</source>
         <translation>图标按钮</translation>
     </message>
     <message id="xx_icon_button_page_info_label">
-        <location filename="../iconbuttonpage.cpp" line="89"/>
+        <location filename="../iconbuttonpage.cpp" line="90"/>
         <source>Icon Buttons have an icon and can have a text label. Icon button differs from push button by its visual presentation: it does not have button-style edges like a Push Button does.
 
  Icon Buttons are used in e.g. Toolbars.</source>
@@ -1261,7 +1287,7 @@ instructions.</oldsource>
 图标按钮可以在工具条使用。</translation>
     </message>
     <message id="xx_icon_button_page_icon_button2">
-        <location filename="../iconbuttonpage.cpp" line="91"/>
+        <location filename="../iconbuttonpage.cpp" line="92"/>
         <source>Lorem ipsum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1455,55 +1481,54 @@ Input feedbacks can be easily configured for different purposes using the themin
         <translation>静音</translation>
     </message>
     <message id="xx_gridpage_configuration">
-        <location filename="../mgridpage.cpp" line="208"/>
+        <location filename="../mgridpage.cpp" line="210"/>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_gridpage_title">
-        <location filename="../mgridpage.cpp" line="203"/>
-        <source>ConfigurationGrid page</source>
-        <oldsource>Grid page</oldsource>
+        <location filename="../mgridpage.cpp" line="205"/>
+        <source>Grid page</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_gridpage_set_columns">
-        <location filename="../mgridpage.cpp" line="297"/>
+        <location filename="../mgridpage.cpp" line="301"/>
         <source>Set columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_gridpage_landscape">
-        <location filename="../mgridpage.cpp" line="329"/>
-        <location filename="../mgridpage.cpp" line="339"/>
+        <location filename="../mgridpage.cpp" line="333"/>
+        <location filename="../mgridpage.cpp" line="343"/>
         <source>Landscape</source>
         <translation type="unfinished">横屏</translation>
     </message>
     <message id="xx_gridpage_portrait">
-        <location filename="../mgridpage.cpp" line="334"/>
-        <location filename="../mgridpage.cpp" line="344"/>
+        <location filename="../mgridpage.cpp" line="338"/>
+        <location filename="../mgridpage.cpp" line="348"/>
         <source>Portrait</source>
         <translation type="unfinished">竖屏</translation>
     </message>
     <message id="xx_bubblepage_title">
-        <location filename="../bubblepage.cpp" line="156"/>
+        <location filename="../bubblepage.cpp" line="158"/>
         <source>Speech Bubble</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_bubblepage_linkactivated">
-        <location filename="../bubblepage.cpp" line="169"/>
+        <location filename="../bubblepage.cpp" line="171"/>
         <source>Link activated</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_bubblepage_bubbleclicked">
-        <location filename="../bubblepage.cpp" line="176"/>
+        <location filename="../bubblepage.cpp" line="178"/>
         <source>Speech buuble clicked</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_title">
-        <location filename="../buttongrouppage.cpp" line="156"/>
+        <location filename="../buttongrouppage.cpp" line="168"/>
         <source>Button Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_info_label">
-        <location filename="../buttongrouppage.cpp" line="168"/>
+        <location filename="../buttongrouppage.cpp" line="180"/>
         <source>Buttons can be grouped together based on visual or logic requirements.
 
 The basic group is formed by placing buttons together into a layout. Depending on the theme, the buttons are typically drawn as connected with each other.
@@ -1512,62 +1537,62 @@ Logical exclusivity can be added to a group, which ensures only one of the butto
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_hlabel1">
-        <location filename="../buttongrouppage.cpp" line="171"/>
+        <location filename="../buttongrouppage.cpp" line="183"/>
         <source>Horizontal group</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button1">
-        <location filename="../buttongrouppage.cpp" line="173"/>
+        <location filename="../buttongrouppage.cpp" line="185"/>
         <source>Yes</source>
         <translation type="unfinished">是</translation>
     </message>
     <message id="xx_button_group_page_button2">
-        <location filename="../buttongrouppage.cpp" line="175"/>
+        <location filename="../buttongrouppage.cpp" line="187"/>
         <source>No</source>
         <translation type="unfinished">否</translation>
     </message>
     <message id="xx_button_group_page_button3">
-        <location filename="../buttongrouppage.cpp" line="177"/>
+        <location filename="../buttongrouppage.cpp" line="189"/>
         <source>Maybe</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_vlabel2">
-        <location filename="../buttongrouppage.cpp" line="180"/>
+        <location filename="../buttongrouppage.cpp" line="192"/>
         <source>Horizontal group, exclusive</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button4">
-        <location filename="../buttongrouppage.cpp" line="182"/>
+        <location filename="../buttongrouppage.cpp" line="194"/>
         <source>Cost</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button5">
-        <location filename="../buttongrouppage.cpp" line="184"/>
+        <location filename="../buttongrouppage.cpp" line="196"/>
         <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button6">
-        <location filename="../buttongrouppage.cpp" line="186"/>
+        <location filename="../buttongrouppage.cpp" line="198"/>
         <source>Schedule</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_vlabel">
-        <location filename="../buttongrouppage.cpp" line="189"/>
+        <location filename="../buttongrouppage.cpp" line="201"/>
         <source>Vertical group, checkable</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button7">
-        <location filename="../buttongrouppage.cpp" line="191"/>
+        <location filename="../buttongrouppage.cpp" line="203"/>
         <source>Milk</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button8">
-        <location filename="../buttongrouppage.cpp" line="193"/>
+        <location filename="../buttongrouppage.cpp" line="205"/>
         <source>Sugar</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_button_group_page_button9">
-        <location filename="../buttongrouppage.cpp" line="195"/>
+        <location filename="../buttongrouppage.cpp" line="207"/>
         <source>Biscotti</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1586,57 +1611,57 @@ Logical exclusivity can be added to a group, which ensures only one of the butto
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_single_title">
-        <location filename="../contentitemspage.cpp" line="310"/>
+        <location filename="../contentitemspage.cpp" line="312"/>
         <source>Single Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_title_with_subtitle">
-        <location filename="../contentitemspage.cpp" line="312"/>
+        <location filename="../contentitemspage.cpp" line="314"/>
         <source>Title with Subtitle</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title">
-        <location filename="../contentitemspage.cpp" line="314"/>
+        <location filename="../contentitemspage.cpp" line="316"/>
         <source>Icon with Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_and_subtitle">
-        <location filename="../contentitemspage.cpp" line="316"/>
+        <location filename="../contentitemspage.cpp" line="318"/>
         <source>Icon with Title and Subtitle</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_subtitle_and_two_side_icons">
-        <location filename="../contentitemspage.cpp" line="320"/>
+        <location filename="../contentitemspage.cpp" line="322"/>
         <source>Icon with Title Subtitle and Two Side Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_subtitle_and_side_icon_with_label">
-        <location filename="../contentitemspage.cpp" line="323"/>
+        <location filename="../contentitemspage.cpp" line="325"/>
         <source>Icon with Title Subtitle and Side Icon with Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_thumbnail_with_title_subtitle_and_two_side_icons">
-        <location filename="../contentitemspage.cpp" line="326"/>
+        <location filename="../contentitemspage.cpp" line="328"/>
         <source>Thumbnail with Title Subtitle and Two Side Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_thumbnail_with_title_and_two_side_icons">
-        <location filename="../contentitemspage.cpp" line="329"/>
+        <location filename="../contentitemspage.cpp" line="331"/>
         <source>Thumbnail with Title and Two Side Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_progress_indicator_and_two_side_icons">
-        <location filename="../contentitemspage.cpp" line="334"/>
+        <location filename="../contentitemspage.cpp" line="336"/>
         <source>Icon with Title Progress Indicator and Two Side Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_wg_contentitemspage_icon_with_title_progress_indicator_and_top_side_icon">
-        <location filename="../contentitemspage.cpp" line="337"/>
+        <location filename="../contentitemspage.cpp" line="339"/>
         <source>Icon with Title Progress Indicator and Top Side Icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message id="xx_contentitemspage_title">
-        <location filename="../contentitemspage.cpp" line="358"/>
+        <location filename="../contentitemspage.cpp" line="359"/>
         <source>Content Items</source>
         <translation type="unfinished"></translation>
     </message>