X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=manpages%2Fpot%2Flive-boot.7.pot;h=447900cab02f517e2a2a5721849e7b2ae3f07f1b;hb=e77f47ca9964b83a76e183ea653dd91402a6757b;hp=0c655f983fd10e78bdaf7c1c5faf8b7bcf97a450;hpb=524e4fb039ccd35a7101e66b661d7b94373487c1;p=live-boot-grml.git

diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index 0c655f9..447900c 100644
--- 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"
-"POT-Creation-Date: 2012-06-05 19:38+0300\n"
+"POT-Creation-Date: 2013-03-10 22:13+0100\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"
@@ -17,31 +17,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: TH
-#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
+#: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
 msgid "LIVE-BOOT"
 msgstr ""
 
 #. type: TH
-#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
+#: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2012-06-05"
+msgid "2013-03-10"
 msgstr ""
 
 #. type: TH
-#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
+#: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "3.0~a30-1"
+msgid "4.0~a9-1"
 msgstr ""
 
 #. type: TH
-#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
+#: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
 msgid "Debian Live Project"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:3 en/live-persistence.conf.5:3 en/live-snapshot.1:3
+#: en/live-boot.7:3 en/persistence.conf.5:3
 #, no-wrap
 msgid "NAME"
 msgstr ""
@@ -52,7 +52,7 @@ msgid "B<live-boot> - System Boot Scripts"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:6 en/live-persistence.conf.5:7 en/live-snapshot.1:17
+#: en/live-boot.7:6 en/persistence.conf.5:7
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr ""
@@ -133,12 +133,12 @@ msgstr ""
 msgid ""
 "B<live-boot> can be configured (but not activated) through configuration "
 "files. Those files can be placed either in the root filesystem itself (/etc/"
-"live/boot.conf, /etc/live/boot.d/*.conf), or on the live media (live/boot."
-"conf, live/boot.d/*.conf)."
+"live/boot.conf, /etc/live/boot/*), or on the live media (live/boot.conf, "
+"live/boot/*)."
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:28 en/live-persistence.conf.5:57 en/live-snapshot.1:20
+#: en/live-boot.7:28 en/persistence.conf.5:57
 #, no-wrap
 msgid "OPTIONS"
 msgstr ""
@@ -339,7 +339,7 @@ msgstr ""
 #. type: IP
 #: en/live-boot.7:77
 #, no-wrap
-msgid "B<ip>=[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>] [,[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>]]"
+msgid "B<ip>=[I<DEVICE>]:[I<CLIENT_IP>]:[I<NETMASK>]:[I<GATEWAY_IP>]:[I<NAMESERVER>] [,[I<DEVICE>]:[I<CLIENT_IP>]:[I<NETMASK>]:[I<GATEWAY_IP>]:[I<NAMESERVER>]]"
 msgstr ""
 
 #. type: Plain text
@@ -515,35 +515,22 @@ msgstr ""
 #. type: IP
 #: en/live-boot.7:103
 #, no-wrap
-msgid "B<noprompt>"
+msgid "B<noeject>"
 msgstr ""
 
 #. type: Plain text
 #: en/live-boot.7:105
-msgid "Do not prompt to eject the CD or remove the USB flash drive on reboot."
+msgid "Do not prompt to eject the live medium."
 msgstr ""
 
 #. type: IP
 #: en/live-boot.7:105
 #, no-wrap
-msgid "B<noprompt>=I<TYPE>"
-msgstr ""
-
-#. type: Plain text
-#: en/live-boot.7:107
-msgid ""
-"This tells live-boot not to prompt to eject the CD (when noprompt=cd) or "
-"remove the USB flash drive (when noprompt=usb) on reboot."
-msgstr ""
-
-#. type: IP
-#: en/live-boot.7:107
-#, no-wrap
 msgid "B<ramdisk-size>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:109
