Merge from BRANCH_1_0.

1 files changed, 1 insertions, 1 deletions

diff --git a/i18n/en/launchersettings.ts b/i18n/en/launchersettings.ts
index d6ee0ff..8cdb19d 100644
--- a/i18n/en/launchersettings.ts
+++ b/i18n/en/launchersettings.ts
@@ -1,105 +1,105 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SampleView</name>
+    <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>