projects
/
live-boot-grml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cf0dc79
)
Adding upstream version 4.0~alpha20.
upstream/4.0_alpha20
author
Daniel Baumann
<mail@daniel-baumann.ch>
Mon, 31 Mar 2014 19:42:06 +0000
(21:42 +0200)
committer
Daniel Baumann
<mail@daniel-baumann.ch>
Mon, 31 Mar 2014 19:42:06 +0000
(21:42 +0200)
22 files changed:
VERSION
patch
|
blob
|
history
components/9990-initramfs-tools.sh
patch
|
blob
|
history
components/9990-main.sh
patch
|
blob
|
history
components/9990-misc-helpers.sh
patch
|
blob
|
history
components/9990-netbase.sh
patch
|
blob
|
history
components/9990-overlay.sh
patch
|
blob
|
history
manpages/de/live-boot.de.7
patch
|
blob
|
history
manpages/de/persistence.conf.de.5
patch
|
blob
|
history
manpages/en/live-boot.7
patch
|
blob
|
history
manpages/en/persistence.conf.5
patch
|
blob
|
history
manpages/es/live-boot.es.7
patch
|
blob
|
history
manpages/es/persistence.conf.es.5
patch
|
blob
|
history
manpages/ja/live-boot.ja.7
patch
|
blob
|
history
manpages/ja/persistence.conf.ja.5
patch
|
blob
|
history
manpages/po/de/live-boot.7.po
patch
|
blob
|
history
manpages/po/de/persistence.conf.5.po
patch
|
blob
|
history
manpages/po/es/live-boot.7.po
patch
|
blob
|
history
manpages/po/es/persistence.conf.5.po
patch
|
blob
|
history
manpages/po/ja/live-boot.7.po
patch
|
blob
|
history
manpages/po/ja/persistence.conf.5.po
patch
|
blob
|
history
manpages/pot/live-boot.7.pot
patch
|
blob
|
history
manpages/pot/persistence.conf.5.pot
patch
|
blob
|
history
diff --git
a/VERSION
b/VERSION
index
d5eae3d
..
eca9249
100644
(file)
--- a/
VERSION
+++ b/
VERSION
@@
-1
+1
@@
-4.0~alpha
19
-1
+4.0~alpha
20
-1
diff --git
a/components/9990-initramfs-tools.sh
b/components/9990-initramfs-tools.sh
index
210579d
..
eb11d23
100755
(executable)
--- a/
components/9990-initramfs-tools.sh
+++ b/
components/9990-initramfs-tools.sh
@@
-31,7
+31,7
@@
panic()
do
case "${_PARAMETER}" in
panic=*)
do
case "${_PARAMETER}" in
panic=*)
- panic="${_PARAMETER#*
verify-checksums
=}"
+ panic="${_PARAMETER#*
panic
=}"
;;
esac
done
;;
esac
done
diff --git
a/components/9990-main.sh
b/components/9990-main.sh
index
83f087f
..
85b8a1d
100755
(executable)
--- a/
components/9990-main.sh
+++ b/
components/9990-main.sh
@@
-178,10
+178,16
@@
Live ()
fi
fi
fi
fi
- if [ -f /etc/resolv.conf ] && [ ! -s ${rootmnt}/etc/resolv.conf ]
+ if [ -L /root/etc/resolv.conf ] ; then
+ # assume we have resolvconf
+ DNSFILE="${rootmnt}/etc/resolvconf/resolv.conf.d/base"
+ else
+ DNSFILE="${rootmnt}/etc/resolv.conf"
+ fi
+ if [ -f /etc/resolv.conf ] && [ ! -s ${DNSFILE} ]
then
then
- log_begin_msg "Copying /etc/resolv.conf to ${
rootmnt}/etc/resolv.conf
"
- cp -v /etc/resolv.conf ${
rootmnt}/etc/resolv.conf
+ log_begin_msg "Copying /etc/resolv.conf to ${
DNSFILE}
"
+ cp -v /etc/resolv.conf ${
DNSFILE}
log_end_msg
fi
log_end_msg
fi
diff --git
a/components/9990-misc-helpers.sh
b/components/9990-misc-helpers.sh
index
c656f23
..
2bf2db1
100755
(executable)
--- a/
components/9990-misc-helpers.sh
+++ b/
components/9990-misc-helpers.sh
@@
-1422,7
+1422,7
@@
get_custom_mounts ()
prev_dest=""
# This sort will ensure that a source /a comes right before a source
# /a/b so we only need to look at the previous source
prev_dest=""
# This sort will ensure that a source /a comes right before a source
# /a/b so we only need to look at the previous source
- sort -k2 -b ${custom_mounts} |
+
[ -e ${custom_mounts} ] &&
sort -k2 -b ${custom_mounts} |
while read device source dest options
do
if echo ${source} | grep -qe "^${prev_source}\(/.*\)\?$"
while read device source dest options
do
if echo ${source} | grep -qe "^${prev_source}\(/.*\)\?$"
diff --git
a/components/9990-netbase.sh
b/components/9990-netbase.sh
index
496c3ff
..
a32a47b
100755
(executable)
--- a/
components/9990-netbase.sh
+++ b/
components/9990-netbase.sh
@@
-16,7
+16,12
@@
Netbase ()
log_begin_msg "Preconfiguring networking"
IFFILE="/root/etc/network/interfaces"
log_begin_msg "Preconfiguring networking"
IFFILE="/root/etc/network/interfaces"
- DNSFILE="/root/etc/resolv.conf"
+ if [ -L /root/etc/resolv.conf ] ; then
+ # assume we have resolvconf
+ DNSFILE="/root/etc/resolvconf/resolv.conf.d/base"
+ else
+ DNSFILE="/root/etc/resolv.conf"
+ fi
if [ "${STATICIP}" = "frommedia" ] && [ -e "${IFFILE}" ]
then
if [ "${STATICIP}" = "frommedia" ] && [ -e "${IFFILE}" ]
then
@@
-102,7
+107,7
@@
EOF
done
fi
done
fi
- if [ ! -f
/root/etc/resolv.conf ] || [ -z "$(cat /root/etc/resolv.conf
)" ]
+ if [ ! -f
"${DNSFILE}" ] || [ -z "$(cat ${DNSFILE}
)" ]
then
if [ -f /netboot.config ]
then
then
if [ -f /netboot.config ]
then
@@
-112,7
+117,7
@@
EOF
rc_search=$(cat netboot.config | awk '/domain/ { print $3 }')
rc_server0="$(cat netboot.config | awk '/dns0/ { print $5 }')"
rc_search=$(cat netboot.config | awk '/domain/ { print $3 }')
rc_server0="$(cat netboot.config | awk '/dns0/ { print $5 }')"
-cat >
/root/etc/resolv.conf
<< EOF
+cat >
$DNSFILE
<< EOF
search ${rc_search}
domain ${rc_search}
nameserver ${rc_server0}
search ${rc_search}
domain ${rc_search}
nameserver ${rc_server0}
@@
-120,12
+125,12
@@
EOF
rc_server1=$(cat netboot.config | awk '/dns0/ { print $8 }')
rc_server1=$(cat netboot.config | awk '/dns0/ { print $8 }')
- if [ "${rc_server1}" !
= "0.0.0.0" ]
+ if [ "${rc_server1}" != "0.0.0.0" ]
then
then
- echo "nameserver ${rc_server1}" >>
/root/etc/resolv.conf
+ echo "nameserver ${rc_server1}" >>
$DNSFILE
fi
fi
- cat
/root/etc/resolv.conf
>> /root/var/log/netboot.config
+ cat
$DNSFILE
>> /root/var/log/netboot.config
fi
fi
fi
fi
fi
fi
diff --git
a/components/9990-overlay.sh
b/components/9990-overlay.sh
index
4ae5c07
..
52c045a
100755
(executable)
--- a/
components/9990-overlay.sh
+++ b/
components/9990-overlay.sh
@@
-376,7
+376,7
@@
setup_unionfs ()
then
local custom_mounts
custom_mounts="/tmp/custom_mounts.list"
then
local custom_mounts
custom_mounts="/tmp/custom_mounts.list"
- rm -
rf ${custom_mounts} 2> /dev/null
+ rm -
f ${custom_mounts}
# Gather information about custom mounts from devies detected as overlays
get_custom_mounts ${custom_mounts} ${overlay_devices}
# Gather information about custom mounts from devies detected as overlays
get_custom_mounts ${custom_mounts} ${overlay_devices}
@@
-387,7
+387,7
@@
setup_unionfs ()
local used_overlays
used_overlays=""
used_overlays=$(activate_custom_mounts ${custom_mounts})
local used_overlays
used_overlays=""
used_overlays=$(activate_custom_mounts ${custom_mounts})
- rm ${custom_mounts}
+ rm
-f
${custom_mounts}
# Close unused overlays (e.g. due to missing $persistence_list)
for overlay in ${overlay_devices}
# Close unused overlays (e.g. due to missing $persistence_list)
for overlay in ${overlay_devices}
diff --git
a/manpages/de/live-boot.de.7
b/manpages/de/live-boot.de.7
index
9b2ccaf
..
6346c37
100644
(file)
--- a/
manpages/de/live-boot.de.7
+++ b/
manpages/de/live-boot.de.7
@@
-3,7
+3,7
@@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT 7 2014\-0
2\-08 4.0~alpha19
\-1 "Live Systems Project"
+.TH LIVE\-BOOT 7 2014\-0
3\-31 4.0~alpha20
\-1 "Live Systems Project"
.SH NAME
\fBlive\-boot\fP \- System Boot Components
.SH NAME
\fBlive\-boot\fP \- System Boot Components
diff --git
a/manpages/de/persistence.conf.de.5
b/manpages/de/persistence.conf.de.5
index
1fd62ec
..
02b45a3
100644
(file)
--- a/
manpages/de/persistence.conf.de.5
+++ b/
manpages/de/persistence.conf.de.5
@@
-3,7
+3,7
@@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT conf 2014\-0
2\-08 4.0~alpha19
\-1 "Live Systems Project"
+.TH LIVE\-BOOT conf 2014\-0
3\-31 4.0~alpha20
\-1 "Live Systems Project"
.SH NAME
\fBpersistence.conf\fP \- Configuration file for persistence media in live\-boot
.SH NAME
\fBpersistence.conf\fP \- Configuration file for persistence media in live\-boot
diff --git
a/manpages/en/live-boot.7
b/manpages/en/live-boot.7
index
6c82c8c
..
ed6fc05
100644
(file)
--- a/
manpages/en/live-boot.7
+++ b/
manpages/en/live-boot.7
@@
-1,4
+1,4
@@
-.TH LIVE\-BOOT 7 2014\-0
2\-08 4.0~alpha19
-1 "Live Systems Project"
+.TH LIVE\-BOOT 7 2014\-0
3\-31 4.0~alpha20
-1 "Live Systems Project"
.SH NAME
\fBlive\-boot\fR \- System Boot Components
.SH NAME
\fBlive\-boot\fR \- System Boot Components
diff --git
a/manpages/en/persistence.conf.5
b/manpages/en/persistence.conf.5
index
72e341c
..
84533ff
100644
(file)
--- a/
manpages/en/persistence.conf.5
+++ b/
manpages/en/persistence.conf.5
@@
-1,4
+1,4
@@
-.TH LIVE\-BOOT conf 2014\-0
2\-08 4.0~alpha19
-1 "Live Systems Project"
+.TH LIVE\-BOOT conf 2014\-0
3\-31 4.0~alpha20
-1 "Live Systems Project"
.SH NAME
\fBpersistence.conf\fR \- Configuration file for persistence media in
.SH NAME
\fBpersistence.conf\fR \- Configuration file for persistence media in
diff --git
a/manpages/es/live-boot.es.7
b/manpages/es/live-boot.es.7
index
03ea578
..
1567865
100644
(file)
--- a/
manpages/es/live-boot.es.7
+++ b/
manpages/es/live-boot.es.7
@@
-3,7
+3,7
@@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT 7 2014\-0
2\-08 4.0~alpha19
\-1 "Proyecto Live Systems"
+.TH LIVE\-BOOT 7 2014\-0
3\-31 4.0~alpha20
\-1 "Proyecto Live Systems"
.SH NOMBRE
\fBlive\-boot\fP \- Componentes de Arranque del Sistema
.SH NOMBRE
\fBlive\-boot\fP \- Componentes de Arranque del Sistema
diff --git
a/manpages/es/persistence.conf.es.5
b/manpages/es/persistence.conf.es.5
index
741f8a1
..
f6323f7
100644
(file)
--- a/
manpages/es/persistence.conf.es.5
+++ b/
manpages/es/persistence.conf.es.5
@@
-3,7
+3,7
@@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT conf 2014\-0
2\-08 4.0~alpha19
\-1 "Proyecto Live Systems"
+.TH LIVE\-BOOT conf 2014\-0
3\-31 4.0~alpha20
\-1 "Proyecto Live Systems"
.SH NOMBRE
\fBpersistence.conf\fP \- Fichero para configurar medios de almacenamiento con
.SH NOMBRE
\fBpersistence.conf\fP \- Fichero para configurar medios de almacenamiento con
diff --git
a/manpages/ja/live-boot.ja.7
b/manpages/ja/live-boot.ja.7
index
948ce8f
..
c1e4b4e
100644
(file)
--- a/
manpages/ja/live-boot.ja.7
+++ b/
manpages/ja/live-boot.ja.7
@@
-3,7
+3,7
@@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT 7 2014\-0
2\-08 4.0~alpha19
\-1 "Live システムプロジェクト"
+.TH LIVE\-BOOT 7 2014\-0
3\-31 4.0~alpha20
\-1 "Live システムプロジェクト"
.SH 名前
\fBlive\-boot\fP \- システム起動構成要素
.SH 名前
\fBlive\-boot\fP \- システム起動構成要素
diff --git
a/manpages/ja/persistence.conf.ja.5
b/manpages/ja/persistence.conf.ja.5
index
9e296ea
..
590fcef
100644
(file)
--- a/
manpages/ja/persistence.conf.ja.5
+++ b/
manpages/ja/persistence.conf.ja.5
@@
-3,7
+3,7
@@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT conf 2014\-0
2\-08 4.0~alpha19
\-1 "Live システムプロジェクト"
+.TH LIVE\-BOOT conf 2014\-0
3\-31 4.0~alpha20
\-1 "Live システムプロジェクト"
.SH 名前
\fBpersistence.conf\fP \- live\-boot 状態保持用メディアの設定ファイル
.SH 名前
\fBpersistence.conf\fP \- live\-boot 状態保持用メディアの設定ファイル
diff --git
a/manpages/po/de/live-boot.7.po
b/manpages/po/de/live-boot.7.po
index
d4b3943
..
f9b6dce
100644
(file)
--- a/
manpages/po/de/live-boot.7.po
+++ b/
manpages/po/de/live-boot.7.po
@@
-4,8
+4,8
@@
#
msgid ""
msgstr ""
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 4.0~alpha
19
-1\n"
-"POT-Creation-Date: 2014-0
2-08 17:31+01
00\n"
+"Project-Id-Version: live-boot 4.0~alpha
20
-1\n"
+"POT-Creation-Date: 2014-0
3-31 21:39+02
00\n"
"PO-Revision-Date: 2013-11-10 20:10+0900\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
"PO-Revision-Date: 2013-11-10 20:10+0900\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
@@
-24,14
+24,14
@@
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2014-0
2-08
"
+msgid "2014-0
3-31
"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~alpha
19
-1"
-msgstr "4.0~alpha
19
-1"
+msgid "4.0~alpha
20
-1"
+msgstr "4.0~alpha
20
-1"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
diff --git
a/manpages/po/de/persistence.conf.5.po
b/manpages/po/de/persistence.conf.5.po
index
d77ce22
..
ec4d237
100644
(file)
--- a/
manpages/po/de/persistence.conf.5.po
+++ b/
manpages/po/de/persistence.conf.5.po
@@
-4,8
+4,8
@@
#
msgid ""
msgstr ""
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 4.0~alpha
19
-1\n"
-"POT-Creation-Date: 2014-0
2-08 17:31+01
00\n"
+"Project-Id-Version: live-boot 4.0~alpha
20
-1\n"
+"POT-Creation-Date: 2014-0
3-31 21:39+02
00\n"
"PO-Revision-Date: 2013-11-10 20:10+0900\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
"PO-Revision-Date: 2013-11-10 20:10+0900\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
@@
-24,14
+24,14
@@
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2014-0
2-08
"
+msgid "2014-0
3-31
"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~alpha
19
-1"
-msgstr "4.0~alpha
19
-1"
+msgid "4.0~alpha
20
-1"
+msgstr "4.0~alpha
20
-1"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
diff --git
a/manpages/po/es/live-boot.7.po
b/manpages/po/es/live-boot.7.po
index
e598881
..
1b76358
100644
(file)
--- a/
manpages/po/es/live-boot.7.po
+++ b/
manpages/po/es/live-boot.7.po
@@
-4,8
+4,8
@@
#
msgid ""
msgstr ""
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 4.0~alpha
19
-1\n"
-"POT-Creation-Date: 2014-0
2-08 17:31+01
00\n"
+"Project-Id-Version: live-boot 4.0~alpha
20
-1\n"
+"POT-Creation-Date: 2014-0
3-31 21:39+02
00\n"
"PO-Revision-Date: 2013-11-10 20:10+0900\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
"PO-Revision-Date: 2013-11-10 20:10+0900\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
@@
-25,14
+25,14
@@
msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2014-0
2-08
"
+msgid "2014-0
3-31
"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~alpha
19
-1"
-msgstr "4.0~alpha
19
-1"
+msgid "4.0~alpha
20
-1"
+msgstr "4.0~alpha
20
-1"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
@@
-75,9
+75,9
@@
msgid ""
"This includes the Live systems ISOs, netboot tarballs, and usb stick images."
msgstr ""
"live-boot es un hook para initramfs-tools, usado para generar un initramfs "
"This includes the Live systems ISOs, netboot tarballs, and usb stick images."
msgstr ""
"live-boot es un hook para initramfs-tools, usado para generar un initramfs "
-"capaz de arrancar sistemas en vivo, tales como los creados por I<live-
helper>
"
-"
(7). Esto incluye las ISOs de Live Systems, netboot tarballs y las imágene
s "
-"para llaves usb. "
+"capaz de arrancar sistemas en vivo, tales como los creados por I<live-"
+"
helper>(7). Esto incluye las ISOs de Live Systems, netboot tarballs y la
s "
+"
imágenes
para llaves usb. "
#. FIXME
#. type: Plain text
#. FIXME
#. type: Plain text
diff --git
a/manpages/po/es/persistence.conf.5.po
b/manpages/po/es/persistence.conf.5.po
index
983d240
..
20e4ef3
100644
(file)
--- a/
manpages/po/es/persistence.conf.5.po
+++ b/
manpages/po/es/persistence.conf.5.po
@@
-4,8
+4,8
@@
#
msgid ""
msgstr ""
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 4.0~alpha
19
-1\n"
-"POT-Creation-Date: 2014-0
2-08 17:31+01
00\n"
+"Project-Id-Version: live-boot 4.0~alpha
20
-1\n"
+"POT-Creation-Date: 2014-0
3-31 21:39+02
00\n"
"PO-Revision-Date: 2013-11-10 20:10+0900\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
"PO-Revision-Date: 2013-11-10 20:10+0900\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
@@
-23,14
+23,14
@@
msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2014-0
2-08
"
+msgid "2014-0
3-31
"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~alpha
19
-1"
-msgstr "4.0~alpha
19
-1"
+msgid "4.0~alpha
20
-1"
+msgstr "4.0~alpha
20
-1"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
diff --git
a/manpages/po/ja/live-boot.7.po
b/manpages/po/ja/live-boot.7.po
index
0a66673
..
cfc5f4d
100644
(file)
--- a/
manpages/po/ja/live-boot.7.po
+++ b/
manpages/po/ja/live-boot.7.po
@@
-4,8
+4,8
@@
#
msgid ""
msgstr ""
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 4.0~alpha
19
-1\n"
-"POT-Creation-Date: 2014-0
2-08 17:31+01
00\n"
+"Project-Id-Version: live-boot 4.0~alpha
20
-1\n"
+"POT-Creation-Date: 2014-0
3-31 21:39+02
00\n"
"PO-Revision-Date: 2013-11-10 20:10+0900\n"
"Last-Translator: victory <victory.deb@gmail.com>\n"
"Language-Team: none\n"
"PO-Revision-Date: 2013-11-10 20:10+0900\n"
"Last-Translator: victory <victory.deb@gmail.com>\n"
"Language-Team: none\n"
@@
-23,14
+23,14
@@
msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2014-0
2-08
"
+msgid "2014-0
3-31
"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~alpha
19
-1"
-msgstr "4.0~alpha
19
-1"
+msgid "4.0~alpha
20
-1"
+msgstr "4.0~alpha
20
-1"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
diff --git
a/manpages/po/ja/persistence.conf.5.po
b/manpages/po/ja/persistence.conf.5.po
index
68a1d39
..
89388f3
100644
(file)
--- a/
manpages/po/ja/persistence.conf.5.po
+++ b/
manpages/po/ja/persistence.conf.5.po
@@
-4,8
+4,8
@@
#
msgid ""
msgstr ""
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 4.0~alpha
19
-1\n"
-"POT-Creation-Date: 2014-0
2-08 17:31+01
00\n"
+"Project-Id-Version: live-boot 4.0~alpha
20
-1\n"
+"POT-Creation-Date: 2014-0
3-31 21:39+02
00\n"
"PO-Revision-Date: 2013-11-06 04:30+0900\n"
"Last-Translator: victory <victory.deb@gmail.com>\n"
"Language-Team: none\n"
"PO-Revision-Date: 2013-11-06 04:30+0900\n"
"Last-Translator: victory <victory.deb@gmail.com>\n"
"Language-Team: none\n"
@@
-23,14
+23,14
@@
msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2014-0
2-08
"
+msgid "2014-0
3-31
"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~alpha
19
-1"
-msgstr "4.0~alpha
19
-1"
+msgid "4.0~alpha
20
-1"
+msgstr "4.0~alpha
20
-1"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
diff --git
a/manpages/pot/live-boot.7.pot
b/manpages/pot/live-boot.7.pot
index
8504cfa
..
cd152b4
100644
(file)
--- a/
manpages/pot/live-boot.7.pot
+++ b/
manpages/pot/live-boot.7.pot
@@
-7,7
+7,7
@@
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2014-0
2-08 17:31+01
00\n"
+"POT-Creation-Date: 2014-0
3-31 21:39+02
00\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"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@
-25,13
+25,13
@@
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2014-0
2-08
"
+msgid "2014-0
3-31
"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~alpha
19
-1"
+msgid "4.0~alpha
20
-1"
msgstr ""
#. type: TH
msgstr ""
#. type: TH
diff --git
a/manpages/pot/persistence.conf.5.pot
b/manpages/pot/persistence.conf.5.pot
index
27d2152
..
a7ea510
100644
(file)
--- a/
manpages/pot/persistence.conf.5.pot
+++ b/
manpages/pot/persistence.conf.5.pot
@@
-7,7
+7,7
@@
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2014-0
2-08 17:31+01
00\n"
+"POT-Creation-Date: 2014-0
3-31 21:39+02
00\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"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@
-25,13
+25,13
@@
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2014-0
2-08
"
+msgid "2014-0
3-31
"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~alpha
19
-1"
+msgid "4.0~alpha
20
-1"
msgstr ""
#. type: TH
msgstr ""
#. type: TH