updated vbootstrap: updated vbootstrap.pot, and merged to ja.po

git-svn-id: http://trac.vinelinux.org/repos/projects/vbootstrap/trunk@2526 ec354946-7b23-47d6-9f5a-488ba84defc7

Makefile

@@ -36,7 +36,10 @@ install:
 	install -d ${DESTDIR}/usr/sbin
 	install -d ${DESTDIR}/etc/vbootstrap
 	install -d ${DESTDIR}/etc/bash_completion.d
-	install -m 644 vbootstrap/scripts/* ${DESTDIR}/usr/share/vbootstrap/scripts/
+	for sh in vbootstrap/scripts/*.sh; do \
+	  inst_sh=`basename $$sh .sh`; \
+	  install -m 644 $$sh ${DESTDIR}/usr/share/vbootstrap/scripts/$$inst_sh; \
+	done
 	install -m 644 vbootstrap/sources.list.d/* ${DESTDIR}/usr/share/vbootstrap/sources.list.d
 	install -m 755 vbootstrap.sh ${DESTDIR}/usr/sbin/vbootstrap
 	install -m 755 vbuilder.sh ${DESTDIR}/usr/sbin/vbuilder

po/POTFILES.in

@@ -1,3 +1,9 @@
 # List of source files containing translatable strings.
 vbootstrap.sh.in
 vbuilder.sh.in
+vbootstrap/scripts/4.2.sh
+vbootstrap/scripts/4.2_i386.sh
+vbootstrap/scripts/5.2.sh
+vbootstrap/scripts/5.2_i386.sh
+vbootstrap/scripts/VineSeed.sh
+vbootstrap/scripts/VineSeed_i386.sh

po/ja.po

@@ -5,36 +5,36 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 0.0.34\n"
+"Project-Id-Version: 0.0.35\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-18 01:43+0900\n"
-"PO-Revision-Date: 2011-01-18 01:46+0900\n"
+"POT-Creation-Date: 2011-01-18 11:55+0900\n"
+"PO-Revision-Date: 2011-01-18 18:06+0900\n"
 "Last-Translator: Munehiro Yamamoto <munepi@vinelinux.org>\n"
 "Language-Team: Vine Linux <Vine@vinelinux.org>\n"
-"Language: Japanese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. #
 #. initialize rpm database
-#: vbootstrap.sh.in:70
+#: vbootstrap.sh.in:73
 #, sh-format
 msgid "Initializing RPM database in $INSTDIR."
 msgstr "$INSTDIR において RPM データベースを初期化しています。"
 
 #. update apt database
-#: vbootstrap.sh.in:75
+#: vbootstrap.sh.in:78
 msgid "update apt database."
 msgstr "apt データベースを更新しています。"
 
 #. install base vine linux system.
-#: vbootstrap.sh.in:90
+#: vbootstrap.sh.in:93
 msgid "Installing basesystem."
 msgstr "ベースシステムをインストールしています。"
 
-#: vbootstrap.sh.in:99
+#: vbootstrap.sh.in:102
 msgid "vboostrap done."
 msgstr "vbootstrap が完了しました。"
 
@@ -142,3 +142,41 @@ msgstr ""
 #, sh-format
 msgid "W: \\$SUDO_USER is empty"
 msgstr "W: \\$SUDO_USER が空です"
+
+#: vbootstrap/scripts/4.2.sh:9 vbootstrap/scripts/4.2_i386.sh:9
+#: vbootstrap/scripts/5.2.sh:9 vbootstrap/scripts/5.2_i386.sh:9
+#: vbootstrap/scripts/VineSeed.sh:9 vbootstrap/scripts/VineSeed_i386.sh:9
+#, sh-format
+msgid "running vbootstrap post install scripts for $INSTVER on $INSTDIR"
+msgstr "$INSTDIR において $INSTVER に対する vbootstrap の後処理を実行しています。"
+
+#: vbootstrap/scripts/4.2.sh:12 vbootstrap/scripts/4.2_i386.sh:12
+#: vbootstrap/scripts/5.2.sh:12 vbootstrap/scripts/5.2_i386.sh:12
+#: vbootstrap/scripts/VineSeed.sh:12 vbootstrap/scripts/VineSeed_i386.sh:12
+msgid " reinitializing rpm database... "
+msgstr " RPM データベースを再初期化しています。"
+
+#: vbootstrap/scripts/4.2.sh:14 vbootstrap/scripts/4.2.sh:17
+#: vbootstrap/scripts/4.2.sh:20 vbootstrap/scripts/4.2_i386.sh:14
+#: vbootstrap/scripts/4.2_i386.sh:17 vbootstrap/scripts/4.2_i386.sh:20
+#: vbootstrap/scripts/5.2.sh:14 vbootstrap/scripts/5.2.sh:17
+#: vbootstrap/scripts/5.2.sh:20 vbootstrap/scripts/5.2_i386.sh:14
+#: vbootstrap/scripts/5.2_i386.sh:17 vbootstrap/scripts/5.2_i386.sh:20
+#: vbootstrap/scripts/VineSeed.sh:14 vbootstrap/scripts/VineSeed.sh:17
+#: vbootstrap/scripts/VineSeed.sh:20 vbootstrap/scripts/VineSeed_i386.sh:14
+#: vbootstrap/scripts/VineSeed_i386.sh:17
+#: vbootstrap/scripts/VineSeed_i386.sh:20
+msgid "DONE."
+msgstr "完了"
+
+#: vbootstrap/scripts/4.2.sh:15 vbootstrap/scripts/4.2_i386.sh:15
+#: vbootstrap/scripts/5.2.sh:15 vbootstrap/scripts/5.2_i386.sh:15
+#: vbootstrap/scripts/VineSeed.sh:15 vbootstrap/scripts/VineSeed_i386.sh:15
+msgid " updating apt database... "
+msgstr " apt データベースを更新しています ... "
+
+#: vbootstrap/scripts/4.2.sh:18 vbootstrap/scripts/4.2_i386.sh:18
+#: vbootstrap/scripts/5.2.sh:18 vbootstrap/scripts/5.2_i386.sh:18
+#: vbootstrap/scripts/VineSeed.sh:18 vbootstrap/scripts/VineSeed_i386.sh:18
+msgid " rebuilding rpm database with chroot rpm... "
+msgstr " chroot 上の rpm で RPM データベースを再構築しています ... "

po/vbootstrap.pot

@@ -8,33 +8,32 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-18 01:43+0900\n"
+"POT-Creation-Date: 2011-01-18 11:55+0900\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"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. #
 #. initialize rpm database
-#: vbootstrap.sh.in:70
+#: vbootstrap.sh.in:73
 #, sh-format
 msgid "Initializing RPM database in $INSTDIR."
 msgstr ""
 
 #. update apt database
-#: vbootstrap.sh.in:75
+#: vbootstrap.sh.in:78
 msgid "update apt database."
 msgstr ""
 
 #. install base vine linux system.
-#: vbootstrap.sh.in:90
+#: vbootstrap.sh.in:93
 msgid "Installing basesystem."
 msgstr ""
 
-#: vbootstrap.sh.in:99
+#: vbootstrap.sh.in:102
 msgid "vboostrap done."
 msgstr ""
 
@@ -138,3 +137,41 @@ msgstr ""
 #, sh-format
 msgid "W: \\$SUDO_USER is empty"
 msgstr ""
+
+#: vbootstrap/scripts/4.2.sh:9 vbootstrap/scripts/4.2_i386.sh:9
+#: vbootstrap/scripts/5.2.sh:9 vbootstrap/scripts/5.2_i386.sh:9
+#: vbootstrap/scripts/VineSeed.sh:9 vbootstrap/scripts/VineSeed_i386.sh:9
+#, sh-format
+msgid "running vbootstrap post install scripts for $INSTVER on $INSTDIR"
+msgstr ""
+
+#: vbootstrap/scripts/4.2.sh:12 vbootstrap/scripts/4.2_i386.sh:12
+#: vbootstrap/scripts/5.2.sh:12 vbootstrap/scripts/5.2_i386.sh:12
+#: vbootstrap/scripts/VineSeed.sh:12 vbootstrap/scripts/VineSeed_i386.sh:12
+msgid " reinitializing rpm database... "
+msgstr ""
+
+#: vbootstrap/scripts/4.2.sh:14 vbootstrap/scripts/4.2.sh:17
+#: vbootstrap/scripts/4.2.sh:20 vbootstrap/scripts/4.2_i386.sh:14
+#: vbootstrap/scripts/4.2_i386.sh:17 vbootstrap/scripts/4.2_i386.sh:20
+#: vbootstrap/scripts/5.2.sh:14 vbootstrap/scripts/5.2.sh:17
+#: vbootstrap/scripts/5.2.sh:20 vbootstrap/scripts/5.2_i386.sh:14
+#: vbootstrap/scripts/5.2_i386.sh:17 vbootstrap/scripts/5.2_i386.sh:20
+#: vbootstrap/scripts/VineSeed.sh:14 vbootstrap/scripts/VineSeed.sh:17
+#: vbootstrap/scripts/VineSeed.sh:20 vbootstrap/scripts/VineSeed_i386.sh:14
+#: vbootstrap/scripts/VineSeed_i386.sh:17
+#: vbootstrap/scripts/VineSeed_i386.sh:20
+msgid "DONE."
+msgstr ""
+
+#: vbootstrap/scripts/4.2.sh:15 vbootstrap/scripts/4.2_i386.sh:15
+#: vbootstrap/scripts/5.2.sh:15 vbootstrap/scripts/5.2_i386.sh:15
+#: vbootstrap/scripts/VineSeed.sh:15 vbootstrap/scripts/VineSeed_i386.sh:15
+msgid " updating apt database... "
+msgstr ""
+
+#: vbootstrap/scripts/4.2.sh:18 vbootstrap/scripts/4.2_i386.sh:18
+#: vbootstrap/scripts/5.2.sh:18 vbootstrap/scripts/5.2_i386.sh:18
+#: vbootstrap/scripts/VineSeed.sh:18 vbootstrap/scripts/VineSeed_i386.sh:18
+msgid " rebuilding rpm database with chroot rpm... "
+msgstr ""

vbootstrap-vl.spec

@@ -1,7 +1,7 @@
 # This package is maintained on trac svn repository. Please do not change on local.
 # If you find a BUG, please report to Vine@vinelinux.org or mailing list or BTS.
 
-%define version 0.0.34
+%define version 0.0.35
 
 Summary: bootstrap scripts to create a basic Vine Linux system
 Summary(ja): Vine Linux の基本システムを作成するためのスクリプト

vbootstrap/scripts/4.2 → vbootstrap/scripts/4.2.sh

@@ -6,19 +6,19 @@ APT_LINE="-o Dir::Etc::sourcelist=$VBOOTSTRAPDIR/sources.list.d/$INSTVER"
 
 vbootstrap_post()
 {
-echo "running vbootstrap post install scripts for $INSTVER on $INSTDIR"
+echo $"running vbootstrap post install scripts for $INSTVER on $INSTDIR"
 cp -a /etc/resolv.conf $INSTDIR/etc/
 rm -f $INSTDIR/var/lib/rpm/*
-echo -n " reinitializing rpm database... "
+echo -n $" reinitializing rpm database... "
 chroot $INSTDIR rpm --initdb
-echo "DONE."
-echo -n " updating apt database... "
+echo $"DONE."
+echo -n $" updating apt database... "
 chroot $INSTDIR apt-get -qq update
-echo "DONE."
-echo -n " rebuilding rpm database with chroot rpm... "
+echo $"DONE."
+echo -n $" rebuilding rpm database with chroot rpm... "
 chroot $INSTDIR apt-get -qq -y install ${BASE_PKGS} -o RPM::Options::=--justdb
-echo "DONE."
-#echo " installing vine-keyring... "
+echo $"DONE."
+#echo $" installing vine-keyring... "
 #chroot $INSTDIR apt-get -qq -y --reinstall install vine-keyring
-#echo "DONE."
+#echo $"DONE."
 }

vbootstrap/scripts/4.2_i386 → vbootstrap/scripts/4.2_i386.sh

@@ -6,19 +6,19 @@ APT_LINE="-o Dir::Etc::sourcelist=$VBOOTSTRAPDIR/sources.list.d/$INSTVER"
 
 vbootstrap_post()
 {
-echo "running vbootstrap post install scripts for $INSTVER on $INSTDIR"
+echo $"running vbootstrap post install scripts for $INSTVER on $INSTDIR"
 cp -a /etc/resolv.conf $INSTDIR/etc/
 rm -f $INSTDIR/var/lib/rpm/*
-echo -n " reinitializing rpm database... "
+echo -n $" reinitializing rpm database... "
 chroot $INSTDIR rpm --initdb
-echo "DONE."
-echo -n " updating apt database... "
+echo $"DONE."
+echo -n $" updating apt database... "
 chroot $INSTDIR apt-get -qq update
-echo "DONE."
-echo -n " rebuilding rpm database with chroot rpm... "
+echo $"DONE."
+echo -n $" rebuilding rpm database with chroot rpm... "
 chroot $INSTDIR apt-get -qq -y install ${BASE_PKGS} -o RPM::Options::=--justdb
-echo "DONE."
-#echo " installing vine-keyring... "
+echo $"DONE."
+#echo $" installing vine-keyring... "
 #chroot $INSTDIR apt-get -qq -y --reinstall install vine-keyring
-#echo "DONE."
+#echo $"DONE."
 }

vbootstrap/scripts/5.2 → vbootstrap/scripts/5.2.sh

@@ -6,19 +6,19 @@ APT_LINE="-o Dir::Etc::sourcelist=$VBOOTSTRAPDIR/sources.list.d/$INSTVER"
 
 vbootstrap_post()
 {
-echo "running vbootstrap post install scripts for $INSTVER on $INSTDIR"
+echo $"running vbootstrap post install scripts for $INSTVER on $INSTDIR"
 cp -a /etc/resolv.conf $INSTDIR/etc/
 rm -f $INSTDIR/var/lib/rpm/*
-echo -n " reinitializing rpm database... "
+echo -n $" reinitializing rpm database... "
 chroot $INSTDIR rpm --initdb
-echo "DONE."
-echo -n " updating apt database... "
+echo $"DONE."
+echo -n $" updating apt database... "
 chroot $INSTDIR apt-get -qq update
-echo "DONE."
-echo -n " rebuilding rpm database with chroot rpm... "
+echo $"DONE."
+echo -n $" rebuilding rpm database with chroot rpm... "
 chroot $INSTDIR apt-get -qq -y install ${BASE_PKGS} -o RPM::Options::=--justdb
-echo "DONE."
-#echo " installing vine-keyring... "
+echo $"DONE."
+#echo $" installing vine-keyring... "
 #chroot $INSTDIR apt-get -qq -y --reinstall install vine-keyring
-#echo "DONE."
+#echo $"DONE."
 }

vbootstrap/scripts/5.2_i386 → vbootstrap/scripts/5.2_i386.sh

@@ -6,19 +6,19 @@ APT_LINE="-o Dir::Etc::sourcelist=$VBOOTSTRAPDIR/sources.list.d/$INSTVER"
 
 vbootstrap_post()
 {
-echo "running vbootstrap post install scripts for $INSTVER on $INSTDIR"
+echo $"running vbootstrap post install scripts for $INSTVER on $INSTDIR"
 cp -a /etc/resolv.conf $INSTDIR/etc/
 rm -f $INSTDIR/var/lib/rpm/*
-echo -n " reinitializing rpm database... "
+echo -n $" reinitializing rpm database... "
 chroot $INSTDIR rpm --initdb
-echo "DONE."
-echo -n " updating apt database... "
+echo $"DONE."
+echo -n $" updating apt database... "
 chroot $INSTDIR apt-get -qq update
-echo "DONE."
-echo -n " rebuilding rpm database with chroot rpm... "
+echo $"DONE."
+echo -n $" rebuilding rpm database with chroot rpm... "
 chroot $INSTDIR apt-get -qq -y install ${BASE_PKGS} -o RPM::Options::=--justdb
-echo "DONE."
-#echo " installing vine-keyring... "
+echo $"DONE."
+#echo $" installing vine-keyring... "
 #chroot $INSTDIR apt-get -qq -y --reinstall install vine-keyring
-#echo "DONE."
+#echo $"DONE."
 }

vbootstrap/scripts/VineSeed → vbootstrap/scripts/VineSeed.sh

@@ -6,19 +6,19 @@ APT_LINE="-o Dir::Etc::sourcelist=$VBOOTSTRAPDIR/sources.list.d/$INSTVER"
 
 vbootstrap_post()
 {
-echo "running vbootstrap post install scripts for $INSTVER on $INSTDIR"
+echo $"running vbootstrap post install scripts for $INSTVER on $INSTDIR"
 cp -a /etc/resolv.conf $INSTDIR/etc/
 rm -f $INSTDIR/var/lib/rpm/__db.*
-echo -n " reinitializing rpm database... "
+echo -n $" reinitializing rpm database... "
 chroot $INSTDIR rpm --initdb
-echo "DONE."
-echo -n " updating apt database... "
+echo $"DONE."
+echo -n $" updating apt database... "
 chroot $INSTDIR apt-get -qq update
-echo "DONE."
-echo -n " rebuilding rpm database with chroot rpm... "
+echo $"DONE."
+echo -n $" rebuilding rpm database with chroot rpm... "
 chroot $INSTDIR apt-get -qq -y install ${BASE_PKGS} -o RPM::Options::=--justdb
-echo "DONE."
-#echo " installing vine-keyring... "
+echo $"DONE."
+#echo $" installing vine-keyring... "
 #chroot $INSTDIR apt-get -qq -y --reinstall install vine-keyring
-#echo "DONE."
+#echo $"DONE."
 }

vbootstrap/scripts/VineSeed_i386 → vbootstrap/scripts/VineSeed_i386.sh

@@ -6,19 +6,19 @@ APT_LINE="-o Dir::Etc::sourcelist=$VBOOTSTRAPDIR/sources.list.d/$INSTVER"
 
 vbootstrap_post()
 {
-echo "running vbootstrap post install scripts for $INSTVER on $INSTDIR"
+echo $"running vbootstrap post install scripts for $INSTVER on $INSTDIR"
 cp -a /etc/resolv.conf $INSTDIR/etc/
 rm -f $INSTDIR/var/lib/rpm/__db.*
-echo -n " reinitializing rpm database... "
+echo -n $" reinitializing rpm database... "
 chroot $INSTDIR rpm --initdb
-echo "DONE."
-echo -n " updating apt database... "
+echo $"DONE."
+echo -n $" updating apt database... "
 chroot $INSTDIR apt-get -qq update
-echo "DONE."
-echo -n " rebuilding rpm database with chroot rpm... "
+echo $"DONE."
+echo -n $" rebuilding rpm database with chroot rpm... "
 chroot $INSTDIR apt-get -qq -y install ${BASE_PKGS} -o RPM::Options::=--justdb
-echo "DONE."
-#echo " installing vine-keyring... "
+echo $"DONE."
+#echo $" installing vine-keyring... "
 #chroot $INSTDIR apt-get -qq -y --reinstall install vine-keyring
-#echo "DONE."
+#echo $"DONE."
 }