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