This email list is read-only. Emails sent to this list will be discarded
----------------------------------
debian/changelog | 3 +-
gui/gui.py | 19 +++++++-------
gui/image-creator.glade | 2 +-
libs/InstallImage.py | 14 +++-------
libs/Makefile.am | 2 +-
po/ja.po | 61 ++++++++++++++++++++++++++++++++++++++++-------
6 files changed, 70 insertions(+), 31 deletions(-)
New commits:
commit dc27e36a52e0a44159af49c6bfad0191fc9c57cc
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Wed Aug 13 22:18:45 2008 +0900
* Added some localization and cleaned to dirty codes.
Diff in this email is a maximum of 400 lines.
diff --git a/debian/changelog b/debian/changelog
index d54aa9a..0455e28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -98,8 +98,9 @@ moblin-image-creator (0.45) UNRELEASED; urgency=low
* Added entry Makefile.am on mccaslin-lpia-fedora.
* Added entry busybox in defaults.cfg.
* Cleaned to dirty codes.
+ * Added some localization and cleaned to dirty codes.
- -- Mitsutaka Amano <[EMAIL PROTECTED]> Wed, 13 Aug 2008 20:53:52 +0900
+ -- Mitsutaka Amano <[EMAIL PROTECTED]> Wed, 13 Aug 2008 22:17:33 +0900
moblin-image-creator (0.44) gaston; urgency=low
diff --git a/gui/gui.py b/gui/gui.py
index 033f648..9ce23f6 100644
--- a/gui/gui.py
+++ b/gui/gui.py
@@ -869,7 +869,7 @@ class App(object):
progress_tree = gtk.glade.XML(self.gladefile, 'ProgressDialog')
progress_dialog = progress_tree.get_widget('ProgressDialog')
progress_dialog.connect('delete_event', self.ignore)
- progress_tree.get_widget('progress_label').set_text("Please wait
while creating %s" % img_name)
+ progress_tree.get_widget('progress_label').set_text(_("Please wait
while creating %s") % img_name)
self.progressbar = progress_tree.get_widget('progressbar')
try:
self.current_project().create_NAND_image(target.name, img_name)
@@ -885,22 +885,24 @@ class App(object):
def on_launch_vm_clicked(self, widget):
# check whether the shared image exists
# the path of folder containing this image is fixed and hardcoded
- if os.path.exists ("/var/lib/moblin-image-creator/kvm") == False:
- print ("Creating folder /var/lib/moblin-image-creator/kvm ... ")
- os.popen("mkdir /var/lib/moblin-image-creator/kvm")
- if
os.path.isfile("/var/lib/moblin-image-creator/kvm/mic_vm_share.img") == False:
- print ("Creating image
/var/lib/moblin-image-creator/kvm/mic_vm_share.img ... ")
+ kvm_dir = '/var/lib/moblin-image-creator/kvm'
+ kvmimg_file = os.path.join(kvm_dir, 'mic_vm_share.img')
+ if os.path.exists (kvm_dir) == False:
+ print _("Creating directory %s ... ") % kvm_dir
+ os.popen("mkdir %s") % kvm_dir
+ if os.path.isfile(kvmimg_file) == False:
+ print _("Creating image %s ... ") % kvmimg_file
progress_tree = gtk.glade.XML(self.gladefile, 'ProgressDialog')
progress_dialog = progress_tree.get_widget('ProgressDialog')
progress_dialog.connect('delete_event', self.ignore)
progress_tree.get_widget('progress_label').set_text(_("Please wait
while creating shared image..."))
self.progressbar = progress_tree.get_widget('progressbar')
- cmd = "qemu-img create
/var/lib/moblin-image-creator/kvm/mic_vm_share.img -f qcow2 4G"
+ cmd = "qemu-img create %s -f qcow2 4G" % kvmimg_file
pdk_utils.execCommand(cmd, False, None, self.gui_throbber)
progress_dialog.destroy()
# select a live usb image
target = self.current_target()
- dialog = gtk.FileChooserDialog(action=gtk.FILE_CHOOSER_ACTION_OPEN,
title="Choose a Live USB image")
+ dialog = gtk.FileChooserDialog(action=gtk.FILE_CHOOSER_ACTION_OPEN,
title=_("Choose a Live USB image"))
dialog.set_current_folder(target.top + "/image/")
dialog.add_button(gtk.STOCK_OK, gtk.RESPONSE_OK)
dialog.add_button(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)
@@ -924,7 +926,6 @@ class App(object):
elif mic_cfg.config.get('general', 'package_manager') == 'yum':
os.popen("qemu-kvm -no-acpi -m 384 -hda " + live_img + " -hdb
/var/lib/moblin-image-creator/kvm/mic_vm_share.img -boot c &")
-
def getImageName(self, default_name = ".img"):
"""Function to query the user for the name of the image file they want
to create"""
diff --git a/gui/image-creator.glade b/gui/image-creator.glade
index 9d1698d..e195636 100644
--- a/gui/image-creator.glade
+++ b/gui/image-creator.glade
@@ -1052,7 +1052,7 @@
<property
name="visible">True</property>
<property
name="sensitive">False</property>
<property
name="can_focus">True</property>
- <property name="tooltip"
translatable="yes">Create an installation image that can be burned to a USB
flash drive. When you boot off the USB flash drive it will erase the target
harddrive, then repartition and install the target image.</property>
+ <property name="tooltip"
translatable="yes">Create a NAND image that can be burned to a Compact flash
drive for Moorestown.</property>
<property
name="response_id">0</property>
<signal name="clicked"
handler="on_create_NAND_btn_clicked"/>
<child>
diff --git a/libs/InstallImage.py b/libs/InstallImage.py
index 3a8a027..283edd0 100755
--- a/libs/InstallImage.py
+++ b/libs/InstallImage.py
@@ -420,7 +420,7 @@ class InstallImage(object):
if self.project.platform.config_info['package_manager'] == 'apt':
self.target.chroot("dpkg-query --show", output = all_packages)
if self.project.platform.config_info['package_manager'] == 'yum':
- self.target.chroot("rpm -qa", output = all_packages)
+ self.target.chroot("rpm -qa", output = all_packages)
manifest = open(image_path.rstrip('.img') + '.manifest', 'w')
print >>manifest, "\n".join(all_packages)
manifest.close()
@@ -493,10 +493,7 @@ class BaseUsbImage(InstallImage):
out_file.write(out_string)
out_file.close()
- if self.project.platform.config_info['package_manager'] == 'apt':
- cmd_line = "mkfs.vfat %s" % self.path
- if self.project.platform.config_info['package_manager'] == 'yum':
- cmd_line = "/sbin/mkfs.vfat %s" % self.path
+ cmd_line = "mkfs.vfat %s" % self.path
result = pdk_utils.execCommand(cmd_line, callback =
self.progress_callback)
if result:
@@ -518,10 +515,7 @@ class BaseUsbImage(InstallImage):
out_file.write(out_string)
out_file.close()
- if self.project.platform.config_info['package_manager'] == 'apt':
- cmd_line = "mkfs.ext3 %s -F" % path
- if self.project.platform.config_info['package_manager'] == 'yum':
- cmd_line = "/sbin/mkfs.ext3 %s -F" % path
+ cmd_line = "mkfs.ext3 %s -F" % path
result = pdk_utils.execCommand(cmd_line, callback =
self.progress_callback)
if result:
@@ -659,7 +653,7 @@ class NANDImage(InstallImage):
def create_image(self):
print os.path.join(self.project.platform.path, "nand.sh")
if not os.path.isfile(os.path.join(self.project.platform.path,
"nand.sh")):
- raise ValueError("NANDImage: This platform could not support
NAND image!")
+ raise ValueError(_("NANDImage: This platform could not support
NAND image!"))
print _("NANDImage: Creating NAND Image...")
if self.project.platform.config_info['package_manager'] == 'apt':
diff --git a/libs/Makefile.am b/libs/Makefile.am
index a081ed8..f14fd36 100644
--- a/libs/Makefile.am
+++ b/libs/Makefile.am
@@ -1,7 +1,7 @@
python_scriptdir = ${pkgdatadir}/lib
python_script_SCRIPTS = \
InstallImage.py \
- Mkinitrd.py \
+ Mkinitrd.py \
Platform.py \
Project.py \
SDK.py \
diff --git a/po/ja.po b/po/ja.po
index bc28ed1..d7ad699 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -151,7 +151,8 @@ msgid ""
msgstr ""
"ã¿ã¼ã²ããåã¯è±æ°åããã¤ãã³ããã³ã¢ã³ãã¼ã¹ã³ã¢ã®ã¿å«ããã¨ãã§ãã¾ã"
-#: ../gui/gui.py:468 ../gui/gui.py:801 ../gui/gui.py:821 ../gui/gui.py:843
+#: ../gui/gui.py:473 ../gui/gui.py:810 ../gui/gui.py:830 ../gui/gui.py:852
+#: ../gui/gui.py:872
#, python-format
msgid "Please wait while creating %s"
msgstr "ã%sããä½æãã¦ãã¾ãããã°ãããå¾
ã¡ãã ãã"
@@ -249,6 +250,24 @@ msgstr "ã¿ã¼ã²ãããã¹: %s"
msgid "Please wait while while creating %s"
msgstr "ã%sããä½æãã¦ãã¾ãããã°ãããå¾
ã¡ãã ãã"
+#: ../gui/gui.py:891
+#, python-format
+msgid "Creating directory %s ... "
+msgstr "ãã£ã¬ã¯ããªã%sããä½æãã¦ãã¾ã..."
+
+#: ../gui/gui.py:894
+#, python-format
+msgid "Creating image %s ... "
+msgstr "ã¤ã¡ã¼ã¸ã%sããä½æãã¦ãã¾ã..."
+
+#: ../gui/gui.py:898
+msgid "Please wait while creating shared image..."
+msgstr
"å
±æã¤ã¡ã¼ã¸ã%sããä½æãã¦ãã¾ãããã°ãããå¾
ã¡ãã ãã"
+
+#: ../gui/gui.py:905
+msgid "Choose a Live USB image"
+msgstr "Live USBã¤ã¡ã¼ã¸ãé¸æãã¦ãã ãã"
+
#: ../gui/gui.py:885 ../gui/gui.py:1021
msgid "No target image selected!"
msgstr "ã¿ã¼ã²ããã¤ã¡ã¼ã¸ãæªé¸æã§ãã!"
@@ -755,6 +774,14 @@ msgstr "grub.conf
kernelã³ãã³ãã©ã¤ã³ãå¤æ´ããã¾ãã"
msgid "HddImage: Create Hard Disk Image not implemented!"
msgstr "HDDã¤ã¡ã¼ã¸:
ãã¼ããã£ã¹ã¯ã¤ã¡ã¼ã¸ã®ä½æã¯å®è£
ããã¦ãã¾ãã!"
+#: ../libs/InstallImage.py:656
+msgid "NANDImage: This platform could not support NAND image!"
+msgstr "NANDåã¤ã¡ã¼ã¸:
ãã®ãã©ãããã©ã¼ã ã¯NANDåã¤ã¡ã¼ã¸ããµãã¼ããã¦ãã¾ãã!"
+
+#: ../libs/InstallImage.py:657
+msgid "NANDImage: Creating NAND Image..."
+msgstr "NANDåã¤ã¡ã¼ã¸: NANDåã¤ã¡ã¼ã¸ãä½æãã¦ãã¾ã..."
+
#: ../libs/InstallImage.py:638
#, python-format
msgid "USAGE: %s proj_path proj_name platform_name"
@@ -1323,14 +1350,10 @@ msgid ""
"moblin_apt.__aptgetPostRun() called without corresponding aptgetPreRun()"
msgstr ""
-#: ../libs/moblin_yum.py:42
-msgid "yum.installPackages: Not implemented yet!!!!"
-msgstr "yum.installPackages: ã¾ã å®è£
ããã¦ã¾ãã!!!!"
-
#: ../libs/moblin_yum.py:54
#, python-format
msgid "Running 'yum install' command: %s"
-msgstr ""
+msgstr "'yum install' ã³ãã³ããå®è¡ãã¦ãã¾ã: %s"
#: ../libs/moblin_yum.py:58
msgid "Completed 'yum install' successfully"
@@ -1652,7 +1675,7 @@ msgstr ""
#: ../gui/image-creator.glade:903
msgid "Live USB"
-msgstr "Live USB ã¤ã¡ã¼ã¸(èªã¿è¾¼ã¿å°ç¨)"
+msgstr "Live USB ã¤ã¡ã¼ã¸\n(èªè¾¼å°ç¨)"
#: ../gui/image-creator.glade:924
msgid ""
@@ -1670,7 +1693,7 @@ msgstr ""
#: ../gui/image-creator.glade:939
msgid "Live RW USB"
-msgstr "Live USB ã¤ã¡ã¼ã¸(èªã¿è¾¼ã¿/æ¸ãè¾¼ã¿å¯è½)"
+msgstr "Live USB ã¤ã¡ã¼ã¸\n(èªè¾¼/æ¸è¾¼å¯è½)"
#: ../gui/image-creator.glade:961
msgid ""
@@ -1699,7 +1722,19 @@ msgstr ""
#: ../gui/image-creator.glade:1023
msgid "Live CD"
-msgstr "Live CD ã¤ã¡ã¼ã¸(èªã¿è¾¼ã¿å°ç¨)"
+msgstr "Live CD ã¤ã¡ã¼ã¸\n(èªè¾¼å°ç¨)"
+
+#: ../gui/image-creator.glade:1055
+msgid ""
+"Create a NAND image that can be burned to a Compact flash drive for "
+"Moorestown."
+msgstr ""
+"ã³ã³ãã¯ããã©ãã·ã¥ã«æ¸ãè¾¼ãäºãå¯è½ãªãNANDåã¤ã¡ã¼ã¸ãä½æãã¾ã(Moorestownç¨)ã"
+""
+
+#: ../gui/image-creator.glade:1070
+msgid "NAND Image"
+msgstr "NANDåã¤ã¡ã¼ã¸"
#: ../gui/image-creator.glade:1055
msgid ""
@@ -1713,6 +1748,14 @@ msgstr ""
msgid "Write USB Image"
msgstr "USBã¤ã¡ã¼ã¸ã®æ¸ãè¾¼ã¿"
+#: ../gui/image-creator.glade:1149
+msgid "Boot a live USB image in KVM"
+msgstr "KVMä¸ã§Live USBã¤ã¡ã¼ã¸ãèµ·åãã¾ã"
+
+#: ../gui/image-creator.glade:1164
+msgid "Launch VM"
+msgstr "KVMã®èµ·å"
+
#: ../gui/image-creator.glade:1125
msgid "<b>Target Images</b>"
msgstr "<b>ã¿ã¼ã²ããã¤ã¡ã¼ã¸(Target Images)</b>"
_______________________________________________
Commits mailing list
[email protected]
https://www.moblin.org/mailman/listinfo/commits
