Doc: Renamed and moved examples/qml/i18n to examples/qml/qml-i18n

-the generated HTML page conflicts with the i18n.html page from qtdoc.
-edited the content.

Task-number: QTBUG-32580
Change-Id: I32ded1913d9faecb95e28043983e957ccd0e8749
Reviewed-by: Martin Smith <martin.smith@digia.com>

diff --git a/examples/qml/i18n/doc/images/qml-i18n-example.png b/examples/qml/qml-i18n/doc/images/qml-i18n-example.png
similarity index 100%
rename from examples/qml/i18n/doc/images/qml-i18n-example.png
rename to examples/qml/qml-i18n/doc/images/qml-i18n-example.png

diff --git a/examples/qml/i18n/doc/src/i18n.qdoc b/examples/qml/qml-i18n/doc/src/i18n.qdoc
similarity index 86%
rename from examples/qml/i18n/doc/src/i18n.qdoc
rename to examples/qml/qml-i18n/doc/src/i18n.qdoc
index 39f2bf9..5a61906 100644 (file)
--- a/examples/qml/i18n/doc/src/i18n.qdoc
+++ b/examples/qml/qml-i18n/doc/src/i18n.qdoc
@@ -26,21 +26,21 @@
 ****************************************************************************/
 /*!
     \title QML Examples - Internationalization
-    \example i18n
+    \example qml-i18n
     \image qml-i18n-example.png
     \brief This is an internationalization example
 
  The QML runtime automatically loads a translation from the i18n subdirectory of the root
  QML file, based on the system language.
 
- The files are created/updated by running:
+ The files are created or updated by running:
 
 \code
-   lupdate i18n.qml -ts i18n/base.ts
+   lupdate qml-i18n.qml -ts i18n/base.ts
 \endcode
 
- Translations for new languages are created by copying i18n/base.ts to i18n/qml_<lang>.ts
- The .ts files can then be edited with Linguist:
+ Translations for new languages are created by copying \e i18n/base.ts to \e i18n/qml_<lang>.ts
+ The .ts files can then be edited with \l {Qt Linguist}:
 
 \code
    linguist i18n/qml_fr.ts

diff --git a/examples/qml/i18n/i18n/base.ts b/examples/qml/qml-i18n/i18n/base.ts
similarity index 73%
rename from examples/qml/i18n/i18n/base.ts
rename to examples/qml/qml-i18n/i18n/base.ts
index 82547a1..07e00f3 100644 (file)
--- a/examples/qml/i18n/i18n/base.ts
+++ b/examples/qml/qml-i18n/i18n/base.ts
@@ -2,9 +2,9 @@
 <!DOCTYPE TS>
 <TS version="2.0" sourcelanguage="en">
 <context>
-    <name>i18n</name>
+    <name>qml-i18n</name>
     <message>
-        <location filename="../i18n.qml" line="30"/>
+        <location filename="../qml-i18n.qml" line="56"/>
         <source>Hello</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/examples/qml/i18n/i18n/qml_en_AU.ts b/examples/qml/qml-i18n/i18n/qml_en_AU.ts
similarity index 100%
rename from examples/qml/i18n/i18n/qml_en_AU.ts
rename to examples/qml/qml-i18n/i18n/qml_en_AU.ts

diff --git a/examples/qml/i18n/i18n/qml_fr.ts b/examples/qml/qml-i18n/i18n/qml_fr.ts
similarity index 81%
rename from examples/qml/i18n/i18n/qml_fr.ts
rename to examples/qml/qml-i18n/i18n/qml_fr.ts
index 365abd9..1784914 100644 (file)
--- a/examples/qml/i18n/i18n/qml_fr.ts
+++ b/examples/qml/qml-i18n/i18n/qml_fr.ts
@@ -4,7 +4,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="../i18n.qml" line="30"/>
+        <location filename="../qml-i18n.qml" line="30"/>
         <source>Hello</source>
         <translation>Bonjour</translation>
     </message>

diff --git a/examples/qml/i18n/i18n.qml b/examples/qml/qml-i18n/qml-i18n.qml
similarity index 100%
rename from examples/qml/i18n/i18n.qml
rename to examples/qml/qml-i18n/qml-i18n.qml

diff --git a/examples/qml/i18n/i18n.qmlproject b/examples/qml/qml-i18n/qml-i18n.qmlproject
similarity index 90%
rename from examples/qml/i18n/i18n.qmlproject
rename to examples/qml/qml-i18n/qml-i18n.qmlproject
index 7ee5b76..a1a56c2 100644 (file)
--- a/examples/qml/i18n/i18n.qmlproject
+++ b/examples/qml/qml-i18n/qml-i18n.qmlproject
@@ -1,7 +1,7 @@
 import QmlProject 1.1
 
 Project {
-    mainFile: "i18n.qml"
+    mainFile: "qml-i18n.qml"
 
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {

diff --git a/examples/qml/qml.pro b/examples/qml/qml.pro
index 8d9cca0..5ab155c 100644 (file)
--- a/examples/qml/qml.pro
+++ b/examples/qml/qml.pro
@@ -9,5 +9,5 @@ SUBDIRS += \
 
 EXAMPLE_FILES = \
     dynamicscene \
-    i18n \
+    qml-i18n \
     locale