Merge from BRANCH_1_0.

1 files changed, 12 insertions, 12 deletions

diff --git a/i18n/xx/mediummount.ts b/i18n/xx/mediummount.ts
index 50045e1..24e9349 100644
--- a/i18n/xx/mediummount.ts
+++ b/i18n/xx/mediummount.ts
@@ -1,95 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MainWindow</name>
+    <name>MediumMountSetting::MainWindow</name>
     <message>
-        <source>Global</source>
+        <source>Medium Mount Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Medium Mount Settings</source>
+        <source>Global</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
-    <name>MediumGlobalWidget</name>
+    <name>MediumMountSetting::MediumGlobalWidget</name>
+    <message>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <translation>FOO</translation>
+    </message>
     <message>
         <source>Enable medium checking</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>FOO</translation>
     </message>
+</context>
+<context>
+    <name>MediumMountSetting::MediumMountWidget</name>
     <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation>FOO</translation>
     </message>
-</context>
-<context>
-    <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation>FOO</translation>
     </message>
-    <message>
-        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
-        <translation>FOO</translation>
-    </message>
 </context>
 </TS>