+#: en/live-boot.7:107
 msgid ""
 "This parameters allows to set a custom ramdisk size (it's the '-o size' "
 "option of tmpfs mount). By default, there is no ramdisk size set, so the "
@@ -552,46 +539,40 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:109
+#: en/live-boot.7:107
 #, no-wrap
 msgid "B<swapon>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:111
+#: en/live-boot.7:109
 msgid "This parameter enables usage of local swap partitions."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:111
+#: en/live-boot.7:109
 #, no-wrap
 msgid "B<persistence>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:113
+#: en/live-boot.7:111
 msgid ""
 "live-boot will probe devices for persistence media. These can be partitions "
-"(with the correct GPT name), filesystems (with the correct label) or image/"
-"archive files (with the correct file name). Overlays are labeled/named "
-"either \"full-ov\", which will be mounted on /, or \"custom-ov\", which can "
-"be completely customized (see I<live-persistence.conf>(5)); snapshots are "
-"labeled/named either \"live-sn\" or \"home-sn\" and will be extracted into / "
-"or /home, respectively (see I<live-snapshot>(1) for more information). The "
-"order these are handled are: full-ov, custom-ov, live-sn, home-sn. Overlay "
-"image files and snapshot archive files have extensions which determines "
-"their filesystem or archive type, e.g. \"custom-ov.ext4\" and \"home-sn."
-"squashfs\"."
+"(with the correct GPT name), filesystems (with the correct label) or image "
+"files (with the correct file name). Overlays are labeled/named \"persistence"
+"\" (see I<persistence.conf>(5)). Overlay image files have extensions which "
+"determines their filesystem, e.g. \"persistence.ext4\"."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:113
+#: en/live-boot.7:111
 #, no-wrap
 msgid "B<persistence-encryption>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:115
+#: en/live-boot.7:113
 msgid ""
 "This option determines which types of encryption that we allow to be used "
 "when probing devices for persistence media. If \"none\" is in the list, we "
@@ -601,43 +582,42 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:115
+#: en/live-boot.7:113
 #, no-wrap
 msgid "B<persistence-media>={I<removable>|I<removable-usb>}"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:117
+#: en/live-boot.7:115
 msgid ""
 "If you specify the keyword 'removable', live-boot will try to find "
-"persistence and snapshot partitions on removable media only. Note that if "
-"you want to further restrict the media to usb mass storage only, you can use "
-"the 'removable-usb' keyword."
+"persistence partitions on removable media only. Note that if you want to "
+"further restrict the media to usb mass storage only, you can use the "
+"'removable-usb' keyword."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:117
+#: en/live-boot.7:115
 #, no-wrap
 msgid "B<persistence-method>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:119
+#: en/live-boot.7:117
 msgid ""
 "This option determines which types of persistence media we allow. If "
 "\"overlay\" is in the list, we consider overlays (i.e. \"live-rw\" and "
-"\"home-rw\"); if \"snapshot\" is in the list, we consider snapshots (i.e. "
-"\"live-sn\" and \"home-sn\"). The default is \"overlay,snapshot\"."
+"\"home-rw\"). The default is \"overlay\"."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:119
+#: en/live-boot.7:117
 #, no-wrap
 msgid "B<persistence-path>=I<PATH>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:121
+#: en/live-boot.7:119
 msgid ""
 "live-boot will look for persistency files in the root directory of a "
 "partition, with this parameter, the path can be configured so that you can "
@@ -645,27 +625,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:121
+#: en/live-boot.7:119
 #, no-wrap
 msgid "B<persistence-read-only>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:123
+#: en/live-boot.7:121
 msgid ""
 "Filesystem changes are not saved back to persistence media. In particular, "
-"overlays and netboot NFS mounts are mounted read-only, and snapshots are not "
-"resynced on shutdown."
+"overlays and netboot NFS mounts are mounted read-only."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:123
+#: en/live-boot.7:121
 #, no-wrap
 msgid "B<persistence-storage>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:125
