Merge lp:~mterry/ubiquity/oem-config-merge into lp:ubiquity

Proposed by Michael Terry
Status: Merged
Merged at revision: 3313
Proposed branch: lp:~mterry/ubiquity/oem-config-merge
Merge into: lp:ubiquity
Diff against target: None lines
To merge this branch: bzr merge lp:~mterry/ubiquity/oem-config-merge
Reviewer Review Type Date Requested Status
Evan (community) Approve
Colin Watson (community) Needs Fixing
Review via email: mp+8342@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote :

OK, so this is a first pass at merging oem-config into ubiquity.

Notes:
 * As far as possible, I wanted to avoid two copies of essentially the same code. Experience shows that one will always bitrot, no matter how close it is in the file tree to its sibling. So where necessary, I used an environment variable to indicate whether we were in 'oem-config mode' or not.

 * The oem-config binary is just a symlink to ubiquity. Ubiquity sees what name it's being run as, and sets a variable accordingly.

 * I didn't try to keep OEM_CONFIG_* environment variables. Where used, I changed them to UBIQUITY_* variables.

 * oem-config had some basic support for preseeding a list of pages to show. This seemed not a terrible idea, and a baby step towards drop-in pages, so I converted ubiquity to use the same system. Especially since oem-config and ubiquity would have different page lists. I only tested ubiquity and oem-config's default page lists. Supporting all iterations of pages would be difficult and not recommended. But the start of such plug-and-play support is there.

 * I ported the debconf frontend for oem-config, but I'm not sure I did it right. I couldn't quite get it to run even with old oem-config. I need some guidance on how this is supposed to behave.

 * There are some d-i packages that hardcode '/target'. Where necessary, ubiquity makes and saves an oem-config-friendly version. Ideally we'd eventually make patches for those packages to accept an argument of what the target is.

I'm sure there's more to say about this, but I'll take questions now. :)

Revision history for this message
Colin Watson (cjwatson) wrote :

Generally speaking I think this is very good - definitely along something very close to the right lines. I have a few miscellaneous comments:

 * UBIQUITY_OEM_USER_CONFIG is a bit verbose as an environment variable name (and "OEM user config" isn't a phrase I've ever used in connection with oem-config, personally). How about just UBIQUITY_OEM?

 * Use 1.99 rather than 1.99.0 in configure.ac, so that we don't have to rerun autoconf for every minor revision.

 * Since 1.13.8 is currently UNRELEASED, you should merge its changelog entries into those for 1.99.0 rather than leaving 1.13.8 as a stub. (Of course this will change if 1.13.8 is released before we merge this branch.)

 * I think you need to rerun debconf-updatepo. I noticed some diffs there that seemed to be going backwards ("Erase and use the entire disk" replaced by "Use the entire disk").

 * There needs to be an oem-config-debconf package, even if it's only a stub; finish-install.d/01oem-config-udeb relies on that name, as do existing seeds. I think it's a good idea to have that interface anyway.

 * I'm not too surprised that ubiquity-frontend-debconf doesn't work; oem-config-debconf only works at all by some exceedingly careful debconf frontend instance handling, and it's entirely possible that its design relies on properties that simply don't hold in ubiquity. I wouldn't advertise the existence of a ubiquity debconf frontend too much as yet, nor would I be inclined to worry excessively about problems with it.

 * I think it may be hard to justify parameterising /target in some of the d-i scripts in question, at least for patch submission to Debian. I'm happy enough to keep those as modifications local to ubiquity, slightly ugly though it is.

 * I'd rather have netcfg in oem-config than oem-config-debconf (or ubiquity-frontend-debconf), even though it's only used in the debconf frontend right now; in general I would prefer frontend packages not to deliver component-type code as well. (ubiquity-frontend-mythbuntu is a weird exception, perhaps best kept that way.)

 * Whichever package contains netcfg needs to be Architecture: any, and built in *-arch targets in debian/rules; netcfg is written in C.

 * Don't hardcode the path to the hostname program.

 * set_debconf could be done with a little less duplication, I think - if in OEM mode, set dccomm = None and dc = self.db, and refrain from closing dccomm at the end. That way the code that actually talks to the debconf instance is shared.

 * Perhaps OEM-only guards would be useful in the network and tasks components? Similarly, I think it would be best to leave them out of ubiquity/steps Choices until they actually work properly in ubiquity's environment.

 * I'm not convinced that we should set OVERRIDE_SYSTEM_USER outside OEM mode; the only reason we set that is to cope with the fact that the temporary oem user looks like a "system user" (bad naming; it means "ordinary user of the system with uid 1000-29999", which has no overlap with 'adduser --system'!).

 * Why does language_label need an entry in string_questions? I don't see that identifier anywhere else.

review: Needs Fixing
Revision history for this message
Michael Terry (mterry) wrote :
Download full text (3.4 KiB)

> * UBIQUITY_OEM_USER_CONFIG is a bit verbose as an environment variable name
> (and "OEM user config" isn't a phrase I've ever used in connection with oem-
> config, personally). How about just UBIQUITY_OEM?

So, Ubiquity already had the idea of running in 'oem-config' mode, except just the first part of it (when the OEM is installing the OS and customizing). So I wanted a name that didn't conceptually conflict with the variable already used in that mode (self.oem_config). I figured 'the user configuration portion of an OEM install' somewhat naturally mapped to OEM_USER_CONFIG. I fear UBIQUITY_OEM would be confused with the first portion of an OEM install.

I won't change it yet, but let me know if you're swayed by my golden words above. If not, I can change it. As long as the maintainers know what it means, I suppose it doesn't matter. It's not a user-visible environment variable.

> * Use 1.99 rather than 1.99.0 in configure.ac, so that we don't have to rerun
> autoconf for every minor revision.

OK, will update

> * Since 1.13.8 is currently UNRELEASED, you should merge its changelog
> entries into those for 1.99.0 rather than leaving 1.13.8 as a stub. (Of course
> this will change if 1.13.8 is released before we merge this branch.)

Yeah, I didn't want to mess with that until I actually merged, but I guess it doesn't hurt to be ready. Will update

> * I think you need to rerun debconf-updatepo. I noticed some diffs there that
> seemed to be going backwards ("Erase and use the entire disk" replaced by "Use
> the entire disk").
>
> * There needs to be an oem-config-debconf package, even if it's only a stub;
> finish-install.d/01oem-config-udeb relies on that name, as do existing seeds.
> I think it's a good idea to have that interface anyway.
>
> * I'd rather have netcfg in oem-config than oem-config-debconf (or ubiquity-
> frontend-debconf), even though it's only used in the debconf frontend right
> now; in general I would prefer frontend packages not to deliver component-type
> code as well. (ubiquity-frontend-mythbuntu is a weird exception, perhaps best
> kept that way.)
>
> * Whichever package contains netcfg needs to be Architecture: any, and built
> in *-arch targets in debian/rules; netcfg is written in C.
>
> * Don't hardcode the path to the hostname program.
>
> * set_debconf could be done with a little less duplication, I think - if in
> OEM mode, set dccomm = None and dc = self.db, and refrain from closing dccomm
> at the end. That way the code that actually talks to the debconf instance is
> shared.
>
> * Perhaps OEM-only guards would be useful in the network and tasks
> components? Similarly, I think it would be best to leave them out of
> ubiquity/steps Choices until they actually work properly in ubiquity's
> environment.

OK, will update for the above issues

> * I'm not convinced that we should set OVERRIDE_SYSTEM_USER outside OEM mode;
> the only reason we set that is to cope with the fact that the temporary oem
> user looks like a "system user" (bad naming; it means "ordinary user of the
> system with uid 1000-29999", which has no overlap with 'adduser --system'!).

Hmm, OK. I'll look at it.

> * ...

Read more...

Revision history for this message
Colin Watson (cjwatson) wrote :

On Wed, Jul 08, 2009 at 12:57:06PM -0000, Michael Terry wrote:
> > * UBIQUITY_OEM_USER_CONFIG is a bit verbose as an environment variable name
> > (and "OEM user config" isn't a phrase I've ever used in connection with oem-
> > config, personally). How about just UBIQUITY_OEM?
>
> So, Ubiquity already had the idea of running in 'oem-config' mode,
> except just the first part of it (when the OEM is installing the OS
> and customizing). So I wanted a name that didn't conceptually
> conflict with the variable already used in that mode
> (self.oem_config). I figured 'the user configuration portion of an
> OEM install' somewhat naturally mapped to OEM_USER_CONFIG. I fear
> UBIQUITY_OEM would be confused with the first portion of an OEM
> install.

Oh, I see what you mean. In that case I think it's OK - we can always
change it later if need be since as you say it's internal.

lp:~mterry/ubiquity/oem-config-merge updated
3312. By Michael Terry

run updatepo

3313. By Michael Terry

don't have micro version number in configure.ac

3314. By Michael Terry

condense changelog

3315. By Michael Terry

add dummy package oem-config-debconf

3316. By Michael Terry

misc fixes; move netcfg and tasksel components to main package; don't allow unknown steps

Revision history for this message
Michael Terry (mterry) wrote :

OK, branch updated with your suggested fixes. I also added a fix for the --query option printing to the debug log and fixed man page installation.

lp:~mterry/ubiquity/oem-config-merge updated
3317. By Michael Terry

whoops, make valid steps a list

3318. By Michael Terry

print queried frontend to *real* stdout

3319. By Michael Terry

man page fixes; actually distribute oem-config ones, symlink main oem-config to ubiquity's man page, add --query option to ubiquity's man

Revision history for this message
Michael Terry (mterry) wrote :

> OK, branch updated with your suggested fixes. I also added a fix for the
> --query option printing to the debug log and fixed man page installation.

A couple comments about those fixes, actually. As for restricting netcfg and tasks, I changed the template to not offer those in the ubiquity case. And I changed base.py to warn and ignore any items in the list that weren't in the template's approved list.

But several times in your comments, you gave me the impression that you thought that the debconf frontend still worked in oem-config mode. That's not the case. I couldn't quite get it to work in either case. Just so we're on the same page about that. As long as that isn't a big deal regression for you, that's cool.

Revision history for this message
Evan (ev) wrote :

The changes to the noninteractive frontend appear to be incomplete. You've removed most of the ubiquity.components imports, and while these are imported by ubiquity.frontend.base, we currently only import the BaseFrontend object.

A quick test of this crashes as soon as it tries to reference the language object.

review: Needs Fixing
lp:~mterry/ubiquity/oem-config-merge updated
3320. By Michael Terry

add missing imports

Revision history for this message
Evan (ev) wrote :

I've built a copy of your branch merged into trunk and run some tests on a recent live CD, and by and large things perform as one would expect. However, I ran into a problem when oem-config/enable is set. In debian/rules your branch adds oem to the list of reserved usernames, but that's the username we use for the temporary OEM user. This results in an impossible to proceed situation at the user setup page, as the page refuses to proceed with the unable to be edited name.

review: Needs Fixing
lp:~mterry/ubiquity/oem-config-merge updated
3321. By Michael Terry

only disallow oem as a name in OEM_USER_CONFIG mode

Revision history for this message
Evan (ev) wrote :

One last change and then I think this is good to go. If the introduction page is displayed, a fake page is inserted for bookkeeping, but pageslen is not incremented. This leads to the installer skipping the summary page and going straight into the install routine.

I've written a tiny patch for this here:
http://pastebin.ubuntu.com/217745/

I've tested your branch plus this patch with both regular ubiquity and in OEM mode and both look great. Booting into oem-config does not work, but further testing shows that it's a problem in trunk as well or with the daily-live CD I'm using. I've tested oem-config from the live CD desktop though, and it works just fine.

I'm going to vote Approve with the expectation that the above patch will be applied.

Colin, any further thoughts before we merge this?

review: Approve
Revision history for this message
Colin Watson (cjwatson) wrote :

If it's basically working and the previous comments I made have been
dealt with then I have no objections :-)

lp:~mterry/ubiquity/oem-config-merge updated
3322. By Michael Terry

