[SCM] GUI front-end for Debian Live. branch, master, updated. f3af49d8f3a857ec5dd3f09dbb85881e761a7a23
Chris Lamb
lamby at debian.org
Wed Jul 8 23:54:43 UTC 2009
The following commit has been merged in the master branch:
commit b3beac57789f4fde173330825bacb15a0d613024
Author: Chris Lamb <lamby at debian.org>
Date: Thu Jul 9 00:49:58 2009 +0100
Add support for squeeze and update "stable -> etch" in user interface and translations.
diff --git a/LiveMagic/controllers/wizard.py b/LiveMagic/controllers/wizard.py
index 15506c2..f8e5c7d 100644
--- a/LiveMagic/controllers/wizard.py
+++ b/LiveMagic/controllers/wizard.py
@@ -41,7 +41,7 @@ class WizardController(object):
# Use cdebootstrap in some situations
if os.path.exists('/usr/bin/cdebootstrap') and \
- data['distribution'] in ('etch', 'lenny'):
+ data['distribution'] in ('lenny',):
data['bootstrap'] = 'cdebootstrap'
# Disabling caching
diff --git a/debian/changelog b/debian/changelog
index f133391..b4436a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ live-magic (1.7) UNRELEASED; urgency=low
actual failure originally reported in #491242.
* Update vte form_command calls to new API. Thanks to Jor <jor123 at gmail.com>.
(Closes: #533556)
+ * Add support for squeeze and update "stable -> etch" in user interface and
+ translations.
-- Chris Lamb <lamby at debian.org> Wed, 08 Jul 2009 22:26:23 +0100
diff --git a/misc/live-magic.glade b/misc/live-magic.glade
index 6d097c1..e0a0e81 100644
--- a/misc/live-magic.glade
+++ b/misc/live-magic.glade
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
+<?xml version="1.0"?>
<glade-interface>
+ <!-- interface-requires gtk+ 2.16 -->
+ <!-- interface-naming-policy toplevel-contextual -->
<widget class="GtkWindow" id="window_build">
<property name="border_width">12</property>
<property name="title" translatable="yes">Generating Debian Live system...</property>
<property name="resizable">False</property>
<property name="modal">True</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+ <property name="window_position">center-on-parent</property>
<property name="icon">debian_openlogo-nd-100.png</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">dialog</property>
<signal name="delete_event" handler="on_window_build_delete_event"/>
<child>
<widget class="GtkVBox" id="vbox_rgdebinstall_progress1">
@@ -29,12 +29,13 @@
<property name="xalign">0.49000000953674316</property>
<property name="ypad">4</property>
<property name="pixbuf">debian_sm.png</property>
- <property name="icon_size">6</property>
<property name="pixel_size">3</property>
+ <property name="icon-size">6</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -52,6 +53,9 @@ Please wait while your Debian Live image is generated for you.</property>
</packing>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkProgressBar" id="progress_build">
@@ -59,7 +63,6 @@ Please wait while your Debian Live image is generated for you.</property>
<property name="visible">True</property>
<property name="fraction">1</property>
<property name="pulse_step">0.029999999329447746</property>
- <property name="text" translatable="yes"></property>
</widget>
<packing>
<property name="position">1</property>
@@ -67,11 +70,11 @@ Please wait while your Debian Live image is generated for you.</property>
</child>
<child>
<widget class="GtkCheckButton" id="checkbutton_build_auto_close">
+ <property name="label" translatable="yes">Automatically close after Live system has been created</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Automatically close after Live system has been created</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
@@ -100,7 +103,7 @@ Please wait while your Debian Live image is generated for you.</property>
<property name="adjustment">90 0 100 1 10 10</property>
</widget>
<packing>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
@@ -123,6 +126,7 @@ Please wait while your Debian Live image is generated for you.</property>
</widget>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -131,33 +135,40 @@ Please wait while your Debian Live image is generated for you.</property>
<child>
<widget class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="button_build_cancel">
+ <property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-cancel</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
<signal name="clicked" handler="on_button_build_cancel_clicked"/>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkButton" id="button_build_close">
+ <property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
- <property name="label">gtk-close</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
<signal name="clicked" handler="on_button_build_close_clicked"/>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -178,7 +189,7 @@ Please wait while your Debian Live image is generated for you.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tab_pos">GTK_POS_LEFT</property>
+ <property name="tab_pos">left</property>
<child>
<widget class="GtkHBox" id="hbox_welcome">
<property name="visible">True</property>
@@ -192,6 +203,7 @@ Please wait while your Debian Live image is generated for you.</property>
<packing>
<property name="expand">False</property>
<property name="padding">75</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -223,8 +235,8 @@ of building your own Debian Live system.</property>
<property name="label" translatable="yes">Welcome to Debian Live Magic!</property>
</widget>
<packing>
- <property name="type">tab</property>
<property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
<child>
@@ -239,7 +251,6 @@ of building your own Debian Live system.</property>
<widget class="GtkTable" id="table11">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">1</property>
<property name="n_columns">2</property>
<child>
<widget class="GtkLabel" id="label36">
@@ -267,6 +278,7 @@ of building your own Debian Live system.</property>
</widget>
<packing>
<property name="padding">14</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -279,8 +291,8 @@ of building your own Debian Live system.</property>
<widget class="GtkRadioButton" id="radio_desktop_standard">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<child>
@@ -294,6 +306,9 @@ of building your own Debian Live system.</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="pixbuf">debian_sm.png</property>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkLabel" id="label70">
@@ -316,17 +331,11 @@ of building your own Debian Live system.</property>
</packing>
</child>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<widget class="GtkRadioButton" id="radio_desktop_gnome">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">radio_desktop_standard</property>
<child>
@@ -340,6 +349,9 @@ of building your own Debian Live system.</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="pixbuf">gnome-logo-icon-transparent.png</property>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkLabel" id="label119">
@@ -367,8 +379,8 @@ of building your own Debian Live system.</property>
<widget class="GtkRadioButton" id="radio_desktop_kde">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">radio_desktop_standard</property>
<child>
@@ -382,6 +394,9 @@ of building your own Debian Live system.</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="pixbuf">kde.png</property>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkLabel" id="label118">
@@ -409,8 +424,8 @@ of building your own Debian Live system.</property>
<widget class="GtkRadioButton" id="radio_desktop_xfce">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">radio_desktop_standard</property>
<child>
@@ -424,6 +439,9 @@ of building your own Debian Live system.</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="pixbuf">xfce.png</property>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkLabel" id="label117">
@@ -451,8 +469,8 @@ of building your own Debian Live system.</property>
<widget class="GtkRadioButton" id="radio_desktop_rescue">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">radio_desktop_standard</property>
<child>
@@ -543,6 +561,12 @@ of building your own Debian Live system.</property>
<property name="x_padding">40</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -552,6 +576,7 @@ of building your own Debian Live system.</property>
</widget>
<packing>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -566,9 +591,9 @@ of building your own Debian Live system.</property>
<property name="label" translatable="yes">Choose image type</property>
</widget>
<packing>
- <property name="type">tab</property>
<property name="position">1</property>
<property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
<child>
@@ -583,7 +608,6 @@ of building your own Debian Live system.</property>
<widget class="GtkTable" id="table17">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">1</property>
<property name="n_columns">2</property>
<child>
<widget class="GtkLabel" id="label95">
@@ -591,7 +615,7 @@ of building your own Debian Live system.</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes"><b>What distribution of Debian would you like to build?</b>
-If unsure, select "<i>Testing (lenny)</i>".</property>
+If unsure, select "<i>Stable (lenny)</i>".</property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -615,6 +639,7 @@ If unsure, select "<i>Testing (lenny)</i>".</property>
<packing>
<property name="expand">False</property>
<property name="padding">14</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -660,11 +685,11 @@ If unsure, select "<i>Testing (lenny)</i>".</property>
</child>
<child>
<widget class="GtkRadioButton" id="radio_distribution_sid">
+ <property name="label" translatable="yes">Unstable (sid) - untested and frequently changing</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Unstable (sid) - untested and frequently changing</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">radio_distribution_lenny</property>
</widget>
@@ -679,15 +704,15 @@ If unsure, select "<i>Testing (lenny)</i>".</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radio_distribution_lenny">
+ <widget class="GtkRadioButton" id="radio_distribution_squeeze">
+ <property name="label" translatable="yes">Testing (squeeze) - receives new versions from unstable if they are not too buggy.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Testing (lenny) - receives new versions from unstable if they are not too buggy.</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="active">True</property>
<property name="draw_indicator">True</property>
+ <property name="group">radio_distribution_lenny</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -700,14 +725,14 @@ If unsure, select "<i>Testing (lenny)</i>".</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radio_distribution_etch">
+ <widget class="GtkRadioButton" id="radio_distribution_lenny">
+ <property name="label" translatable="yes">Stable (lenny) - well-tested and rarely changes.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Stable (etch) - well-tested and rarely changes.</property>
- <property name="response_id">0</property>
+ <property name="active">True</property>
<property name="draw_indicator">True</property>
- <property name="group">radio_distribution_lenny</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -727,6 +752,7 @@ If unsure, select "<i>Testing (lenny)</i>".</property>
</widget>
<packing>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -740,9 +766,9 @@ If unsure, select "<i>Testing (lenny)</i>".</property>
<property name="label" translatable="yes">Select distribution</property>
</widget>
<packing>
- <property name="type">tab</property>
<property name="position">2</property>
<property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
<child>
@@ -757,7 +783,6 @@ If unsure, select "<i>Testing (lenny)</i>".</property>
<widget class="GtkTable" id="table9">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">1</property>
<property name="n_columns">2</property>
<child>
<widget class="GtkLabel" id="label102">
@@ -787,6 +812,7 @@ If unsure, select "<i>Testing (lenny)</i>".</property>
<packing>
<property name="expand">False</property>
<property name="padding">14</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -896,8 +922,8 @@ If unsure, select "<i>Testing (lenny)</i>".</property>
<widget class="GtkRadioButton" id="radio_media_net">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">radio_media_iso</property>
@@ -913,6 +939,9 @@ If unsure, select "<i>Testing (lenny)</i>".</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="stock">gtk-network</property>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkLabel" id="label99">
@@ -940,8 +969,8 @@ If unsure, select "<i>Testing (lenny)</i>".</property>
<widget class="GtkRadioButton" id="radio_media_usb-hdd">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">radio_media_iso</property>
@@ -956,6 +985,9 @@ If unsure, select "<i>Testing (lenny)</i>".</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="stock">gtk-harddisk</property>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkLabel" id="label98">
@@ -983,8 +1015,8 @@ If unsure, select "<i>Testing (lenny)</i>".</property>
<widget class="GtkRadioButton" id="radio_media_iso">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<child>
@@ -998,6 +1030,9 @@ If unsure, select "<i>Testing (lenny)</i>".</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="stock">gtk-cdrom</property>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkLabel" id="label97">
@@ -1063,6 +1098,7 @@ If unsure, select "<i>Testing (lenny)</i>".</property>
</widget>
<packing>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -1077,9 +1113,9 @@ If unsure, select "<i>Testing (lenny)</i>".</property>
<property name="label" translatable="yes">Select media type</property>
</widget>
<packing>
- <property name="type">tab</property>
<property name="position">3</property>
<property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
<child>
@@ -1094,7 +1130,6 @@ If unsure, select "<i>Testing (lenny)</i>".</property>
<widget class="GtkTable" id="table15">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">1</property>
<property name="n_columns">2</property>
<child>
<widget class="GtkLabel" id="label77">
@@ -1126,13 +1161,13 @@ To select a mirror that is not on the list, simply enter it below.</property>
<packing>
<property name="expand">False</property>
<property name="padding">14</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkTable" id="table16">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">1</property>
<property name="n_columns">3</property>
<child>
<widget class="GtkLabel" id="label88">
@@ -1202,13 +1237,6 @@ http://ftp.tw.debian.org/debian
http://ftp.us.debian.org/debian
http://ftp.uk.debian.org/debian
</property>
- <child internal-child="entry">
- <widget class="GtkEntry" id="comboboxentry-entry5">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- </child>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -1225,6 +1253,7 @@ http://ftp.uk.debian.org/debian
</widget>
<packing>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -1239,9 +1268,9 @@ http://ftp.uk.debian.org/debian
<property name="label" translatable="yes">Choose mirror</property>
</widget>
<packing>
- <property name="type">tab</property>
<property name="position">4</property>
<property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
<child>
@@ -1256,7 +1285,6 @@ http://ftp.uk.debian.org/debian
<widget class="GtkTable" id="table10">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">1</property>
<property name="n_columns">2</property>
<child>
<widget class="GtkLabel" id="label104">
@@ -1288,6 +1316,7 @@ If you are unsure, select "<i>i386</i>".</property>
<packing>
<property name="expand">False</property>
<property name="padding">14</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -1298,13 +1327,13 @@ If you are unsure, select "<i>i386</i>".</property>
<property name="n_columns">2</property>
<child>
<widget class="GtkRadioButton" id="radio_architecture_i386">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">i386
Computers with e.g. AMD Sempron or Intel Celeron, almost all
desktop computers dating 2004 or earlier.</property>
- <property name="response_id">0</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</widget>
@@ -1318,13 +1347,13 @@ desktop computers dating 2004 or earlier.</property>
</child>
<child>
<widget class="GtkRadioButton" id="radio_architecture_amd64">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">amd64
Most new computers with e.g. AMD Opteron, Turion 64, Athlon 64, or
Intel Core2, Pentium 4xx, Pentium D CPUs.</property>
- <property name="response_id">0</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">radio_architecture_i386</property>
@@ -1372,6 +1401,7 @@ Intel Core2, Pentium 4xx, Pentium D CPUs.</property>
</widget>
<packing>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -1386,9 +1416,9 @@ Intel Core2, Pentium 4xx, Pentium D CPUs.</property>
<property name="label" translatable="yes">Select architecture</property>
</widget>
<packing>
- <property name="type">tab</property>
<property name="position">5</property>
<property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
<child>
@@ -1403,7 +1433,6 @@ Intel Core2, Pentium 4xx, Pentium D CPUs.</property>
<widget class="GtkTable" id="table3">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">1</property>
<property name="n_columns">2</property>
<child>
<widget class="GtkLabel" id="label12">
@@ -1438,6 +1467,7 @@ If unsure, select "<i>no</i>".</property>
<packing>
<property name="expand">False</property>
<property name="padding">14</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -1459,11 +1489,11 @@ If unsure, select "<i>no</i>".</property>
</child>
<child>
<widget class="GtkRadioButton" id="radio_installer_live">
+ <property name="label" translatable="yes">Yes, integrate the Debian Installer.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Yes, integrate the Debian Installer.</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">radio_installer_disabled</property>
</widget>
@@ -1489,12 +1519,12 @@ If unsure, select "<i>no</i>".</property>
</child>
<child>
<widget class="GtkRadioButton" id="radio_installer_disabled">
+ <property name="label" translatable="yes">No, do not integrate the Debian Installer.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">No, do not integrate the Debian Installer.</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</widget>
@@ -1518,6 +1548,7 @@ If unsure, select "<i>no</i>".</property>
</widget>
<packing>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -1531,9 +1562,9 @@ If unsure, select "<i>no</i>".</property>
<property name="label" translatable="yes">Select Debian Installer integration</property>
</widget>
<packing>
- <property name="type">tab</property>
<property name="position">6</property>
<property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
<child>
@@ -1548,7 +1579,6 @@ If unsure, select "<i>no</i>".</property>
<widget class="GtkTable" id="table5">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">1</property>
<property name="n_columns">2</property>
<child>
<widget class="GtkLabel" id="label16">
@@ -1581,6 +1611,7 @@ settings. If unsure, please use the defaults.</property>
<packing>
<property name="expand">False</property>
<property name="padding">14</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -1663,6 +1694,7 @@ settings. If unsure, please use the defaults.</property>
</widget>
<packing>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -1676,6 +1708,7 @@ settings. If unsure, please use the defaults.</property>
</widget>
<packing>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -1689,9 +1722,9 @@ settings. If unsure, please use the defaults.</property>
<property name="label" translatable="yes">Select locale and keyboard layout</property>
</widget>
<packing>
- <property name="type">tab</property>
<property name="position">7</property>
<property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
<child>
@@ -1706,7 +1739,6 @@ settings. If unsure, please use the defaults.</property>
<widget class="GtkTable" id="table1">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">1</property>
<property name="n_columns">2</property>
<child>
<widget class="GtkLabel" id="label3">
@@ -1738,13 +1770,13 @@ If the specified directory is not empty, images will be created in a <i>De
<packing>
<property name="expand">False</property>
<property name="padding">14</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkTable" id="table2">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">1</property>
<property name="n_columns">3</property>
<child>
<widget class="GtkLabel" id="label5">
@@ -1771,7 +1803,7 @@ If the specified directory is not empty, images will be created in a <i>De
<child>
<widget class="GtkFileChooserButton" id="filechooser_build_directory">
<property name="visible">True</property>
- <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
+ <property name="action">select-folder</property>
<property name="use_preview_label">False</property>
<property name="focus_on_click">False</property>
<property name="title" translatable="yes">Select build folder</property>
@@ -1791,6 +1823,7 @@ If the specified directory is not empty, images will be created in a <i>De
</widget>
<packing>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -1804,9 +1837,9 @@ If the specified directory is not empty, images will be created in a <i>De
<property name="label" translatable="yes">Select build folder</property>
</widget>
<packing>
- <property name="type">tab</property>
<property name="position">8</property>
<property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
<child>
@@ -1823,6 +1856,9 @@ If the specified directory is not empty, images will be created in a <i>De
Press <i>Apply</i> to begin the build process.</property>
<property name="use_markup">True</property>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkImage" id="image24">
@@ -1847,12 +1883,12 @@ Press <i>Apply</i> to begin the build process.</property>
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">Ready to build!</property>
- <property name="justify">GTK_JUSTIFY_RIGHT</property>
+ <property name="justify">right</property>
</widget>
<packing>
- <property name="type">tab</property>
<property name="position">9</property>
<property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
</widget>
diff --git a/po/cs.po b/po/cs.po
index fb88205..efcd715 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -160,11 +160,11 @@ msgstr "Výběr obrazu"
msgid ""
"<b>What distribution of Debian would you like to build?</b>\n"
"\n"
-"If unsure, select \"<i>Testing (lenny)</i>\"."
+"If unsure, select \"<i>Stable (lenny)</i>\"."
msgstr ""
"<b>Kterou distribuci Debianu chcete sestavit?</b>\n"
"\n"
-"Pokud si nejste jisti, zvolte „<i>Testovací (Lenny)</i>“."
+"Pokud si nejste jisti, zvolte „<i>Stabilní (Lenny)</i>“."
#: misc/live-magic.glade:666
msgid "Unstable (sid) - untested and frequently changing"
@@ -172,13 +172,13 @@ msgstr "Nestabilní (Sid) - nevyzkoušená a často se měnící"
#: misc/live-magic.glade:686
msgid ""
-"Testing (lenny) - receives new versions from unstable if they are not too "
+"Testing (squeeze) - receives new versions from unstable if they are not too "
"buggy."
-msgstr "Testovací (Lenny) - získává balíky ze Sida (pokud nejsou moc chybové)."
+msgstr "Testovací (Squeeze) - získává balíky ze Sida (pokud nejsou moc chybové)."
#: misc/live-magic.glade:707
-msgid "Stable (etch) - well-tested and rarely changes."
-msgstr "Stabilní (Etch) - dobře otestovaná, téměř se nemění."
+msgid "Stable (lenny) - well-tested and rarely changes."
+msgstr "Stabilní (Lenny) - dobře otestovaná, téměř se nemění."
#: misc/live-magic.glade:740
msgid "Select distribution"
diff --git a/po/de.po b/po/de.po
index 3adc275..bf50db0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -161,11 +161,11 @@ msgstr "Wählen Sie den Image-Typ aus"
msgid ""
"<b>What distribution of Debian would you like to build?</b>\n"
"\n"
-"If unsure, select \"<i>Testing (lenny)</i>\"."
+"If unsure, select \"<i>Stable (lenny)</i>\"."
msgstr ""
"<b>Welche Debian-Distribution möchten Sie gerne bauen?</b>\n"
"\n"
-"Falls Sie sich unsicher sind, wählen Sie »<i>Testing (Lenny)</i>«."
+"Falls Sie sich unsicher sind, wählen Sie »<i>Stable (Lenny)</i>«."
#: misc/live-magic.glade:666
msgid "Unstable (sid) - untested and frequently changing"
@@ -173,15 +173,15 @@ msgstr "Unstable (Sid) - ungetestet und mit häufigen Veränderungen"
#: misc/live-magic.glade:686
msgid ""
-"Testing (lenny) - receives new versions from unstable if they are not too "
+"Testing (squeeze) - receives new versions from unstable if they are not too "
"buggy."
msgstr ""
-"Testing (Lenny) - erhält neue Versionen von Unstable falls diese nicht zu "
+"Testing (Squeeze) - erhält neue Versionen von Unstable falls diese nicht zu "
"fehlerhaft sind."
#: misc/live-magic.glade:707
-msgid "Stable (etch) - well-tested and rarely changes."
-msgstr "Stable (Etch) - gut getestet und mit seltenen Änderungen"
+msgid "Stable (lenny) - well-tested and rarely changes."
+msgstr "Stable (Lenny) - gut getestet und mit seltenen Änderungen"
#: misc/live-magic.glade:740
msgid "Select distribution"
diff --git a/po/es.po b/po/es.po
index 9ec464a..9968edc 100644
--- a/po/es.po
+++ b/po/es.po
@@ -161,11 +161,11 @@ msgstr "Elija un tipo de imagen"
msgid ""
"<b>What distribution of Debian would you like to build?</b>\n"
"\n"
-"If unsure, select \"<i>Testing (lenny)</i>\"."
+"If unsure, select \"<i>Stable (lenny)</i>\"."
msgstr ""
"<b>¿Qué distribución de Debian te gustaría construir?</b>\n"
"\n"
-"Si no está seguro, selecciona \"<i>Testing (lenny)</i>\"."
+"Si no está seguro, selecciona \"<i>Stable (lenny)</i>\"."
#: misc/live-magic.glade:666
msgid "Unstable (sid) - untested and frequently changing"
@@ -173,15 +173,15 @@ msgstr "Unstable (sid)- no probado y que varía con frecuencia"
#: misc/live-magic.glade:686
msgid ""
-"Testing (lenny) - receives new versions from unstable if they are not too "
+"Testing (squeeze) - receives new versions from unstable if they are not too "
"buggy."
msgstr ""
-"Testing (lenny) - recibe nuevas versiones desde la inestable cuando no sean demasiado "
+"Testing (squeeze) - recibe nuevas versiones desde la inestable cuando no sean demasiado "
"erroneas."
#: misc/live-magic.glade:707
-msgid "Stable (etch) - well-tested and rarely changes."
-msgstr "Stable (etch) - bien probado y con rara vez cambios."
+msgid "Stable (lenny) - well-tested and rarely changes."
+msgstr "Stable (lenny) - bien probado y con rara vez cambios."
#: misc/live-magic.glade:740
msgid "Select distribution"
diff --git a/po/fi.po b/po/fi.po
index 9dbc87d..e709a7c 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -155,23 +155,23 @@ msgstr "Valitse levykuvan tyyppi"
msgid ""
"<b>What distribution of Debian would you like to build?</b>\n"
"\n"
-"If unsure, select \"<i>Testing (lenny)</i>\"."
+"If unsure, select \"<i>Stable (lenny)</i>\"."
msgstr ""
"<b>Minkä Debianin jakelun haluat kääntää?</b>\n"
"\n"
-"Jos olet epävarma, valitse ”<i>Testattava (lenny)</i>”."
+"Jos olet epävarma, valitse ”<i>Vakaa (lenny)</i>”."
#: misc/live-magic.glade:666
msgid "Unstable (sid) - untested and frequently changing"
msgstr "Epävakaa (sid) - testaamaton ja usein muuttuva"
#: misc/live-magic.glade:686
-msgid "Testing (lenny) - receives new versions from unstable if they are not too buggy."
-msgstr "Testattava (lenny) - epävakaan jakelun versiot, joista ei löydy liikaa virheitä."
+msgid "Testing (squeeze) - receives new versions from unstable if they are not too buggy."
+msgstr "Testattava (squeeze) - epävakaan jakelun versiot, joista ei löydy liikaa virheitä."
#: misc/live-magic.glade:707
-msgid "Stable (etch) - well-tested and rarely changes."
-msgstr "Vakaa (etch) - hyvin testattu ja harvoin muuttuva."
+msgid "Stable (lenny) - well-tested and rarely changes."
+msgstr "Vakaa (lenny) - hyvin testattu ja harvoin muuttuva."
#: misc/live-magic.glade:740
msgid "Select distribution"
diff --git a/po/fr.po b/po/fr.po
index 2e4f230..d3f65aa 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -160,11 +160,11 @@ msgstr "Choisir le type de l'image"
msgid ""
"<b>What distribution of Debian would you like to build?</b>\n"
"\n"
-"If unsure, select \"<i>Testing (lenny)</i>\"."
+"If unsure, select \"<i>Stable (lenny)</i>\"."
msgstr ""
"<b>Quelle version de Debian voulez-vous construire ?</b>\n"
"\n"
-"Dans le doute, choisissez \"<i>version de test (lenny)</i>\"."
+"Dans le doute, choisissez \"<i>Stable (lenny)</i>\"."
#: misc/live-magic.glade:666
msgid "Unstable (sid) - untested and frequently changing"
@@ -172,13 +172,13 @@ msgstr "Instable (sid) - non testée et changeant fréquemment"
#: misc/live-magic.glade:686
msgid ""
-"Testing (lenny) - receives new versions from unstable if they are not too "
+"Testing (squeeze) - receives new versions from unstable if they are not too "
"buggy."
-msgstr "Version de test (lenny) - reçoit les nouvelles versions de instable si elles n'ont pas trop de problèmes."
+msgstr "Version de test (squeeze) - reçoit les nouvelles versions de instable si elles n'ont pas trop de problèmes."
#: misc/live-magic.glade:707
-msgid "Stable (etch) - well-tested and rarely changes."
-msgstr "Stable (etch) - bien testée et changeant rarement."
+msgid "Stable (lenny) - well-tested and rarely changes."
+msgstr "Stable (lenny) - bien testée et changeant rarement."
#: misc/live-magic.glade:740
msgid "Select distribution"
diff --git a/po/gu.po b/po/gu.po
index 97230c9..c1177a9 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -161,19 +161,19 @@ msgid ""
msgstr ""
"<b>ડેબિયનનું કયું ડિસ્ટ્રીબ્યુશન તમે બનાવવા માંગો છો?</b>\n"
"\n"
-"જો અચોક્કસ હોવ તો, \"<i>ટેસ્ટીંગ (લેન્ની)</i>\" પસંદ કરો."
+"જો અચોક્કસ હોવ તો, \"<i>સ્ટેબલ (લેન્ની)</i>\" પસંદ કરો."
#: misc/live-magic.glade:666
msgid "Unstable (sid) - untested and frequently changing"
msgstr "અનસ્ટેબલ (સિડ) - ચકાસણી ન કરેલ અને વારંવાર બદલાય છે"
#: misc/live-magic.glade:686
-msgid "Testing (lenny) - receives new versions from unstable if they are not too buggy."
-msgstr "ટેસ્ટિંગ (લેન્ની) - અનસ્ટેબલ માંથી નવી આવૃત્તિ મેળવે છે જો તે બહુ ક્ષતિઓ ન ધરાવતી હોય."
+msgid "Testing (squeeze) - receives new versions from unstable if they are not too buggy."
+msgstr "ટેસ્ટિંગ (squeeze) - અનસ્ટેબલ માંથી નવી આવૃત્તિ મેળવે છે જો તે બહુ ક્ષતિઓ ન ધરાવતી હોય."
#: misc/live-magic.glade:707
-msgid "Stable (etch) - well-tested and rarely changes."
-msgstr "સ્ટેબલ (ઇચ) - યોગ્ય રીતે ચકાસણી કરેલ અને ભાગ્યે જ બદલાય છે."
+msgid "Stable (lenny) - well-tested and rarely changes."
+msgstr "સ્ટેબલ (લેન્ની) - યોગ્ય રીતે ચકાસણી કરેલ અને ભાગ્યે જ બદલાય છે."
#: misc/live-magic.glade:740
msgid "Select distribution"
diff --git a/po/id.po b/po/id.po
index 0db5b7a..b43f469 100644
--- a/po/id.po
+++ b/po/id.po
@@ -164,11 +164,11 @@ msgstr "Pilih tipe image"
msgid ""
"<b>What distribution of Debian would you like to build?</b>\n"
"\n"
-"If unsure, select \"<i>Testing (lenny)</i>\"."
+"If unsure, select \"<i>Stable (lenny)</i>\"."
msgstr ""
"<b>Distribusi Debian apa yang ingin Anda bangun?</b>\n"
"\n"
-"Jika tidak yakin, pilih \"<i>Testing (lenny)</i>\"."
+"Jika tidak yakin, pilih \"<i>Stable (lenny)</i>\"."
#: misc/live-magic.glade:666
msgid "Unstable (sid) - untested and frequently changing"
@@ -176,15 +176,15 @@ msgstr "Unstable (sid) - belum diujicoba dan cepat berubah"
#: misc/live-magic.glade:686
msgid ""
-"Testing (lenny) - receives new versions from unstable if they are not too "
+"Testing (squeeze) - receives new versions from unstable if they are not too "
"buggy."
msgstr ""
-"Testing (lenny) - mendapatkan versi terbaru dari unstable jika tidak terlalu "
+"Testing (squeeze) - mendapatkan versi terbaru dari unstable jika tidak terlalu "
"banyak kutu."
#: misc/live-magic.glade:707
-msgid "Stable (etch) - well-tested and rarely changes."
-msgstr "Stable (etch) - teruji dengan baik dan jarang ada perubahan."
+msgid "Stable (lenny) - well-tested and rarely changes."
+msgstr "Stable (lenny) - teruji dengan baik dan jarang ada perubahan."
#: misc/live-magic.glade:740
msgid "Select distribution"
diff --git a/po/it.po b/po/it.po
index b822bb6..5a162a7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -160,11 +160,11 @@ msgstr "Scegliere il tipo di immagine"
msgid ""
"<b>What distribution of Debian would you like to build?</b>\n"
"\n"
-"If unsure, select \"<i>Testing (lenny)</i>\"."
+"If unsure, select \"<i>Stable (lenny)</i>\"."
msgstr ""
"<b>Che distribuzione di Debian creare?</b>\n"
"\n"
-"In caso di dubbio, scegliere \"<i>Testing (lenny)</i>\"."
+"In caso di dubbio, scegliere \"<i>Stable (lenny)</i>\"."
#: misc/live-magic.glade:666
msgid "Unstable (sid) - untested and frequently changing"
@@ -172,15 +172,15 @@ msgstr "Unstable (sid) - non testata, con cambi frequenti"
#: misc/live-magic.glade:686
msgid ""
-"Testing (lenny) - receives new versions from unstable if they are not too "
+"Testing (squeeze) - receives new versions from unstable if they are not too "
"buggy."
msgstr ""
-"Testing (lenny) - riceve nuove versioni dalla unstable se non sono troppo "
+"Testing (squeeze) - riceve nuove versioni dalla unstable se non sono troppo "
"bacate."
#: misc/live-magic.glade:707
-msgid "Stable (etch) - well-tested and rarely changes."
-msgstr "Stable (etch) - Ben testata e con cambi rari."
+msgid "Stable (lenny) - well-tested and rarely changes."
+msgstr "Stable (lenny) - Ben testata e con cambi rari."
#: misc/live-magic.glade:740
msgid "Select distribution"
diff --git a/po/ja.po b/po/ja.po
index 939f22b..44f2239 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -161,11 +161,11 @@ msgstr "イメージの種類を選択してください"
msgid ""
"<b>What distribution of Debian would you like to build?</b>\n"
"\n"
-"If unsure, select \"<i>Testing (lenny)</i>\"."
+"If unsure, select \"<i>Stable (lenny)</i>\"."
msgstr ""
"<b>構築したいのは Debian のどのディストリビューションですか?</b>\n"
"\n"
-"よく分からない場合は \"<i>Testing (lenny)</i>\" を選択してください。"
+"よく分からない場合は \"<i>Stable (lenny)</i>\" を選択してください。"
# FIXME: Add a trailing period.
#: misc/live-magic.glade:666
@@ -175,15 +175,15 @@ msgstr "不安定版 (unstable, sid) - テストされていなく、変更が
# From Translator: 意訳しています
#: misc/live-magic.glade:686
msgid ""
-"Testing (lenny) - receives new versions from unstable if they are not too "
+"Testing (squeeze) - receives new versions from unstable if they are not too "
"buggy."
msgstr ""
-"テスト版 (testing, lenny) - あまりバグの多くない新しいバージョンのみが不安定"
+"テスト版 (testing, squeeze) - あまりバグの多くない新しいバージョンのみが不安定"
"版から入ります。"
#: misc/live-magic.glade:707
-msgid "Stable (etch) - well-tested and rarely changes."
-msgstr "安定版 (stable, etch) - よくテストされ、変更はほとんどありません。"
+msgid "Stable (lenny) - well-tested and rarely changes."
+msgstr "安定版 (stable, lenny) - よくテストされ、変更はほとんどありません。"
#: misc/live-magic.glade:740
msgid "Select distribution"
diff --git a/po/live-magic.pot b/po/live-magic.pot
index 16a6d21..b88cc8c 100644
--- a/po/live-magic.pot
+++ b/po/live-magic.pot
@@ -85,22 +85,22 @@ msgstr ""
msgid "Generating Debian Live system..."
msgstr ""
-#: misc/live-magic.glade:44
+#: misc/live-magic.glade:45
msgid ""
"<big><b>Generating Debian Live system...</b></big>\n"
"\n"
"Please wait while your Debian Live image is generated for you."
msgstr ""
-#: misc/live-magic.glade:72
+#: misc/live-magic.glade:73
msgid "Automatically close after Live system has been created"
msgstr ""
-#: misc/live-magic.glade:112
+#: misc/live-magic.glade:115
msgid "Details"
msgstr ""
-#: misc/live-magic.glade:201
+#: misc/live-magic.glade:213
msgid ""
"<b>Welcome to Debian Live Magic!</b>\n"
"\n"
@@ -112,133 +112,132 @@ msgid ""
"of building your own Debian Live system."
msgstr ""
-#: misc/live-magic.glade:223
+#: misc/live-magic.glade:235
msgid "Welcome to Debian Live Magic!"
msgstr ""
-#: misc/live-magic.glade:248
+#: misc/live-magic.glade:259
msgid "<b>What type of image would you like to build?</b>"
msgstr ""
-#: misc/live-magic.glade:302
+#: misc/live-magic.glade:317
msgid "Standard Debian GNU/Linux image"
msgstr ""
-#: misc/live-magic.glade:348
+#: misc/live-magic.glade:360
msgid "GNOME desktop environment"
msgstr ""
-#: misc/live-magic.glade:390
+#: misc/live-magic.glade:405
msgid "KDE desktop environment"
msgstr ""
-#: misc/live-magic.glade:432
+#: misc/live-magic.glade:450
msgid "Xfce desktop environment"
msgstr ""
-#: misc/live-magic.glade:470
+#: misc/live-magic.glade:488
msgid "Debian GNU/Linux rescue image"
msgstr ""
-#: misc/live-magic.glade:566
+#: misc/live-magic.glade:591
msgid "Choose image type"
msgstr ""
-#: misc/live-magic.glade:592
+#: misc/live-magic.glade:616
msgid ""
"<b>What distribution of Debian would you like to build?</b>\n"
"\n"
-"If unsure, select \"<i>Testing (lenny)</i>\"."
+"If unsure, select \"<i>Stable (lenny)</i>\"."
msgstr ""
-#: misc/live-magic.glade:666
+#: misc/live-magic.glade:688
msgid "Unstable (sid) - untested and frequently changing"
msgstr ""
-#: misc/live-magic.glade:686
+#: misc/live-magic.glade:708
msgid ""
-"Testing (lenny) - receives new versions from unstable if they are not too "
+"Testing (squeeze) - receives new versions from unstable if they are not too "
"buggy."
msgstr ""
-#: misc/live-magic.glade:707
-msgid "Stable (etch) - well-tested and rarely changes."
+#: misc/live-magic.glade:729
+msgid "Stable (lenny) - well-tested and rarely changes."
msgstr ""
-#: misc/live-magic.glade:740
+#: misc/live-magic.glade:766
msgid "Select distribution"
msgstr ""
-#: misc/live-magic.glade:777
+#: misc/live-magic.glade:802
msgid "<b>What media type would you like to target?</b>"
msgstr ""
-#: misc/live-magic.glade:817
+#: misc/live-magic.glade:843
msgid "Server path:"
msgstr ""
-#: misc/live-magic.glade:829
+#: misc/live-magic.glade:855
msgid "Server address:"
msgstr ""
-# Netboot server type (e.g NFS / CIFS)
-#: misc/live-magic.glade:840
+#: misc/live-magic.glade:866
msgid "Server type:"
msgstr ""
-#: misc/live-magic.glade:921
+#: misc/live-magic.glade:950
msgid "Network boot image"
msgstr ""
-#: misc/live-magic.glade:964
+#: misc/live-magic.glade:996
msgid "USB / HDD image"
msgstr ""
-#: misc/live-magic.glade:1006
+#: misc/live-magic.glade:1041
msgid "ISO image for a CD or DVD"
msgstr ""
-#: misc/live-magic.glade:1077
+#: misc/live-magic.glade:1113
msgid "Select media type"
msgstr ""
-#: misc/live-magic.glade:1103
+#: misc/live-magic.glade:1138
msgid ""
"<b>Please choose your local mirror:</b>\n"
"\n"
"To select a mirror that is not on the list, simply enter it below."
msgstr ""
-#: misc/live-magic.glade:1239
+#: misc/live-magic.glade:1268
msgid "Choose mirror"
msgstr ""
-#: misc/live-magic.glade:1265
+#: misc/live-magic.glade:1293
msgid ""
"<b>What type of machine is your Debian Live system for?</b>\n"
"\n"
"If you are unsure, select \"<i>i386</i>\"."
msgstr ""
-#: misc/live-magic.glade:1304
+#: misc/live-magic.glade:1330
msgid ""
"i386\n"
"Computers with e.g. AMD Sempron or Intel Celeron, almost all\n"
"desktop computers dating 2004 or earlier."
msgstr ""
-#: misc/live-magic.glade:1324
+#: misc/live-magic.glade:1350
msgid ""
"amd64\n"
"Most new computers with e.g. AMD Opteron, Turion 64, Athlon 64, or\n"
"Intel Core2, Pentium 4xx, Pentium D CPUs."
msgstr ""
-#: misc/live-magic.glade:1386
+#: misc/live-magic.glade:1416
msgid "Select architecture"
msgstr ""
-#: misc/live-magic.glade:1412
+#: misc/live-magic.glade:1441
msgid ""
"<b>Select Debian Installer integration:</b>\n"
"\n"
@@ -249,19 +248,19 @@ msgid ""
"If unsure, select \"<i>no</i>\"."
msgstr ""
-#: misc/live-magic.glade:1465
+#: misc/live-magic.glade:1492
msgid "Yes, integrate the Debian Installer."
msgstr ""
-#: misc/live-magic.glade:1495
+#: misc/live-magic.glade:1522
msgid "No, do not integrate the Debian Installer."
msgstr ""
-#: misc/live-magic.glade:1531
+#: misc/live-magic.glade:1562
msgid "Select Debian Installer integration"
msgstr ""
-#: misc/live-magic.glade:1557
+#: misc/live-magic.glade:1587
msgid ""
"<b>Select locale and keyboard layout:</b>\n"
"\n"
@@ -270,19 +269,19 @@ msgid ""
"settings. If unsure, please use the defaults."
msgstr ""
-#: misc/live-magic.glade:1632
+#: misc/live-magic.glade:1663
msgid "Keyboard layout:"
msgstr ""
-#: misc/live-magic.glade:1656
+#: misc/live-magic.glade:1687
msgid "Locale:"
msgstr ""
-#: misc/live-magic.glade:1689
+#: misc/live-magic.glade:1722
msgid "Select locale and keyboard layout"
msgstr ""
-#: misc/live-magic.glade:1726
+#: misc/live-magic.glade:1758
msgid ""
"<b>Please choose a build folder:</b>\n"
"\n"
@@ -290,19 +289,17 @@ msgid ""
"<i>DebianLive/</i> subfolder."
msgstr ""
-#: misc/live-magic.glade:1777 misc/live-magic.glade:1804
+#: misc/live-magic.glade:1809 misc/live-magic.glade:1837
msgid "Select build folder"
msgstr ""
-# Shown in the final wizard screen. The text for the 'Apply' button is
-# translated by GTK (gtk-apply).
-#: misc/live-magic.glade:1821
+#: misc/live-magic.glade:1854
msgid ""
"<b>Your Debian Live image is ready to build!</b>\n"
"\n"
"Press <i>Apply</i> to begin the build process."
msgstr ""
-#: misc/live-magic.glade:1849
+#: misc/live-magic.glade:1885
msgid "Ready to build!"
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 38d930f..f9946e8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -160,11 +160,11 @@ msgstr "Выберите тип образа"
msgid ""
"<b>What distribution of Debian would you like to build?</b>\n"
"\n"
-"If unsure, select \"<i>Testing (lenny)</i>\"."
+"If unsure, select \"<i>Stable (lenny)</i>\"."
msgstr ""
"<b>Какой дистрибутив Debian нужно собрать?</b>\n"
"\n"
-"Если не знаете, выбирайте \"<i>Тестируемый (lenny)</i>\"."
+"Если не знаете, выбирайте \"<i>Стабильный (lenny)</i>\"."
#: misc/live-magic.glade:666
msgid "Unstable (sid) - untested and frequently changing"
@@ -172,15 +172,15 @@ msgstr "Нестабильный (sid) - не протестирован и ча
#: misc/live-magic.glade:686
msgid ""
-"Testing (lenny) - receives new versions from unstable if they are not too "
+"Testing (squeeze) - receives new versions from unstable if they are not too "
"buggy."
msgstr ""
-"Тестируемый (lenny) - получает новые версии из нестабильного, если в них нет критических "
+"Тестируемый (squeeze) - получает новые версии из нестабильного, если в них нет критических "
"ошибок."
#: misc/live-magic.glade:707
-msgid "Stable (etch) - well-tested and rarely changes."
-msgstr "Стабильный (etch) - хорошо протестирован и редко изменяется."
+msgid "Stable (lenny) - well-tested and rarely changes."
+msgstr "Стабильный (lenny) - хорошо протестирован и редко изменяется."
#: misc/live-magic.glade:740
msgid "Select distribution"
diff --git a/po/sv.po b/po/sv.po
index 883fbff..155ecde 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -162,11 +162,11 @@ msgstr "Välj avbildningstyp"
msgid ""
"<b>What distribution of Debian would you like to build?</b>\n"
"\n"
-"If unsure, select \"<i>Testing (lenny)</i>\"."
+"If unsure, select \"<i>Stable (lenny)</i>\"."
msgstr ""
"<b>Vilken utgåva av Debian vill du bygga?</b>\n"
"\n"
-"Om du är osäker, välj \"<i>Uttestningsutgåvan (lenny)</i>\"."
+"Om du är osäker, välj \"<i>Den stabila utgåvan (lenny)</i>\"."
#: misc/live-magic.glade:666
msgid "Unstable (sid) - untested and frequently changing"
@@ -174,15 +174,15 @@ msgstr "Den instabila utgåvan (sid) - otestad utgåva som ändras ofta"
#: misc/live-magic.glade:686
msgid ""
-"Testing (lenny) - receives new versions from unstable if they are not too "
+"Testing (squeeze) - receives new versions from unstable if they are not too "
"buggy."
msgstr ""
-"Uttestningsutgåvan (lenny) - tar emot nya versioner från den instabila "
+"Uttestningsutgåvan (squeeze) - tar emot nya versioner från den instabila "
"utgåvan om de inte innehåller för många fel."
#: misc/live-magic.glade:707
-msgid "Stable (etch) - well-tested and rarely changes."
-msgstr "Den stabila utgåvan (etch) - vältestad utgåva som sällan ändras."
+msgid "Stable (lenny) - well-tested and rarely changes."
+msgstr "Den stabila utgåvan (lenny) - vältestad utgåva som sällan ändras."
#: misc/live-magic.glade:740
msgid "Select distribution"
--
GUI front-end for Debian Live.
More information about the debian-live-changes
mailing list