+#: en/live-boot.7:123
 msgid ""
 "This option determines which types of persistence storage to consider when "
 "probing for persistence media. If \"filesystem\" is in the list, filesystems "
@@ -675,70 +654,68 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:125
+#: en/live-boot.7:123
 #, no-wrap
-msgid "B<persistence-subtext>=I<SUFFIX>"
+msgid "B<persistence-label>=I<LABEL>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:127
+#: en/live-boot.7:125
 msgid ""
-"Add a suffix when searching for the image filenames or partition labels to "
-"use for the above mentioned persistence feature, the SUFFIX will be added "
-"after a dash (e.g.: \"live-sn\" would transform to \"live-sn-SUFFIX\"). This "
-"is handy to test multiple live-boot based live-systems with different "
-"persistence storage choices."
+"live-boot will use the name \"LABEL\" instead of \"persistence\" when "
+"searching for persistent storage. LABEL can be any valid filename, partition "
+"label, or GPT name."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:127
+#: en/live-boot.7:125
 #, no-wrap
 msgid "B<quickreboot>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:129
+#: en/live-boot.7:127
 msgid ""
 "This option causes live-boot to reboot without attempting to eject the media "
 "and without asking the user to remove the boot media."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:129
+#: en/live-boot.7:127
 #, no-wrap
 msgid "B<showmounts>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:131
+#: en/live-boot.7:129
 msgid ""
 "This parameter will make live-boot to show on \"/\" the ro filesystems "
-"(mostly compressed) on \"/live\". This is not enabled by default because "
+"(mostly compressed) on \"/lib/live\". This is not enabled by default because "
 "could lead to problems by applications like \"mono\" which store binary "
 "paths on installation."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:131
+#: en/live-boot.7:129
 #, no-wrap
 msgid "B<silent>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:133
+#: en/live-boot.7:131
 msgid ""
 "If you boot with the normal quiet parameter, live-boot hides most messages "
 "of its own. When adding silent, it hides all."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:133
+#: en/live-boot.7:131
 #, no-wrap
 msgid "B<todisk>=I<DEVICE>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:135
+#: en/live-boot.7:133
 msgid ""
 "Adding this parameter, live-boot will try to copy the entire read-only media "
 "to the specified device before mounting the root filesystem. It probably "
@@ -748,13 +725,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:135
+#: en/live-boot.7:133
 #, no-wrap
 msgid "B<toram>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:137
+#: en/live-boot.7:135
 msgid ""
 "Adding this parameter, live-boot will try to copy the whole read-only media "
 "to the computer's RAM before mounting the root filesystem. This could need a "
@@ -762,14 +739,14 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:137
+#: en/live-boot.7:135
 #, no-wrap
 msgid "B<union>=aufs|unionfs"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-boot.7:140
+#: en/live-boot.7:138
 msgid ""
 "By default, live-boot uses aufs. With this parameter, you can switch to "
 "unionfs."
@@ -777,32 +754,33 @@ msgstr ""
 
 #.  FIXME
 #. type: SH
-#: en/live-boot.7:142
+#: en/live-boot.7:140
 #, no-wrap
 msgid "FILES (old)"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:143 en/live-snapshot.1:43
+#: en/live-boot.7:141
 #, no-wrap
 msgid "B</etc/live.conf>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:145 en/live-snapshot.1:45
+#: en/live-boot.7:143
 msgid ""
 "Some variables can be configured via this config file (inside the live "
 "system)."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:145 en/live-snapshot.1:45
+#: en/live-boot.7:143
 #, no-wrap
 msgid "B<live/filesystem.module>"
 msgstr ""
 
+#.  FIXME
 #. type: Plain text
-#: en/live-boot.7:147 en/live-snapshot.1:47
+#: en/live-boot.7:146
 msgid ""
 "This optional file (inside the live media) contains a list of white-space or "
 "carriage-return-separated file names corresponding to disk images in the \"/"
