Merge remote-tracking branch 'origin/4.1'

Change-Id: I86049138466399411ba36791330f4a94faad8c52

2 files changed, 26 insertions, 5 deletions

diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc
index 6f77d8850..0d60a3fca 100644
--- a/doc/installerfw.qdoc
+++ b/doc/installerfw.qdoc
@@ -533,9 +533,10 @@
             \li Filename for the configuration file on the target. Default is components.xml.
         \row
             \li Translations
-            \li List of language codes to be used for translating the user interface. To add several language
-                variants, specify several \c <Translation> child elements that each specify the name
-                of a language variant. Optional. For more information, see \l{Translating Pages}.
+            \li List of translation files to be used for translating the user interface. To add
+                several translation files, specify several \c <Translation> child elements that
+                each specify the name of the translation. Optional. For more information, see
+                \l{Translating Pages} and \l{Configuring and Overwriting Default Translations}.
         \row
             \li UrlQueryString
             \li This string needs to be in the form "key=value" and will be appended to archive download
@@ -729,6 +730,25 @@
     \note The translation system can also be used to customize the UI. Use e.g.
     an \c en.ts file to replace any text in the installer with a custom English
     version.
+
+    \section1 Configuring and Overwriting Default Translations
+
+    The installer has been localized into several languages. System language is used to define the
+    loaded language. In case you want to define the used language for your installer, define the
+    languages in \c config.xml using the \c <Translations> element. For example, using only German
+    translations:
+
+    \code
+        <Translations>
+            <Translation>ifw_de</Translation>
+            <Translation>qt_de</Translation>
+        </Translations>
+    \endcode
+
+    The default translations can be also overwritten. Write your own translation file and add
+    it to a custom resource called \c :/translations_new. This custom resource can be added to
+    the installer using \c binarycreator option \c -r. For more information, see
+    \l{Summary of binarycreator Parameters}.
 */
 
 /*!
diff --git a/doc/scripting-api/packagemanagercore.qdoc b/doc/scripting-api/packagemanagercore.qdoc
index f4d71ee97..918aed78d 100644
--- a/doc/scripting-api/packagemanagercore.qdoc
+++ b/doc/scripting-api/packagemanagercore.qdoc
@@ -33,11 +33,12 @@
 */
 
 /*!
-    \qmlmethod array installer::components()
+    \qmlmethod array installer::components(string regexp)
 
     Returns an array of all components currently available.
     If the repository metadata have not been fetched yet,
-    the array will be empty.
+    the array will be empty. Optionally, a \a regexp expression
+    can be used to further filter the listed packages.
 
     \sa component, finishAllComponentsReset(), finishUpdaterComponentsReset()
 */