=== modified file 'debian/ubiquity.templates'
--- debian/ubiquity.templates 2007-04-13 00:14:18 +0000
+++ debian/ubiquity.templates 2007-06-15 09:17:28 +0000
@@ -188,7 +188,15 @@
Template: ubiquity/text/warning_dialog_label
Type: text
-_Description: Do you really want to abort the installation now?
+_Description: Do you really want to abort the installation now, or would you like to continue installing?
+
+Template: ubiquity/text/warning_dialog_continue
+Type: text
+_Description: Continue
+
+Template: ubiquity/text/warning_dialog_abort
+Type: text
+_Description: Abort
Template: ubiquity/text/progress_cancel_button
Type: text
=== modified file 'debian/ubiquity.templates-imported'
--- debian/ubiquity.templates-imported 2007-02-08 16:48:53 +0000
+++ debian/ubiquity.templates-imported 2007-06-15 09:50:25 +0000
@@ -27,9 +27,3 @@
# Translations for this template are imported from GTK. Please keep them in
# sync.
_Description: _OK
-
-Template: ubiquity/imported/quit
-Type: text
-# Translations for this template are imported from GTK. Please keep them in
-# sync.
-_Description: _Quit
=== modified file 'ubiquity/frontend/gtk-ui.py'
--- ubiquity/frontend/gtk-ui.py 2007-06-13 13:34:37 +0000
+++ ubiquity/frontend/gtk-ui.py 2007-06-15 09:14:13 +0000
@@ -101,7 +101,7 @@
'release_notes_url', 'step_label',
'cancel', 'back', 'next',
'warning_dialog', 'warning_dialog_label',
- 'cancelbutton', 'exitbutton')
+ 'warning_dialog_continue', 'warning_dialog_abort')
self.current_page = None
self.allowed_change_step = True
self.allowed_go_forward = True
=== modified file 'ubiquity/frontend/ubiquity.glade'
--- ubiquity/frontend/ubiquity.glade 2007-04-13 00:14:18 +0000
+++ ubiquity/frontend/ubiquity.glade 2007-06-15 09:10:03 +0000
@@ -1979,7 +1979,7 @@
True
True
- Do you really want to abort the installation now?
+ Do you really want to abort the installation now, or would you like to continue installing?
True
True
@@ -2001,22 +2001,20 @@
True
GTK_BUTTONBOX_END
-
+
True
True
True
- gtk-cancel
- True
+ Continue
-6
-
+
True
True
True
- gtk-quit
- True
+ Abort
-7
=== modified file 'ubiquity/i18n.py'
--- ubiquity/i18n.py 2007-04-18 08:44:10 +0000
+++ ubiquity/i18n.py 2007-06-15 09:54:29 +0000
@@ -131,8 +131,8 @@
'cancel': 'ubiquity/imported/cancel',
'back': 'ubiquity/imported/go-back',
'next': 'ubiquity/imported/go-forward',
- 'cancelbutton': 'ubiquity/imported/cancel',
- 'exitbutton': 'ubiquity/imported/quit',
+ 'warning_dialog_continue': 'ubiquity/text/warning_dialog_continue',
+ 'warning_dialog_abort': 'ubiquity/text/warning_dialog_abort',
'closebutton1': 'ubiquity/imported/close',
'cancelbutton1': 'ubiquity/imported/cancel',
'okbutton1': 'ubiquity/imported/ok',