On Wed, Sep 16, 2009 at 07:36:22PM +0200, David Planella wrote:
> El dv 11 de 09 de 2009 a les 22:38 +0100, en/na Josh Holland va
> escriure:
> > I have attached a diff of my changes
Oops, no I didn't. I do this far too often.
--
Josh Holland <j...@joshh.co.uk> (key F6067C12)
http://joshh.co.uk dutchie on irc.freenode.net
http://twitter.com/jshholland
http://identi.ca/jshholland
=== modified file 'AutoUpgradeTester/UpgradeTestBackendSSH.py'
--- AutoUpgradeTester/UpgradeTestBackendSSH.py 2009-06-30 15:10:35 +0000
+++ AutoUpgradeTester/UpgradeTestBackendSSH.py 2009-09-05 21:52:49 +0000
@@ -109,7 +109,7 @@
def installPackages(self, pkgs):
- " install additional pkgs (list) into the vm before the ugprade "
+ " install additional pkgs (list) into the vm before the upgrade "
if not pkgs:
return True
self.start()
=== modified file 'AutoUpgradeTester/jeos/README'
--- AutoUpgradeTester/jeos/README 2009-01-13 20:08:44 +0000
+++ AutoUpgradeTester/jeos/README 2009-09-05 21:52:49 +0000
@@ -29,7 +29,7 @@
$ ./ubuntu-jeos-builder --vm kvm --kernel-flavour 386 --suite dapper --ssh-key `pwd`/foo.pub --components main,restricted --rootsize 80G --no-opt
(notice the different kernel names for dapper,feisty). The ssh-key is the
-key that is used by the ugprade tester to log into the virtual machine.
+key that is used by the upgrade tester to log into the virtual machine.
The copy it from
"jeos/ubuntu-jeos-$dist-i386/root.qcow2"
=== modified file 'DistUpgrade/DistUpgrade.cfg'
--- DistUpgrade/DistUpgrade.cfg 2009-06-18 10:10:09 +0000
+++ DistUpgrade/DistUpgrade.cfg 2009-09-05 21:52:49 +0000
@@ -4,7 +4,7 @@
View=DistUpgradeViewGtk,DistUpgradeViewKDE,DistUpgradeViewText
#View=DistUpgradeViewNonInteractive
#Depends= python-apt (>= 0.6.0), apt (>= 0.6)
-# the views below support ugprades over ssh connection
+# the views below support upgrades over ssh connection
SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive
# Distro contains global information about the upgrade
=== modified file 'DistUpgrade/DistUpgrade.cfg.hardy'
--- DistUpgrade/DistUpgrade.cfg.hardy 2009-03-23 15:23:12 +0000
+++ DistUpgrade/DistUpgrade.cfg.hardy 2009-09-05 21:52:49 +0000
@@ -4,7 +4,7 @@
View=DistUpgradeViewGtk,DistUpgradeViewKDE,DistUpgradeViewText
#View=DistUpgradeViewNonInteractive
#Depends= python-apt (>= 0.6.0), apt (>= 0.6)
-# the views below support ugprades over ssh connection
+# the views below support upgrades over ssh connection
SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive
# Distro contains global information about the upgrade
=== modified file 'DistUpgrade/DistUpgradeController.py'
--- DistUpgrade/DistUpgradeController.py 2009-08-24 15:10:44 +0000
+++ DistUpgrade/DistUpgradeController.py 2009-09-05 21:52:50 +0000
@@ -229,7 +229,7 @@
"""
pidfile = os.path.join("/var/run/release-upgrader-sshd.pid")
if (not os.path.exists(pidfile) and self._isRemoteLogin()):
- # check if the frontend supports ssh ugprades (see lp: #322482)
+ # check if the frontend supports ssh upgrades (see lp: #322482)
if not self._viewSupportsSSH():
logging.error("upgrade over ssh not alllowed")
self._view.error(_("Upgrading over remote connection not supported"),
=== modified file 'DistUpgrade/DistUpgradeQuirks.py'
--- DistUpgrade/DistUpgradeQuirks.py 2009-07-24 15:10:24 +0000
+++ DistUpgrade/DistUpgradeQuirks.py 2009-09-05 21:25:45 +0000
@@ -143,9 +143,9 @@
res = self._view.error(_("No ARMv6 CPU"),
_("Your system uses an ARM CPU that is older "
"than the ARMv6 architecture. "
- "All packages in karmic were build with, "
+ "All packages in karmic were built with "
"optimizations requiring ARMv6 as the "
- "minimal architecture, i can not upgrade "
+ "minimal architecture. I can not upgrade "
"your system to karmic on your hardware."))
self.controller.abort()
=== modified file 'DistUpgrade/README'
--- DistUpgrade/README 2009-01-21 15:25:54 +0000
+++ DistUpgrade/README 2009-09-05 21:52:50 +0000
@@ -4,7 +4,7 @@
The dist-upgrader is designed to make upgrades for ubuntu (or similar
distributions) easy and painless. It supports both network mode and
cdrom upgrades. The cdromupgrade will ask if it should use the network
-or not. There is a wrapper script "cdromugprade" (that assumes the
+or not. There is a wrapper script "cdromupgrade" (that assumes the
file of the upgrade life in
CDROM_ROOT/dists/stable/dist-upgrader/binary-all/) that can be put
onto the CD and it will support upgrades directly from the CD.
=== modified file 'DistUpgrade/cdromupgrade'
--- DistUpgrade/cdromupgrade 2009-06-22 08:10:51 +0000
+++ DistUpgrade/cdromupgrade 2009-09-05 21:52:49 +0000
@@ -7,7 +7,7 @@
# Not that useful unfortunately when the CD is mounted "noexec".
#
# WARNING: make sure to call it with a absolute path!
-# (e.g. /cdrom/cdromugprade)
+# (e.g. /cdrom/cdromupgrade)
# the codename is AUTO-GENERATED from the build-host relase codename
CODENAME=karmic
=== modified file 'UpdateManager/UpdateManager.py'
--- UpdateManager/UpdateManager.py 2009-08-24 08:10:04 +0000
+++ UpdateManager/UpdateManager.py 2009-09-05 17:42:29 +0000
@@ -762,7 +762,7 @@
def dist_no_longer_supported(self, meta_release):
msg = "<big><b>%s</b></big>\n\n%s" % \
- (_("Your distribution is not supported anymore"),
+ (_("Your Ubuntu release is not supported anymore"),
_("You will not get any further security fixes or critical "
"updates. "
"Please Upgrade to a later version of Ubuntu Linux."))
@@ -797,7 +797,7 @@
def new_dist_available(self, meta_release, upgradable_to):
self.frame_new_release.show()
- self.label_new_release.set_markup(_("<b>New distribution release '%s' is available</b>") % upgradable_to.version)
+ self.label_new_release.set_markup(_("<b>New Ubuntu release '%s' is available</b>") % upgradable_to.version)
self.new_dist = upgradable_to
=== modified file 'debian/changelog'
--- debian/changelog 2009-09-04 19:37:01 +0000
+++ debian/changelog 2009-09-06 10:35:28 +0000
@@ -1,12 +1,16 @@
update-manager (1:0.125) UNRELEASEDkarmic; urgency=low
+ [ Michael Vogt ]
* integrate base-installer as a sub-component into the
release upgrader and use the base-installer/kernel/*.sh
functionality to ensure we select the most appropriate
kernel on upgrade
NOT TESTED YET
- -- Michael Vogt <e...@top.ping.de> Fri, 04 Sep 2009 21:21:09 +0200
+ [ Josh Holland ]
+ * Fixed several typos (LP: #93804, LP: #277731, LP: #404435)
+
+ -- Josh Holland <j...@joshh.co.uk> Sun, 06 Sep 2009 11:34:11 +0100
update-manager (1:0.124.11) karmic; urgency=low
@@ -531,7 +535,7 @@
- create /var/lib/pycentral/pkgremove before the upgrade to
help pycentral transition to the new python policy (thanks
to doko)
- * ensure pidgin-libnotify is ugpraded (LP: #332328)
+ * ensure pidgin-libnotify is upgraded (LP: #332328)
* better wording for aborts (thanks to Gabor Kelemen and
Jean-Baptiste Lallement), LP: #289303
* wording fixes, thanks to Brian Murray and Gabor Kelemen
@@ -795,7 +799,7 @@
- when a meta package can not be upgraded, show a proper
error message with the package in question
* DistUpgrade/DistUpgradeQuirks.py:
- - abort ugprade from hardy if evms is used in /proc/mounts
+ - abort upgrade from hardy if evms is used in /proc/mounts
evms got removed from the archive in intrepid (LP: #292179)
- do not add "relatime" if "noatime" is already given (thanks
to Ken Geis)
=== modified file 'tests/test-data-cdrom/cdromupgrade'
--- tests/test-data-cdrom/cdromupgrade 2008-10-08 10:31:21 +0000
+++ tests/test-data-cdrom/cdromupgrade 2009-09-05 21:52:50 +0000
@@ -7,7 +7,7 @@
# Not that useful unfortunately when the CD is mounted "noexec".
#
# WARNING: make sure to call it with a absolute path!
-# (e.g. /cdrom/cdromugprade)
+# (e.g. /cdrom/cdromupgrade)
# the codename is AUTO-GENERATED from the build-host relase codename
CODENAME=intrepid
=== modified file 'update-manager'
--- update-manager 2009-07-24 15:10:24 +0000
+++ update-manager 2009-09-05 17:41:33 +0000
@@ -55,7 +55,7 @@
help=_("Directory that contains the data files"))
parser.add_option ("-c", "--check-dist-upgrades", action="store_true",
dest="check_dist_upgrades", default=False,
- help=_("Check if a new distribution release is available"))
+ help=_("Check if a new Ubuntu release is available"))
parser.add_option ("-d", "--devel-release", action="store_true",
dest="devel_release", default=False,
help=_("Check if upgrading to the latest devel release "
=== modified file 'update-manager-hildon'
--- update-manager-hildon 2009-06-30 13:54:56 +0000
+++ update-manager-hildon 2009-09-05 21:52:50 +0000
@@ -53,7 +53,7 @@
help=_("Show version and exit"))
parser.add_option ("-c", "--check-dist-upgrades", action="store_true",
dest="check_dist_upgrades", default=False,
- help=_("Check if a new distribution release is available"))
+ help=_("Check if a new Ubuntu release is available"))
parser.add_option ("-d", "--devel-release", action="store_true",
dest="devel_release", default=False,
help=_("Check if upgrading to the latest devel release "
@@ -68,7 +68,7 @@
# input focus control when it is displayed for the
# first time (see also the gtk devhelp page)
help=_("Do not focus on map when starting"))
- parser.add_option ("--dist-upgrade","--dist-ugprade", action="store_true",
+ parser.add_option ("--dist-upgrade","--dist-upgrade", action="store_true",
dest="dist_upgrade", default=False,
help=_("Try to run a dist-upgrade"))
--
ubuntu-translators mailing list
ubuntu-translators@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-translators