@@ -814,105 +792,76 @@ msgid ""
 "are loaded in alphanumeric order."
 msgstr ""
 
-#. type: IP
-#: en/live-boot.7:147 en/live-snapshot.1:47
-#, no-wrap
-msgid "B</etc/live-persistence.binds>"
-msgstr ""
-
-#. type: Plain text
-#: en/live-boot.7:149
-msgid ""
-"This optional file (which resides in the rootfs system, not in the live "
-"media) is used as a list of directories which not need be persistent: ie. "
-"their content does not need to survive reboots when using the persistence "
-"features."
-msgstr ""
-
-#. type: Plain text
-#: en/live-boot.7:152 en/live-snapshot.1:51
-msgid ""
-"This saves expensive writes and speeds up operations on volatile data such "
-"as web caches and temporary files (like e.g. /tmp and .mozilla) which are "
-"regenerated each time. This is achieved by bind mounting each listed "
-"directory with a tmpfs on the original path."
-msgstr ""
-
 #. type: SH
-#: en/live-boot.7:153 en/live-snapshot.1:42
+#: en/live-boot.7:147
 #, no-wrap
 msgid "FILES"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:154
+#: en/live-boot.7:148
 #, no-wrap
 msgid "B</etc/live/boot.conf>"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:155
+#: en/live-boot.7:149
 #, no-wrap
-msgid "B</etc/live/boot.d/*.conf>"
+msgid "B</etc/live/boot/*>"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:156
+#: en/live-boot.7:150
 #, no-wrap
 msgid "B<live/boot.conf>"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:157
+#: en/live-boot.7:151
 #, no-wrap
-msgid "B<live/boot.d/*.conf>"
+msgid "B<live/boot/*>"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:158
+#: en/live-boot.7:152
 #, no-wrap
-msgid "B<live-persistence.conf>"
+msgid "B<persistence.conf>"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:160 en/live-persistence.conf.5:191 en/live-snapshot.1:54
+#: en/live-boot.7:154 en/persistence.conf.5:191
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:162
-msgid "I<live-snapshot>(1)"
-msgstr ""
-
-#. type: Plain text
-#: en/live-boot.7:164
-msgid "I<live-persistence.conf>(5)"
+#: en/live-boot.7:156
+msgid "I<persistence.conf>(5)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:166 en/live-persistence.conf.5:195 en/live-snapshot.1:58
+#: en/live-boot.7:158 en/persistence.conf.5:195
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:168 en/live-persistence.conf.5:197 en/live-snapshot.1:60
+#: en/live-boot.7:160 en/persistence.conf.5:197
 msgid "I<live-config>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:170 en/live-persistence.conf.5:199 en/live-snapshot.1:62
+#: en/live-boot.7:162 en/persistence.conf.5:199
 msgid "I<live-tools>(7)"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:171 en/live-persistence.conf.5:200 en/live-snapshot.1:63
+#: en/live-boot.7:163 en/persistence.conf.5:200
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:173 en/live-persistence.conf.5:204 en/live-snapshot.1:65
+#: en/live-boot.7:165 en/persistence.conf.5:204
 msgid ""
 "More information about live-boot and the Debian Live project can be found on "
 "the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -920,13 +869,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:174 en/live-persistence.conf.5:205 en/live-snapshot.1:66
+#: en/live-boot.7:166 en/persistence.conf.5:205
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:176 en/live-persistence.conf.5:210 en/live-snapshot.1:68
+#: en/live-boot.7:168 en/persistence.conf.5:210
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-boot package in "
 "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -935,14 +884,14 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:177 en/live-persistence.conf.5:211 en/live-snapshot.1:69
+#: en/live-boot.7:169 en/persistence.conf.5:211
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:178 en/live-snapshot.1:70
+#: en/live-boot.7:170
 msgid ""
-"live-boot was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
-"the Debian project."
+"live-boot was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt> "
+"for the Debian project."
 msgstr ""