patch from Evan to fix incorrect pageslen variable

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2009-06-24 23:44:58 +0000
3+++ .bzrignore 2009-06-25 15:31:51 +0000
4@@ -5,6 +5,12 @@
5 ./build-stamp
6 debian/build
7 debian/files
8+debian/oem-config
9+debian/oem-config-check
10+debian/oem-config-debconf
11+debian/oem-config-gtk
12+debian/oem-config-kde
13+debian/oem-config-udeb
14 debian/ubiquity
15 debian/ubiquity-frontend-cloner
16 debian/ubiquity-frontend-gtk
17
18=== renamed file 'apport/ubiquity.py' => 'apport/source_ubiquity.py'
19=== added file 'bin/oem-config-firstboot'
20--- bin/oem-config-firstboot 1970-01-01 00:00:00 +0000
21+++ bin/oem-config-firstboot 2009-06-29 19:40:27 +0000
22@@ -0,0 +1,126 @@
23+#! /bin/bash
24+# Run oem-config on the first boot after shipping to the end user.
25+set -e
26+
27+# TODO: This is an awful, awful hack. In Ubuntu intrepid, kernel-helper runs
28+# from an /etc/event.d script (in parallel to rc2) and uses debconf; as a
29+# result, it is often running while oem-config is trying to start and locks
30+# the debconf database. I can't think of a way to declare that
31+# /etc/event.d/last-good-boot needs to complete before our single init
32+# script in rc2 starts, so we're left with this piece of pure evil.
33+while pidof -x kernel-helper; do
34+ sleep 1
35+done
36+
37+DEBUG=
38+if [ "$1" = '--debug' ]; then
39+ DEBUG=--debug
40+fi
41+
42+# KDM stores the default user here, and apparently gets upset that we've
43+# just removed its previous default user.
44+rm -f /var/lib/kdm/kdmsts
45+# Revert to creating a user at uid 1000.
46+echo RESET passwd/user-uid | debconf-communicate >/dev/null
47+# These two templates have been preseeded, which does nasty things to their
48+# templates. It's probably a bug in cdebconf's debconf-copydb that they end
49+# up still registered to debian-installer/dummy at this point, but let's
50+# just work around it for now so that we get sensible translated
51+# descriptions.
52+for q in passwd/user-fullname passwd/username; do
53+ echo REGISTER "$q" "$q"
54+ echo RESET "$q"
55+done | debconf-communicate oem-config >/dev/null
56+# Remove the oem-config-prepare menu item.
57+rm -f /usr/share/applications/oem-config-prepare-gtk.desktop \
58+ /usr/share/applications/kde/oem-config-prepare-kde.desktop
59+# Adjust fontconfig configuration, if possible.
60+if type fontconfig-voodoo >/dev/null 2>&1; then
61+ RET="$(echo GET debian-installer/locale | debconf-communicate)"
62+ if [ "${RET%% *}" = 0 ]; then
63+ LC_ALL="${RET#* }" fontconfig-voodoo --auto --force --quiet \
64+ || true
65+ fi
66+fi
67+
68+# TODO: will this work for X-based frontends when X isn't up yet?
69+FRONTEND="$(/usr/sbin/oem-config -q)"
70+
71+if [ ! -e '/var/log/installer']; then
72+ mkdir -p /var/log/installer
73+fi
74+
75+if [ "$DEBUG" ]; then
76+ TRY=1
77+else
78+ TRY=5
79+fi
80+for try in $(seq 1 $TRY); do
81+ CODE=0
82+ if [ "$FRONTEND" = debconf_ui ]; then
83+ LANG=en_US.UTF-8 \
84+ /usr/sbin/oem-config $DEBUG --only 2>>/var/log/installer/debug \
85+ || CODE=$?
86+ else
87+ /usr/bin/ubiquity-dm vt7 :0 root \
88+ /usr/sbin/oem-config $DEBUG --only || CODE=$?
89+ fi
90+ if [ "$CODE" -eq 0 ]; then
91+ # Don't run again.
92+ update-rc.d -f oem-config remove >>/var/log/installer/debug 2>&1
93+ # Remove the temporary OEM configuration user, if possible.
94+ if getent passwd oem >/dev/null; then
95+ deluser --quiet --remove-home oem || true
96+ fi
97+ exit 0
98+ elif [ "$CODE" -eq 10 ]; then
99+ cat <<EOF
100+Your system is not yet configured. Press 'a' to try again, 's' for a
101+recovery shell, or 'r' to reboot.
102+EOF
103+ while :; do
104+ read -p '[asr] ' -n 1 REPLY
105+ echo
106+ case $REPLY in
107+ A|a) continue 2 ;;
108+ S|s)
109+ cat <<EOF
110+After you type 'exit', your system will reboot.
111+EOF
112+ bash
113+ reboot
114+ sleep 3600
115+ exit 1
116+ ;;
117+ R|r) reboot; sleep 3600; exit 1 ;;
118+ esac
119+ done
120+ exit 1
121+ fi
122+done
123+
124+if [ -z "$DEBUG" ]; then
125+ # Panic. At this point, probably the best thing we can do is drop to
126+ # a shell so that the user has some hope of fixing things up.
127+ cat <<EOF
128+ERROR: The OEM installer failed. Your system may not be usable yet. Please
129+report this as a bug to your vendor.
130+
131+To create a user so that you can use your new system normally, type:
132+
133+ adduser USERNAME
134+
135+... replacing USERNAME with the username you would like to use (your first
136+name in lower case is normally a reasonable choice), and follow the prompts.
137+If this succeeds, type 'exit' to reboot the system.
138+
139+EOF
140+ bash
141+
142+ # Don't run again.
143+ update-rc.d -f oem-config remove >>/var/log/installer/debug 2>&1
144+
145+ reboot
146+fi
147+
148+exit 0
149
150=== added file 'bin/oem-config-prepare'
151--- bin/oem-config-prepare 1970-01-01 00:00:00 +0000
152+++ bin/oem-config-prepare 2009-06-24 13:57:01 +0000
153@@ -0,0 +1,79 @@
154+#! /bin/sh
155+set -e
156+
157+# Try to detect which frontend will be used by looking for a frontend
158+# module.
159+frontend=
160+for f in gtk_ui kde_ui debconf_ui; do
161+ if [ -f "/usr/lib/ubiquity/ubiquity/frontend/$f.py" ]; then
162+ frontend="$f"
163+ break
164+ fi
165+done
166+
167+if [ "$(id -u)" = 0 ]; then
168+ # no privilege escalation required
169+ :
170+else
171+ case $frontend in
172+ gtk_ui)
173+ exec gksudo --desktop /usr/share/applications/oem-config-prepare-gtk.desktop -- "$0" "$@"
174+ ;;
175+ kde_ui)
176+ echo kde_ui
177+ kdesu=
178+ #kdesudo seems to have issues with this, so default to the original kdesu
179+ if [ -x /usr/lib/kde4/libexec/kdesu.distrib ]; then
180+ kdesu=/usr/lib/kde4/libexec/kdesu.distrib
181+ elif [ -x /usr/lib/kde4/libexec/kdesu ]; then
182+ kdesu=/usr/lib/kde4/libexec/kdesu
183+ fi
184+ if [ "$kdesu" ]; then
185+ exec $kdesu -- "$0" "$@"
186+ else
187+ exec sudo "$0" "$@"
188+ fi
189+ ;;
190+ *)
191+ exec sudo "$0" "$@"
192+ ;;
193+ esac
194+fi
195+
196+quiet=
197+if [ "$1" = --quiet ]; then
198+ quiet=1
199+ shift
200+fi
201+
202+# Machine-specific, so remove in case this system is going to be cloned.
203+# These will be regenerated on the first boot.
204+rm -f /etc/udev/rules.d/70-persistent-cd.rules \
205+ /etc/udev/rules.d/70-persistent-net.rules
206+
207+# Potentially sensitive.
208+rm -f /home/oem/.ssh/known_hosts
209+
210+update-rc.d oem-config start 29 2 3 4 5 .
211+
212+if [ -z "$quiet" ]; then
213+ MESSAGE='oem-config will run the next time the system boots.'
214+ case $frontend in
215+ gtk_ui)
216+ if [ "$DISPLAY" ] && type zenity >/dev/null 2>&1; then
217+ zenity --title oem-config-prepare --info --text \
218+ "$MESSAGE"
219+ exit 0
220+ fi
221+ ;;
222+ kde_ui)
223+ if [ "$DISPLAY" ] && type kdialog >/dev/null 2>&1; then
224+ kdialog --title oem-config-prepare --msgbox "$MESSAGE"
225+ exit 0
226+ fi
227+ ;;
228+ esac
229+ echo "$MESSAGE"
230+fi
231+
232+exit 0
233
234=== modified file 'bin/ubiquity'
235--- bin/ubiquity 2009-06-23 19:24:07 +0000
236+++ bin/ubiquity 2009-06-26 18:05:44 +0000
237@@ -27,6 +27,7 @@
238 sys.path.insert(0, '/usr/lib/ubiquity')
239
240 from ubiquity import misc
241+from ubiquity import im_switch
242
243 VERSION = '@VERSION@'
244 TARGET = '/target'
245@@ -39,20 +40,173 @@
246 proc = subprocess.Popen(['lsb_release', '-is'], stdout=subprocess.PIPE)
247 return proc.communicate()[0].strip()
248
249-def install(frontend=None):
250+def open_terminal():
251+ """Set up the terminal to run ubiquity's debconf frontend."""
252+
253+ # Set up a framebuffer and start bterm if debian-installer/framebuffer
254+ # says to do so. See
255+ # rootskel/src/lib/debian-installer-startup.d/S40framebuffer-module-linux-x86.
256+ # TODO: more careful architecture handling
257+
258+ import debconf
259+
260+ if 'UBIQUITY_BTERM' not in os.environ:
261+ os.environ['UBIQUITY_BTERM'] = '1'
262+
263+ framebuffer = False
264+ dccomm = subprocess.Popen(['debconf-communicate',
265+ '-fnoninteractive', 'ubiquity'],
266+ stdin=subprocess.PIPE,
267+ stdout=subprocess.PIPE, close_fds=True)
268+ try:
269+ dc = debconf.Debconf(read=dccomm.stdout, write=dccomm.stdin)
270+ try:
271+ if dc.get('debian-installer/framebuffer') == 'true':
272+ framebuffer = True
273+ except debconf.DebconfError:
274+ pass
275+ finally:
276+ dccomm.stdin.close()
277+ dccomm.wait()
278+
279+ if framebuffer:
280+ def fb_has(substring):
281+ try:
282+ fb = open('/proc/fb')
283+ except IOError:
284+ return False
285+ try:
286+ for line in fb:
287+ if substring in line:
288+ return True
289+ finally:
290+ fb.close()
291+ return False
292+
293+ got_fb = False
294+ if fb_has('VESA'):
295+ got_fb = True
296+
297+ devnull = open('/dev/null', 'w')
298+
299+ if not got_fb:
300+ subprocess.call(['modprobe', '-q', 'vesafb'],
301+ stdout=devnull, stderr=devnull)
302+ if fb_has(''):
303+ got_fb = True
304+
305+ if not got_fb:
306+ subprocess.call(['modprobe', '-q', 'vga16fb'],
307+ stdout=devnull, stderr=devnull)
308+ if fb_has(''):
309+ got_fb = True
310+
311+ if got_fb:
312+ if not os.path.isdir('/sys/class/graphics/fbcon'):
313+ subprocess.call(['modprobe', '-q', 'fbcon'],
314+ stdout=devnull, stderr=devnull)
315+
316+ # TODO: import debian-installer-utils and use update-dev?
317+ subprocess.call(['udevadm', 'settle'])
318+
319+ devnull.close()
320+
321+ if os.path.exists('/dev/fb0'):
322+ bterm_args = ['bterm',
323+ '-f', '/usr/share/ubiquity/unifont.bgf', '--']
324+ bterm_args.extend(sys.argv)
325+ os.execvp('bterm', bterm_args)
326+
327+ # Start a new session and start a controlling terminal. Approach loosely
328+ # borrowed from util-linux.
329+
330+ if 'UBIQUITY_CTTY' not in os.environ:
331+ os.environ['UBIQUITY_CTTY'] = '1'
332+
333+ import fcntl
334+ import termios
335+
336+ try:
337+ os.setsid()
338+ except OSError:
339+ pass
340+
341+ ttyn = os.ttyname(0)
342+ tty = os.open(ttyn, os.O_RDWR | os.O_NONBLOCK)
343+ flags = fcntl.fcntl(tty, fcntl.F_GETFL)
344+ fcntl.fcntl(tty, fcntl.F_SETFL, flags)
345+ # Leave stderr alone in the following; it's already redirected to
346+ # our log file.
347+ for i in range(tty):
348+ if i != 2:
349+ os.close(i)
350+ for i in range(2):
351+ if tty != i:
352+ os.dup2(tty, i)
353+ if tty >= 3:
354+ os.close(tty)
355+
356+ fcntl.ioctl(0, termios.TIOCSCTTY, 1)
357+
358+def start_debconf():
359+ """debconf_ui needs to run within a debconf frontend."""
360+
361+ if 'DEBIAN_HAS_FRONTEND' in os.environ:
362+ # debconf already started, so just clean up the configuration file
363+ # if any (debconf has already read it by now).
364+ if 'DEBCONF_SYSTEMRC' in os.environ:
365+ try:
366+ os.unlink(os.environ['DEBCONF_SYSTEMRC'])
367+ except OSError:
368+ pass
369+ return
370+
371+ print >>sys.stderr, "debconf_ui selected; starting debconf frontend"
372+
373+ if 'DEBCONF_USE_CDEBCONF' not in os.environ:
374+ # This is rather unsatisfactory. Perhaps it would be better to
375+ # have a custom debconf program, a bit like dpkg-reconfigure.
376+ debconfrc_fd, debconfrc = tempfile.mkstemp()
377+ os.chmod(debconfrc, 0644)
378+ debconfrc_file = os.fdopen(debconfrc_fd, 'w')
379+ orig_debconfrc = open('/etc/debconf.conf')
380+ state = 0
381+ for line in orig_debconfrc:
382+ if (state == 0 and
383+ line.rstrip('\n') and not line.startswith('#')):
384+ state = 1
385+ elif state == 1 and not line.rstrip('\n'):
386+ print >>debconfrc_file, 'Reshow: true'
387+ state = 2
388+ print >>debconfrc_file, line,
389+ orig_debconfrc.close()
390+ debconfrc_file.close()
391+ os.environ['DEBCONF_SYSTEMRC'] = debconfrc
392+
393+ os.environ['DEBCONF_PACKAGE'] = 'ubiquity'
394+ else:
395+ os.environ['DEBCONF_SHOWOLD'] = 'true'
396+ # TODO: need to set owner somehow
397+
398+ import debconf
399+ debconf.runFrontEnd() # re-execs this program
400+
401+def install(frontend=None, query=False):
402 '''install(frontend=None) -> none
403
404 Get the type of frontend to use and load the module for that.
405 If frontend is None, defaults to the first of mythbuntu_ui,
406- gtk_ui, and kde_ui that exists.
407+ gtk_ui, kde_ui, and debconf_ui that exists.
408 '''
409 if frontend is None:
410- frontends = ['mythbuntu_ui', 'gtk_ui', 'kde_ui']
411+ frontends = ['mythbuntu_ui', 'gtk_ui', 'kde_ui', 'debconf_ui']
412 else:
413 frontends = [frontend]
414+ chosen = None
415 mod = __import__('ubiquity.frontend', globals(), locals(), frontends)
416 for f in frontends:
417 if hasattr(mod, f):
418+ chosen = f
419 ui = getattr(mod, f)
420 # Noninteractive implies automatic mode.
421 if f == 'noninteractive':
422@@ -61,10 +215,17 @@
423 else:
424 raise AttributeError, ('No frontend available; tried %s' %
425 ', '.join(frontends))
426+ os.environ['UBIQUITY_FRONTEND'] = chosen
427
428 unmount_target()
429 distro = distribution().lower()
430 wizard = ui.Wizard(distro)
431+ if query:
432+ print os.environ['UBIQUITY_FRONTEND']
433+ sys.exit(0)
434+ if os.environ['UBIQUITY_FRONTEND'] == 'debconf_ui':
435+ open_terminal()
436+ start_debconf()
437 ret = wizard.run()
438 copy_debconf()
439 unmount_target()
440@@ -73,7 +234,9 @@
441
442 def copy_debconf():
443 """Copy a few important questions into the installed system."""
444- targetdb = '/target/var/cache/debconf/config.dat'
445+ if not TARGET:
446+ return
447+ targetdb = TARGET + '/var/cache/debconf/config.dat'
448 # xserver-xorg is temporary, pending a rework of bullet-proof-x; but
449 # note that xserver-xorg/config/inputdevice/keyboard/* is still needed
450 for q in ('^console-setup/','^xserver-xorg/'):
451@@ -82,11 +245,13 @@
452 '--config=Filename:%s' % targetdb)
453
454 def unmount_target():
455+ if not TARGET:
456+ return
457 paths = []
458 mounts = open('/proc/mounts')
459 for line in mounts:
460 path = line.split(' ')[1]
461- if path == '/target' or path.startswith('/target/'):
462+ if path == TARGET or path.startswith(TARGET + '/'):
463 paths.append(path)
464 mounts.close()
465 paths.sort()
466@@ -126,7 +291,25 @@
467 lock.flush()
468 os.fsync(lock.fileno())
469
470-def main():
471+def run_oem_hooks():
472+ """Run hook scripts from /usr/lib/oem-config/post-install."""
473+
474+ hookdir = '/usr/lib/oem-config/post-install'
475+
476+ if os.path.isdir(hookdir):
477+ # Exclude hooks containing '.', so that *.dpkg-* et al are avoided.
478+ hooks = filter(lambda entry: '.' not in entry, os.listdir(hookdir))
479+ child_env = dict(os.environ)
480+ child_env['DEBIAN_FRONTEND'] = 'noninteractive'
481+ if 'DEBIAN_HAS_FRONTEND' in child_env:
482+ del child_env['DEBIAN_HAS_FRONTEND']
483+ for hookentry in hooks:
484+ hook = os.path.join(hookdir, hookentry)
485+ if os.access(hook, os.X_OK):
486+ # Errors are ignored at present, although this may change.
487+ subprocess.call([hook], env=child_env)
488+
489+def main(oem_config):
490 usage = '%prog [options] [frontend]'
491 parser = optparse.OptionParser(usage=usage, version=VERSION)
492 parser.set_defaults(
493@@ -134,16 +317,18 @@
494 debug_pdb=False,
495 cdebconf=False,
496 automatic=False,
497- migration_assistant=True)
498+ query=False,
499+ migration_assistant=(not oem_config))
500 parser.add_option('-d', '--debug', dest='debug', action='store_true',
501 help='debug mode (warning: passwords will be logged!)')
502 parser.add_option('--pdb', dest='debug_pdb', action='store_true',
503 help='drop into Python debugger on a crash')
504 parser.add_option('--cdebconf', dest='cdebconf', action='store_true',
505 help='use cdebconf instead of debconf (experimental)')
506- parser.add_option('--no-migration-assistant', dest='migration_assistant',
507- action='store_false',
508- help='disable Migration Assistant')
509+ if not oem_config:
510+ parser.add_option('--no-migration-assistant', dest='migration_assistant',
511+ action='store_false',
512+ help='disable Migration Assistant')
513 parser.add_option('--automatic', dest='automatic', action='store_true',
514 help='do not ignore the "seen" flag (useful for ' \
515 'unattended installations).')
516@@ -151,6 +336,8 @@
517 help='tell the application that it is the only desktop ' \
518 'program running so that it can customize its UI to ' \
519 'better suit a minimal environment.')
520+ parser.add_option('-q', '--query', dest='query', action='store_true',
521+ help='find out which frontend will be used by default')
522 (options, args) = parser.parse_args()
523
524 if options.debug:
525@@ -175,6 +362,10 @@
526 if options.only:
527 os.environ['UBIQUITY_ONLY'] = '1'
528
529+ if oem_config:
530+ os.environ['UBIQUITY_OEM_USER_CONFIG'] = '1'
531+ TARGET = ''
532+
533 acquire_lock()
534
535 if not os.path.exists('/var/log/installer'):
536@@ -193,7 +384,7 @@
537 os.environ['DEBCONF_DEBUG'] = 'developer|filter'
538 # The frontend should take care of displaying a helpful message if
539 # we are being run without root privileges.
540- if not (args and args[0] == 'noninteractive'):
541+ if not (options.query and args and args[0] == 'noninteractive'):
542 try:
543 log = os.open('/var/log/installer/debug',
544 os.O_WRONLY | os.O_CREAT | os.O_APPEND)
545@@ -219,11 +410,21 @@
546 shutil.rmtree("/var/lib/partman", ignore_errors=True)
547
548 if args:
549- install(args[0])
550+ install(args[0], query=options.query)
551 else:
552- install()
553+ install(query=options.query)
554+
555+ if oem_config:
556+ run_oem_hooks()
557+ im_switch.kill_im()
558
559 if __name__ == '__main__':
560- main()
561+ # Are we running as ubiquity or oem-config?
562+ oem_config = False
563+ script_name = os.path.basename(sys.argv[0])
564+ if script_name == 'oem-config':
565+ oem_config = True
566+
567+ main(oem_config)
568
569 # vim:ai:et:sts=4:tw=80:sw=4:
570
571=== modified file 'bin/ubiquity-dm'
572--- bin/ubiquity-dm 2009-06-15 18:38:59 +0000
573+++ bin/ubiquity-dm 2009-06-29 19:40:27 +0000
574@@ -26,12 +26,12 @@
575 pass
576
577 class DM:
578- def __init__(self, vt, display):
579+ def __init__(self, vt, display, default_username):
580 self.vt = vt
581 self.display = display
582 self.server_started = False
583
584- self.username = get_casper('USERNAME', 'ubuntu')
585+ self.username = get_casper('USERNAME', default_username)
586 self.uid, self.gid = pwd.getpwnam(self.username)[2:4]
587 self.homedir = pwd.getpwnam(self.username)[5]
588 self.uid = int(self.uid)
589@@ -247,13 +247,13 @@
590 else:
591 return 1
592
593-if len(sys.argv) < 3:
594- sys.stderr.write('Usage: ubiquity-dm <vt[1-N]> <:[0-N]> <program> [<arguments>]\n')
595+if len(sys.argv) < 4:
596+ sys.stderr.write('Usage: %s <vt[1-N]> <:[0-N]> <username> <program> [<arguments>]\n' % sys.argv[0])
597 sys.exit(1)
598
599-vt, display = sys.argv[1:3]
600+vt, display, username = sys.argv[1:4]
601 try:
602- dm = DM(vt, display)
603+ dm = DM(vt, display, username)
604 except XStartupError:
605 sys.exit(1)
606 proc = None
607@@ -261,7 +261,7 @@
608 proc = ['/etc/init.d/gdm', 'start']
609 elif dm.frontend == 'kde_ui':
610 proc = ['/etc/init.d/kdm', 'start']
611-ret = dm.run(*sys.argv[3:])
612+ret = dm.run(*sys.argv[4:])
613 if proc:
614 subprocess.Popen(proc)
615 sys.exit(ret)
616
617=== modified file 'compat/apt-install'
618--- compat/apt-install 2009-04-06 14:55:27 +0000
619+++ compat/apt-install 2009-07-02 18:04:28 +0000
620@@ -1,4 +1,25 @@
621 #! /bin/sh -e
622+
623+setup_env()
624+{
625+ unset DEBIAN_HAS_FRONTEND
626+ export DEBIAN_FRONTEND=noninteractive
627+ unset DEBCONF_FRONTEND
628+ unset DEBCONF_REDIR
629+ export DEBCONF_ADMIN_EMAIL=
630+ export APT_LISTCHANGES_FRONTEND=none
631+}
632+
633+apt_get_args="--no-upgrade -o Acquire::gpgv::Options::=--ignore-time-conflict -y"
634+
635+if [ -n "$UBIQUITY_OEM_USER_CONFIG" ]; then
636+ # The installer uses apt-install to queue packages for installation in the
637+ # target system. In oem user config mode, we can just install them directly.
638+ setup_env
639+ apt-get $apt_get_args install "$@" </dev/null
640+ exit 0
641+fi
642+
643 mkdir -p /var/lib/ubiquity
644 for package; do
645 echo "$package" >> /var/lib/ubiquity/apt-installed
646@@ -12,14 +33,7 @@
647 toinstall="$(echo "$@" | xargs -n1 | sort | join -v1 - "$installed")"
648 if [ "$toinstall" ]; then
649 # TODO: use chroot-setup
650- unset DEBIAN_HAS_FRONTEND
651- export DEBIAN_FRONTEND=noninteractive
652- unset DEBCONF_FRONTEND
653- unset DEBCONF_REDIR
654- export DEBCONF_ADMIN_EMAIL=
655- export APT_LISTCHANGES_FRONTEND=none
656- chroot /target apt-get --no-upgrade \
657- -o Acquire::gpgv::Options::=--ignore-time-conflict -y \
658- install $toinstall </dev/null
659+ setup_env
660+ chroot /target apt-get $apt_get_args install $toinstall </dev/null
661 fi
662 fi
663
664=== modified file 'configure'
665--- configure 2009-06-24 23:44:58 +0000
666+++ configure 2009-06-25 18:24:29 +0000
667@@ -1,6 +1,6 @@
668 #! /bin/sh
669 # Guess values for system-dependent variables and create Makefiles.
670-# Generated by GNU Autoconf 2.63 for ubiquity 1.13.
671+# Generated by GNU Autoconf 2.63 for ubiquity 1.99.0.
672 #
673 # Report bugs to <https://launchpad.net/ubuntu/+source/ubiquity/+filebug>.
674 #
675@@ -596,8 +596,8 @@
676 # Identity of this package.
677 PACKAGE_NAME='ubiquity'
678 PACKAGE_TARNAME='ubiquity'
679-PACKAGE_VERSION='1.13'
680-PACKAGE_STRING='ubiquity 1.13'
681+PACKAGE_VERSION='1.99.0'
682+PACKAGE_STRING='ubiquity 1.99.0'
683 PACKAGE_BUGREPORT='https://launchpad.net/ubuntu/+source/ubiquity/+filebug'
684
685 ac_unique_file="ubiquity/filteredcommand.py"
686@@ -1305,7 +1305,7 @@
687 # Omit some internal or obsolete options to make the list less imposing.
688 # This message is too long to be a string in the A/UX 3.1 sh.
689 cat <<_ACEOF
690-\`configure' configures ubiquity 1.13 to adapt to many kinds of systems.
691+\`configure' configures ubiquity 1.99.0 to adapt to many kinds of systems.
692
693 Usage: $0 [OPTION]... [VAR=VALUE]...
694
695@@ -1375,7 +1375,7 @@
696
697 if test -n "$ac_init_help"; then
698 case $ac_init_help in
699- short | recursive ) echo "Configuration of ubiquity 1.13:";;
700+ short | recursive ) echo "Configuration of ubiquity 1.99.0:";;
701 esac
702 cat <<\_ACEOF
703
704@@ -1474,7 +1474,7 @@
705 test -n "$ac_init_help" && exit $ac_status
706 if $ac_init_version; then
707 cat <<\_ACEOF
708-ubiquity configure 1.13
709+ubiquity configure 1.99.0
710 generated by GNU Autoconf 2.63
711
712 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
713@@ -1488,7 +1488,7 @@
714 This file contains any messages produced by compilers while
715 running configure, to aid debugging if configure makes a mistake.
716
717-It was created by ubiquity $as_me 1.13, which was
718+It was created by ubiquity $as_me 1.99.0, which was
719 generated by GNU Autoconf 2.63. Invocation command line was
720
721 $ $0 $@
722@@ -2207,7 +2207,7 @@
723
724 # Define the identity of the package.
725 PACKAGE='ubiquity'
726- VERSION='1.13'
727+ VERSION='1.99.0'
728
729
730 cat >>confdefs.h <<_ACEOF
731@@ -7010,7 +7010,7 @@
732 # report actual input values of CONFIG_FILES etc. instead of their
733 # values after options handling.
734 ac_log="
735-This file was extended by ubiquity $as_me 1.13, which was
736+This file was extended by ubiquity $as_me 1.99.0, which was
737 generated by GNU Autoconf 2.63. Invocation command line was
738
739 CONFIG_FILES = $CONFIG_FILES
740@@ -7064,7 +7064,7 @@
741 _ACEOF
742 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
743 ac_cs_version="\\
744-ubiquity config.status 1.13
745+ubiquity config.status 1.99.0
746 configured by $0, generated by GNU Autoconf 2.63,
747 with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
748
749
750=== modified file 'configure.ac'
751--- configure.ac 2009-06-24 23:47:34 +0000
752+++ configure.ac 2009-06-25 18:24:29 +0000
753@@ -1,5 +1,5 @@
754 AC_PREREQ(2.52)
755-AC_INIT([ubiquity], [1.13], [https://launchpad.net/ubuntu/+source/ubiquity/+filebug])
756+AC_INIT([ubiquity], [1.99.0], [https://launchpad.net/ubuntu/+source/ubiquity/+filebug])
757 AC_CONFIG_SRCDIR([ubiquity/filteredcommand.py])
758 AC_CONFIG_AUX_DIR([build])
759 AC_CONFIG_MACRO_DIR([m4])
760
761=== modified file 'd-i/Makefile'
762--- d-i/Makefile 2008-08-08 14:22:31 +0000
763+++ d-i/Makefile 2009-06-24 13:57:01 +0000
764@@ -72,7 +72,9 @@
765 if [ -f "udeb-control/$$name/templates" ]; then \
766 sed -n '/./,$$p' "udeb-control/$$name/templates" | \
767 grep -iv '^indices.*:' >> templates; \
768- echo >> templates; \
769+ if [ "$$(tail -n1 templates)" ]; then \
770+ echo >> templates; \
771+ fi; \
772 fi; \
773 fi; \
774 done
775
776=== modified file 'd-i/lists/any'
777--- d-i/lists/any 2008-09-08 17:02:32 +0000
778+++ d-i/lists/any 2009-06-24 13:57:01 +0000
779@@ -1,5 +1,6 @@
780 apt-setup
781 base-installer
782+bterm-unifont
783 choose-mirror
784 clock-setup
785 console-setup
786@@ -7,6 +8,7 @@
787 hw-detect
788 localechooser
789 migration-assistant
790+netcfg
791 partconf
792 partman-auto
793 partman-auto-loop
794
795=== modified file 'd-i/manifest'
796--- d-i/manifest 2009-06-26 04:58:02 +0000
797+++ d-i/manifest 2009-07-07 18:55:31 +0000
798@@ -1,15 +1,17 @@
799 apt-setup 1:0.41ubuntu1
800 base-installer 1.101ubuntu2
801+bterm-unifont 1.1
802 choose-mirror 2.29ubuntu1
803 clock-setup 0.98ubuntu1
804 console-setup 1.34ubuntu1
805-debian-installer-utils 1.69ubuntu1
806+debian-installer-utils 1.70ubuntu1
807 flash-kernel 2.13ubuntu8
808 grub-installer 1.38ubuntu1
809 hw-detect 1.72ubuntu1
810 kboot-installer 0.0.1ubuntu9
811 localechooser 2.12ubuntu2
812 migration-assistant 0.6.4
813+netcfg 1.49ubuntu1
814 partconf 1.31
815 partman-auto 86ubuntu1
816 partman-auto-loop 0ubuntu16
817@@ -27,5 +29,5 @@
818 preseed 1.42ubuntu1
819 silo-installer 1.16ubuntu1
820 tzsetup 1:0.25ubuntu1
821-user-setup 1.27ubuntu1
822+user-setup 1.27ubuntu4
823 yaboot-installer 1.1.15ubuntu1
824
825=== added directory 'debian-installer-startup.d'
826=== added file 'debian-installer-startup.d/S60oem-config-check'
827--- debian-installer-startup.d/S60oem-config-check 1970-01-01 00:00:00 +0000
828+++ debian-installer-startup.d/S60oem-config-check 2007-05-18 16:50:39 +0000
829@@ -0,0 +1,9 @@
830+#! /bin/sh -e
831+
832+export DEBIAN_FRONTEND=none
833+. /usr/share/debconf/confmodule
834+
835+db_get oem-config/enable
836+if [ "$RET" = true ]; then
837+ anna-install oem-config-udeb
838+fi
839
840=== modified file 'debian/changelog'
841--- debian/changelog 2009-07-02 19:30:42 +0000
842+++ debian/changelog 2009-07-07 18:59:38 +0000
843@@ -1,3 +1,11 @@
844+ubiquity (1.99.0) UNRELEASED; urgency=low
845+
846+ * Merge oem-config code into ubiquity. Adds several new binary packages
847+ * Automatic update of included source packages: debian-installer-utils
848+ 1.70ubuntu1, user-setup 1.27ubuntu4.
849+
850+ -- Michael Terry <michael.terry@canonical.com> Thu, 02 Jul 2009 14:13:41 -0400
851+
852 ubiquity (1.13.8) UNRELEASED; urgency=low
853
854 [ Evan Dandrea ]
855
856=== added file 'debian/changelog.oem-config'
857--- debian/changelog.oem-config 1970-01-01 00:00:00 +0000
858+++ debian/changelog.oem-config 2009-06-24 13:57:01 +0000
859@@ -0,0 +1,1159 @@
860+# The following is oem-config changelog's before it got merged into
861+# ubiquity. This is just of historic interest.
862+
863+oem-config (1.55.1) karmic; urgency=low
864+
865+ * Declare GTK frontend as "NotShowIn=KDE;" rather than
866+ "OnlyShowIn=GNOME;XFCE;" (LP: #163518).
867+ * Sync up oem-config/text/password_extra_label text with the corresponding
868+ string in ubiquity.
869+ * Update translations from my last conveniently available Launchpad export
870+ (2009-04-16); we'll update again after Karmic translations open.
871+ * Use small print rather than italics in "Who are you?" (LP: #287626).
872+ * Automatic update of included source packages: user-setup 1.26ubuntu1.
873+
874+ -- Colin Watson <cjwatson@ubuntu.com> Fri, 12 Jun 2009 11:22:58 +0100
875+
876+oem-config (1.55.0) karmic; urgency=low
877+
878+ * Automatic update of included source packages: console-setup 1.34ubuntu1,
879+ localechooser 2.11ubuntu1, netcfg 1.48ubuntu1.
880+ * Update for new message context system in GTK+ 2.15.1, and update
881+ imported translations from gtk+2.0 2.16.1-0ubuntu3.
882+ * Adjust for changes in console-setup 1.34ubuntu1.
883+
884+ -- Colin Watson <cjwatson@ubuntu.com> Mon, 11 May 2009 10:30:19 +0100
885+
886+oem-config (1.54.13) jaunty; urgency=low
887+
888+ [ Roman Shtylman ]
889+ * Updated the timezone map from ubiquity (LP: #360652), including copying
890+ CairoExtensions from ubiquity/segmented_bar.py.
891+ * Moved common artwork files from oem-config-gtk/oem-config-kde to
892+ oem-config.
893+
894+ [ Colin Watson ]
895+ * Preseed tzsetup/selected up-front rather than filtering it and then
896+ preseeding it; filtering it causes the backup state to be reset, which
897+ causes an infinite loop when backing up from the timezone page when the
898+ default country only has one timezone (LP: #361674).
899+ * Preseed passwd/auto-login-backup=oem in the udeb, so that the original
900+ configuration files are available for restoration (LP: #361272).
901+ * Automatic update of included source packages: user-setup 1.23ubuntu20.
902+
903+ -- Colin Watson <cjwatson@ubuntu.com> Fri, 17 Apr 2009 15:41:12 +0100
904+
905+oem-config (1.54.12) jaunty; urgency=low
906+
907+ * Sync with console-setup 1.28ubuntu8: treat the Kazakhstan layout (kz) as
908+ non-Latin (LP: #356816).
909+ * Work around a debconf bug which broke the default time zone for some
910+ countries: REGISTER does not appear to give a newly-registered question
911+ the same default as the question associated with its template, unless we
912+ also RESET it, so do that (LP: #356794).
913+ * Update translations from Launchpad.
914+ * Automatic update of included source packages: console-setup 1.28ubuntu8,
915+ user-setup 1.23ubuntu18.
916+
917+ -- Colin Watson <cjwatson@ubuntu.com> Thu, 09 Apr 2009 10:03:54 +0100
918+
919+oem-config (1.54.11) jaunty; urgency=low
920+
921+ * GTK frontend:
922+ - Use the full size of the underlying images for the timezone map if the
923+ screen is big enough.
924+ - Fix spacing on timezone page (LP: #336745).
925+ * Don't pass the debconf PURGE command through debconffilter, since we
926+ don't know the owner of the package calling it (see LP #354534).
927+ * Update translations from Launchpad.
928+ * Automatic update of included source packages: user-setup 1.23ubuntu16.
929+
930+ -- Colin Watson <cjwatson@ubuntu.com> Mon, 06 Apr 2009 21:36:39 +0100
931+
932+oem-config (1.54.10) jaunty; urgency=low
933+
934+ [ Colin Watson ]
935+ * Tighten frontend dependencies on oem-config to prevent problems when one
936+ architecture is out of sync.
937+ * Set passwd/auto-login=true rather than implementing auto-login ourselves
938+ (LP: #347900).
939+ * Suggest checkbox/checkbox-gtk rather than recommending
940+ hwtest/hwtest-gtk.
941+ * Update translations from Launchpad.
942+ * Automatic update of included source packages: console-setup 1.28ubuntu7,
943+ user-setup 1.23ubuntu15.
944+
945+ [ Evan Dandrea ]
946+ * Update the timezone_map to match changes in ubiquity (more accurate
947+ city placement).
948+ * Merge in the new KDE time zone map from ubiquity. Thanks Roman
949+ Shtylman.
950+
951+ [ Mario Limonciello ]
952+ * Change the number of columns in the language icon view to 5. This
953+ should make it fit in 1024x600. (LP: #347350)
954+ * Remove old hack in gtk frontend to only show scrollbars on language
955+ selector when it would be larger than the desktop. With the hack taken
956+ out, the scrollbars aren't showing up on 800x576, which is likely the
957+ lowest supportable resolution.
958+
959+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 31 Mar 2009 16:31:14 +0100
960+
961+oem-config (1.54.9) jaunty; urgency=low
962+
963+ [ Evan Dandrea ]
964+ * Add missing errno import.
965+ * Merge in the new timezone widget from ubiquity (LP: #335557).
966+ * Fix 'resize if too big for screen' logic (LP: #341758). Thanks Michael
967+ Terry!
968+
969+ [ Colin Watson ]
970+ * GTK frontend:
971+ - Full-screen the window when --only is used - i.e. more or less always,
972+ except for testing. The extra screen real estate makes the timezone
973+ map, among other widgets, easier to use. (Ported from Evan Dandrea's
974+ similar change to Ubiquity; the KDE frontend needed no change as in
975+ oem-config it's always full-screen.)
976+ - Use stock preferences-system icon (thanks, Michael Terry;
977+ LP: #341770).
978+ * Update translations from Launchpad.
979+
980+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 17 Mar 2009 01:22:18 +0000
981+
982+oem-config (1.54.8) jaunty; urgency=low
983+
984+ * debconf frontend:
985+ - Fix typo: "oem-config/text/task_heading_label" should have been
986+ "oem-config/text/tasks_heading_label".
987+ - Explicitly stop our debconf frontend just before exiting, to avoid
988+ leaving a zombie if tasksel installs some package that starts a daemon
989+ that doesn't disconnect from fd 3.
990+ * Remove obsolete local copy of DebconfCommunicator. We just rely on a new
991+ enough debconf now.
992+ * Automatic update of included source packages: console-setup 1.28ubuntu6.
993+
994+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 04 Mar 2009 18:26:26 +0000
995+
996+oem-config (1.54.7) jaunty; urgency=low
997+
998+ [ Evan Dandrea ]
999+ * Give the proper return value in the user component's run function
1000+ (LP: #334281).
1001+
1002+ [ Colin Watson ]
1003+ * Automatic update of included source packages: localechooser 2.09ubuntu2,
1004+ user-setup 1.23ubuntu14.
1005+
1006+ -- Colin Watson <cjwatson@ubuntu.com> Sun, 01 Mar 2009 11:50:24 +0000
1007+
1008+oem-config (1.54.6) jaunty; urgency=low
1009+
1010+ * Only call setxkbmap if DISPLAY is set.
1011+ * Don't show the "Who are you?" page just because the auto-login question
1012+ is asked and not preseeded (LP: #328281).
1013+ * Handle user-setup's new weak password detection.
1014+ * Add forgotten oem-config/text/network_heading_label template.
1015+ * Add a "tasks" component (only usable in the debconf frontend at the
1016+ moment) that runs tasksel.
1017+ * Check whether /usr/lib/network-manager/ifblacklist_migrate.sh exists
1018+ before running it.
1019+ * Fix copying of debian-installer/framebuffer to /target in
1020+ oem-config-udeb: debconf-dumpdb returns "(null)" as the value if the
1021+ question has never been set.
1022+ * Automatic update of included source packages: user-setup 1.23ubuntu12.
1023+
1024+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 18 Feb 2009 23:38:31 +0000
1025+
1026+oem-config (1.54.5) jaunty; urgency=low
1027+
1028+ * Move most debconf-communicator handling into BaseFrontend, to make it
1029+ easier to fetch configuration from debconf there.
1030+ * Fetch the list of steps to be displayed from debconf (oem-config/steps).
1031+ * Tell components' prepare method whether they're being run unfiltered, to
1032+ make it possible to write a component that only works in unfiltered
1033+ mode.
1034+ * Fix Debconf import in BaseFrontend.
1035+ * Start bterm and give oem-config a controlling terminal if using the
1036+ debconf frontend.
1037+ * Run the debconf frontend in a UTF-8 locale (en_US.UTF-8, since d-i
1038+ guarantees that that always exists) so that newt uses proper window
1039+ borders and can display non-ASCII characters.
1040+ * Redirect stderr to the log file as early as possible in oem-config.
1041+ * In unfiltered mode, don't reask locale questions in the timezone
1042+ component.
1043+ * Drop priority of user-setup/encrypt-home question so that it isn't asked
1044+ in unfiltered mode.
1045+ * Add a "network" component (only usable in the debconf frontend at the
1046+ moment) that runs netcfg.
1047+
1048+ -- Colin Watson <cjwatson@ubuntu.com> Fri, 06 Feb 2009 14:13:01 +0100
1049+
1050+oem-config (1.54.4) jaunty; urgency=low
1051+
1052+ * Move xserver-xorg dependency to oem-config-gtk and oem-config-kde, since
1053+ it's only needed by oem-config-dm which isn't used by
1054+ oem-config-debconf.
1055+ * Automatic update of included source packages: console-setup 1.28ubuntu5,
1056+ localechooser 2.09ubuntu1, user-setup 1.23ubuntu9.
1057+
1058+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 04 Feb 2009 15:57:36 +0100
1059+
1060+oem-config (1.54.3) jaunty; urgency=low
1061+
1062+ * Suppress user-setup's encrypted home directory question in OEM mode.
1063+ * Simplify page/step handling; the list of pages is now in BaseFrontend,
1064+ and step indices are calculated directly from that. (This won't quite
1065+ work for Ubiquity as-is, because it can't yet handle multi-page steps
1066+ such as Ubiquity's partitioner.)
1067+ * Reword templates, package descriptions, and the oem-config(8) manual
1068+ page to make it clearer that the first stage of oem-config is for use by
1069+ OEMs, not end users (LP: #48144). Clarify the term "OEM" in a comment
1070+ for translators.
1071+ * Add LSB init script header.
1072+ * Only run fontconfig-voodoo if it's present.
1073+ * If the user backs up all the way out of oem-config (perhaps
1074+ deliberately, or perhaps by accident), ask whether they want to try
1075+ again, drop to a recovery shell, or reboot.
1076+ * Automatic update of included source packages: user-setup 1.23ubuntu7.
1077+
1078+ -- Colin Watson <cjwatson@ubuntu.com> Mon, 26 Jan 2009 19:23:36 +0000
1079+
1080+oem-config (1.54.2) jaunty; urgency=low
1081+
1082+ * Add a debconf_ui frontend which can be used in text mode on a server.
1083+ This is still experimental; in particular, setting the language does not
1084+ yet take effect until after oem-config exits.
1085+ * Adjust for changes in tzsetup 1:0.24ubuntu1.
1086+ * Add experimental --cdebconf option.
1087+ * Use spaces rather than ${!TAB} in localechooser, since debconf doesn't
1088+ support the latter yet.
1089+ * Add manual pages for all programs (LP: #274048).
1090+ * Automatic update of included source packages: console-setup 1.28ubuntu4,
1091+ tzsetup 1:0.24ubuntu1, user-setup 1.23ubuntu3.
1092+
1093+ -- Colin Watson <cjwatson@ubuntu.com> Mon, 22 Dec 2008 15:42:48 +0000
1094+
1095+oem-config (1.54.1) jaunty; urgency=low
1096+
1097+ [ Evan Dandrea ]
1098+ * GTK frontend:
1099+ - Use an iconview as the language selection widget. Only show
1100+ scrollbars for the language selection widget if the window is going to
1101+ be larger than the desktop.
1102+
1103+ [ Colin Watson ]
1104+ * Fix debian/oem-config.install for new location of tzmap in build tree.
1105+
1106+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 19 Nov 2008 10:03:45 +0000
1107+
1108+oem-config (1.54.0) jaunty; urgency=low
1109+
1110+ * Use OVERRIDE_SHOW_ALL_LANGUAGES in the tzsetup wrapper as well as
1111+ localechooser (LP: #290580).
1112+ * Switch to a new versioning scheme and omit the sub-minor version from
1113+ AC_INIT so that we don't have to regenerate configure with every single
1114+ upload.
1115+ * Create a BaseFrontend class and move various things to it; it now counts
1116+ as a relatively clear specification of what a frontend has to implement.
1117+ * Install apport hook as source_oem-config.py so that it covers all our
1118+ binary packages without the need for symlinks.
1119+ * Automatic update of included source packages: console-setup 1.28ubuntu1,
1120+ localechooser 2.08ubuntu1, tzsetup 1:0.24.
1121+
1122+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 18 Nov 2008 17:11:02 +0000
1123+
1124+oem-config (1.53) intrepid; urgency=low
1125+
1126+ * KDE frontend:
1127+ - Hardcode command line (including setting the Oxygen style) rather than
1128+ passing sys.argv to KCmdLineArgs, which will include options that KDE
1129+ doesn't understand (LP: #218144).
1130+ * Update translations from Launchpad.
1131+
1132+ -- Colin Watson <cjwatson@ubuntu.com> Thu, 23 Oct 2008 13:53:28 +0100
1133+
1134+oem-config (1.52) intrepid; urgency=low
1135+
1136+ [ Colin Watson ]
1137+ * Reset debian-installer/country if the language is changed, as otherwise
1138+ we can end up defaulting to an inappropriate country for the language.
1139+ * Stop defaulting to the timezone from /etc/timezone or /etc/localtime, as
1140+ this has a nasty habit of overriding the usual defaults for countries
1141+ with multiple timezone choices (LP: #283861).
1142+ * Update translations from Launchpad.
1143+ * Automatic update of included source packages: user-setup 1.20ubuntu10.
1144+
1145+ [ Evan Dandrea ]
1146+ * Pull timezone map changes from ubiquity:
1147+ - Iterate through a list of nearby timezones on click, rather than
1148+ selecting the absolute closest timezone to the pointer.
1149+ - Stop scrolling the timezone map once the mouse is outside its
1150+ boundaries (LP: #251231).
1151+
1152+ -- Colin Watson <cjwatson@ubuntu.com> Thu, 16 Oct 2008 19:45:48 +0100
1153+
1154+oem-config (1.51) intrepid; urgency=low
1155+
1156+ * Log messages from update-rc.d rather than throwing them away.
1157+ * Fix intltool handling; po/Makefile.in.in was still coming from gettext.
1158+ Pass no-xml to IT_PROG_INTLTOOL so that we don't need to build-depend on
1159+ libxml-parser-perl.
1160+ * Add a comment to /etc/init.d/oem-config to explain the purpose of the
1161+ oem-config-firstboot check.
1162+ * Disable window minimise buttons when running in standalone mode at first
1163+ boot (LP: #249045).
1164+ * Run oem-config in debugging mode if 'debug-oem-config' is set on the
1165+ kernel command line.
1166+ * Update translations from Launchpad.
1167+ * Automatic update of included source packages: user-setup 1.20ubuntu9.
1168+
1169+ -- Colin Watson <cjwatson@ubuntu.com> Sun, 12 Oct 2008 21:25:16 +0100
1170+
1171+oem-config (1.50) intrepid; urgency=low
1172+
1173+ * Change "Automatically sign in" to "Log in automatically", to match
1174+ wording elsewhere (LP: #266995).
1175+ * Automatic update of included source packages: localechooser 2.03ubuntu3.
1176+
1177+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 16 Sep 2008 12:33:39 +0100
1178+
1179+oem-config (1.49) intrepid; urgency=low
1180+
1181+ [ Jonathan Riddell ]
1182+ * In oem-config-prepare fix option between kdesu and kdesudo
1183+
1184+ [ Colin Watson ]
1185+ * Update check for python-codegen-2.0 to instead use
1186+ pygobject-codegen-2.0. The former disappeared as of pygtk
1187+ 2.13.0-0ubuntu1 in favor of this. (From the same change in ubiquity by
1188+ Mario Limonciello.)
1189+ * Build-depend on python-gobject-dev (>= 2.15.1) for
1190+ pygobject-codegen-2.0.
1191+
1192+ -- Colin Watson <cjwatson@ubuntu.com> Mon, 08 Sep 2008 19:16:43 +0100
1193+
1194+oem-config (1.48) intrepid; urgency=low
1195+
1196+ * Update oem-config-dm for KDE 4
1197+ * Update kde_ui for intrepid wallpaper
1198+ * Change kde_ui into a KApplication, so it picks up the KDE widget style
1199+ * Fix i18n in kde_ui
1200+ * Use kdesu not kdesudo by default, kdesudo seems unreliable
1201+ * Set icons not text on next button, we have no i18n'ed text
1202+ * Automatic update of included source packages: console-setup
1203+ 1.25ubuntu3, user-setup 1.20ubuntu6.
1204+
1205+ -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 05 Sep 2008 12:59:23 +0100
1206+
1207+oem-config (1.47) intrepid; urgency=low
1208+
1209+ * Add a vile hack to avoid clashing with kernel-helper over the debconf
1210+ database lock. Filed LP #261543 to document that we need to do something
1211+ better.
1212+
1213+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 26 Aug 2008 18:35:39 +0100
1214+
1215+oem-config (1.46) intrepid; urgency=low
1216+
1217+ * Suppress user-setup's encrypted private directory question in OEM mode.
1218+ * Move oem-config init script link from 12 to 29 so that it starts after
1219+ hal.
1220+
1221+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 26 Aug 2008 14:21:05 +0100
1222+
1223+oem-config (1.45) intrepid; urgency=low
1224+
1225+ [ Colin Watson ]
1226+ * Restore lost change from 1.38:
1227+ - Don't fail to set the locale if the mirror/country question doesn't
1228+ exist.
1229+ * Add oem to /usr/lib/oem-config/user/reserved-usernames (see LP #251056).
1230+ * Add sensible --version output and output our version to oem-config.log.
1231+ * Automatic update of included source packages: localechooser 2.03ubuntu2,
1232+ user-setup 1.20ubuntu4.
1233+
1234+ [ Michael Terry ]
1235+ * Set LANG in /etc/default/locale even if it isn't there already
1236+ (LP: #249550).
1237+ * Ensure that some widget is focused after changing page (LP: #241367).
1238+ * Add an auto-login option, currently GTK-only (LP: #241372).
1239+
1240+ [ Evan Dandrea ]
1241+ * Do not try to set localechooser/alreadyrun. It is no longer used.
1242+ * Also remove the langlevel file if it exists before we start
1243+ localechooser.
1244+
1245+ -- Colin Watson <cjwatson@ubuntu.com> Fri, 22 Aug 2008 13:00:18 +0100
1246+
1247+oem-config (1.44) intrepid; urgency=low
1248+
1249+ * Create /var/lib/localechooser directory, otherwise localechooser
1250+ completely breaks.
1251+
1252+ -- Colin Watson <cjwatson@ubuntu.com> Thu, 24 Jul 2008 20:11:02 +0100
1253+
1254+oem-config (1.43) intrepid; urgency=low
1255+
1256+ [ Colin Watson ]
1257+ * Adjust Brazilian and Japanese keyboard models when applying the keyboard
1258+ layout on the fly (LP: #217140).
1259+ * Remove po/.intltool-merge-cache and po/stamp-po on clean.
1260+ * Update the FSF's address in a few more places.
1261+ * Use kdesudo for the KDE frontend where available.
1262+ * Upgrade to current autotools in Intrepid, including libtool 2.2.
1263+ * Automatic update of included source packages: console-setup 1.25ubuntu2,
1264+ localechooser 2.03ubuntu1, user-setup 1.20ubuntu3.
1265+
1266+ [ Jonathan Riddell ]
1267+ * Update KDM config file for KDE 4 and remove kpersonaliser references
1268+
1269+ [ Evan Dandrea ]
1270+ * Update the language component to reflect changes to localechooser.
1271+ * Use OVERRIDE_SHOW_ALL_LANGUAGES in the localechooser wrapper
1272+ (LP: #249795).
1273+
1274+ -- Colin Watson <cjwatson@ubuntu.com> Thu, 24 Jul 2008 19:33:13 +0100
1275+
1276+oem-config (1.42) intrepid; urgency=low
1277+
1278+ * Remove old local copies of intltool-* scripts; build-depend on intltool
1279+ (>= 0.40.0).
1280+
1281+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 15 Jul 2008 15:39:51 +0100
1282+
1283+oem-config (1.41) intrepid; urgency=low
1284+
1285+ * Recommend hwtest (not hwdb-client), and recommend hwtest-gtk from
1286+ oem-config-gtk.
1287+
1288+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 15 Jul 2008 13:46:37 +0100
1289+
1290+oem-config (1.40) intrepid; urgency=low
1291+
1292+ [ Jonathan Riddell ]
1293+ * Depend on kde-window-manager (KDE 4) not kwin (KDE 3)
1294+
1295+ [ Colin Watson ]
1296+ * Switch to glade-3.
1297+
1298+ [ Michael Terry ]
1299+ * Make the UI initially invisible to avoid resize "jittering" as it loads
1300+ (LP: #241354).
1301+
1302+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 01 Jul 2008 09:34:34 +0100
1303+
1304+oem-config (1.39) intrepid; urgency=low
1305+
1306+ * Merge from hardy-proposed, updating translations.
1307+
1308+ -- Colin Watson <cjwatson@ubuntu.com> Mon, 09 Jun 2008 11:21:01 +0100
1309+
1310+oem-config (1.38) intrepid; urgency=low
1311+
1312+ [ Colin Watson ]
1313+ * Silence deprecation warning in zoommap.
1314+ * Internationalise .desktop files (LP: #233949).
1315+ * Don't fail to set the locale if the mirror/country question doesn't
1316+ exist.
1317+ * Disable support for console-setup preseeding again, as it interferes
1318+ with the more important goal of inferring a default keyboard from the
1319+ selected locale (LP: #219209).
1320+ * Automatic update of included source packages: tzsetup 1:0.21.
1321+
1322+ [ Evan Dandrea ]
1323+ * Disable the close button (LP: #190234).
1324+
1325+ -- Colin Watson <cjwatson@ubuntu.com> Sun, 01 Jun 2008 13:12:28 +0100
1326+
1327+oem-config (1.37.2) hardy-proposed; urgency=low
1328+
1329+ * Update translations from Launchpad.
1330+
1331+ -- Colin Watson <cjwatson@ubuntu.com> Mon, 02 Jun 2008 23:04:12 +0100
1332+
1333+oem-config (1.37.1) hardy-proposed; urgency=low
1334+
1335+ [ Evan Dandrea ]
1336+ * Disable the close button (LP: #190234).
1337+
1338+ [ Colin Watson ]
1339+ * Don't fail to set the locale if the mirror/country question doesn't
1340+ exist.
1341+ * Disable support for console-setup preseeding again, as it interferes
1342+ with the more important goal of inferring a default keyboard from the
1343+ selected locale (LP: #219209).
1344+
1345+ -- Colin Watson <cjwatson@ubuntu.com> Sun, 01 Jun 2008 13:30:52 +0100
1346+
1347+oem-config (1.37) hardy; urgency=low
1348+
1349+ * Fix built-in lists of keyboard variant names (patch from ubiquity;
1350+ LP: #106971).
1351+
1352+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 22 Apr 2008 09:59:27 +0100
1353+
1354+oem-config (1.36) hardy; urgency=low
1355+
1356+ * Set OVERRIDE_ALLOW_PRESEEDING=1 while calling console-setup to force it
1357+ to allow preseeding (LP: #188492).
1358+ * Update translations from Launchpad.
1359+ * Automatic update of included source packages: console-setup 1.21ubuntu8.
1360+
1361+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 22 Apr 2008 01:15:50 +0100
1362+
1363+oem-config (1.35) hardy; urgency=low
1364+
1365+ * Properly initialize the UI object and its parent widget
1366+ (LP: #217884).
1367+
1368+ -- Evan Dandrea <evand@ubuntu.com> Tue, 15 Apr 2008 16:31:04 -0400
1369+
1370+oem-config (1.34) hardy; urgency=low
1371+
1372+ * Port hiding the minimize button on the main window from Ubiquity.
1373+ * Port tzmap usability fixes from ubiquity.
1374+ * Automatic update of included source packages: console-setup
1375+ 1.21ubuntu7, localechooser 1.42ubuntu5.
1376+
1377+ -- Evan Dandrea <evand@ubuntu.com> Mon, 14 Apr 2008 22:27:11 -0400
1378+
1379+oem-config (1.33) hardy; urgency=low
1380+
1381+ * Fix ownership of /home/oem/Desktop (LP: #209683).
1382+ * Automatic update of included source packages: console-setup 1.21ubuntu5,
1383+ tzsetup 1:0.20.
1384+
1385+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 01 Apr 2008 14:33:33 +0100
1386+
1387+oem-config (1.32) hardy; urgency=low
1388+
1389+ [ Evan Dandrea ]
1390+ * Use a GtkEventBox rather than a GtkScrolledWindow for the tzmap to
1391+ match ubiquity (LP: #198179)
1392+ * Port changes to zoommap.py from ubiquity:
1393+ - Use a black border around tzmap points to assist the visually
1394+ impaired.
1395+ - Flash the currently selected location on the tzmap so that it's easier
1396+ to spot.
1397+ - When clicking on the tzmap, if the closest match is already selected,
1398+ take the next closest.
1399+ - Place the tzmap in an AspectFrame so it doesn't look distorted on
1400+ widescreen displays (LP: #200152).
1401+ * Center the oem-config window to match ubiquity.
1402+ * Port fix for correctly answering the countrychooser/country-name question
1403+ from ubiquity (was LP #174937) (LP: #203648).
1404+ * Automatic update of included source packages: localechooser
1405+ 1.42ubuntu3.
1406+
1407+ [ Colin Watson ]
1408+ * Ensure that our build fails if one of the d-i components fails to build.
1409+ * Add a check-manifest tool to ensure that d-i/manifest is in sync with
1410+ d-i/source/ on upload (from ubiquity).
1411+ * Don't clean console-setup; bits of it are intentionally missing from our
1412+ copy, and it's not necessary.
1413+ * Now that we allow user creation even if a non-system user already
1414+ exists, we can only delete the temporary oem user once oem-config has
1415+ actually succeeded (LP: #153311).
1416+
1417+ [ Jonathan Riddell ]
1418+ * kde_ui:
1419+ - Load new Kubuntu wallpaper, also fix background if it can't find wallpaper
1420+ - Load Oxygen icons if available
1421+
1422+ -- Evan Dandrea <evand@ubuntu.com> Tue, 25 Mar 2008 16:32:01 -0400
1423+
1424+oem-config (1.31) hardy; urgency=low
1425+
1426+ [ Colin Watson ]
1427+ * Remove /etc/udev/rules.d/70-persistent-cd.rules and
1428+ /etc/udev/rules.d/70-persistent-net.rules in oem-config-prepare, in case
1429+ the system is going to be cloned.
1430+ * Remove /home/oem/.ssh/known_hosts in oem-config-prepare. If ssh was used
1431+ then this might be slightly sensitive.
1432+ * Allow user creation even if a non-system user already exists (thanks,
1433+ Torsten Spindler; LP: #153310).
1434+
1435+ [ Evan Dandrea ]
1436+ * Port zoommap fixes from ubiquity.
1437+ * Automatic update of included source packages: console-setup
1438+ 1.21ubuntu4, user-setup 1.16ubuntu5.
1439+
1440+ -- Evan Dandrea <evand@ubuntu.com> Tue, 04 Mar 2008 11:51:16 -0500
1441+
1442+oem-config (1.30) hardy; urgency=low
1443+
1444+ [ Evan Dandrea ]
1445+ * Fix zoommap import, references to ubiquity (LP: #194491).
1446+
1447+ [ Matthias Klose ]
1448+ * Automatic update of included source packages.
1449+
1450+ -- Matthias Klose <doko@ubuntu.com> Fri, 29 Feb 2008 20:41:40 +0000
1451+
1452+oem-config (1.29) hardy; urgency=low
1453+
1454+ * Drop build dependency on python-xml.
1455+ * d-i/source/localechooser/iso3166tab.py: Include ErrorPrinter and
1456+ DefaultHandler from obsolete saxutils.py
1457+
1458+ -- Matthias Klose <doko@ubuntu.com> Fri, 29 Feb 2008 15:45:24 +0000
1459+
1460+oem-config (1.28) hardy; urgency=low
1461+
1462+ [ Colin Watson ]
1463+ * Build-depend on dctrl-tools rather than grep-dctrl.
1464+
1465+ [ Evan Dandrea ]
1466+ * Use new timezone widget from Ubiquity. oem-config now shrinks to a
1467+ much smaller size (LP: #191823).
1468+
1469+ -- Evan Dandrea <evand@ubuntu.com> Wed, 20 Feb 2008 10:49:44 -0500
1470+
1471+oem-config (1.27) hardy; urgency=low
1472+
1473+ [ Colin Watson ]
1474+ * Call 'fontconfig-voodoo --auto --force --quiet' on startup and when the
1475+ language is changed. May help with LP #185269.
1476+
1477+ [ Evan Dandrea ]
1478+ * Updated the location of gnome-settings-daemon (LP: #190029).
1479+ * Automatic update of included source packages: console-setup
1480+ 1.21ubuntu2.
1481+
1482+ -- Evan Dandrea <evand@ubuntu.com> Thu, 07 Feb 2008 16:36:50 -0500
1483+
1484+oem-config (1.26) hardy; urgency=low
1485+
1486+ * Activate appropriate input methods when changing language (LP: #181857).
1487+ * Update console-setup component for layout and variant changes in
1488+ console-setup 1.21ubuntu1.
1489+ * Automatic update of included source packages: console-setup 1.21ubuntu1,
1490+ user-setup 1.16ubuntu3.
1491+
1492+ -- Colin Watson <cjwatson@ubuntu.com> Mon, 28 Jan 2008 23:59:56 +0000
1493+
1494+oem-config (1.25) hardy; urgency=low
1495+
1496+ [ Colin Watson ]
1497+ * Update d-i/update-control to work with the new Dpkg::Deps module in
1498+ dpkg-dev 1.14.8.
1499+ * Append to /var/log/oem-config.log rather than overwriting it.
1500+
1501+ [ Evan Dandrea ]
1502+ * Copy the value of debian-installer/locale over to the target system
1503+ so that it gets used by oem-config as the default language
1504+ selection (LP: #181291).
1505+ * Properly handle situations where localechooser might ask
1506+ languagechooser/language-name-*.
1507+ * Automatic update of included source packages: console-setup
1508+ 1.19ubuntu2.
1509+
1510+ -- Evan Dandrea <evand@ubuntu.com> Fri, 11 Jan 2008 11:03:35 -0500
1511+
1512+oem-config (1.24) hardy; urgency=low
1513+
1514+ * Fix "Step 1 of 4" counter advancement (part of LP #153139, #153336).
1515+ * Fix oem-config-frontend-* virtual package name generation to handle ~ in
1516+ versions.
1517+ * Check $DISPLAY before trying to run zenity or kdialog.
1518+ * Add Vcs-Bzr field to debian/control.
1519+ * Convert to python-central.
1520+ * Adjust for localechooser 1.39:
1521+ - Don't edit /etc/environment unless it already contains LANG or
1522+ LANGUAGE settings.
1523+ * Adjust for localechooser 1.40:
1524+ - Cope with localechooser asking countrychooser/country-name rather than
1525+ countrychooser/shortlist.
1526+ * Automatic update of included source packages: console-setup 1.19ubuntu1,
1527+ localechooser 1.42ubuntu1, tzsetup 1:0.19, user-setup 1.16ubuntu1.
1528+
1529+ -- Colin Watson <cjwatson@ubuntu.com> Mon, 03 Dec 2007 13:52:21 +0000
1530+
1531+oem-config (1.23) gutsy; urgency=low
1532+
1533+ * busybox sed doesn't support making backup files when editing in place
1534+ (e.g. 'sed -i.oem'); chroot to edit kdmrc as well.
1535+ * Fix GTK .desktop filename used in oem-config-prepare gksudo invocation.
1536+ * Install .desktop files under /usr/share/applications/ at first install
1537+ rather than shipping them there in the .debs, and remove them once
1538+ oem-config-firstboot has been run (LP: #145281).
1539+ * Set HOME in oem-config-dm so that iceauth is happier.
1540+ * Start dcopserver before kwin (LP: #145226).
1541+ * Run kdesktop too to fix the background in KDE.
1542+ * Update translations from Rosetta.
1543+
1544+ -- Colin Watson <cjwatson@ubuntu.com> Fri, 12 Oct 2007 15:04:03 +0100
1545+
1546+oem-config (1.22) gutsy; urgency=low
1547+
1548+ * Only run gnome-settings-daemon if it exists, removing dependency on
1549+ gnome-control-center (LP: #147852).
1550+ * GTK frontend:
1551+ - Make sure the next button remains the default widget despite being
1552+ hidden and re-shown.
1553+ * Update translations from Rosetta.
1554+ * Automatic update of included source packages: user-setup 1.14ubuntu4
1555+ (LP: #149582).
1556+
1557+ -- Colin Watson <cjwatson@ubuntu.com> Sat, 06 Oct 2007 13:19:18 +0100
1558+
1559+oem-config (1.21) gutsy; urgency=low
1560+
1561+ * GTK frontend:
1562+ - Work around http://bugzilla.gnome.org/show_bug.cgi?id=56070 by hiding
1563+ and re-showing the button widgets, following a suggestion by Scott
1564+ Horowitz.
1565+ - Remove some duplication of work now done in oem_config.i18n.
1566+ * Add lots of translations from Rosetta.
1567+ * Don't ignore 'make distclean' errors other than missing Makefiles.
1568+ * Remove d-i/source/console-setup/Keyboard/MyKeyboardNames.pl on clean.
1569+
1570+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 03 Oct 2007 01:02:55 +0100
1571+
1572+oem-config (1.20) gutsy; urgency=low
1573+
1574+ * Add a --quiet option to oem-config-prepare to suppress its
1575+ acknowledgement message (and thus the dialog requiring user interaction
1576+ if $DISPLAY is set).
1577+ * Add internationalisation (LP: #23537). Adjusted several widget names and
1578+ strings in the KDE frontend to bring it into sync with the GTK frontend
1579+ for this purpose.
1580+ * Start dcopserver when running the KDE frontend (LP: #145226).
1581+ * Add a --debug option to oem-config-firstboot to make debugging a bit
1582+ less painful.
1583+ * Remove use of dh_python, since it's a no-op now. Bump debhelper
1584+ build-dependency to 5.0.37.3ubuntu2 (a.k.a. dh_python from 5.0.38) for
1585+ this.
1586+ * Clean up subprocesses even if oem-config-dm is interrupted.
1587+ * GTK frontend:
1588+ - Go forward when activating rows in language or keyboard treeviews.
1589+ * Make sure the selected locale at least exists (we should really install
1590+ the language pack, but this is a stopgap measure).
1591+ * Automatic update of included source packages: console-setup 1.16ubuntu5,
1592+ localechooser 1.38ubuntu2, user-setup 1.14ubuntu3.
1593+
1594+ -- Colin Watson <cjwatson@ubuntu.com> Mon, 01 Oct 2007 17:59:41 +0100
1595+
1596+oem-config (1.19) gutsy; urgency=low
1597+
1598+ * Run gnome-settings-daemon so that we use the normal theme (LP: #23899).
1599+ * Use zenity or kdialog if available to display oem-config-prepare's
1600+ acknowledgement message (LP: #131309).
1601+
1602+ -- Colin Watson <cjwatson@ubuntu.com> Thu, 06 Sep 2007 14:38:08 +0100
1603+
1604+oem-config (1.18) gutsy; urgency=low
1605+
1606+ * Chroot to test for existence of gdm-cdd.conf to avoid problems with
1607+ broken symlinks; cf. casper 1.93.
1608+
1609+ -- Colin Watson <cjwatson@ubuntu.com> Thu, 09 Aug 2007 17:54:46 +0100
1610+
1611+oem-config (1.17) gutsy; urgency=low
1612+
1613+ * Move .glade and .ui files to a new top-level gui directory in the source
1614+ package, and install them under /usr/share/oem-config/glade and
1615+ /usr/share/oem-config/qt respectively.
1616+ * Rename gtk-ui to gtk_ui and kde-ui to kde_ui, to make it easier to
1617+ subclass them.
1618+ * Break up the glade file into multiple pieces to make updates to single
1619+ pages a lot easier (port of work done in ubiquity by Mario Limonciello).
1620+ * Drop into pdb.post_mortem on non-SyntaxError exceptions if the --pdb
1621+ option is given and oem-config is running from a terminal.
1622+ * Fix title of language page: "Choose language and location" no longer
1623+ makes sense now that the location is computed from the timezone.
1624+ * Minor UI tweaks to sync up with ubiquity.
1625+ * Add a warning in d-i/source/README about modifying files in this
1626+ directory.
1627+ * Implement the oem-config parts of the ubiquity-oem specification:
1628+ - Fix desktop file installation harder.
1629+ - Update user page layout to match ubiquity, including filling in a
1630+ suggested username automatically, displaying error messages inline,
1631+ and showing a warning message in debugging mode.
1632+ - Set up autologin for the oem user via gdm/kdm.
1633+ - Disable the hwdb-client notification for the created user.
1634+ - Add a facility to run hook scripts from
1635+ /usr/lib/oem-config/post-install just before exiting. Hook scripts are
1636+ run noninteractively, although they can talk to debconf for database
1637+ queries and the like if they need to.
1638+
1639+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 03 Jul 2007 14:12:45 +0100
1640+
1641+oem-config (1.16) gutsy; urgency=low
1642+
1643+ * Update console-setup component for Lithuanian changes in console-setup
1644+ 1.16ubuntu1.
1645+ * Fix desktop file installation.
1646+ * Automatic update of included source packages: console-setup 1.16ubuntu4.
1647+
1648+ -- Colin Watson <cjwatson@ubuntu.com> Mon, 02 Jul 2007 08:54:44 +0100
1649+
1650+oem-config (1.15) gutsy; urgency=low
1651+
1652+ * Add an oem-config-check udeb to set an "OEM mode (for manufacturers
1653+ only)" info message. OEM mode should now be enabled using
1654+ oem-config/enable=true.
1655+ * Multiply menu-item-numbers by 100.
1656+
1657+ -- Colin Watson <cjwatson@ubuntu.com> Fri, 18 May 2007 17:55:43 +0100
1658+
1659+oem-config (1.14) gutsy; urgency=low
1660+
1661+ * Add an apport hook to attach /var/log/oem-config.log.
1662+ * Strip binaries.
1663+ * Print usage message and exit if any non-option arguments are supplied to
1664+ oem-config; suggest oem-config-prepare (LP: #105940).
1665+ * Update Japanese keyboard layout handling to match console-setup
1666+ 1.7ubuntu18, which uses jp(latin),jp by default (LP: #63915).
1667+ * Teach oem-config-prepare to escalate privileges itself using gksudo,
1668+ kdesu, etc. as appropriate, rather than requiring it to be invoked using
1669+ sudo.
1670+ * Add a desktop icon to the oem user's desktop to run oem-config-prepare
1671+ (LP: #41698).
1672+ * Display an error dialog and exit if running as non-root (LP: #99211).
1673+ * Automatic update of included source packages: console-setup 1.15ubuntu1,
1674+ localechooser 1.38ubuntu1, tzsetup 1:0.17, user-setup 1.14ubuntu1.
1675+
1676+ -- Colin Watson <cjwatson@ubuntu.com> Thu, 17 May 2007 11:43:03 +0100
1677+
1678+oem-config (1.13) feisty; urgency=low
1679+
1680+ * Display error dialogs on user-setup errors (LP: #94913).
1681+
1682+ -- Colin Watson <cjwatson@ubuntu.com> Thu, 5 Apr 2007 11:38:22 +0100
1683+
1684+oem-config (1.12) feisty; urgency=low
1685+
1686+ [ Anirudh Ramesh ]
1687+ * Force Qt4 frontend to use Plastique instead of the default Motif style.
1688+ * Add copyright, license and bug contact information.
1689+
1690+ [ Colin Watson ]
1691+ * Update other copyright notices.
1692+ * Automatic update of included source packages: console-setup 1.13ubuntu9.
1693+
1694+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 21 Mar 2007 09:45:21 +0000
1695+
1696+oem-config (1.11) feisty; urgency=low
1697+
1698+ [ Anirudh Ramesh ]
1699+ * Add missing 'import os' to oem-config.
1700+ * Stop using xsetroot in oem-config-dm for KDE, as the KDE frontend now
1701+ sets its own wallpaper.
1702+
1703+ [ Colin Watson ]
1704+ * Automatic update of included source packages: user-setup 1.8ubuntu2.
1705+
1706+ -- Colin Watson <cjwatson@ubuntu.com> Thu, 15 Mar 2007 11:41:01 +0000
1707+
1708+oem-config (1.10) feisty; urgency=low
1709+
1710+ [ Anirudh Ramesh ]
1711+ * Make oem-config-kde depend on python-qt4, not python-kde3.
1712+
1713+ [ Colin Watson ]
1714+ * Don't install e-map.defs; it's not all that important and it causes a
1715+ conflict with ubiquity-frontend-gtk.
1716+
1717+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 14 Mar 2007 12:23:51 +0000
1718+
1719+oem-config (1.9) feisty; urgency=low
1720+
1721+ [ Colin Watson ]
1722+ * Install copyright and changelog files in Architecture: all packages too.
1723+ * Add a 'debian/rules update-local' target to allow updating d-i/source/
1724+ without updating debian/changelog, which is sometimes convenient for
1725+ local hacking.
1726+ * Make OEM_CONFIG_DEBUG=1 imply DEBCONF_DEBUG='developer|filter' for ease
1727+ of debugging.
1728+ * Add a --debug option, equivalent to setting OEM_CONFIG_DEBUG=1.
1729+ * Add timezone widget from ubiquity.
1730+ * Update language, timezone, and keyboard handling code from ubiquity.
1731+ * Move the timezone step before the keyboard step.
1732+ * Apply language, timezone, and keyboard changes at the end of oem-config
1733+ rather than on the fly.
1734+ * Depend on a version of console-setup at least as new as the one in our
1735+ source tree.
1736+ * Track console-setup 1.13ubuntu4 changes by generating and using
1737+ MyKeyboardNames.pl based on xkb-data, which is more up to date than
1738+ KeyboardNames.pl.
1739+ * Stop the user page spreading out in an ugly manner now that the pages
1740+ are bigger. This does result in an unpleasant amount of empty space; the
1741+ page needs a redesign to cope with this.
1742+ * Activate the Forward button when Enter is pressed in any entry field on
1743+ the user page.
1744+ * Leave the UI up until we've finished applying changes; we now have to
1745+ regenerate the initramfs (due to console-setup changes) and it takes a
1746+ while.
1747+ * Send SIGKILL to the window manager if it fails to exit within a second
1748+ of receiving SIGTERM.
1749+ * Automatic update of included source packages: console-setup 1.13ubuntu8,
1750+ localechooser 1.37ubuntu1, tzsetup 1:0.14, user-setup 1.8ubuntu1.
1751+
1752+ [ Anirudh Ramesh ]
1753+ * Port KDE frontend to Qt 4.
1754+
1755+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 13 Mar 2007 15:53:32 +0000
1756+
1757+oem-config (1.8) edgy; urgency=low
1758+
1759+ [ Colin Watson ]
1760+ * Remove /var/lib/kdm/kdmsts in oem-config-firstboot after removing the
1761+ oem user; KDM stores the default user there.
1762+ * Automatic update of included source packages: console-setup 1.7ubuntu19,
1763+ localechooser 1.20ubuntu8, user-setup 1.2ubuntu4.
1764+
1765+ [ Anirudh Ramesh ]
1766+ * KDE frontend: Fixed bug where set_country combobox was not being
1767+ updated.
1768+
1769+ -- Colin Watson <cjwatson@ubuntu.com> Sat, 21 Oct 2006 00:36:15 +0100
1770+
1771+oem-config (1.7) edgy; urgency=low
1772+
1773+ * Add oem-config-udeb/frontend question, defaulting to gtk; preseed this
1774+ to install a different oem-config frontend on the target system (closes:
1775+ Malone #62777).
1776+ * Wait more or less properly by means of SIGUSR1 for the X server to start
1777+ up, rather than arbitrarily sleeping for five seconds.
1778+ * Don't actually import the frontend module in oem-config-dm; merely check
1779+ whether it exists. Otherwise, at least gtk will try to contact the X
1780+ server at import time and get very confused when it predictably isn't
1781+ there (closes: Malone #62814).
1782+
1783+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 3 Oct 2006 22:04:48 +0100
1784+
1785+oem-config (1.6) edgy; urgency=low
1786+
1787+ * Add /usr/lib/oem-config to sys.path in oem-config-dm so that it can
1788+ import frontend modules.
1789+
1790+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 27 Sep 2006 13:38:57 +0100
1791+
1792+oem-config (1.5) edgy; urgency=low
1793+
1794+ * Fix syntax error in oem-config-dm.
1795+
1796+ -- Colin Watson <cjwatson@ubuntu.com> Mon, 25 Sep 2006 10:45:58 +0100
1797+
1798+oem-config (1.4) edgy; urgency=low
1799+
1800+ [ Anirudh Ramesh ]
1801+ * KDE frontend: Reindented to match rest of project.
1802+ * KDE frontend: Fixed crash in set_timezone.
1803+
1804+ [ Colin Watson ]
1805+ * Add frontend detection to oem-config-dm, so that KDE support can be
1806+ filled in.
1807+
1808+ [ Anirudh Ramesh ]
1809+ * Add KDE support to oem-config-dm.
1810+
1811+ -- Colin Watson <cjwatson@ubuntu.com> Fri, 22 Sep 2006 12:13:59 +0100
1812+
1813+oem-config (1.3) edgy; urgency=low
1814+
1815+ * Import subprocess in console-setup component (closes: Malone #60409).
1816+ * Fix language name handling (closes: Malone #60410).
1817+ * GTK frontend: Make the Forward button the default widget so that it's
1818+ activated when Enter is pressed.
1819+ * Add kde-ui to default frontend search list.
1820+ * Automatic update of included source packages: console-setup 1.7ubuntu9.
1821+
1822+ -- Colin Watson <cjwatson@ubuntu.com> Mon, 18 Sep 2006 14:26:02 +0100
1823+
1824+oem-config (1.2) edgy; urgency=low
1825+
1826+ * Merge from ubiquity:
1827+ - Move from kbd-chooser to console-setup
1828+ (https://launchpad.net/distros/ubuntu/+spec/sane-installer-keyboard).
1829+ We still need to add a UI element for the keyboard variant, and
1830+ translations of layout and variant names are missing, but it mostly
1831+ seems to work.
1832+ - Strip Fonts and Keyboard directories from our copy of console-setup;
1833+ they're very large, and not needed since we don't actually build
1834+ console-setup, but just copy a few scripts from it.
1835+
1836+ -- Colin Watson <cjwatson@ubuntu.com> Thu, 7 Sep 2006 20:33:41 +0100
1837+
1838+oem-config (1.1) edgy; urgency=low
1839+
1840+ * Merge KDE frontend from Anirudh Ramesh.
1841+ * Automatic update of included source packages: kbd-chooser 1.30ubuntu1,
1842+ localechooser 1.20ubuntu6, tzsetup 1:0.10ubuntu2, user-setup 1.2ubuntu3.
1843+
1844+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 5 Sep 2006 17:24:33 +0100
1845+
1846+oem-config (1.0) edgy; urgency=low
1847+
1848+ * Reorganise oem-config to have a reasonable frontend/backend separation,
1849+ thereby allowing for a future KDE port. This involved updating much of
1850+ the core to look more like ubiquity (since ubiquity's core was an
1851+ evolution of oem-config's), and a new UI using a single window/notebook
1852+ rather than a succession of dialogs.
1853+ * Casualties of this work include the whole base-config-like menu
1854+ structure and the include/exclude mechanism. The menu structure made it
1855+ difficult to avoid spawning a new dialog for each step, which was a poor
1856+ UI; I don't believe the include/exclude mechanism was heavily used, but
1857+ contact me if you were relying on it and it may be possible to restore
1858+ it in a new form.
1859+ * I haven't yet ported the new i18n infrastructure from ubiquity, so the
1860+ oem-config UI will be untranslated.
1861+ * Like ubiquity, we now incorporate source for all d-i components we use
1862+ under d-i/source/ and include them directly in our binary package,
1863+ reducing the number of complex interdependencies with d-i packages.
1864+ 'debian/rules update' can be used to do automatic updates of these
1865+ copied source packages.
1866+ * Remove some leftover code that dealt with restoring the inittab, as we
1867+ don't do the temporary inittab thing any more.
1868+ * Fix kbd-chooser wrapper script to actually install the selected keymap
1869+ (though only for the console at present).
1870+ * Move from prebaseconfig to finish-install.
1871+ * Make oem-config Architecture: any, since it now includes kbd-chooser
1872+ binaries.
1873+ * Add an oem-config-gtk package for the GTK frontend.
1874+ * Convert to python-support.
1875+ * Fix apt-install compatibility wrapper to use debconf's noninteractive
1876+ frontend, tell debconf not to send e-mail, avoid upgrading, ignore GPG
1877+ time conflicts, and suppress prompts.
1878+ * Update localechooser wrapper to handle /etc/default/locale (based on
1879+ localechooser 0.19) and to use /usr/share/i18n/SUPPORTED (based on
1880+ localechooser 1.20ubuntu5).
1881+ * Make more of an effort to display translated country names.
1882+ * Use /bin/bash for user-setup due to a dash test(1) bug.
1883+ * Language names are now sorted according to the local name for each
1884+ language (closes: Malone #47724).
1885+
1886+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 22 Aug 2006 16:26:07 +0100
1887+
1888+oem-config (0.14) dapper; urgency=low
1889+
1890+ * Set LANGUAGE as well as LANG when changing the locale; this allows us to
1891+ get correct debconf translations without needing to run locale-gen (see
1892+ Malone #43071).
1893+
1894+ -- Colin Watson <cjwatson@ubuntu.com> Fri, 12 May 2006 15:27:07 +0100
1895+
1896+oem-config (0.13) dapper; urgency=low
1897+
1898+ * Depend on xserver-xorg and metacity for oem-config-dm (closes: Malone
1899+ #33837).
1900+ * Depend on user-setup for username/password menu item (closes: Malone
1901+ #33277).
1902+
1903+ -- Colin Watson <cjwatson@ubuntu.com> Thu, 13 Apr 2006 14:13:41 +0100
1904+
1905+oem-config (0.12) dapper; urgency=low
1906+
1907+ * Make better use of dh_install.
1908+ * Add various helpers in /usr/lib/oem-config/compat, moved here from
1909+ oem-config-locale.
1910+
1911+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 17 Jan 2006 15:33:33 +0000
1912+
1913+oem-config (0.11) dapper; urgency=low
1914+
1915+ * Add a main-menu step to the udeb which is responsible for arranging to
1916+ create the oem user with a suitable uid. This was formerly done by a
1917+ preseed file.
1918+
1919+ -- Colin Watson <cjwatson@ubuntu.com> Mon, 16 Jan 2006 18:38:37 +0000
1920+
1921+oem-config (0.10) dapper; urgency=low
1922+
1923+ * Remove unused moduledir variable.
1924+ * Remove passwd menu entry, now moved to user-setup.
1925+ * Build binary package in binary-indep, not binary-arch.
1926+ * We now use a single-stage installer, so we can no longer hook into
1927+ base-config. Add a udeb instead which provides instructions on what to
1928+ do after the first boot, and add an oem-config-prepare program which
1929+ should be run by the OEM once they have completed any necessary
1930+ modifications. Note that this means that the system is no longer
1931+ prepared for the end-user until oem-config-prepare is manually run
1932+ (closes: Malone #28095).
1933+ * Make oem-config-udeb responsible for installing oem-config in /target.
1934+ This will require preseed file changes.
1935+ * Remove timezone menu entry, now moved to oem-config-timezone.
1936+
1937+ -- Colin Watson <cjwatson@ubuntu.com> Mon, 16 Jan 2006 16:20:14 +0000
1938+
1939+oem-config (0.9) breezy; urgency=low
1940+
1941+ * Quieten output from deluser.
1942+ * Quieten output from debconf-communicate while resetting passwd/user-uid.
1943+ * Try setting LANG to the value of debian-installer/fallbacklocale if the
1944+ value of debian-installer/locale isn't a valid locale (Ubuntu #17366).
1945+ * Set labels in passwd and timezone windows to the translated descriptions
1946+ of the same questions in the installer; sync text of passwd labels with
1947+ the text in passwd.templates (Ubuntu #17366).
1948+ * Re-register passwd/user-fullname and passwd/username templates to
1949+ themselves rather than debian-installer/dummy (although it's a bug
1950+ somewhere in preseeding that they're left this way) so that we get
1951+ useful translated descriptions for them.
1952+ * Set title of timezone window to the translated description of
1953+ tzconfig/title. Unfortunately this is too hard to do for the passwd
1954+ window at present.
1955+ * Exiting oem-config can leave you without a configured user, so try not
1956+ to exit unnecessarily. If we have to, then print an error message with
1957+ instructions and drop the user to a shell, since that's better than a
1958+ login prompt with no users.
1959+ * Reload /var/lib/dpkg/info/base-config.templates for timezone question;
1960+ for some reason the translations seem to be getting lost from it.
1961+
1962+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 11 Oct 2005 21:41:41 +0100
1963+
1964+oem-config (0.8) breezy; urgency=low
1965+
1966+ * Remove the temporary OEM configuration user before running oem-config.
1967+ * Reset passwd/user-uid before running oem-config, so that the new user is
1968+ created at uid 1000 rather than 29999.
1969+
1970+ -- Colin Watson <cjwatson@ubuntu.com> Mon, 3 Oct 2005 13:04:42 +0100
1971+
1972+oem-config (0.7) breezy; urgency=low
1973+
1974+ * Use an init script and temporary rc.d links to launch
1975+ oem-config-firstboot on the first boot after installation, rather than a
1976+ temporary inittab. The latter approach caused base-config to be
1977+ respawned after exiting.
1978+
1979+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 21 Sep 2005 12:53:13 +0100
1980+
1981+oem-config (0.6) breezy; urgency=low
1982+
1983+ * Set passwd and timezone window gravity to center.
1984+
1985+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 14 Sep 2005 13:35:58 +0100
1986+
1987+oem-config (0.5) breezy; urgency=low
1988+
1989+ * Unset LANGUAGE while running steps; it overrides LANG and thereby causes
1990+ much confusion.
1991+ * Policy version 3.6.2. No changes required.
1992+
1993+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 9 Aug 2005 16:48:08 +0100
1994+
1995+oem-config (0.4) breezy; urgency=low
1996+
1997+ * Emit a debug message when changing LANG.
1998+
1999+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 9 Aug 2005 16:31:07 +0100
2000+
2001+oem-config (0.3) breezy; urgency=low
2002+
2003+ * Actually install /usr/sbin/oem-config-firstboot.
2004+
2005+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 3 Aug 2005 20:18:53 +0100
2006+
2007+oem-config (0.2) breezy; urgency=low
2008+
2009+ * Update GPL notices with the FSF's new address.
2010+ * Add description for base-config menu entry.
2011+
2012+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 3 Aug 2005 11:59:44 +0100
2013+
2014+oem-config (0.1) breezy; urgency=low
2015+
2016+ * Initial release.
2017+
2018+ -- Colin Watson <cjwatson@ubuntu.com> Fri, 29 Jul 2005 17:24:44 +0100
2019
2020=== modified file 'debian/control'
2021--- debian/control 2009-06-26 04:58:02 +0000
2022+++ debian/control 2009-07-02 18:14:49 +0000
2023@@ -3,7 +3,7 @@
2024 Priority: optional
2025 Maintainer: Ubuntu Installer Team <ubuntu-installer@lists.ubuntu.com>
2026 Uploaders: Colin Watson <cjwatson@ubuntu.com>, Evan Dandrea <evand@ubuntu.com>
2027-Build-Depends: apt, dash, dctrl-tools, debconf (>= 0.5.0), debhelper (>= 7), dpkg-dev (>= 1.9.0), intltool (>= 0.40.0), intltool-debian (>= 0.30+20040212), iso-codes, isoquery, libdebconfclient0-dev (>= 0.68), libdebian-installer4-dev (>= 0.41), libparted1.8-dev, libxml2-dev (>= 2.6.24), locales, po-debconf (>= 1.0), python-central (>= 0.5), tzdata, wget, xkb-data (>= 0.9)
2028+Build-Depends: apt, bf-utf-source, dash, dctrl-tools, debconf (>= 0.5.0), debhelper (>= 7), dpkg-dev (>= 1.9.0), intltool (>= 0.40.0), intltool-debian (>= 0.30+20040212), iso-codes, isoquery, libart-2.0-dev, libbogl-dev, libdebconfclient0-dev (>= 0.68), libdebian-installer4-dev (>= 0.41), libiw-dev (>= 27+28pre9), libparted1.8-dev, libxml2-dev (>= 2.6.24), locales, po-debconf (>= 1.0), python-central (>= 0.5), tzdata, wget, xkb-data (>= 0.9)
2029 Standards-Version: 3.6.2.1
2030 XS-Python-Version: current, >= 2.4
2031 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-installer/ubiquity/trunk
2032@@ -71,3 +71,68 @@
2033 This package provides a GTK+-based user interface frontend for the use
2034 when performing a Mythbuntu installation. The interface is derived
2035 from the GTK frontend already available.
2036+
2037+Package: ubiquity-frontend-debconf
2038+Architecture: all
2039+Depends: ${misc:Depends}, ${python:Depends}, ubiquity (= ${binary:Version}), debconf (>= 1.5.24ubuntu2) | cdebconf, bogl-bterm (>= 0.1.18-2ubuntu4), tasksel
2040+Provides: ubiquity-frontend-${mangled-version}
2041+XB-Python-Version: ${python:Versions}
2042+Description: debconf frontend for the Ubiquity live installer
2043+ This package provides a debconf-based user interface frontend for the
2044+ Ubiquity live CD installer.
2045+
2046+Package: oem-config
2047+Architecture: all
2048+Depends: ${misc:Depends}, ubiquity (= ${binary:Version}), oem-config-frontend-${mangled-version}
2049+Conflicts: oem-config-keyboard, oem-config-locale, oem-config-timezone
2050+Replaces: oem-config-keyboard, oem-config-locale, oem-config-timezone, oem-config-gtk (<< 1.54.13), oem-config-kde (<< 1.54.13)
2051+Description: Perform end-user configuration after initial OEM installation
2052+ The oem-config script re-asks a number of questions that are normally asked
2053+ during installation, and reconfigures the system accordingly. This allows a
2054+ vendor to install a skeleton system, clone it onto a large number of
2055+ machines, and ship it to end users, while still allowing end users to set
2056+ up their own username and password, language, timezone, and so on.
2057+
2058+Package: oem-config-gtk
2059+Architecture: all
2060+Depends: ${misc:Depends}, oem-config (= ${source:Version}), ubiquity-frontend-gtk (= ${source:Version})
2061+Replaces: oem-config (<< 1.0)
2062+Provides: oem-config-frontend-${mangled-version}
2063+Description: GTK+ frontend for end-user post-OEM-install configuration
2064+ The oem-config script re-asks a number of questions that are normally asked
2065+ during installation, and reconfigures the system accordingly. This allows a
2066+ vendor to install a skeleton system, clone it onto a large number of
2067+ machines, and ship it to end users, while still allowing end users to set
2068+ up their own username and password, language, timezone, and so on.
2069+ .
2070+ This is a GTK+ frontend to oem-config.
2071+
2072+Package: oem-config-kde
2073+Architecture: all
2074+Depends: ${misc:Depends}, oem-config (= ${source:Version}), ubiquity-frontend-kde (= ${source:Version})
2075+Replaces: oem-config (<< 1.0)
2076+Provides: oem-config-frontend-${mangled-version}
2077+Description: KDE frontend for end-user post-OEM-install configuration
2078+ The oem-config script re-asks a number of questions that are normally asked
2079+ during installation, and reconfigures the system accordingly. This allows a
2080+ vendor to install a skeleton system, clone it onto a large number of
2081+ machines, and ship it to end users, while still allowing end users to set
2082+ up their own username and password, language, timezone, and so on.
2083+ .
2084+ This is a KDE frontend to oem-config.
2085+
2086+Package: oem-config-check
2087+XC-Package-Type: udeb
2088+Section: debian-installer
2089+Priority: standard
2090+Architecture: all
2091+Depends: cdebconf-udeb (>= 0.75), main-menu (>= 1.03)
2092+Description: enter OEM mode if requested
2093+
2094+Package: oem-config-udeb
2095+XC-Package-Type: udeb
2096+Section: debian-installer
2097+Architecture: all
2098+Depends: oem-config-check, cdebconf-udeb
2099+XB-Installer-Menu-Item: 2800
2100+Description: Prepare for OEM configuration
2101
2102=== modified file 'debian/copyright'
2103--- debian/copyright 2009-01-13 10:30:42 +0000
2104+++ debian/copyright 2009-06-24 13:57:01 +0000
2105@@ -23,6 +23,21 @@
2106
2107 Portions copyright (C) 2007 Mario Limonciello
2108
2109+oem-config was written by Colin Watson <cjwatson@ubuntu.com>.
2110+It is:
2111+ Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd.
2112+ Copyright (C) 2006, 2007 Anirudh Ramesh
2113+
2114+Some code in oem-config is borrowed from base-config, whose copyright
2115+declaration is as follows:
2116+
2117+ This package is copyright 2000-2004 by Joey Hess <joeyh@debian.org>.
2118+ Portions are also copyright by Bruce Perens <bruce@hams.com>, Enrique
2119+ Zanardi <ezanard@debian.org>, Sven Rudolph, Luis Francisco Gonzalez
2120+ <luisgh@debian.org>, Ben Collins <bcollins@debian.org>, Matt Kraai
2121+ <kraai@debian.org>, Petter Reinholdtsen <pere@debian.org>, VA Linux
2122+ Systems, and Software in the Public Interest.
2123+
2124 License:
2125
2126 This program is free software; you can redistribute it and/or modify
2127
2128=== added file 'debian/lintian-override'
2129--- debian/lintian-override 1970-01-01 00:00:00 +0000
2130+++ debian/lintian-override 2009-06-24 13:57:01 +0000
2131@@ -0,0 +1,1 @@
2132+oem-config: no-debconf-config
2133
2134=== added file 'debian/oem-config-check.install'
2135--- debian/oem-config-check.install 1970-01-01 00:00:00 +0000
2136+++ debian/oem-config-check.install 2009-06-24 13:57:01 +0000
2137@@ -0,0 +1,2 @@
2138+debian-installer-startup.d lib
2139+main-menu.d lib
2140
2141=== added file 'debian/oem-config-check.templates'
2142--- debian/oem-config-check.templates 1970-01-01 00:00:00 +0000
2143+++ debian/oem-config-check.templates 2009-06-24 13:57:01 +0000
2144@@ -0,0 +1,11 @@
2145+Template: oem-config/enable
2146+Type: boolean
2147+Default: false
2148+Description: for internal use; can be preseeded
2149+ Enable OEM mode? This is only recommended for use by manufacturers who will
2150+ be shipping systems to end users.
2151+
2152+Template: oem-config/info
2153+Type: title
2154+# Info message displayed when running in OEM mode
2155+_Description: OEM mode (for manufacturers only)
2156
2157=== added file 'debian/oem-config-gtk.install'
2158--- debian/oem-config-gtk.install 1970-01-01 00:00:00 +0000
2159+++ debian/oem-config-gtk.install 2009-06-24 13:57:01 +0000
2160@@ -0,0 +1,1 @@
2161+desktop/oem-config-prepare-gtk.desktop usr/share/ubiquity/desktop
2162
2163=== added file 'debian/oem-config-gtk.postinst'
2164--- debian/oem-config-gtk.postinst 1970-01-01 00:00:00 +0000
2165+++ debian/oem-config-gtk.postinst 2009-06-29 19:40:27 +0000
2166@@ -0,0 +1,11 @@
2167+#! /bin/sh
2168+set -e
2169+
2170+if [ "$1" = configure ] && dpkg --compare-versions "$2" lt 0; then
2171+ cp -a /usr/share/ubiquity/desktop/oem-config-prepare-gtk.desktop \
2172+ /usr/share/applications/
2173+fi
2174+
2175+#DEBHELPER#
2176+
2177+exit 0
2178
2179=== added file 'debian/oem-config-kde.install'
2180--- debian/oem-config-kde.install 1970-01-01 00:00:00 +0000
2181+++ debian/oem-config-kde.install 2009-07-01 20:19:40 +0000
2182@@ -0,0 +1,1 @@
2183+desktop/oem-config-prepare-kde.desktop usr/share/ubiquity/desktop
2184
2185=== added file 'debian/oem-config-kde.postinst'
2186--- debian/oem-config-kde.postinst 1970-01-01 00:00:00 +0000
2187+++ debian/oem-config-kde.postinst 2009-06-29 19:40:27 +0000
2188@@ -0,0 +1,11 @@
2189+#! /bin/sh
2190+set -e
2191+
2192+if [ "$1" = configure ] && dpkg --compare-versions "$2" lt 0; then
2193+ cp -a /usr/share/ubiquity/desktop/oem-config-prepare-kde.desktop \
2194+ /usr/share/applications/kde/
2195+fi
2196+
2197+#DEBHELPER#
2198+
2199+exit 0
2200
2201=== added file 'debian/oem-config-udeb.install'
2202--- debian/oem-config-udeb.install 1970-01-01 00:00:00 +0000
2203+++ debian/oem-config-udeb.install 2009-06-24 13:57:01 +0000
2204@@ -0,0 +1,1 @@
2205+finish-install.d usr/lib
2206
2207=== added file 'debian/oem-config-udeb.postinst'
2208--- debian/oem-config-udeb.postinst 1970-01-01 00:00:00 +0000
2209+++ debian/oem-config-udeb.postinst 2009-06-24 13:57:01 +0000
2210@@ -0,0 +1,23 @@
2211+#! /bin/sh
2212+set -e
2213+
2214+. /usr/share/debconf/confmodule
2215+
2216+set_question () {
2217+ if ! db_set "$1" "$2"; then
2218+ db_register debian-installer/dummy "$1"
2219+ db_subst "$1" ID "$1"
2220+ db_set "$1" "$2"
2221+ fi
2222+ db_fset "$1" seen true
2223+}
2224+
2225+set_question passwd/user-fullname 'OEM Configuration (temporary user)'
2226+set_question passwd/username oem
2227+set_question passwd/user-uid 29999
2228+set_question passwd/auto-login true
2229+set_question passwd/auto-login-backup oem
2230+set_question user-setup/encrypted-private false
2231+set_question user-setup/encrypt-home false
2232+
2233+exit 0
2234
2235=== added file 'debian/oem-config-udeb.templates'
2236--- debian/oem-config-udeb.templates 1970-01-01 00:00:00 +0000
2237+++ debian/oem-config-udeb.templates 2009-06-24 13:57:01 +0000
2238@@ -0,0 +1,31 @@
2239+Template: debian-installer/oem-config-udeb/title
2240+Type: text
2241+# Translators: OEM stands for "Original Equipment Manufacturer", used in
2242+# this case to describe an organisation that pre-installs the operating
2243+# system on hardware and then sells the result to end users. These strings
2244+# will typically only be displayed to OEMs themselves, so you don't have to
2245+# worry too much about clarity.
2246+_Description: Prepare for OEM configuration
2247+
2248+Template: finish-install/progress/oem-config-udeb
2249+Type: text
2250+# finish-install progress bar item
2251+_Description: Preparing for OEM configuration...
2252+
2253+Template: oem-config-udeb/instructions
2254+Type: text
2255+_Description: Ready for OEM configuration
2256+ When you boot into the new system, you will be able to log in as the 'oem'
2257+ user with the password you selected earlier; this user also has
2258+ administrative privileges using 'sudo'. You will then be able to make any
2259+ additional modifications you require to the system.
2260+ .
2261+ Once the system is configured to your satisfaction, run
2262+ 'oem-config-prepare'. This will cause the system to delete the temporary
2263+ 'oem' user and ask the end user various configuration questions the next
2264+ time it boots.
2265+
2266+Template: oem-config-udeb/frontend
2267+Type: string
2268+Default: gtk
2269+Description: frontend package to install (gtk or kde)
2270
2271=== added file 'debian/oem-config.dirs'
2272--- debian/oem-config.dirs 1970-01-01 00:00:00 +0000
2273+++ debian/oem-config.dirs 2009-06-24 13:57:01 +0000
2274@@ -0,0 +1,3 @@
2275+usr/share/lintian/overrides
2276+var/lib/localechooser
2277+usr/lib/oem-config/post-install
2278
2279=== added file 'debian/oem-config.init'
2280--- debian/oem-config.init 1970-01-01 00:00:00 +0000
2281+++ debian/oem-config.init 2009-06-24 13:57:01 +0000
2282@@ -0,0 +1,50 @@
2283+#! /bin/sh
2284+### BEGIN INIT INFO
2285+# Provides: oem-config
2286+# Required-Start: $remote_fs $syslog $time hal
2287+# Required-Stop: $remote_fs $syslog $time hal
2288+# X-Start-Before: gdm kdm xdm
2289+# X-Stop-After: gdm kdm xdm
2290+# Default-Start:
2291+# Default-Stop:
2292+# Short-Description: End-user configuration after initial OEM installation
2293+# Description: Run on the first boot after shipping to the end user to
2294+# reconfigure the system for them; removes itself
2295+# thereafter.
2296+### END INIT INFO
2297+
2298+set -e
2299+
2300+PATH="/usr/local/sbin:/usr/sbin:/sbin${PATH:+:$PATH}"
2301+
2302+# Exit if the package is not installed
2303+if ! type oem-config-firstboot >/dev/null 2>&1; then
2304+ exit 0
2305+fi
2306+
2307+debug=
2308+for x in $(cat /proc/cmdline); do
2309+ case $x in
2310+ debug-oem-config)
2311+ debug=--debug
2312+ ;;
2313+ esac
2314+done
2315+
2316+case $1 in
2317+ start)
2318+ # Make the splash screen go away if necessary.
2319+ if type usplash_write >/dev/null 2>&1 && \
2320+ [ "$TERM" = linux ]; then
2321+ clear >/dev/tty1
2322+ chvt 1
2323+ usplash_write QUIT || true
2324+ fi
2325+
2326+ # Reconfigure the system (starts a temporary display
2327+ # manager).
2328+ oem-config-firstboot $debug </dev/console >/dev/console 2>&1
2329+ ;;
2330+esac
2331+
2332+exit 0
2333
2334=== added file 'debian/oem-config.install'
2335--- debian/oem-config.install 1970-01-01 00:00:00 +0000
2336+++ debian/oem-config.install 2009-06-24 13:57:01 +0000
2337@@ -0,0 +1,1 @@
2338+bin/oem-config-* usr/sbin
2339
2340=== added file 'debian/oem-config.links'
2341--- debian/oem-config.links 1970-01-01 00:00:00 +0000
2342+++ debian/oem-config.links 2009-06-25 13:14:25 +0000
2343@@ -0,0 +1,1 @@
2344+/usr/lib/ubiquity/bin/ubiquity /usr/sbin/oem-config
2345
2346=== added file 'debian/oem-config.manpages'
2347--- debian/oem-config.manpages 1970-01-01 00:00:00 +0000
2348+++ debian/oem-config.manpages 2009-06-24 13:57:01 +0000
2349@@ -0,0 +1,1 @@
2350+man/oem-config*.8
2351
2352=== modified file 'debian/po/af.po'
2353--- debian/po/af.po 2009-07-02 19:32:12 +0000
2354+++ debian/po/af.po 2009-07-07 18:59:38 +0000
2355@@ -7,7 +7,7 @@
2356 msgstr ""
2357 "Project-Id-Version: debian-installer\n"
2358 "Report-Msgid-Bugs-To: ubiquity@packages.debian.org\n"
2359-"POT-Creation-Date: 2009-07-02 20:30+0100\n"
2360+"POT-Creation-Date: 2009-06-19 15:07-0400\n"
2361 "PO-Revision-Date: 2007-10-29 18:09+0000\n"
2362 "Last-Translator: Heybes <heybes@gmail.com>\n"
2363 "Language-Team: Afrikaans <af@li.org>\n"
2364@@ -19,50 +19,50 @@
2365
2366 #. Type: text
2367 #. Description
2368-#: ../ubiquity.templates:2001
2369+#: ../ubiquity.templates:3001
2370 msgid "Use the largest continuous free space"
2371 msgstr ""
2372
2373 #. Type: text
2374 #. Description
2375-#: ../ubiquity.templates:3001
2376-msgid "Erase and use the entire disk"
2377-msgstr ""
2378-
2379-#. Type: text
2380-#. Description
2381 #: ../ubiquity.templates:4001
2382+msgid "Use the entire disk"
2383+msgstr ""
2384+
2385+#. Type: text
2386+#. Description
2387+#: ../ubiquity.templates:5001
2388 msgid "Install them side by side, choosing between them each startup"
2389 msgstr ""
2390
2391 #. Type: text
2392 #. Description
2393-#: ../ubiquity.templates:5001
2394+#: ../ubiquity.templates:6001
2395 msgid "Specify partitions manually (advanced)"
2396 msgstr ""
2397
2398 #. Type: text
2399 #. Description
2400 #. This is used as a window title.
2401-#: ../ubiquity.templates:6001
2402+#: ../ubiquity.templates:7001
2403 msgid "Install"
2404 msgstr "Installeer"
2405
2406 #. Type: text
2407 #. Description
2408-#: ../ubiquity.templates:7001
2409+#: ../ubiquity.templates:8001
2410 msgid "Install (OEM mode, for manufacturers only)"
2411 msgstr ""
2412
2413 #. Type: text
2414 #. Description
2415-#: ../ubiquity.templates:8001
2416+#: ../ubiquity.templates:9001
2417 msgid "Welcome"
2418 msgstr "Welkom"
2419
2420 #. Type: text
2421 #. Description
2422-#: ../ubiquity.templates:9001
2423+#: ../ubiquity.templates:10001
2424 msgid ""
2425 "Ready to install? Once you answer a few questions, the contents of the live "
2426 "CD can be installed on this computer so you can run the system at full speed "
2427@@ -74,13 +74,13 @@
2428
2429 #. Type: text
2430 #. Description
2431-#: ../ubiquity.templates:9001
2432+#: ../ubiquity.templates:10001
2433 msgid "Answering the questions should only take a few minutes."
2434 msgstr "Om die vrae te beantwoord sal net 'n paar minute duur."
2435
2436 #. Type: text
2437 #. Description
2438-#: ../ubiquity.templates:9001
2439+#: ../ubiquity.templates:10001
2440 msgid ""
2441 "Please choose the language used for the installation process. This language "
2442 "will be the default language for the final system."
2443@@ -88,7 +88,7 @@
2444
2445 #. Type: text
2446 #. Description
2447-#: ../ubiquity.templates:10001
2448+#: ../ubiquity.templates:11001
2449 msgid ""
2450 "You are installing in system manufacturer mode. Please enter a unique name "
2451 "for this batch of systems. This name will be saved on the installed system "
2452@@ -97,7 +97,7 @@
2453
2454 #. Type: text
2455 #. Description
2456-#: ../ubiquity.templates:11001
2457+#: ../ubiquity.templates:12001
2458 msgid ""
2459 "If you have Internet access, read the release notes for information on "
2460 "problems that may affect you."
2461@@ -107,79 +107,85 @@
2462
2463 #. Type: text
2464 #. Description
2465-#: ../ubiquity.templates:12001
2466+#: ../ubiquity.templates:13001
2467 msgid "Release Notes"
2468 msgstr "Vrystelling Notas"
2469
2470 #. Type: text
2471 #. Description
2472-#: ../ubiquity.templates:13001
2473+#: ../ubiquity.templates:14001
2474 msgid "Where are you?"
2475 msgstr "Waar is jy?"
2476
2477 #. Type: text
2478 #. Description
2479 #: ../ubiquity.templates:15001
2480+msgid "Select your time zone from the map, or by region and city."
2481+msgstr ""
2482+
2483+#. Type: text
2484+#. Description
2485+#: ../ubiquity.templates:16001
2486 msgid "City:"
2487 msgstr ""
2488
2489 #. Type: text
2490 #. Description
2491-#: ../ubiquity.templates:16001
2492+#: ../ubiquity.templates:17001
2493 msgid "Region:"
2494 msgstr ""
2495
2496 #. Type: text
2497 #. Description
2498-#: ../ubiquity.templates:17001
2499+#: ../ubiquity.templates:18001
2500 msgid "Keyboard layout"
2501 msgstr "Sleutelbord-uitleg"
2502
2503 #. Type: text
2504 #. Description
2505-#: ../ubiquity.templates:18001
2506+#: ../ubiquity.templates:19001
2507 msgid "Which layout is most similar to your keyboard?"
2508 msgstr "Watter uitleg lyk mees soos jou sleutelbord?"
2509
2510 #. Type: text
2511 #. Description
2512-#: ../ubiquity.templates:19001
2513+#: ../ubiquity.templates:20001
2514 msgid "You can type into this box to test your new keyboard layout."
2515 msgstr "Jy kan in hierdie boks tik om jou nuwe sleutelborduitleg te toets."
2516
2517 #. Type: text
2518 #. Description
2519-#: ../ubiquity.templates:20001
2520+#: ../ubiquity.templates:21001
2521 msgid "Suggested option:"
2522 msgstr ""
2523
2524 #. Type: text
2525 #. Description
2526-#: ../ubiquity.templates:21001
2527+#: ../ubiquity.templates:22001
2528 msgid "Choose your own:"
2529 msgstr ""
2530
2531 #. Type: text
2532 #. Description
2533-#: ../ubiquity.templates:22001
2534+#: ../ubiquity.templates:23001
2535 msgid "Who are you?"
2536 msgstr "Wie is jy?"
2537
2538 #. Type: text
2539 #. Description
2540-#: ../ubiquity.templates:23001
2541+#: ../ubiquity.templates:24001
2542 msgid "What is your name?"
2543 msgstr "Wat is jou naam?"
2544
2545 #. Type: text
2546 #. Description
2547-#: ../ubiquity.templates:24001
2548+#: ../ubiquity.templates:25001
2549 msgid "What name do you want to use to log in?"
2550 msgstr "Watter naam gebruik jy om aan te teken?"
2551
2552 #. Type: text
2553 #. Description
2554-#: ../ubiquity.templates:25001
2555+#: ../ubiquity.templates:26001
2556 msgid ""
2557 "If more than one person will use this computer, you can set up multiple "
2558 "accounts after installation."
2559@@ -189,19 +195,19 @@
2560
2561 #. Type: text
2562 #. Description
2563-#: ../ubiquity.templates:26001
2564+#: ../ubiquity.templates:27001
2565 msgid "Choose a password to keep your account safe."
2566 msgstr "Kies 'n wagwoord om jou rekening veilig te hou."
2567
2568 #. Type: text
2569 #. Description
2570-#: ../ubiquity.templates:27001
2571+#: ../ubiquity.templates:28001
2572 msgid "You are running in debugging mode. Do not use a valuable password!"
2573 msgstr ""
2574
2575 #. Type: text
2576 #. Description
2577-#: ../ubiquity.templates:28001
2578+#: ../ubiquity.templates:29001
2579 msgid ""
2580 "Enter the same password twice, so that it can be checked for typing errors. "
2581 "A good password will contain a mixture of letters, numbers and punctuation, "
2582@@ -211,13 +217,13 @@
2583
2584 #. Type: text
2585 #. Description
2586-#: ../ubiquity.templates:29001
2587+#: ../ubiquity.templates:30001
2588 msgid "What is the name of this computer?"
2589 msgstr "Wat is die naam van hierdie rekenaar?"
2590
2591 #. Type: text
2592 #. Description
2593-#: ../ubiquity.templates:30001
2594+#: ../ubiquity.templates:31001
2595 msgid ""
2596 "This name will be used if you make the computer visible to others on a "
2597 "network."
2598@@ -227,37 +233,37 @@
2599
2600 #. Type: text
2601 #. Description
2602-#: ../ubiquity.templates:31001
2603+#: ../ubiquity.templates:32001
2604 msgid "Log in automatically"
2605 msgstr ""
2606
2607 #. Type: text
2608 #. Description
2609-#: ../ubiquity.templates:32001
2610+#: ../ubiquity.templates:33001
2611 msgid "Require a password to log in"
2612 msgstr ""
2613
2614 #. Type: text
2615 #. Description
2616-#: ../ubiquity.templates:33001
2617+#: ../ubiquity.templates:34001
2618 msgid "Require a password to log in and to decrypt your home folder"
2619 msgstr ""
2620
2621 #. Type: text
2622 #. Description
2623-#: ../ubiquity.templates:34001
2624+#: ../ubiquity.templates:35001
2625 msgid "Choose another password"
2626 msgstr ""
2627
2628 #. Type: text
2629 #. Description
2630-#: ../ubiquity.templates:35001
2631+#: ../ubiquity.templates:36001
2632 msgid "Migrate documents and settings"
2633 msgstr ""
2634
2635 #. Type: text
2636 #. Description
2637-#: ../ubiquity.templates:36001
2638+#: ../ubiquity.templates:37001
2639 msgid ""
2640 "Select any accounts you would like to import. The documents and settings "
2641 "for these accounts will be available after the install completes."
2642@@ -265,7 +271,7 @@
2643
2644 #. Type: text
2645 #. Description
2646-#: ../ubiquity.templates:36001
2647+#: ../ubiquity.templates:37001
2648 msgid ""
2649 "If you do not wish to import any accounts, select nothing and go to the next "
2650 "page."
2651@@ -273,50 +279,50 @@
2652
2653 #. Type: text
2654 #. Description
2655-#: ../ubiquity.templates:37001
2656+#: ../ubiquity.templates:38001
2657 msgid "Prepare disk space"
2658 msgstr "Maak skyf-spasie gereed"
2659
2660 #. Type: text
2661 #. Description
2662-#: ../ubiquity.templates:38001
2663+#: ../ubiquity.templates:39001
2664 msgid "How do you want to partition the disk?"
2665 msgstr "Hoe wil jy die skyf partisie?"
2666
2667 #. Type: text
2668 #. Description
2669-#: ../ubiquity.templates:39001
2670+#: ../ubiquity.templates:40001
2671 msgid "This computer has no operating systems on it."
2672 msgstr ""
2673
2674 #. Type: text
2675 #. Description
2676-#: ../ubiquity.templates:40001
2677+#: ../ubiquity.templates:41001
2678 msgid "This computer has ${OS} on it."
2679 msgstr ""
2680
2681 #. Type: text
2682 #. Description
2683-#: ../ubiquity.templates:41001
2684+#: ../ubiquity.templates:42001
2685 msgid "This computer has several operating systems on it."
2686 msgstr ""
2687
2688 #. Type: text
2689 #. Description
2690-#: ../ubiquity.templates:42001
2691+#: ../ubiquity.templates:43001
2692 msgid "Where do you want to put ${RELEASE}?"
2693 msgstr ""
2694
2695 #. Type: text
2696 #. Description
2697-#: ../ubiquity.templates:43001
2698+#: ../ubiquity.templates:44001
2699 msgid "Prepare partitions"
2700 msgstr "Maak partisies gereed"
2701
2702 #. Type: text
2703 #. Description
2704 #. SYSTEMS is a comma-separated list of operating systems present on the disk.
2705-#: ../ubiquity.templates:44001
2706+#: ../ubiquity.templates:45001
2707 msgid "This will delete ${SYSTEMS} and install ${RELEASE}."
2708 msgstr ""
2709
2710@@ -324,20 +330,20 @@
2711 #. Description
2712 #. Type: note
2713 #. Description
2714-#: ../ubiquity.templates:45001 ../ubiquity.templates:96001
2715+#: ../ubiquity.templates:46001 ../ubiquity.templates:97001
2716 #: ../ubiquity-frontend-mythbuntu.templates:1001
2717 msgid "Ready to install"
2718 msgstr "Gereed om te installeer"
2719
2720 #. Type: text
2721 #. Description
2722-#: ../ubiquity.templates:46001
2723+#: ../ubiquity.templates:47001
2724 msgid "Details"
2725 msgstr ""
2726
2727 #. Type: text
2728 #. Description
2729-#: ../ubiquity.templates:47001
2730+#: ../ubiquity.templates:48001
2731 msgid ""
2732 "Your new operating system will now be installed with the following settings:"
2733 msgstr ""
2734@@ -345,7 +351,7 @@
2735
2736 #. Type: text
2737 #. Description
2738-#: ../ubiquity.templates:48001
2739+#: ../ubiquity.templates:49001
2740 msgid "Advanced..."
2741 msgstr "Gevorderde..."
2742
2743@@ -353,49 +359,49 @@
2744 #. Description
2745 #. This is used as a button label, and should be translated as an action.
2746 #. Omit the [ ... ] from the translation.
2747-#: ../ubiquity.templates:49001
2748+#: ../ubiquity.templates:50001
2749 msgid "Install[ action ]"
2750 msgstr ""
2751
2752 #. Type: text
2753 #. Description
2754-#: ../ubiquity.templates:50001
2755+#: ../ubiquity.templates:51001
2756 msgid "Step ${INDEX} of ${TOTAL}"
2757 msgstr "Stap ${INDEX} van ${TOTAL}"
2758
2759 #. Type: title
2760 #. Description
2761-#: ../ubiquity.templates:51001
2762+#: ../ubiquity.templates:52001
2763 msgid "Quit the installation?"
2764 msgstr ""
2765
2766 #. Type: text
2767 #. Description
2768-#: ../ubiquity.templates:52001
2769+#: ../ubiquity.templates:53001
2770 msgid "Do you really want to quit the installation now?"
2771 msgstr ""
2772
2773 #. Type: text
2774 #. Description
2775-#: ../ubiquity.templates:53001
2776+#: ../ubiquity.templates:54001
2777 msgid "Skip"
2778 msgstr ""
2779
2780 #. Type: title
2781 #. Description
2782-#: ../ubiquity.templates:54001
2783+#: ../ubiquity.templates:55001
2784 msgid "Installation Complete"
2785 msgstr ""
2786
2787 #. Type: text
2788 #. Description
2789-#: ../ubiquity.templates:55001
2790+#: ../ubiquity.templates:56001
2791 msgid "Continue Testing"
2792 msgstr ""
2793
2794 #. Type: text
2795 #. Description
2796-#: ../ubiquity.templates:56001
2797+#: ../ubiquity.templates:57001
2798 msgid "Restart Now"
2799 msgstr ""
2800
2801@@ -403,13 +409,13 @@
2802 #. Description
2803 #. Type: text
2804 #. Description
2805-#: ../ubiquity.templates:57001 ../ubiquity.templates:58001
2806+#: ../ubiquity.templates:58001 ../ubiquity.templates:59001
2807 msgid "Installer crashed"
2808 msgstr ""
2809
2810 #. Type: text
2811 #. Description
2812-#: ../ubiquity.templates:59001
2813+#: ../ubiquity.templates:60001
2814 msgid ""
2815 "We're sorry; the installer crashed. Please file a new bug report at https://"
2816 "launchpad.net/ubuntu/+source/ubiquity/+filebug (do not attach your details "
2817@@ -423,7 +429,7 @@
2818 #. Description
2819 #. Displayed next to a graphical bar depicting the state of the disk before
2820 #. automatic partitioning.
2821-#: ../ubiquity.templates:60001
2822+#: ../ubiquity.templates:61001
2823 msgid "Before:"
2824 msgstr ""
2825
2826@@ -431,21 +437,21 @@
2827 #. Description
2828 #. Displayed next to a graphical bar depicting the state of the disk after
2829 #. automatic partitioning.
2830-#: ../ubiquity.templates:61001
2831+#: ../ubiquity.templates:62001
2832 msgid "After:"
2833 msgstr ""
2834
2835 #. Type: text
2836 #. Description
2837 #. An action, displayed on a button or as a menu item.
2838-#: ../ubiquity.templates:62001
2839+#: ../ubiquity.templates:63001
2840 msgid "New Partition Table..."
2841 msgstr ""
2842
2843 #. Type: text
2844 #. Description
2845 #. An action, displayed on a button or as a menu item.
2846-#: ../ubiquity.templates:63001
2847+#: ../ubiquity.templates:64001
2848 #, fuzzy
2849 #| msgid "Advanced..."
2850 msgid "Add..."
2851@@ -454,7 +460,7 @@
2852 #. Type: text
2853 #. Description
2854 #. An action, displayed on a button or as a menu item.
2855-#: ../ubiquity.templates:64001
2856+#: ../ubiquity.templates:65001
2857 #, fuzzy
2858 #| msgid "Advanced..."
2859 msgid "Change..."
2860@@ -463,21 +469,21 @@
2861 #. Type: text
2862 #. Description
2863 #. An action, displayed on a button or as a menu item.
2864-#: ../ubiquity.templates:65001
2865+#: ../ubiquity.templates:66001
2866 msgid "Delete"
2867 msgstr ""
2868
2869 #. Type: text
2870 #. Description
2871 #. An action, displayed on a button or as a menu item.
2872-#: ../ubiquity.templates:66001
2873+#: ../ubiquity.templates:67001
2874 msgid "Revert"
2875 msgstr ""
2876
2877 #. Type: text
2878 #. Description
2879 #. A column heading in the partitioner.
2880-#: ../ubiquity.templates:67001
2881+#: ../ubiquity.templates:68001
2882 msgid "Device"
2883 msgstr ""
2884
2885@@ -485,28 +491,28 @@
2886 #. Description
2887 #. A column heading in the partitioner. Indicates how the partition is to be
2888 #. used (ext2, swap, etc.).
2889-#: ../ubiquity.templates:68001
2890+#: ../ubiquity.templates:69001
2891 msgid "Type"
2892 msgstr ""
2893
2894 #. Type: text
2895 #. Description
2896 #. A column heading in the partitioner.
2897-#: ../ubiquity.templates:69001
2898+#: ../ubiquity.templates:70001
2899 msgid "Mount point"
2900 msgstr ""
2901
2902 #. Type: text
2903 #. Description
2904 #. A column heading in the partitioner.
2905-#: ../ubiquity.templates:70001
2906+#: ../ubiquity.templates:71001
2907 msgid "Format?"
2908 msgstr ""
2909
2910 #. Type: text
2911 #. Description
2912 #. A column heading in the partitioner.
2913-#: ../ubiquity.templates:71001
2914+#: ../ubiquity.templates:72001
2915 msgid "Size"
2916 msgstr ""
2917
2918@@ -514,27 +520,27 @@
2919 #. Description
2920 #. A column heading in the partitioner. Indicates how much of the space on
2921 #. this partition is used by data.
2922-#: ../ubiquity.templates:72001
2923+#: ../ubiquity.templates:73001
2924 msgid "Used"
2925 msgstr ""
2926
2927 #. Type: text
2928 #. Description
2929 #. Indicates unpartitioned free space on a disk.
2930-#: ../ubiquity.templates:73001
2931+#: ../ubiquity.templates:74001
2932 msgid "free space"
2933 msgstr ""
2934
2935 #. Type: text
2936 #. Description
2937 #. Indicates that we do not know how much space is used on this partition.
2938-#: ../ubiquity.templates:74001
2939+#: ../ubiquity.templates:75001
2940 msgid "unknown"
2941 msgstr ""
2942
2943 #. Type: text
2944 #. Description
2945-#: ../ubiquity.templates:75001
2946+#: ../ubiquity.templates:76001
2947 msgid "Create partition"
2948 msgstr ""
2949
2950@@ -542,97 +548,97 @@
2951 #. Description
2952 #. Type: text
2953 #. Description
2954-#: ../ubiquity.templates:76001 ../ubiquity.templates:83001
2955+#: ../ubiquity.templates:77001 ../ubiquity.templates:84001
2956 msgid "New partition size in megabytes (1000000 bytes):"
2957 msgstr ""
2958
2959 #. Type: text
2960 #. Description
2961-#: ../ubiquity.templates:77001
2962+#: ../ubiquity.templates:78001
2963 msgid "Beginning"
2964 msgstr "Begin"
2965
2966 #. Type: text
2967 #. Description
2968-#: ../ubiquity.templates:78001
2969+#: ../ubiquity.templates:79001
2970 msgid "End"
2971 msgstr "Einde"
2972
2973 #. Type: text
2974 #. Description
2975-#: ../ubiquity.templates:79001
2976+#: ../ubiquity.templates:80001
2977 msgid "Primary"
2978 msgstr ""
2979
2980 #. Type: text
2981 #. Description
2982-#: ../ubiquity.templates:80001
2983+#: ../ubiquity.templates:81001
2984 msgid "Logical"
2985 msgstr ""
2986
2987 #. Type: text
2988 #. Description
2989-#: ../ubiquity.templates:81001
2990+#: ../ubiquity.templates:82001
2991 msgid "Edit partition"
2992 msgstr ""
2993
2994 #. Type: text
2995 #. Description
2996-#: ../ubiquity.templates:82001
2997+#: ../ubiquity.templates:83001
2998 msgid "Edit a partition"
2999 msgstr ""
3000
3001 #. Type: text
3002 #. Description
3003-#: ../ubiquity.templates:84001
3004+#: ../ubiquity.templates:85001
3005 msgid "Advanced Options"
3006 msgstr ""
3007
3008 #. Type: text
3009 #. Description
3010-#: ../ubiquity.templates:85001
3011+#: ../ubiquity.templates:86001
3012 msgid "Boot loader"
3013 msgstr ""
3014
3015 #. Type: text
3016 #. Description
3017-#: ../ubiquity.templates:86001
3018+#: ../ubiquity.templates:87001
3019 msgid "Install boot loader"
3020 msgstr ""
3021
3022 #. Type: text
3023 #. Description
3024-#: ../ubiquity.templates:87001
3025+#: ../ubiquity.templates:88001
3026 msgid "Popularity contest"
3027 msgstr ""
3028
3029 #. Type: text
3030 #. Description
3031-#: ../ubiquity.templates:88001
3032+#: ../ubiquity.templates:89001
3033 msgid "Participate in the package usage survey"
3034 msgstr ""
3035
3036 #. Type: text
3037 #. Description
3038-#: ../ubiquity.templates:89001
3039+#: ../ubiquity.templates:90001
3040 msgid "Network proxy"
3041 msgstr ""
3042
3043 #. Type: text
3044 #. Description
3045-#: ../ubiquity.templates:90001
3046+#: ../ubiquity.templates:91001
3047 msgid "HTTP proxy:"
3048 msgstr ""
3049
3050 #. Type: text
3051 #. Description
3052-#: ../ubiquity.templates:91001
3053+#: ../ubiquity.templates:92001
3054 msgid "Port:"
3055 msgstr ""
3056
3057 #. Type: text
3058 #. Description
3059-#: ../ubiquity.templates:92001
3060+#: ../ubiquity.templates:93001
3061 msgid ""
3062 "Installation has finished. You can continue testing Ubuntu now, but until "
3063 "you restart the computer, any changes you make or documents you save will "
3064@@ -642,20 +648,20 @@
3065 #. Type: text
3066 #. Description
3067 #. Translators, this text will appear on a button, so KEEP IT SHORT
3068-#: ../ubiquity.templates:93001
3069+#: ../ubiquity.templates:94001
3070 msgid "Go Back"
3071 msgstr "Gaan terug"
3072
3073 #. Type: text
3074 #. Description
3075 #. Translators, this text will appear on a button, so KEEP IT SHORT
3076-#: ../ubiquity.templates:94001
3077+#: ../ubiquity.templates:95001
3078 msgid "Continue"
3079 msgstr "Gaan voort"
3080
3081 #. Type: text
3082 #. Description
3083-#: ../ubiquity.templates:95001
3084+#: ../ubiquity.templates:96001
3085 msgid ""
3086 "Installation is complete. You need to restart the computer in order to use "
3087 "the new installation."
3088@@ -663,7 +669,7 @@
3089
3090 #. Type: note
3091 #. Description
3092-#: ../ubiquity.templates:96001
3093+#: ../ubiquity.templates:97001
3094 msgid ""
3095 " Language: ${LANGUAGE}\n"
3096 " Keyboard layout: ${KEYMAP}\n"
3097@@ -683,37 +689,37 @@
3098
3099 #. Type: text
3100 #. Description
3101-#: ../ubiquity.templates:97001
3102+#: ../ubiquity.templates:98001
3103 msgid "Checking the installation..."
3104 msgstr ""
3105
3106 #. Type: title
3107 #. Description
3108-#: ../ubiquity.templates:98001
3109+#: ../ubiquity.templates:99001
3110 msgid "Installing system"
3111 msgstr "Installeer stelsel"
3112
3113 #. Type: text
3114 #. Description
3115-#: ../ubiquity.templates:99001
3116+#: ../ubiquity.templates:100001
3117 msgid "Finding the distribution to copy..."
3118 msgstr "Soek die verspreiding om te kopieër..."
3119
3120 #. Type: text
3121 #. Description
3122-#: ../ubiquity.templates:101001
3123+#: ../ubiquity.templates:102001
3124 msgid "Scanning files..."
3125 msgstr "Deursoek lêers..."
3126
3127 #. Type: text
3128 #. Description
3129-#: ../ubiquity.templates:102001
3130+#: ../ubiquity.templates:103001
3131 msgid "Copying files..."
3132 msgstr "Kopieër lêers..."
3133
3134 #. Type: text
3135 #. Description
3136-#: ../ubiquity.templates:103001
3137+#: ../ubiquity.templates:104001
3138 msgid "Copying files (less than a minute remaining)..."
3139 msgstr "Besig om lêers te kopieer (minder as 'n minuut oor)..."
3140
3141@@ -727,9 +733,9 @@
3142 #. Description
3143 #. Type: select
3144 #. Description
3145-#: ../ubiquity.templates:104001 ../ubiquity.templates:105001
3146-#: ../ubiquity.templates:106001 ../ubiquity.templates:107001
3147-#: ../ubiquity.templates:108001
3148+#: ../ubiquity.templates:105001 ../ubiquity.templates:106001
3149+#: ../ubiquity.templates:107001 ../ubiquity.templates:108001
3150+#: ../ubiquity.templates:109001
3151 msgid "Installation Failed"
3152 msgstr ""
3153
3154@@ -741,14 +747,14 @@
3155 #. Description
3156 #. Type: error
3157 #. Description
3158-#: ../ubiquity.templates:104001 ../ubiquity.templates:105001
3159-#: ../ubiquity.templates:106001 ../ubiquity.templates:107001
3160+#: ../ubiquity.templates:105001 ../ubiquity.templates:106001
3161+#: ../ubiquity.templates:107001 ../ubiquity.templates:108001
3162 msgid "The installer encountered an error copying files to the hard disk:"
3163 msgstr ""
3164
3165 #. Type: error
3166 #. Description
3167-#: ../ubiquity.templates:104001
3168+#: ../ubiquity.templates:105001
3169 msgid ""
3170 "This is due to there being insufficient disk space for the install to "
3171 "complete on the target partition. Please run the installer again and select "
3172@@ -757,7 +763,7 @@
3173
3174 #. Type: error
3175 #. Description
3176-#: ../ubiquity.templates:105001
3177+#: ../ubiquity.templates:106001
3178 msgid ""
3179 "This is often due to a faulty CD/DVD disk or drive. It may help to clean the "
3180 "CD/DVD, to burn the CD/DVD at a lower speed, or to clean the CD/DVD drive "
3181@@ -766,7 +772,7 @@
3182
3183 #. Type: error
3184 #. Description
3185-#: ../ubiquity.templates:106001
3186+#: ../ubiquity.templates:107001
3187 msgid ""
3188 "This is often due to a faulty hard disk. It may help to check whether the "
3189 "hard disk is old and in need of replacement, or to move the system to a "
3190@@ -781,7 +787,7 @@
3191 #. Description
3192 #. This is used when there was an md5 mismatch during copying, meaning that
3193 #. the source file and destination file are not equal.
3194-#: ../ubiquity.templates:107001 ../ubiquity.templates:108001
3195+#: ../ubiquity.templates:108001 ../ubiquity.templates:109001
3196 msgid ""
3197 "This is often due to a faulty CD/DVD disk or drive, or a faulty hard disk. "
3198 "It may help to clean the CD/DVD, to burn the CD/DVD at a lower speed, to "
3199@@ -792,145 +798,145 @@
3200
3201 #. Type: select
3202 #. Description
3203-#: ../ubiquity.templates:108001
3204+#: ../ubiquity.templates:109001
3205 msgid "The following file did not match its source copy on the CD/DVD:"
3206 msgstr ""
3207
3208 #. Type: text
3209 #. Description
3210-#: ../ubiquity.templates:109001
3211+#: ../ubiquity.templates:110001
3212 msgid "Copying installation logs..."
3213 msgstr ""
3214
3215 #. Type: text
3216 #. Description
3217-#: ../ubiquity.templates:110001
3218+#: ../ubiquity.templates:111001
3219 msgid "Configuring target system..."
3220 msgstr "Konfigureer teikien stesel..."
3221
3222 #. Type: text
3223 #. Description
3224-#: ../ubiquity.templates:111001
3225+#: ../ubiquity.templates:112001
3226 msgid "Configuring system locales..."
3227 msgstr "Stel lokaliteitsinstellings op..."
3228
3229 #. Type: text
3230 #. Description
3231-#: ../ubiquity.templates:112001
3232+#: ../ubiquity.templates:113001
3233 msgid "Configuring apt..."
3234 msgstr "Stel apt op..."
3235
3236 #. Type: text
3237 #. Description
3238-#: ../ubiquity.templates:113001
3239+#: ../ubiquity.templates:114001
3240 msgid "Configuring time zone..."
3241 msgstr "Stel tydsone op..."
3242
3243 #. Type: text
3244 #. Description
3245-#: ../ubiquity.templates:114001
3246+#: ../ubiquity.templates:115001
3247 msgid "Configuring keyboard..."
3248 msgstr "Stel sleutelbord op..."
3249
3250 #. Type: text
3251 #. Description
3252-#: ../ubiquity.templates:115001
3253+#: ../ubiquity.templates:116001
3254 msgid "Creating user..."
3255 msgstr ""
3256
3257 #. Type: text
3258 #. Description
3259-#: ../ubiquity.templates:116001
3260+#: ../ubiquity.templates:117001
3261 msgid "Importing documents and settings..."
3262 msgstr "Invoering van dokumente en stellinge..."
3263
3264 #. Type: text
3265 #. Description
3266-#: ../ubiquity.templates:117001
3267+#: ../ubiquity.templates:118001
3268 msgid "Configuring hardware..."
3269 msgstr "Stel hardeware op..."
3270
3271 #. Type: text
3272 #. Description
3273-#: ../ubiquity.templates:118001
3274+#: ../ubiquity.templates:119001
3275 msgid "Configuring network..."
3276 msgstr "Stel netwerk op..."
3277
3278 #. Type: text
3279 #. Description
3280-#: ../ubiquity.templates:119001
3281+#: ../ubiquity.templates:120001
3282 msgid "Setting computer name..."
3283 msgstr "Stel rekenaarnaam..."
3284
3285 #. Type: text
3286 #. Description
3287-#: ../ubiquity.templates:120001
3288+#: ../ubiquity.templates:121001
3289 msgid "Configuring boot loader..."
3290 msgstr "Stel boot-laaier op..."
3291
3292 #. Type: text
3293 #. Description
3294-#: ../ubiquity.templates:121001
3295+#: ../ubiquity.templates:122001
3296 msgid "Installing additional packages..."
3297 msgstr ""
3298
3299 #. Type: text
3300 #. Description
3301-#: ../ubiquity.templates:122001
3302+#: ../ubiquity.templates:123001
3303 msgid "Checking for packages to install..."
3304 msgstr ""
3305
3306 #. Type: text
3307 #. Description
3308-#: ../ubiquity.templates:123001
3309+#: ../ubiquity.templates:124001
3310 msgid "Removing extra packages..."
3311 msgstr "Verwyder ekstra pakette..."
3312
3313 #. Type: text
3314 #. Description
3315-#: ../ubiquity.templates:124001
3316+#: ../ubiquity.templates:125001
3317 msgid "Checking for packages to remove..."
3318 msgstr "Soek pakette om te verwyder..."
3319
3320 #. Type: text
3321 #. Description
3322-#: ../ubiquity.templates:125001
3323+#: ../ubiquity.templates:126001
3324 msgid "Downloading packages (${TIME} remaining)..."
3325 msgstr "Laai pakette af (${TIME} bly nog oor)..."
3326
3327 #. Type: text
3328 #. Description
3329-#: ../ubiquity.templates:126001
3330+#: ../ubiquity.templates:127001
3331 msgid "Downloading package lists..."
3332 msgstr ""
3333
3334 #. Type: text
3335 #. Description
3336-#: ../ubiquity.templates:127001
3337+#: ../ubiquity.templates:128001
3338 msgid "Downloading package lists (${TIME} remaining)..."
3339 msgstr ""
3340
3341 #. Type: error
3342 #. Description
3343-#: ../ubiquity.templates:129001
3344+#: ../ubiquity.templates:130001
3345 msgid "Error installing ${PACKAGE}"
3346 msgstr "Fout met installasie van ${PACKAGE}"
3347
3348 #. Type: error
3349 #. Description
3350-#: ../ubiquity.templates:130001
3351+#: ../ubiquity.templates:131001
3352 msgid "Error removing ${PACKAGE}"
3353 msgstr ""
3354
3355 #. Type: error
3356 #. Description
3357-#: ../ubiquity.templates:131001
3358+#: ../ubiquity.templates:132001
3359 msgid "Error while installing packages"
3360 msgstr ""
3361
3362 #. Type: error
3363 #. Description
3364-#: ../ubiquity.templates:131001
3365+#: ../ubiquity.templates:132001
3366 msgid "An error occurred while installing packages:"
3367 msgstr ""
3368
3369@@ -938,7 +944,7 @@
3370 #. Description
3371 #. Type: error
3372 #. Description
3373-#: ../ubiquity.templates:131001 ../ubiquity.templates:132001
3374+#: ../ubiquity.templates:132001 ../ubiquity.templates:133001
3375 msgid "The following packages are in a broken state:"
3376 msgstr ""
3377
3378@@ -946,7 +952,7 @@
3379 #. Description
3380 #. Type: error
3381 #. Description
3382-#: ../ubiquity.templates:131001 ../ubiquity.templates:132001
3383+#: ../ubiquity.templates:132001 ../ubiquity.templates:133001
3384 msgid ""
3385 "This may be due to using an old installer image, or it may be due to a bug "
3386 "in some of the packages listed above. More details may be found in /var/log/"
3387@@ -959,43 +965,43 @@
3388
3389 #. Type: error
3390 #. Description
3391-#: ../ubiquity.templates:132001
3392+#: ../ubiquity.templates:133001
3393 msgid "Error while removing packages"
3394 msgstr ""
3395
3396 #. Type: error
3397 #. Description
3398-#: ../ubiquity.templates:132001
3399+#: ../ubiquity.templates:133001
3400 msgid "An error occurred while removing packages:"
3401 msgstr ""
3402
3403 #. Type: text
3404 #. Description
3405-#: ../ubiquity.templates:135001
3406+#: ../ubiquity.templates:136001
3407 msgid "Calculating files to skip copying..."
3408 msgstr ""
3409
3410 #. Type: title
3411 #. Description
3412-#: ../ubiquity.templates:136001
3413+#: ../ubiquity.templates:137001
3414 msgid "Installing language packs"
3415 msgstr "Installeer taalpakette"
3416
3417 #. Type: text
3418 #. Description
3419-#: ../ubiquity.templates:137001
3420+#: ../ubiquity.templates:138001
3421 msgid "Downloading language packs (${TIME} remaining)..."
3422 msgstr "Laai taalpaketlyste af (${TIME} bly nog oor)..."
3423
3424 #. Type: boolean
3425 #. Description
3426-#: ../ubiquity.templates:144001
3427+#: ../ubiquity.templates:145001
3428 msgid "Failed to unmount partitions"
3429 msgstr ""
3430
3431 #. Type: boolean
3432 #. Description
3433-#: ../ubiquity.templates:144001
3434+#: ../ubiquity.templates:145001
3435 msgid ""
3436 "The installer needs to commit changes to partition tables, but cannot do so "
3437 "because partitions on the following mount points could not be unmounted:"
3438@@ -1003,25 +1009,25 @@
3439
3440 #. Type: boolean
3441 #. Description
3442-#: ../ubiquity.templates:144001
3443+#: ../ubiquity.templates:145001
3444 msgid "Please close any applications using these mount points."
3445 msgstr ""
3446
3447 #. Type: boolean
3448 #. Description
3449-#: ../ubiquity.templates:144001
3450+#: ../ubiquity.templates:145001
3451 msgid "Would you like the installer to try to unmount these partitions again?"
3452 msgstr ""
3453
3454 #. Type: boolean
3455 #. Description
3456-#: ../ubiquity.templates:150001
3457+#: ../ubiquity.templates:151001
3458 msgid "Do you want to return to the partitioner?"
3459 msgstr ""
3460
3461 #. Type: boolean
3462 #. Description
3463-#: ../ubiquity.templates:150001
3464+#: ../ubiquity.templates:151001
3465 msgid ""
3466 "Some of the partitions you created are too small. Please make the following "
3467 "partitions at least this large (in bytes):"
3468@@ -1029,12 +1035,61 @@
3469
3470 #. Type: boolean
3471 #. Description
3472-#: ../ubiquity.templates:150001
3473+#: ../ubiquity.templates:151001
3474 msgid ""
3475 "If you do not go back to the partitioner and increase the size of these "
3476 "partitions, the installation may fail."
3477 msgstr ""
3478
3479+#. Type: text
3480+#. Description
3481+#: ../ubiquity.templates:152001
3482+msgid "System Configuration"
3483+msgstr ""
3484+
3485+#. Type: text
3486+#. Description
3487+#: ../ubiquity.templates:153001
3488+msgid "Choose language"
3489+msgstr ""
3490+
3491+#. Type: text
3492+#. Description
3493+#: ../ubiquity.templates:154001
3494+msgid ""
3495+"Once you answer a few questions, the system will be ready for you to use."
3496+msgstr ""
3497+
3498+#. Type: text
3499+#. Description
3500+#: ../ubiquity.templates:155001
3501+msgid "Selected region:"
3502+msgstr ""
3503+
3504+#. Type: text
3505+#. Description
3506+#: ../ubiquity.templates:156001
3507+msgid "Current time:"
3508+msgstr ""
3509+
3510+#. Type: text
3511+#. Description
3512+#: ../ubiquity.templates:157001
3513+msgid "Network configuration"
3514+msgstr ""
3515+
3516+#. Type: text
3517+#. Description
3518+#: ../ubiquity.templates:158001
3519+msgid "Software selection"
3520+msgstr ""
3521+
3522+#. Type: text
3523+#. Description
3524+#: ../ubiquity.templates:159001
3525+msgid "Applying configuration"
3526+msgstr ""
3527+
3528 #. Type: note
3529 #. Description
3530 #: ../ubiquity-frontend-mythbuntu.templates:1001
3531
3532=== modified file 'debian/po/am.po'
3533--- debian/po/am.po 2009-07-02 19:32:12 +0000
3534+++ debian/po/am.po 2009-07-07 18:59:38 +0000
3535@@ -6,7 +6,7 @@
3536 msgstr ""
3537 "Project-Id-Version: debian-installer\n"
3538 "Report-Msgid-Bugs-To: ubiquity@packages.debian.org\n"
3539-"POT-Creation-Date: 2009-07-02 20:30+0100\n"
3540+"POT-Creation-Date: 2009-06-19 15:07-0400\n"
3541 "PO-Revision-Date: 2009-04-10 11:18+0000\n"
3542 "Last-Translator: teferra <Unknown>\n"
3543 "Language-Team: Amharic\n"
3544@@ -18,50 +18,50 @@
3545
3546 #. Type: text
3547 #. Description
3548-#: ../ubiquity.templates:2001
3549+#: ../ubiquity.templates:3001
3550 msgid "Use the largest continuous free space"
3551 msgstr ""
3552
3553 #. Type: text
3554 #. Description
3555-#: ../ubiquity.templates:3001
3556-msgid "Erase and use the entire disk"
3557-msgstr ""
3558-
3559-#. Type: text
3560-#. Description
3561 #: ../ubiquity.templates:4001
3562+msgid "Use the entire disk"
3563+msgstr ""
3564+
3565+#. Type: text
3566+#. Description
3567+#: ../ubiquity.templates:5001
3568 msgid "Install them side by side, choosing between them each startup"
3569 msgstr ""
3570
3571 #. Type: text
3572 #. Description
3573-#: ../ubiquity.templates:5001
3574+#: ../ubiquity.templates:6001
3575 msgid "Specify partitions manually (advanced)"
3576 msgstr ""
3577
3578 #. Type: text
3579 #. Description
3580 #. This is used as a window title.
3581-#: ../ubiquity.templates:6001
3582+#: ../ubiquity.templates:7001
3583 msgid "Install"
3584 msgstr "ትከል"
3585
3586 #. Type: text
3587 #. Description
3588-#: ../ubiquity.templates:7001
3589+#: ../ubiquity.templates:8001
3590 msgid "Install (OEM mode, for manufacturers only)"
3591 msgstr ""
3592
3593 #. Type: text
3594 #. Description
3595-#: ../ubiquity.templates:8001
3596+#: ../ubiquity.templates:9001
3597 msgid "Welcome"
3598 msgstr "እንኳን ደህና መጡ"
3599
3600 #. Type: text
3601 #. Description
3602-#: ../ubiquity.templates:9001
3603+#: ../ubiquity.templates:10001
3604 msgid ""
3605 "Ready to install? Once you answer a few questions, the contents of the live "
3606 "CD can be installed on this computer so you can run the system at full speed "
3607@@ -72,13 +72,13 @@
3608
3609 #. Type: text
3610 #. Description
3611-#: ../ubiquity.templates:9001
3612+#: ../ubiquity.templates:10001
3613 msgid "Answering the questions should only take a few minutes."
3614 msgstr "ጥያቄዎቹን ይመልሱ፡፡ ጥቂት ደቂቃዎች ብቻ ነው የሚፈጀው፡፡"
3615
3616 #. Type: text
3617 #. Description
3618-#: ../ubiquity.templates:9001
3619+#: ../ubiquity.templates:10001
3620 msgid ""
3621 "Please choose the language used for the installation process. This language "
3622 "will be the default language for the final system."
3623@@ -86,7 +86,7 @@
3624
3625 #. Type: text
3626 #. Description
3627-#: ../ubiquity.templates:10001
3628+#: ../ubiquity.templates:11001
3629 msgid ""
3630 "You are installing in system manufacturer mode. Please enter a unique name "
3631 "for this batch of systems. This name will be saved on the installed system "
3632@@ -95,7 +95,7 @@
3633
3634 #. Type: text
3635 #. Description
3636-#: ../ubiquity.templates:11001
3637+#: ../ubiquity.templates:12001
3638 msgid ""
3639 "If you have Internet access, read the release notes for information on "
3640 "problems that may affect you."
3641@@ -103,79 +103,85 @@
3642
3643 #. Type: text
3644 #. Description
3645-#: ../ubiquity.templates:12001
3646+#: ../ubiquity.templates:13001
3647 msgid "Release Notes"
3648 msgstr ""
3649
3650 #. Type: text
3651 #. Description
3652-#: ../ubiquity.templates:13001
3653+#: ../ubiquity.templates:14001
3654 msgid "Where are you?"
3655 msgstr "የት ነዎት?"
3656
3657 #. Type: text
3658 #. Description
3659 #: ../ubiquity.templates:15001
3660+msgid "Select your time zone from the map, or by region and city."
3661+msgstr ""
3662+
3663+#. Type: text
3664+#. Description
3665+#: ../ubiquity.templates:16001
3666 msgid "City:"
3667 msgstr ""
3668
3669 #. Type: text
3670 #. Description
3671-#: ../ubiquity.templates:16001
3672+#: ../ubiquity.templates:17001
3673 msgid "Region:"
3674 msgstr ""
3675
3676 #. Type: text
3677 #. Description
3678-#: ../ubiquity.templates:17001
3679+#: ../ubiquity.templates:18001
3680 msgid "Keyboard layout"
3681 msgstr ""
3682
3683 #. Type: text
3684 #. Description
3685-#: ../ubiquity.templates:18001
3686+#: ../ubiquity.templates:19001
3687 msgid "Which layout is most similar to your keyboard?"
3688 msgstr ""
3689
3690 #. Type: text
3691 #. Description
3692-#: ../ubiquity.templates:19001
3693+#: ../ubiquity.templates:20001
3694 msgid "You can type into this box to test your new keyboard layout."
3695 msgstr ""
3696
3697 #. Type: text
3698 #. Description
3699-#: ../ubiquity.templates:20001
3700+#: ../ubiquity.templates:21001
3701 msgid "Suggested option:"
3702 msgstr ""
3703
3704 #. Type: text
3705 #. Description
3706-#: ../ubiquity.templates:21001
3707+#: ../ubiquity.templates:22001
3708 msgid "Choose your own:"
3709 msgstr ""
3710
3711 #. Type: text
3712 #. Description
3713-#: ../ubiquity.templates:22001
3714+#: ../ubiquity.templates:23001
3715 msgid "Who are you?"
3716 msgstr "ማነዎት?"
3717
3718 #. Type: text
3719 #. Description
3720-#: ../ubiquity.templates:23001
3721+#: ../ubiquity.templates:24001
3722 msgid "What is your name?"
3723 msgstr "ስምዎት ማነው?"
3724
3725 #. Type: text
3726 #. Description
3727-#: ../ubiquity.templates:24001
3728+#: ../ubiquity.templates:25001
3729 msgid "What name do you want to use to log in?"
3730 msgstr ""
3731
3732 #. Type: text
3733 #. Description
3734-#: ../ubiquity.templates:25001
3735+#: ../ubiquity.templates:26001
3736 msgid ""
3737 "If more than one person will use this computer, you can set up multiple "
3738 "accounts after installation."
3739@@ -183,19 +189,19 @@
3740
3741 #. Type: text
3742 #. Description
3743-#: ../ubiquity.templates:26001
3744+#: ../ubiquity.templates:27001
3745 msgid "Choose a password to keep your account safe."
3746 msgstr ""
3747
3748 #. Type: text
3749 #. Description
3750-#: ../ubiquity.templates:27001
3751+#: ../ubiquity.templates:28001
3752 msgid "You are running in debugging mode. Do not use a valuable password!"
3753 msgstr ""
3754
3755 #. Type: text
3756 #. Description
3757-#: ../ubiquity.templates:28001
3758+#: ../ubiquity.templates:29001
3759 msgid ""
3760 "Enter the same password twice, so that it can be checked for typing errors. "
3761 "A good password will contain a mixture of letters, numbers and punctuation, "
3762@@ -205,13 +211,13 @@
3763
3764 #. Type: text
3765 #. Description
3766-#: ../ubiquity.templates:29001
3767+#: ../ubiquity.templates:30001
3768 msgid "What is the name of this computer?"
3769 msgstr "የዚህ አስሊ ስም ምንድነው?"
3770
3771 #. Type: text
3772 #. Description
3773-#: ../ubiquity.templates:30001
3774+#: ../ubiquity.templates:31001
3775 msgid ""
3776 "This name will be used if you make the computer visible to others on a "
3777 "network."
3778@@ -219,37 +225,37 @@
3779
3780 #. Type: text
3781 #. Description
3782-#: ../ubiquity.templates:31001
3783+#: ../ubiquity.templates:32001
3784 msgid "Log in automatically"
3785 msgstr ""
3786
3787 #. Type: text
3788 #. Description
3789-#: ../ubiquity.templates:32001
3790+#: ../ubiquity.templates:33001
3791 msgid "Require a password to log in"
3792 msgstr ""
3793
3794 #. Type: text
3795 #. Description
3796-#: ../ubiquity.templates:33001
3797+#: ../ubiquity.templates:34001
3798 msgid "Require a password to log in and to decrypt your home folder"
3799 msgstr ""
3800
3801 #. Type: text
3802 #. Description
3803-#: ../ubiquity.templates:34001
3804+#: ../ubiquity.templates:35001
3805 msgid "Choose another password"
3806 msgstr ""
3807
3808 #. Type: text
3809 #. Description
3810-#: ../ubiquity.templates:35001
3811+#: ../ubiquity.templates:36001
3812 msgid "Migrate documents and settings"
3813 msgstr ""
3814
3815 #. Type: text
3816 #. Description
3817-#: ../ubiquity.templates:36001
3818+#: ../ubiquity.templates:37001
3819 msgid ""
3820 "Select any accounts you would like to import. The documents and settings "
3821 "for these accounts will be available after the install completes."
3822@@ -257,7 +263,7 @@
3823
3824 #. Type: text
3825 #. Description
3826-#: ../ubiquity.templates:36001
3827+#: ../ubiquity.templates:37001
3828 msgid ""
3829 "If you do not wish to import any accounts, select nothing and go to the next "
3830 "page."
3831@@ -265,50 +271,50 @@
3832
3833 #. Type: text
3834 #. Description
3835-#: ../ubiquity.templates:37001
3836+#: ../ubiquity.templates:38001
3837 msgid "Prepare disk space"
3838 msgstr ""
3839
3840 #. Type: text
3841 #. Description
3842-#: ../ubiquity.templates:38001
3843+#: ../ubiquity.templates:39001
3844 msgid "How do you want to partition the disk?"
3845 msgstr ""
3846
3847 #. Type: text
3848 #. Description
3849-#: ../ubiquity.templates:39001
3850+#: ../ubiquity.templates:40001
3851 msgid "This computer has no operating systems on it."
3852 msgstr ""
3853
3854 #. Type: text
3855 #. Description
3856-#: ../ubiquity.templates:40001
3857+#: ../ubiquity.templates:41001
3858 msgid "This computer has ${OS} on it."
3859 msgstr ""
3860
3861 #. Type: text
3862 #. Description
3863-#: ../ubiquity.templates:41001
3864+#: ../ubiquity.templates:42001
3865 msgid "This computer has several operating systems on it."
3866 msgstr ""
3867
3868 #. Type: text
3869 #. Description
3870-#: ../ubiquity.templates:42001
3871+#: ../ubiquity.templates:43001
3872 msgid "Where do you want to put ${RELEASE}?"
3873 msgstr ""
3874
3875 #. Type: text
3876 #. Description
3877-#: ../ubiquity.templates:43001
3878+#: ../ubiquity.templates:44001
3879 msgid "Prepare partitions"
3880 msgstr "ክፋይ አዘጋጅ"
3881
3882 #. Type: text
3883 #. Description
3884 #. SYSTEMS is a comma-separated list of operating systems present on the disk.
3885-#: ../ubiquity.templates:44001
3886+#: ../ubiquity.templates:45001
3887 msgid "This will delete ${SYSTEMS} and install ${RELEASE}."
3888 msgstr ""
3889
3890@@ -316,27 +322,27 @@
3891 #. Description
3892 #. Type: note
3893 #. Description
3894-#: ../ubiquity.templates:45001 ../ubiquity.templates:96001
3895+#: ../ubiquity.templates:46001 ../ubiquity.templates:97001
3896 #: ../ubiquity-frontend-mythbuntu.templates:1001
3897 msgid "Ready to install"
3898 msgstr "ለመትከል ዝግጁ ነው"
3899
3900 #. Type: text
3901 #. Description
3902-#: ../ubiquity.templates:46001
3903+#: ../ubiquity.templates:47001
3904 msgid "Details"
3905 msgstr ""
3906
3907 #. Type: text
3908 #. Description
3909-#: ../ubiquity.templates:47001
3910+#: ../ubiquity.templates:48001
3911 msgid ""
3912 "Your new operating system will now be installed with the following settings:"
3913 msgstr ""
3914
3915 #. Type: text
3916 #. Description
3917-#: ../ubiquity.templates:48001
3918+#: ../ubiquity.templates:49001
3919 msgid "Advanced..."
3920 msgstr ""
3921
3922@@ -344,49 +350,49 @@
3923 #. Description
3924 #. This is used as a button label, and should be translated as an action.
3925 #. Omit the [ ... ] from the translation.
3926-#: ../ubiquity.templates:49001
3927+#: ../ubiquity.templates:50001
3928 msgid "Install[ action ]"
3929 msgstr ""
3930
3931 #. Type: text
3932 #. Description
3933-#: ../ubiquity.templates:50001
3934+#: ../ubiquity.templates:51001
3935 msgid "Step ${INDEX} of ${TOTAL}"
3936 msgstr ""
3937
3938 #. Type: title
3939 #. Description
3940-#: ../ubiquity.templates:51001
3941+#: ../ubiquity.templates:52001
3942 msgid "Quit the installation?"
3943 msgstr ""
3944
3945 #. Type: text
3946 #. Description
3947-#: ../ubiquity.templates:52001
3948+#: ../ubiquity.templates:53001
3949 msgid "Do you really want to quit the installation now?"
3950 msgstr ""
3951
3952 #. Type: text
3953 #. Description
3954-#: ../ubiquity.templates:53001
3955+#: ../ubiquity.templates:54001
3956 msgid "Skip"
3957 msgstr "ዝለል"
3958
3959 #. Type: title
3960 #. Description
3961-#: ../ubiquity.templates:54001
3962+#: ../ubiquity.templates:55001
3963 msgid "Installation Complete"
3964 msgstr ""
3965
3966 #. Type: text
3967 #. Description
3968-#: ../ubiquity.templates:55001
3969+#: ../ubiquity.templates:56001
3970 msgid "Continue Testing"
3971 msgstr ""
3972
3973 #. Type: text
3974 #. Description
3975-#: ../ubiquity.templates:56001
3976+#: ../ubiquity.templates:57001
3977 msgid "Restart Now"
3978 msgstr ""
3979
3980@@ -394,13 +400,13 @@
3981 #. Description
3982 #. Type: text
3983 #. Description
3984-#: ../ubiquity.templates:57001 ../ubiquity.templates:58001
3985+#: ../ubiquity.templates:58001 ../ubiquity.templates:59001
3986 msgid "Installer crashed"
3987 msgstr ""
3988
3989 #. Type: text
3990 #. Description
3991-#: ../ubiquity.templates:59001
3992+#: ../ubiquity.templates:60001
3993 msgid ""
3994 "We're sorry; the installer crashed. Please file a new bug report at https://"
3995 "launchpad.net/ubuntu/+source/ubiquity/+filebug (do not attach your details "
3996@@ -414,7 +420,7 @@
3997 #. Description
3998 #. Displayed next to a graphical bar depicting the state of the disk before
3999 #. automatic partitioning.
4000-#: ../ubiquity.templates:60001
4001+#: ../ubiquity.templates:61001
4002 msgid "Before:"
4003 msgstr ""
4004
4005@@ -422,51 +428,50 @@
4006 #. Description
4007 #. Displayed next to a graphical bar depicting the state of the disk after
4008 #. automatic partitioning.
4009-#: ../ubiquity.templates:61001
4010+#: ../ubiquity.templates:62001
4011 msgid "After:"
4012 msgstr ""
4013
4014 #. Type: text
4015 #. Description
4016 #. An action, displayed on a button or as a menu item.
4017-#: ../ubiquity.templates:62001
4018+#: ../ubiquity.templates:63001
4019 msgid "New Partition Table..."
4020 msgstr ""
4021
4022 #. Type: text
4023 #. Description
4024 #. An action, displayed on a button or as a menu item.
4025-#: ../ubiquity.templates:63001
4026+#: ../ubiquity.templates:64001
4027 msgid "Add..."
4028 msgstr ""
4029
4030 #. Type: text
4031 #. Description
4032 #. An action, displayed on a button or as a menu item.
4033-#: ../ubiquity.templates:64001
4034+#: ../ubiquity.templates:65001
4035 #, fuzzy
4036-#| msgid "Creating user..."
4037 msgid "Change..."
4038 msgstr "ተጠቃሚን በመፍጠር ላይ..."
4039
4040 #. Type: text
4041 #. Description
4042 #. An action, displayed on a button or as a menu item.
4043-#: ../ubiquity.templates:65001
4044+#: ../ubiquity.templates:66001
4045 msgid "Delete"
4046 msgstr ""
4047
4048 #. Type: text
4049 #. Description
4050 #. An action, displayed on a button or as a menu item.
4051-#: ../ubiquity.templates:66001
4052+#: ../ubiquity.templates:67001
4053 msgid "Revert"
4054 msgstr ""
4055
4056 #. Type: text
4057 #. Description
4058 #. A column heading in the partitioner.
4059-#: ../ubiquity.templates:67001
4060+#: ../ubiquity.templates:68001
4061 msgid "Device"
4062 msgstr ""
4063
4064@@ -474,28 +479,28 @@
4065 #. Description
4066 #. A column heading in the partitioner. Indicates how the partition is to be
4067 #. used (ext2, swap, etc.).
4068-#: ../ubiquity.templates:68001
4069+#: ../ubiquity.templates:69001
4070 msgid "Type"
4071 msgstr ""
4072
4073 #. Type: text
4074 #. Description
4075 #. A column heading in the partitioner.
4076-#: ../ubiquity.templates:69001
4077+#: ../ubiquity.templates:70001
4078 msgid "Mount point"
4079 msgstr ""
4080
4081 #. Type: text
4082 #. Description
4083 #. A column heading in the partitioner.
4084-#: ../ubiquity.templates:70001
4085+#: ../ubiquity.templates:71001
4086 msgid "Format?"
4087 msgstr ""
4088
4089 #. Type: text
4090 #. Description
4091 #. A column heading in the partitioner.
4092-#: ../ubiquity.templates:71001
4093+#: ../ubiquity.templates:72001
4094 msgid "Size"
4095 msgstr ""
4096
4097@@ -503,27 +508,27 @@
4098 #. Description
4099 #. A column heading in the partitioner. Indicates how much of the space on
4100 #. this partition is used by data.
4101-#: ../ubiquity.templates:72001
4102+#: ../ubiquity.templates:73001
4103 msgid "Used"
4104 msgstr ""
4105
4106 #. Type: text
4107 #. Description
4108 #. Indicates unpartitioned free space on a disk.
4109-#: ../ubiquity.templates:73001
4110+#: ../ubiquity.templates:74001
4111 msgid "free space"
4112 msgstr ""
4113
4114 #. Type: text
4115 #. Description
4116 #. Indicates that we do not know how much space is used on this partition.
4117-#: ../ubiquity.templates:74001
4118+#: ../ubiquity.templates:75001
4119 msgid "unknown"
4120 msgstr ""
4121
4122 #. Type: text
4123 #. Description
4124-#: ../ubiquity.templates:75001
4125+#: ../ubiquity.templates:76001
4126 msgid "Create partition"
4127 msgstr ""
4128
4129@@ -531,97 +536,97 @@
4130 #. Description
4131 #. Type: text
4132 #. Description
4133-#: ../ubiquity.templates:76001 ../ubiquity.templates:83001
4134+#: ../ubiquity.templates:77001 ../ubiquity.templates:84001
4135 msgid "New partition size in megabytes (1000000 bytes):"
4136 msgstr ""
4137
4138 #. Type: text
4139 #. Description
4140-#: ../ubiquity.templates:77001
4141+#: ../ubiquity.templates:78001
4142 msgid "Beginning"
4143 msgstr "መጀመሪያ"
4144
4145 #. Type: text
4146 #. Description
4147-#: ../ubiquity.templates:78001
4148+#: ../ubiquity.templates:79001
4149 msgid "End"
4150 msgstr "መጨረሻ"
4151
4152 #. Type: text
4153 #. Description
4154-#: ../ubiquity.templates:79001
4155+#: ../ubiquity.templates:80001
4156 msgid "Primary"
4157 msgstr "ዋና ክፋይ"
4158
4159 #. Type: text
4160 #. Description
4161-#: ../ubiquity.templates:80001
4162+#: ../ubiquity.templates:81001
4163 msgid "Logical"
4164 msgstr "ንዑስ ክፋይ"
4165
4166 #. Type: text
4167 #. Description
4168-#: ../ubiquity.templates:81001
4169+#: ../ubiquity.templates:82001
4170 msgid "Edit partition"
4171 msgstr ""
4172
4173 #. Type: text
4174 #. Description
4175-#: ../ubiquity.templates:82001
4176+#: ../ubiquity.templates:83001
4177 msgid "Edit a partition"
4178 msgstr ""
4179
4180 #. Type: text
4181 #. Description
4182-#: ../ubiquity.templates:84001
4183+#: ../ubiquity.templates:85001
4184 msgid "Advanced Options"
4185 msgstr ""
4186
4187 #. Type: text
4188 #. Description
4189-#: ../ubiquity.templates:85001
4190+#: ../ubiquity.templates:86001
4191 msgid "Boot loader"
4192 msgstr ""
4193
4194 #. Type: text
4195 #. Description
4196-#: ../ubiquity.templates:86001
4197+#: ../ubiquity.templates:87001
4198 msgid "Install boot loader"
4199 msgstr ""
4200
4201 #. Type: text
4202 #. Description
4203-#: ../ubiquity.templates:87001
4204+#: ../ubiquity.templates:88001
4205 msgid "Popularity contest"
4206 msgstr ""
4207
4208 #. Type: text
4209 #. Description
4210-#: ../ubiquity.templates:88001
4211+#: ../ubiquity.templates:89001
4212 msgid "Participate in the package usage survey"
4213 msgstr ""
4214
4215 #. Type: text
4216 #. Description
4217-#: ../ubiquity.templates:89001
4218+#: ../ubiquity.templates:90001
4219 msgid "Network proxy"
4220 msgstr ""
4221
4222 #. Type: text
4223 #. Description
4224-#: ../ubiquity.templates:90001
4225+#: ../ubiquity.templates:91001
4226 msgid "HTTP proxy:"
4227 msgstr ""
4228
4229 #. Type: text
4230 #. Description
4231-#: ../ubiquity.templates:91001
4232+#: ../ubiquity.templates:92001
4233 msgid "Port:"
4234 msgstr ""
4235
4236 #. Type: text
4237 #. Description
4238-#: ../ubiquity.templates:92001
4239+#: ../ubiquity.templates:93001
4240 msgid ""
4241 "Installation has finished. You can continue testing Ubuntu now, but until "
4242 "you restart the computer, any changes you make or documents you save will "
4243@@ -631,20 +636,20 @@
4244 #. Type: text
4245 #. Description
4246 #. Translators, this text will appear on a button, so KEEP IT SHORT
4247-#: ../ubiquity.templates:93001
4248+#: ../ubiquity.templates:94001
4249 msgid "Go Back"
4250 msgstr "ሂድ ወደ ኋላ"
4251
4252 #. Type: text
4253 #. Description
4254 #. Translators, this text will appear on a button, so KEEP IT SHORT
4255-#: ../ubiquity.templates:94001
4256+#: ../ubiquity.templates:95001
4257 msgid "Continue"
4258 msgstr "ቀጥል"
4259
4260 #. Type: text
4261 #. Description
4262-#: ../ubiquity.templates:95001
4263+#: ../ubiquity.templates:96001
4264 msgid ""
4265 "Installation is complete. You need to restart the computer in order to use "
4266 "the new installation."
4267@@ -652,7 +657,7 @@
4268
4269 #. Type: note
4270 #. Description
4271-#: ../ubiquity.templates:96001
4272+#: ../ubiquity.templates:97001
4273 msgid ""
4274 " Language: ${LANGUAGE}\n"
4275 " Keyboard layout: ${KEYMAP}\n"
4276@@ -665,37 +670,37 @@
4277
4278 #. Type: text
4279 #. Description
4280-#: ../ubiquity.templates:97001
4281+#: ../ubiquity.templates:98001
4282 msgid "Checking the installation..."
4283 msgstr ""
4284
4285 #. Type: title
4286 #. Description
4287-#: ../ubiquity.templates:98001
4288+#: ../ubiquity.templates:99001
4289 msgid "Installing system"
4290 msgstr ""
4291
4292 #. Type: text
4293 #. Description
4294-#: ../ubiquity.templates:99001
4295+#: ../ubiquity.templates:100001
4296 msgid "Finding the distribution to copy..."
4297 msgstr ""
4298
4299 #. Type: text
4300 #. Description
4301-#: ../ubiquity.templates:101001
4302+#: ../ubiquity.templates:102001
4303 msgid "Scanning files..."
4304 msgstr ""
4305
4306 #. Type: text
4307 #. Description
4308-#: ../ubiquity.templates:102001
4309+#: ../ubiquity.templates:103001
4310 msgid "Copying files..."
4311 msgstr ""
4312
4313 #. Type: text
4314 #. Description
4315-#: ../ubiquity.templates:103001
4316+#: ../ubiquity.templates:104001
4317 msgid "Copying files (less than a minute remaining)..."
4318 msgstr ""
4319
4320@@ -709,9 +714,9 @@
4321 #. Description
4322 #. Type: select
4323 #. Description
4324-#: ../ubiquity.templates:104001 ../ubiquity.templates:105001
4325-#: ../ubiquity.templates:106001 ../ubiquity.templates:107001
4326-#: ../ubiquity.templates:108001
4327+#: ../ubiquity.templates:105001 ../ubiquity.templates:106001
4328+#: ../ubiquity.templates:107001 ../ubiquity.templates:108001
4329+#: ../ubiquity.templates:109001
4330 msgid "Installation Failed"
4331 msgstr ""
4332
4333@@ -723,14 +728,14 @@
4334 #. Description
4335 #. Type: error
4336 #. Description
4337-#: ../ubiquity.templates:104001 ../ubiquity.templates:105001
4338-#: ../ubiquity.templates:106001 ../ubiquity.templates:107001
4339+#: ../ubiquity.templates:105001 ../ubiquity.templates:106001
4340+#: ../ubiquity.templates:107001 ../ubiquity.templates:108001
4341 msgid "The installer encountered an error copying files to the hard disk:"
4342 msgstr ""
4343
4344 #. Type: error
4345 #. Description
4346-#: ../ubiquity.templates:104001
4347+#: ../ubiquity.templates:105001
4348 msgid ""
4349 "This is due to there being insufficient disk space for the install to "
4350 "complete on the target partition. Please run the installer again and select "
4351@@ -739,7 +744,7 @@
4352
4353 #. Type: error
4354 #. Description
4355-#: ../ubiquity.templates:105001
4356+#: ../ubiquity.templates:106001
4357 msgid ""
4358 "This is often due to a faulty CD/DVD disk or drive. It may help to clean the "
4359 "CD/DVD, to burn the CD/DVD at a lower speed, or to clean the CD/DVD drive "
4360@@ -748,7 +753,7 @@
4361
4362 #. Type: error
4363 #. Description
4364-#: ../ubiquity.templates:106001
4365+#: ../ubiquity.templates:107001
4366 msgid ""
4367 "This is often due to a faulty hard disk. It may help to check whether the "
4368 "hard disk is old and in need of replacement, or to move the system to a "
4369@@ -763,7 +768,7 @@
4370 #. Description
4371 #. This is used when there was an md5 mismatch during copying, meaning that
4372 #. the source file and destination file are not equal.
4373-#: ../ubiquity.templates:107001 ../ubiquity.templates:108001
4374+#: ../ubiquity.templates:108001 ../ubiquity.templates:109001
4375 msgid ""
4376 "This is often due to a faulty CD/DVD disk or drive, or a faulty hard disk. "
4377 "It may help to clean the CD/DVD, to burn the CD/DVD at a lower speed, to "
4378@@ -774,145 +779,145 @@
4379
4380 #. Type: select
4381 #. Description
4382-#: ../ubiquity.templates:108001
4383+#: ../ubiquity.templates:109001
4384 msgid "The following file did not match its source copy on the CD/DVD:"
4385 msgstr ""
4386
4387 #. Type: text
4388 #. Description
4389-#: ../ubiquity.templates:109001
4390+#: ../ubiquity.templates:110001
4391 msgid "Copying installation logs..."
4392 msgstr ""
4393
4394 #. Type: text
4395 #. Description
4396-#: ../ubiquity.templates:110001
4397+#: ../ubiquity.templates:111001
4398 msgid "Configuring target system..."
4399 msgstr ""
4400
4401 #. Type: text
4402 #. Description
4403-#: ../ubiquity.templates:111001
4404+#: ../ubiquity.templates:112001
4405 msgid "Configuring system locales..."
4406 msgstr ""
4407
4408 #. Type: text
4409 #. Description
4410-#: ../ubiquity.templates:112001
4411+#: ../ubiquity.templates:113001
4412 msgid "Configuring apt..."
4413 msgstr ""
4414
4415 #. Type: text
4416 #. Description
4417-#: ../ubiquity.templates:113001
4418+#: ../ubiquity.templates:114001
4419 msgid "Configuring time zone..."
4420 msgstr ""
4421
4422 #. Type: text
4423 #. Description
4424-#: ../ubiquity.templates:114001
4425+#: ../ubiquity.templates:115001
4426 msgid "Configuring keyboard..."
4427 msgstr ""
4428
4429 #. Type: text
4430 #. Description
4431-#: ../ubiquity.templates:115001
4432+#: ../ubiquity.templates:116001
4433 msgid "Creating user..."
4434 msgstr "ተጠቃሚን በመፍጠር ላይ..."
4435
4436 #. Type: text
4437 #. Description
4438-#: ../ubiquity.templates:116001
4439+#: ../ubiquity.templates:117001
4440 msgid "Importing documents and settings..."
4441 msgstr ""
4442
4443 #. Type: text
4444 #. Description
4445-#: ../ubiquity.templates:117001
4446+#: ../ubiquity.templates:118001
4447 msgid "Configuring hardware..."
4448 msgstr ""
4449
4450 #. Type: text
4451 #. Description
4452-#: ../ubiquity.templates:118001
4453+#: ../ubiquity.templates:119001
4454 msgid "Configuring network..."
4455 msgstr "አውታርን በማዘጋጀት ላይ..."
4456
4457 #. Type: text
4458 #. Description
4459-#: ../ubiquity.templates:119001
4460+#: ../ubiquity.templates:120001
4461 msgid "Setting computer name..."
4462 msgstr "የአስሊ ስም በመሰየም ላይ..."
4463
4464 #. Type: text
4465 #. Description
4466-#: ../ubiquity.templates:120001
4467+#: ../ubiquity.templates:121001
4468 msgid "Configuring boot loader..."
4469 msgstr ""
4470
4471 #. Type: text
4472 #. Description
4473-#: ../ubiquity.templates:121001
4474+#: ../ubiquity.templates:122001
4475 msgid "Installing additional packages..."
4476 msgstr ""
4477
4478 #. Type: text
4479 #. Description
4480-#: ../ubiquity.templates:122001
4481+#: ../ubiquity.templates:123001
4482 msgid "Checking for packages to install..."
4483 msgstr ""
4484
4485 #. Type: text
4486 #. Description
4487-#: ../ubiquity.templates:123001
4488+#: ../ubiquity.templates:124001
4489 msgid "Removing extra packages..."
4490 msgstr ""
4491
4492 #. Type: text
4493 #. Description
4494-#: ../ubiquity.templates:124001
4495+#: ../ubiquity.templates:125001
4496 msgid "Checking for packages to remove..."
4497 msgstr ""
4498
4499 #. Type: text
4500 #. Description
4501-#: ../ubiquity.templates:125001
4502+#: ../ubiquity.templates:126001
4503 msgid "Downloading packages (${TIME} remaining)..."
4504 msgstr ""
4505
4506 #. Type: text
4507 #. Description
4508-#: ../ubiquity.templates:126001
4509+#: ../ubiquity.templates:127001
4510 msgid "Downloading package lists..."
4511 msgstr ""
4512
4513 #. Type: text
4514 #. Description
4515-#: ../ubiquity.templates:127001
4516+#: ../ubiquity.templates:128001
4517 msgid "Downloading package lists (${TIME} remaining)..."
4518 msgstr ""
4519
4520 #. Type: error
4521 #. Description
4522-#: ../ubiquity.templates:129001
4523+#: ../ubiquity.templates:130001
4524 msgid "Error installing ${PACKAGE}"
4525 msgstr "${PACKAGE}ን የመትከል ስህተት"
4526
4527 #. Type: error
4528 #. Description
4529-#: ../ubiquity.templates:130001
4530+#: ../ubiquity.templates:131001
4531 msgid "Error removing ${PACKAGE}"
4532 msgstr "${PACKAGE}ን የመሰረዝ ስህተት"
4533
4534 #. Type: error
4535 #. Description
4536-#: ../ubiquity.templates:131001
4537+#: ../ubiquity.templates:132001
4538 msgid "Error while installing packages"
4539 msgstr ""
4540
4541 #. Type: error
4542 #. Description
4543-#: ../ubiquity.templates:131001
4544+#: ../ubiquity.templates:132001
4545 msgid "An error occurred while installing packages:"
4546 msgstr ""
4547
4548@@ -920,7 +925,7 @@
4549 #. Description
4550 #. Type: error
4551 #. Description
4552-#: ../ubiquity.templates:131001 ../ubiquity.templates:132001
4553+#: ../ubiquity.templates:132001 ../ubiquity.templates:133001
4554 msgid "The following packages are in a broken state:"
4555 msgstr ""
4556
4557@@ -928,7 +933,7 @@
4558 #. Description
4559 #. Type: error
4560 #. Description
4561-#: ../ubiquity.templates:131001 ../ubiquity.templates:132001
4562+#: ../ubiquity.templates:132001 ../ubiquity.templates:133001
4563 msgid ""
4564 "This may be due to using an old installer image, or it may be due to a bug "
4565 "in some of the packages listed above. More details may be found in /var/log/"
4566@@ -941,43 +946,43 @@
4567
4568 #. Type: error
4569 #. Description
4570-#: ../ubiquity.templates:132001
4571+#: ../ubiquity.templates:133001
4572 msgid "Error while removing packages"
4573 msgstr ""
4574
4575 #. Type: error
4576 #. Description
4577-#: ../ubiquity.templates:132001
4578+#: ../ubiquity.templates:133001
4579 msgid "An error occurred while removing packages:"
4580 msgstr ""
4581
4582 #. Type: text
4583 #. Description
4584-#: ../ubiquity.templates:135001
4585+#: ../ubiquity.templates:136001
4586 msgid "Calculating files to skip copying..."
4587 msgstr ""
4588
4589 #. Type: title
4590 #. Description
4591-#: ../ubiquity.templates:136001
4592+#: ../ubiquity.templates:137001
4593 msgid "Installing language packs"
4594 msgstr "የቋንቋ ጥቅሎችን በመትከል ላይ"
4595
4596 #. Type: text
4597 #. Description
4598-#: ../ubiquity.templates:137001
4599+#: ../ubiquity.templates:138001
4600 msgid "Downloading language packs (${TIME} remaining)..."
4601 msgstr ""
4602
4603 #. Type: boolean
4604 #. Description
4605-#: ../ubiquity.templates:144001
4606+#: ../ubiquity.templates:145001
4607 msgid "Failed to unmount partitions"
4608 msgstr "ክፋዮችን ማውረድ አልተቻለም"
4609
4610 #. Type: boolean
4611 #. Description
4612-#: ../ubiquity.templates:144001
4613+#: ../ubiquity.templates:145001
4614 msgid ""
4615 "The installer needs to commit changes to partition tables, but cannot do so "
4616 "because partitions on the following mount points could not be unmounted:"
4617@@ -985,25 +990,25 @@
4618
4619 #. Type: boolean
4620 #. Description
4621-#: ../ubiquity.templates:144001
4622+#: ../ubiquity.templates:145001
4623 msgid "Please close any applications using these mount points."
4624 msgstr ""
4625
4626 #. Type: boolean
4627 #. Description
4628-#: ../ubiquity.templates:144001
4629+#: ../ubiquity.templates:145001
4630 msgid "Would you like the installer to try to unmount these partitions again?"
4631 msgstr ""
4632
4633 #. Type: boolean
4634 #. Description
4635-#: ../ubiquity.templates:150001
4636+#: ../ubiquity.templates:151001
4637 msgid "Do you want to return to the partitioner?"
4638 msgstr ""
4639
4640 #. Type: boolean
4641 #. Description
4642-#: ../ubiquity.templates:150001
4643+#: ../ubiquity.templates:151001
4644 msgid ""
4645 "Some of the partitions you created are too small. Please make the following "
4646 "partitions at least this large (in bytes):"
4647@@ -1011,12 +1016,61 @@
4648
4649 #. Type: boolean
4650 #. Description
4651-#: ../ubiquity.templates:150001
4652+#: ../ubiquity.templates:151001
4653 msgid ""
4654 "If you do not go back to the partitioner and increase the size of these "
4655 "partitions, the installation may fail."
4656 msgstr ""
4657
4658+#. Type: text
4659+#. Description
4660+#: ../ubiquity.templates:152001
4661+msgid "System Configuration"
4662+msgstr ""
4663+
4664+#. Type: text
4665+#. Description
4666+#: ../ubiquity.templates:153001
4667+msgid "Choose language"
4668+msgstr "ቋንቋ በመምረጥ ላይ"
4669+
4670+#. Type: text
4671+#. Description
4672+#: ../ubiquity.templates:154001
4673+msgid ""
4674+"Once you answer a few questions, the system will be ready for you to use."
4675+msgstr ""
4676+
4677+#. Type: text
4678+#. Description
4679+#: ../ubiquity.templates:155001
4680+msgid "Selected region:"
4681+msgstr "የተመረጠው አካባቢ፦"
4682+
4683+#. Type: text
4684+#. Description
4685+#: ../ubiquity.templates:156001
4686+msgid "Current time:"
4687+msgstr ""
4688+
4689+#. Type: text
4690+#. Description
4691+#: ../ubiquity.templates:157001
4692+msgid "Network configuration"
4693+msgstr ""
4694+
4695+#. Type: text
4696+#. Description
4697+#: ../ubiquity.templates:158001
4698+msgid "Software selection"
4699+msgstr ""
4700+
4701+#. Type: text
4702+#. Description
4703+#: ../ubiquity.templates:159001
4704+msgid "Applying configuration"
4705+msgstr ""
4706+
4707 #. Type: note
4708 #. Description
4709 #: ../ubiquity-frontend-mythbuntu.templates:1001
4710
4711=== modified file 'debian/po/ar.po'
4712--- debian/po/ar.po 2009-07-02 19:32:12 +0000
4713+++ debian/po/ar.po 2009-07-07 18:59:38 +0000
4714@@ -6,7 +6,7 @@
4715 msgstr ""
4716 "Project-Id-Version: debian-installer\n"
4717 "Report-Msgid-Bugs-To: ubiquity@packages.debian.org\n"
4718-"POT-Creation-Date: 2009-07-02 20:30+0100\n"
4719+"POT-Creation-Date: 2009-06-19 15:07-0400\n"
4720 "PO-Revision-Date: 2009-04-12 14:09+0000\n"
4721 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
4722 "Language-Team: Arabic <support@arabeyes.org>\n"
4723@@ -18,52 +18,50 @@
4724
4725 #. Type: text
4726 #. Description
4727-#: ../ubiquity.templates:2001
4728+#: ../ubiquity.templates:3001
4729 msgid "Use the largest continuous free space"
4730 msgstr "استخدم أكبر مساحة متاحة مستمرة"
4731
4732 #. Type: text
4733 #. Description
4734-#: ../ubiquity.templates:3001
4735-#, fuzzy
4736-#| msgid "Use the entire disk"
4737-msgid "Erase and use the entire disk"
4738+#: ../ubiquity.templates:4001
4739+msgid "Use the entire disk"
4740 msgstr "استخدم كامل القرص"
4741
4742 #. Type: text
4743 #. Description
4744-#: ../ubiquity.templates:4001
4745+#: ../ubiquity.templates:5001
4746 msgid "Install them side by side, choosing between them each startup"
4747 msgstr "ثبتها جنبا إلى جنب مع الاختيار بينهم عند بدء التشغيل"
4748
4749 #. Type: text
4750 #. Description
4751-#: ../ubiquity.templates:5001
4752+#: ../ubiquity.templates:6001
4753 msgid "Specify partitions manually (advanced)"
4754 msgstr "حدد الأقسام يدويا (متقدم)"
4755
4756 #. Type: text
4757 #. Description
4758 #. This is used as a window title.
4759-#: ../ubiquity.templates:6001
4760+#: ../ubiquity.templates:7001
4761 msgid "Install"
4762 msgstr "ثبت"
4763
4764 #. Type: text
4765 #. Description
4766-#: ../ubiquity.templates:7001
4767+#: ../ubiquity.templates:8001
4768 msgid "Install (OEM mode, for manufacturers only)"
4769 msgstr "ثبت (وضع الصانع الأصلي للأجهزة، للصانعين فقط)"
4770
4771 #. Type: text
4772 #. Description
4773-#: ../ubiquity.templates:8001
4774+#: ../ubiquity.templates:9001
4775 msgid "Welcome"
4776 msgstr "أهلا بك"
4777
4778 #. Type: text
4779 #. Description
4780-#: ../ubiquity.templates:9001
4781+#: ../ubiquity.templates:10001
4782 msgid ""
4783 "Ready to install? Once you answer a few questions, the contents of the live "
4784 "CD can be installed on this computer so you can run the system at full speed "
4785@@ -74,13 +72,13 @@
4786
4787 #. Type: text
4788 #. Description
4789-#: ../ubiquity.templates:9001
4790+#: ../ubiquity.templates:10001
4791 msgid "Answering the questions should only take a few minutes."
4792 msgstr "لن تستغرق الإجابة على الأسئلة أكثر من بضعة دقائق."
4793
4794 #. Type: text
4795 #. Description
4796-#: ../ubiquity.templates:9001
4797+#: ../ubiquity.templates:10001
4798 msgid ""
4799 "Please choose the language used for the installation process. This language "
4800 "will be the default language for the final system."
4801@@ -90,7 +88,7 @@
4802
4803 #. Type: text
4804 #. Description
4805-#: ../ubiquity.templates:10001
4806+#: ../ubiquity.templates:11001
4807 msgid ""
4808 "You are installing in system manufacturer mode. Please enter a unique name "
4809 "for this batch of systems. This name will be saved on the installed system "
4810@@ -101,7 +99,7 @@
4811
4812 #. Type: text
4813 #. Description
4814-#: ../ubiquity.templates:11001
4815+#: ../ubiquity.templates:12001
4816 msgid ""
4817 "If you have Internet access, read the release notes for information on "
4818 "problems that may affect you."
4819@@ -111,79 +109,85 @@
4820
4821 #. Type: text
4822 #. Description
4823-#: ../ubiquity.templates:12001
4824+#: ../ubiquity.templates:13001
4825 msgid "Release Notes"
4826 msgstr "ملاحظات الإصدار"
4827
4828 #. Type: text
4829 #. Description
4830-#: ../ubiquity.templates:13001
4831+#: ../ubiquity.templates:14001
4832 msgid "Where are you?"
4833 msgstr "أين أنت؟"
4834
4835 #. Type: text
4836 #. Description
4837 #: ../ubiquity.templates:15001
4838+msgid "Select your time zone from the map, or by region and city."
4839+msgstr "حدد منطقتك الزمنية من الخريطة او باستخدام الإقليم والمدينة"
4840+
4841+#. Type: text
4842+#. Description
4843+#: ../ubiquity.templates:16001
4844 msgid "City:"
4845 msgstr "المدينة:"
4846
4847 #. Type: text
4848 #. Description
4849-#: ../ubiquity.templates:16001
4850+#: ../ubiquity.templates:17001
4851 msgid "Region:"
4852 msgstr "الإقليم:"
4853
4854 #. Type: text
4855 #. Description
4856-#: ../ubiquity.templates:17001
4857+#: ../ubiquity.templates:18001
4858 msgid "Keyboard layout"
4859 msgstr "تخطيط لوحة المفاتيح"
4860
4861 #. Type: text
4862 #. Description
4863-#: ../ubiquity.templates:18001
4864+#: ../ubiquity.templates:19001
4865 msgid "Which layout is most similar to your keyboard?"
4866 msgstr "ما هو التخطيط الأكثر شبهًا بلوحة مفاتيحك؟"
4867
4868 #. Type: text
4869 #. Description
4870-#: ../ubiquity.templates:19001
4871+#: ../ubiquity.templates:20001
4872 msgid "You can type into this box to test your new keyboard layout."
4873 msgstr "يمكنك الكتابة في هذا الصندوق لاختبار تخطيط لوحة المفاتيح الجديد."
4874
4875 #. Type: text
4876 #. Description
4877-#: ../ubiquity.templates:20001
4878+#: ../ubiquity.templates:21001
4879 msgid "Suggested option:"
4880 msgstr "الخيار المقترح:"
4881
4882 #. Type: text
4883 #. Description
4884-#: ../ubiquity.templates:21001
4885+#: ../ubiquity.templates:22001
4886 msgid "Choose your own:"
4887 msgstr "اختر:"
4888
4889 #. Type: text
4890 #. Description
4891-#: ../ubiquity.templates:22001
4892+#: ../ubiquity.templates:23001
4893 msgid "Who are you?"
4894 msgstr "من أنت؟"
4895
4896 #. Type: text
4897 #. Description
4898-#: ../ubiquity.templates:23001
4899+#: ../ubiquity.templates:24001
4900 msgid "What is your name?"
4901 msgstr "ما اسمك؟"
4902
4903 #. Type: text
4904 #. Description
4905-#: ../ubiquity.templates:24001
4906+#: ../ubiquity.templates:25001
4907 msgid "What name do you want to use to log in?"
4908 msgstr "ما الاسم الذي تريد استخدامه للولوج إلى النظام؟"
4909
4910 #. Type: text
4911 #. Description
4912-#: ../ubiquity.templates:25001
4913+#: ../ubiquity.templates:26001
4914 msgid ""
4915 "If more than one person will use this computer, you can set up multiple "
4916 "accounts after installation."
4917@@ -193,19 +197,19 @@
4918
4919 #. Type: text
4920 #. Description
4921-#: ../ubiquity.templates:26001
4922+#: ../ubiquity.templates:27001
4923 msgid "Choose a password to keep your account safe."
4924 msgstr "اختر كلمة سر لحماية حسابك."
4925
4926 #. Type: text
4927 #. Description
4928-#: ../ubiquity.templates:27001
4929+#: ../ubiquity.templates:28001
4930 msgid "You are running in debugging mode. Do not use a valuable password!"
4931 msgstr "أنت الآن تعمل في وضع تتبع الأخطاء. لا تستخدم كلمة سر ذات قيمة!"
4932
4933 #. Type: text
4934 #. Description
4935-#: ../ubiquity.templates:28001
4936+#: ../ubiquity.templates:29001
4937 msgid ""
4938 "Enter the same password twice, so that it can be checked for typing errors. "
4939 "A good password will contain a mixture of letters, numbers and punctuation, "
4940@@ -218,13 +222,13 @@
4941
4942 #. Type: text
4943 #. Description
4944-#: ../ubiquity.templates:29001
4945+#: ../ubiquity.templates:30001
4946 msgid "What is the name of this computer?"
4947 msgstr "ما اسم هذا الحاسوب؟"
4948
4949 #. Type: text
4950 #. Description
4951-#: ../ubiquity.templates:30001
4952+#: ../ubiquity.templates:31001
4953 msgid ""
4954 "This name will be used if you make the computer visible to others on a "
4955 "network."
4956@@ -232,37 +236,37 @@
4957
4958 #. Type: text
4959 #. Description
4960-#: ../ubiquity.templates:31001
4961+#: ../ubiquity.templates:32001
4962 msgid "Log in automatically"
4963 msgstr "ولوج آلي"
4964
4965 #. Type: text
4966 #. Description
4967-#: ../ubiquity.templates:32001
4968+#: ../ubiquity.templates:33001
4969 msgid "Require a password to log in"
4970 msgstr "اطلب كلمة سر عند الولوج"
4971
4972 #. Type: text
4973 #. Description
4974-#: ../ubiquity.templates:33001
4975+#: ../ubiquity.templates:34001
4976 msgid "Require a password to log in and to decrypt your home folder"
4977 msgstr "اطلب كلمة سر عند للولوج إلى المجلّد المنزل وتظهيره"
4978
4979 #. Type: text
4980 #. Description
4981-#: ../ubiquity.templates:34001
4982+#: ../ubiquity.templates:35001
4983 msgid "Choose another password"
4984 msgstr "اختر كلمة سر أُخرى"
4985
4986 #. Type: text
4987 #. Description
4988-#: ../ubiquity.templates:35001
4989+#: ../ubiquity.templates:36001
4990 msgid "Migrate documents and settings"
4991 msgstr "انقل الإعدادات والمستندات"
4992
4993 #. Type: text
4994 #. Description
4995-#: ../ubiquity.templates:36001
4996+#: ../ubiquity.templates:37001
4997 msgid ""
4998 "Select any accounts you would like to import. The documents and settings "
4999 "for these accounts will be available after the install completes."
5000@@ -272,7 +276,7 @@
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to status/vote changes: