From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QjunP-00012y-9L for garchives@archives.gentoo.org; Thu, 21 Jul 2011 15:04:15 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3AD3121C112; Thu, 21 Jul 2011 15:04:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id F032121C112 for ; Thu, 21 Jul 2011 15:04:07 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 69B721B400C for ; Thu, 21 Jul 2011 15:04:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B16F08003D for ; Thu, 21 Jul 2011 15:04:06 +0000 (UTC) From: "Wiktor W Brodlo" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Wiktor W Brodlo" Message-ID: Subject: [gentoo-commits] proj/anaconda:master commit in: iw/ X-VCS-Repository: proj/anaconda X-VCS-Files: iw/welcome_gui.py X-VCS-Directories: iw/ X-VCS-Committer: wiktor X-VCS-Committer-Name: Wiktor W Brodlo X-VCS-Revision: ceff147bebd5d447920c9b9cd1692b8659ebb8cc Date: Thu, 21 Jul 2011 15:04:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: f1a64a1b784a1ce02aaab414cdebd6b1 commit: ceff147bebd5d447920c9b9cd1692b8659ebb8cc Author: wiktor w brodlo brodlo net> AuthorDate: Thu Jul 21 15:03:43 2011 +0000 Commit: Wiktor W Brodlo brodlo net> CommitDate: Thu Jul 21 15:03:43 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/anaconda.git;= a=3Dcommit;h=3Dceff147b iw/welcome_gui.py: GTK+ labels are retarded https://bugzilla.gnome.org/sh= ow_bug.cgi?id=3D318276 --- iw/welcome_gui.py | 67 +++++++++++++++++++++++++++--------------------= ----- 1 files changed, 35 insertions(+), 32 deletions(-) diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py index 538e04c..2950b19 100644 --- a/iw/welcome_gui.py +++ b/iw/welcome_gui.py @@ -28,73 +28,76 @@ _ =3D lambda x: gettext.ldgettext("anaconda", x) =20 class WelcomeWindow (InstallWindow): =20 + # We have to do it this way with the "\n"s because GTK+ is retarded. + # https://bugzilla.gnome.org/show_bug.cgi?id=3D318276 windows =3D {=20 "welcomescreen" : ( _("Welcome to the Gentoo installer!"), - _("This wizard will take you through installing Gentoo \ -on your computer. We will follow the official Gentoo \ -Handbook (with a few changes) and if at any point \ -you'd like to consult the handbook, you'll find the \ -link in the top-right corner of the window.\n\n\ -We'll start off asking you for the language and \ -keyboard layout you'd like the installer and your \ -future system to use. We will then skip straight to \ -Chapter 4 and continue with the installation."), + _("\ +This wizard will take you through installing Gentoo on your computer. We= will\n\ +follow the official Gentoo Handbook (with a few changes) and if at any p= oint\n\ +you'd like to consult the handbook, you'll find the link in the top-righ= t corner\n\ + of the window.\n\n\ +We'll start off asking you for the language and keyboard layout you'd li= ke the\n\ +installer and your future system to use. We will then skip straight to C= hapter 4\n\ +and continue with the installation."), 0, "Gentoo Handbook"), =20 "preparedisks" : ( _("Preparing the Disks"), - _("To be able to install Gentoo, you must create the \ -necessary partitions. The following screens will \ -help you choose the right disk configuration for \ -your system."), + _("\ +To be able to install Gentoo, you must create the necessary partitions. = The \n\ +following screens will help you choose the right disk configuration for = your \n\ +system."), 4, None), =20 "installationfiles" : ( _("Installing the Gentoo Installation Files"), - _("Gentoo installs work through a stage3 archive. In \ -this chapter the installer will help you choose the \ -right compilation options for your machine. "), + _("\ +Gentoo installs work through a stage3 archive. In this chapter the insta= ller \n\ +will help you choose the right compilation options for your machine. "), 5, None), =20 "basesystem" : ( _("Installing the Gentoo Installation Files"), - _("In this chapter you will set your Gentoo mirrors, \ -select your profile and choose your the USE flags."), + _("\ +In this chapter you will set your Gentoo mirrors, select your profile an= d choose\n\ + your the USE flags."), 6, None), =20 "configurekernel": ( _("Configuring the Kernel"), - _("The Linux kernel is the core of every distribution. \ -This chapter explains how to configure your kernel. \ -You will only have to set your timezone, as the \ -installer will just copy the LiveDVD kernel to your \ -new system."), + _("\ +The Linux kernel is the core of every distribution. This chapter explain= s how to\n\ +configure your kernel. You will only have to set your timezone, as the \= n\ +installer will just copy the LiveDVD kernel to your new system."), 7, None), =20 "configuresystem" : ( _("Configuring your System"), - _("In this chapter you will only have to set your root \ -password as the rest is figured out automatically ;-)"), + _("\ +In this chapter you will only have to set your root password as the rest= is\n\ +figured out automatically ;-)"), 8, None), =20 "systools" : ( _("Installing Necessary System Tools"), - _("In this chapter we help you choose and install some impor= tant tools."), + _("\ +In this chapter we help you choose and install some important tools."), 9, None), =20 "bootloader" : ( _("Configuring the Bootloader"), - _("In this chapter you'll be able configure the GRUB bootloa= der."), + _("\ +In this chapter you'll be able configure the GRUB bootloader."), 10, None), =20 "finalizing" : ( _("Finalizing your Gentoo Installation"), - _("You're almost done. We'll just create a user for \ -your system.\n\ -You'll also be able to choose if you'd like the X \ -Window System and a desktop environment installed on \ -your new system. "), + _("\ +You're almost done. We'll just create a user for your system.\n\n\ +You'll also be able to choose if you'd like the X Window System and a de= sktop\n\ +environment installed on your new system. "), 11, None) } =20