summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--anaconda.spec.in68
-rw-r--r--configure.ac2
-rw-r--r--po/anaconda.pot314
3 files changed, 320 insertions, 64 deletions
diff --git a/anaconda.spec.in b/anaconda.spec.in
index ebde10d3d..51d65938a 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -293,6 +293,74 @@ update-desktop-database &> /dev/null || :
/usr/lib/dracut/modules.d/80%{name}/*
%changelog
+* Wed Aug 15 2012 Chris Lumens <clumens@redhat.com> - 18.5-1
+- Mark/unmark some strings for translation, as appropriate. (clumens)
+- Save the distro label into the right variable for retranslation. (clumens)
+- Add custom widget files to POTFILES.in. (clumens)
+- Fix attribution on common UI code. (clumens)
+- don't set armMachine in class definition (bcl)
+- libudev now has a version of .1 (hamzy)
+- Load anaconda-lib.sh if necessary (jkeating)
+- Use shell code to work around missing basename (jkeating)
+- Enable text mode once again! (jkeating)
+- Update text prompt to include c for continue (jkeating)
+- Don't continue if incomplete spokes exist (jkeating)
+- Return a bool for timezone completed property (jkeating)
+- Add a text progress hub to do the install (jkeating)
+- text based storage spoke. (jkeating)
+- Allow updating tmux.conf via makeupdates. (clumens)
+- Prevent yum messages from showing on tty (jkeating)
+- Remove unused imports from the installclasses. (clumens)
+- NoSuchGroup is provided by packaging now. yuminstall is on the way out.
+ (clumens)
+- Set transaction color in case of multilib install. (clumens)
+- Add selinux-specific RPM macro setup. (clumens)
+- Add the user-agent to urlgrabber from the old yuminstall.py. (clumens)
+- Fix inheritance problems with the gui *Spoke classes. (clumens)
+- Only setup python-meh when doing graphical installs (jkeating)
+- Call the correct method to schedule the screen (jkeating)
+- Add a missing import of os (jkeating)
+- Don't display indirect spokes in the hub (jkeating)
+- Revert "Remove unncessary __init__ definition. (clumens)" (jkeating)
+- Honor displayMode from kickstart files (jkeating)
+- Merge master into newtui (jkeating)
+- Remove the base_tests file for now (jkeating)
+- Remove unused import of UIObject (jkeating)
+- Fix up detailederror for new common UI code (jkeating)
+- Translate the base text hub class (jkeating)
+- Translate the base tui class strings (jkeating)
+- Remove unncessary __init__ definition. (clumens) (jkeating)
+- Translate some strings in the base tui spokes classes (jkeating)
+- Always use collect directly from common (jkeating)
+- Add comment headers to the new files (jkeating)
+- Ad source files to POTFILES.in (msivak)
+- Merge remote-tracking branch 'origin/master' into newtui (msivak)
+- import localization stuff and use it to translate more strings (msivak)
+- finish renaming _mainloop (msivak)
+- Fix naming for data attribute and move the NormalSpoke.__init__ under the
+ proper class (msivak)
+- Improve documentation and add licensing headers (msivak)
+- Add translations to the simpleline framework (msivak)
+- Add translations to Password Spoke (msivak)
+- Add elementary timezone spoke (msivak)
+- Pass screen args argument to prompt and input methods + fix for run-text-
+ spoke (msivak)
+- Merge master into newtui (msivak)
+- Add automake files for TUI (msivak)
+- add couple of tests and fix write method of widget (newline added unwanted
+ space) (msivak)
+- add couple of tests and support for them (msivak)
+- add documentation and comments to TUI classes (msivak)
+- Add documentation to the simpleline library for TUI (msivak)
+- Add the new Summary hub and Password TUI spokes + tools to test TUI stuff
+ (msivak)
+- Fix bits and pieces to make TUI hub and spoke model work + example Hub and
+ Password spoke (msivak)
+- Create common abstract classes usable for all types of UI (msivak)
+- Create the base classes for TUI Hub and Spoke model (msivak)
+- Make collect and part of UserInterface setup more generic (msivak)
+- Text based UI framework core (msivak)
+
* Mon Aug 13 2012 Chris Lumens <clumens@redhat.com> - 18.4-1
- dracut: fix inst.ks.sendmac (#826657) (wwoods)
- dracut: suppress ks errors from missing %include (wwoods)
diff --git a/configure.ac b/configure.ac
index 4ed38adc6..a39a168c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
m4_define(python_required_version, 2.5)
AC_PREREQ([2.63])
-AC_INIT([anaconda], [18.4], [anaconda-devel-list@redhat.com])
+AC_INIT([anaconda], [18.5], [anaconda-devel-list@redhat.com])
AM_INIT_AUTOMAKE([foreign no-dist-gzip dist-bzip2])
AC_CONFIG_HEADERS([config.h])
diff --git a/po/anaconda.pot b/po/anaconda.pot
index 89abc5ed0..b27e07de5 100644
--- a/po/anaconda.pot
+++ b/po/anaconda.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: anaconda 18.3\n"
+"Project-Id-Version: anaconda 18.4\n"
"Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2012-08-13 15:30-0400\n"
+"POT-Creation-Date: 2012-08-15 15:34-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -274,12 +274,12 @@ msgid ""
"After shutdown, please perform a manual IPL from %s to continue installation."
msgstr ""
-#: pyanaconda/kickstart.py:155
+#: pyanaconda/kickstart.py:156
#, python-format
msgid "Escrow certificate %s requires the network."
msgstr ""
-#: pyanaconda/kickstart.py:163
+#: pyanaconda/kickstart.py:164
#, python-format
msgid ""
"The following error was encountered while downloading the escrow "
@@ -288,7 +288,7 @@ msgid ""
"%s"
msgstr ""
-#: pyanaconda/kickstart.py:1521
+#: pyanaconda/kickstart.py:1522
msgid "Running pre-installation scripts"
msgstr ""
@@ -669,7 +669,7 @@ msgstr[1] ""
msgid "Preparing to install"
msgstr ""
-#: pyanaconda/yuminstall.py:136 pyanaconda/packaging/yumpayload.py:1119
+#: pyanaconda/yuminstall.py:136 pyanaconda/packaging/yumpayload.py:1139
msgid "Preparing transaction from installation source"
msgstr ""
@@ -755,6 +755,7 @@ msgstr ""
#: pyanaconda/yuminstall.py:1017 pyanaconda/yuminstall.py:1290
#: pyanaconda/yuminstall.py:1350 pyanaconda/yuminstall.py:1562
#: pyanaconda/yuminstall.py:1584 pyanaconda/storage/zfcp.py:375
+#: pyanaconda/ui/tui/__init__.py:37
msgid "Error"
msgstr ""
@@ -785,6 +786,7 @@ msgstr ""
#: pyanaconda/yuminstall.py:1019 pyanaconda/yuminstall.py:1114
#: pyanaconda/yuminstall.py:1537 pyanaconda/yuminstall.py:1591
+#: widgets/src/SpokeWindow.c:106
msgid "_Back"
msgstr ""
@@ -944,11 +946,11 @@ msgstr ""
msgid "Installation Progress"
msgstr ""
-#: pyanaconda/installclasses/fedora.py:40
+#: pyanaconda/installclasses/fedora.py:35
msgid "_Fedora"
msgstr ""
-#: pyanaconda/installclasses/fedora.py:41
+#: pyanaconda/installclasses/fedora.py:36
#, python-format
msgid ""
"The default installation of %s includes a set of software applicable for "
@@ -956,46 +958,46 @@ msgid ""
"software now."
msgstr ""
-#: pyanaconda/installclasses/fedora.py:50
+#: pyanaconda/installclasses/fedora.py:45
msgid "Graphical Desktop"
msgstr ""
-#: pyanaconda/installclasses/fedora.py:55
+#: pyanaconda/installclasses/fedora.py:50
msgid "Software Development"
msgstr ""
-#: pyanaconda/installclasses/fedora.py:61
+#: pyanaconda/installclasses/fedora.py:56
msgid "Web Server"
msgstr ""
-#: pyanaconda/installclasses/fedora.py:65 pyanaconda/installclasses/rhel.py:43
+#: pyanaconda/installclasses/fedora.py:60 pyanaconda/installclasses/rhel.py:39
msgid "Minimal"
msgstr ""
-#: pyanaconda/installclasses/rhel.py:32
+#: pyanaconda/installclasses/rhel.py:28
msgid "Red Hat Enterprise Linux"
msgstr ""
-#: pyanaconda/installclasses/rhel.py:33
+#: pyanaconda/installclasses/rhel.py:29
#, python-format
msgid ""
"The default installation of %s is a minimum install. You can optionally "
"select a different set of software now."
msgstr ""
-#: pyanaconda/packaging/yumpayload.py:968
+#: pyanaconda/packaging/yumpayload.py:973
msgid "Starting package installation process"
msgstr ""
-#: pyanaconda/packaging/yumpayload.py:1139
+#: pyanaconda/packaging/yumpayload.py:1159
msgid "Upgrading"
msgstr ""
-#: pyanaconda/packaging/yumpayload.py:1141
+#: pyanaconda/packaging/yumpayload.py:1161
msgid "Installing"
msgstr ""
-#: pyanaconda/packaging/yumpayload.py:1198
+#: pyanaconda/packaging/yumpayload.py:1218
msgid "Performing post-install setup tasks"
msgstr ""
@@ -1421,24 +1423,213 @@ msgstr ""
msgid "Could not set zFCP device %(devnum)s offline (%(e)s)."
msgstr ""
-#: pyanaconda/ui/gui/__init__.py:113
+#: pyanaconda/ui/tui/hubs/progress.py:37
+msgid "Installation Hub"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/progress.py:111
+msgid "\tInstallation complete. Press return to quit"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/summary.py:28
+msgid "Install hub"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:43
+msgid "Default HUB title"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:104
+#: pyanaconda/ui/tui/simpleline/base.py:301
+msgid "c"
+msgstr ""
+
+#: pyanaconda/ui/tui/hubs/__init__.py:107
+msgid "Please complete all spokes before continuing"
+msgstr ""
+
+#: pyanaconda/ui/tui/simpleline/base.py:306
+msgid "q"
+msgstr ""
+
+#: pyanaconda/ui/tui/simpleline/base.py:308
+msgid "Do you really want to quit?"
+msgstr ""
+
+#: pyanaconda/ui/tui/simpleline/base.py:407
+msgid " Please make your choice from above ['q' to quit | 'c' to continue]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/password.py:31
+msgid "Set root password"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/password.py:45
+msgid "Password is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/password.py:47
+msgid "Password is set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/password.py:52
+msgid "Please select new root password. You will have to type it twice."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/password.py:58
+msgid "Password: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/password.py:59
+msgid "Password (confirm): "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/password.py:62
+msgid "Passwords do not match!"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:44
+msgid "Use All Space"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:45
+msgid "Replace Existing Linux system(s)"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:46
+msgid "Use Free Space"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:89
+msgid "Install Destination"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:109
+#: pyanaconda/ui/gui/spokes/storage.py:344
+msgid "No disks selected"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:116
+#: pyanaconda/ui/gui/spokes/storage.py:351
+msgid "Error checking storage configuration"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:119
+#: pyanaconda/ui/gui/spokes/storage.py:353
+msgid "Automatic partitioning selected"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:121
+#: pyanaconda/ui/gui/spokes/storage.py:355
+msgid "Custom partitioning selected"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:157
+#: pyanaconda/ui/gui/spokes/storage.py:466
+msgid "No disks selected; please select at least one disk to install to."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:170
+#: pyanaconda/ui/gui/spokes/source.py:601
+#: pyanaconda/ui/gui/spokes/storage.py:405
+msgid "Probing storage..."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:255
+msgid "Generating updated storage configuration"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:263
+#: pyanaconda/ui/gui/spokes/storage.py:248
+msgid "Checking storage configuration..."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:298
+msgid "Autopartitioning Options"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/storage.py:329
+msgid ""
+"Installation requires partitioning of your hard drive. Select what space to "
+"use for the install target."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/time.py:30
+msgid "Timezone settings"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/time.py:53 pyanaconda/ui/tui/spokes/time.py:55
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:324
+#: pyanaconda/ui/gui/spokes/datetime_spoke.py:326
+#, python-format
+msgid "%s timezone"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/time.py:57
+msgid "Timezone is not set."
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/time.py:65
+#, python-format
+msgid "Available timezones in region %s"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/time.py:68
+msgid "Available regions"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/time.py:131
+msgid ""
+"Please select the timezone.\n"
+"Use numbers or type names directly [b to region list, q to quit]: "
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:44
+msgid "Default spoke title"
+msgstr ""
+
+#: pyanaconda/ui/tui/spokes/__init__.py:54
+msgid "testing status..."
+msgstr ""
+
+#: pyanaconda/ui/tui/__init__.py:57
+msgid "Press enter to exit."
+msgstr ""
+
+#: pyanaconda/ui/tui/__init__.py:66
+msgid "Question"
+msgstr ""
+
+#: pyanaconda/ui/tui/__init__.py:89
+msgid "Please respond 'yes' or 'no': "
+msgstr ""
+
+#: pyanaconda/ui/tui/__init__.py:92
+msgid "yes"
+msgstr ""
+
+#: pyanaconda/ui/tui/__init__.py:97
+msgid "no"
+msgstr ""
+
+#: pyanaconda/ui/gui/__init__.py:105
#, python-format
msgid "%(productName)s %(productVersion)s INSTALLATION"
msgstr ""
-#: pyanaconda/ui/gui/__init__.py:129
+#: pyanaconda/ui/gui/__init__.py:121
msgid "_Exit Installer"
msgstr ""
-#: pyanaconda/ui/gui/__init__.py:142
+#: pyanaconda/ui/gui/__init__.py:134
msgid "_No"
msgstr ""
-#: pyanaconda/ui/gui/__init__.py:142
+#: pyanaconda/ui/gui/__init__.py:134
msgid "_Yes"
msgstr ""
-#: pyanaconda/ui/gui/categories/__init__.py:43
+#: pyanaconda/ui/gui/categories/__init__.py:44
msgid "DEFAULT TITLE"
msgstr ""
@@ -1450,13 +1641,13 @@ msgstr ""
msgid "SOFTWARE"
msgstr ""
-#: pyanaconda/ui/gui/hubs/__init__.py:221
+#: pyanaconda/ui/gui/hubs/__init__.py:219
msgid ""
"When all items marked with this icon are complete, installation will "
"automatically continue."
msgstr ""
-#: pyanaconda/ui/gui/hubs/__init__.py:223
+#: pyanaconda/ui/gui/hubs/__init__.py:221
msgid ""
"Please complete items marked with this icon before continuing to the next "
"step."
@@ -1547,12 +1738,6 @@ msgstr ""
msgid "DATE & TIME"
msgstr ""
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:324
-#: pyanaconda/ui/gui/spokes/datetime_spoke.py:326
-#, python-format
-msgid "%s timezone"
-msgstr ""
-
#: pyanaconda/ui/gui/spokes/datetime_spoke.py:694
msgid "You need to set up networking first if you want to use NTP"
msgstr ""
@@ -1665,7 +1850,7 @@ msgstr ""
msgid "Enterprise"
msgstr ""
-#: pyanaconda/ui/gui/spokes/network.py:893
+#: pyanaconda/ui/gui/spokes/network.py:893 widgets/src/SpokeSelector.c:52
msgid "None"
msgstr ""
@@ -1809,11 +1994,6 @@ msgstr ""
msgid "Error setting up software source"
msgstr ""
-#: pyanaconda/ui/gui/spokes/source.py:601
-#: pyanaconda/ui/gui/spokes/storage.py:405
-msgid "Probing storage..."
-msgstr ""
-
#: pyanaconda/ui/gui/spokes/storage.py:136
#, python-format
msgid ""
@@ -1865,34 +2045,10 @@ msgid ""
"quit the installer."
msgstr ""
-#: pyanaconda/ui/gui/spokes/storage.py:248
-msgid "Checking storage configuration..."
-msgstr ""
-
#: pyanaconda/ui/gui/spokes/storage.py:266
msgid "INSTALLATION DESTINATION"
msgstr ""
-#: pyanaconda/ui/gui/spokes/storage.py:344
-msgid "No disks selected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:351
-msgid "Error checking storage configuration"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:353
-msgid "Automatic partitioning selected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:355
-msgid "Custom partitioning selected"
-msgstr ""
-
-#: pyanaconda/ui/gui/spokes/storage.py:466
-msgid "No disks selected; please select at least one disk to install to."
-msgstr ""
-
#: pyanaconda/ui/gui/spokes/welcome.py:243
msgid "LANGUAGE"
msgstr ""
@@ -2196,7 +2352,7 @@ msgid "summary"
msgstr ""
#: pyanaconda/ui/gui/spokes/storage.glade:775
-#: pyanaconda/ui/gui/hubs/summary.glade:91
+#: pyanaconda/ui/gui/hubs/summary.glade:91 widgets/src/StandaloneWindow.c:53
msgid "_CONTINUE"
msgstr ""
@@ -2575,7 +2731,7 @@ msgid ""
"installation process?"
msgstr ""
-#: pyanaconda/ui/gui/hubs/summary.glade:73
+#: pyanaconda/ui/gui/hubs/summary.glade:73 widgets/src/StandaloneWindow.c:52
msgid "_QUIT"
msgstr ""
@@ -2589,6 +2745,38 @@ msgstr ""
msgid "_REBOOT"
msgstr ""
+#: widgets/src/BaseWindow.c:83
+msgid "DISTRIBUTION INSTALLATION"
+msgstr ""
+
+#: widgets/src/BaseWindow.c:84
+msgid "SPOKE NAME"
+msgstr ""
+
+#: widgets/src/BaseWindow.c:85
+msgid "PRE-RELEASE / TESTING"
+msgstr ""
+
+#: widgets/src/DiskOverview.c:50
+msgid "New Device"
+msgstr ""
+
+#: widgets/src/DiskOverview.c:52
+msgid "0 MB"
+msgstr ""
+
+#: widgets/src/MountpointSelector.c:48
+msgid "Root"
+msgstr ""
+
+#: widgets/src/MountpointSelector.c:49
+msgid "0 GB"
+msgstr ""
+
+#: widgets/src/SpokeSelector.c:53
+msgid "New Selector"
+msgstr ""
+
#: data/liveinst/gnome/fedora-welcome:64
msgid "Welcome to Fedora"
msgstr ""