Merge lp:~arky/ubuntu/karmic/qemulator/fix-348718 into lp:ubuntu/karmic/qemulator

[arky]

[arky (arky)]

fixes bug 348718

[James Westby (james-w)]

Hi,

There is another instance of “allready” in that file, could
you fix that one too?

Also, could you please submit the bug and patch to

  http://trac.createweb.de/projects/qemulator/report

Thanks,

James

review: Needs Fixing

[James Westby (james-w)]

Hi,

Karmic is EOL, so I'm rejecting this proposal.

Thanks,

James

Unmerged revisions

5. By arky on 2009-09-10

correct typo allready (LP: #348718)

=== modified file 'Qemulator.pot'
--- Qemulator.pot	2007-06-20 16:11:22 +0000
+++ Qemulator.pot	2009-09-10 09:28:54 +0000
@@ -245,7 +245,7 @@
 
 #: /home/rainer/createweb/Projekte/python/Qemulator/usr/local/lib/qemulator/src/interface.c:767
 #: /home/rainer/createweb/Projekte/python/Qemulator/usr/local/lib/qemulator/src/interface.c:3595
-msgid "With \"auto hide stored settings\" enabled, config panel for the selected image/machine will be hidden automatically, if there allready is a stored configuration for this image/machine."
+msgid "With \"auto hide stored settings\" enabled, config panel for the selected image/machine will be hidden automatically, if there already is a stored configuration for this image/machine."
 msgstr ""
 
 #: /home/rainer/createweb/Projekte/python/Qemulator/usr/local/lib/qemulator/src/interface.c:775
@@ -2612,7 +2612,7 @@
 
 #: /home/rainer/createweb/Projekte/python/Qemulator/usr/local/lib/qemulator/qml_installwizzard.py:608
 #: /home/rainer/createweb/Projekte/python/Qemulator/usr/local/lib/qemulator/qml_machinesetup.py:1456
-msgid "A Machine with this name allready exists, please choose another one"
+msgid "A Machine with this name already exists, please choose another one"
 msgstr ""
 
 #: /home/rainer/createweb/Projekte/python/Qemulator/usr/local/lib/qemulator/qml_installwizzard.py:658
 
=== modified file 'debian/changelog'
--- debian/changelog	2007-09-16 21:23:56 +0000
+++ debian/changelog	2009-09-10 09:28:54 +0000
@@ -1,3 +1,9 @@
+qemulator (0.5-3ubuntu1) karmic; urgency=low
+
+  * correct typo allready (LP: #348718)
+
+ -- Rakesh 'arky' Ambati <[e-mail]>  Thu, 10 Sep 2009 14:57:19 +0530
+
 qemulator (0.5-3) unstable; urgency=low
 
   * debian/patches/fix_python_dir.patch: fixed to avoid patching of
 
=== modified file 'usr/local/lib/qemulator/qemulator.glade'
--- usr/local/lib/qemulator/qemulator.glade	2007-06-20 16:11:22 +0000
+++ usr/local/lib/qemulator/qemulator.glade	2009-09-10 09:28:54 +0000
@@ -937,7 +937,7 @@
 		  <child>
 		    <widget class="GtkCheckButton" id="checkbutton_autohide_settings">
 		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">With &quot;auto hide stored settings&quot; enabled, config panel for the selected image/machine will be hidden automatically, if there allready is a stored configuration for this image/machine.</property>
+		      <property name="tooltip" translatable="yes">With &quot;auto hide stored settings&quot; enabled, config panel for the selected image/machine will be hidden automatically, if there already is a stored configuration for this image/machine.</property>
 		      <property name="can_focus">True</property>
 		      <property name="label" translatable="yes">auto hide</property>
 		      <property name="use_underline">True</property>
@@ -7177,7 +7177,7 @@
 				      <child>
 					<widget class="GtkCheckButton" id="checkbutton_autohide_settings">
 					  <property name="visible">True</property>
-					  <property name="tooltip" translatable="yes">With &quot;auto hide stored settings&quot; enabled, config panel for the selected image/machine will be hidden automatically, if there allready is a stored configuration for this image/machine.</property>
+					  <property name="tooltip" translatable="yes">With &quot;auto hide stored settings&quot; enabled, config panel for the selected image/machine will be hidden automatically, if there already is a stored configuration for this image/machine.</property>
 					  <property name="can_focus">True</property>
 					  <property name="label" translatable="yes">auto _hide stored settings</property>
 					  <property name="use_underline">True</property>