X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=manpages%2Fpot%2Flive-persistence.conf.5.pot;fp=manpages%2Fpot%2Flive.persist.5.pot;h=44a1e257b61b813e304ebf3acdb8117f87b9b87a;hb=10709960de62ab97b4628a49016d0f46676d61e9;hp=b0e491929be0415f023b576cb454914c54cdad0e;hpb=f7b2f82c34ad572bbf178da3a18ccaa317332196;p=live-boot-grml.git

diff --git a/manpages/pot/live.persist.5.pot b/manpages/pot/live-persistence.conf.5.pot
similarity index 55%
rename from manpages/pot/live.persist.5.pot
rename to manpages/pot/live-persistence.conf.5.pot
index b0e4919..44a1e25 100644
--- a/manpages/pot/live.persist.5.pot
+++ b/manpages/pot/live-persistence.conf.5.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2012-04-05 08:11+0300\n"
+"POT-Creation-Date: 2012-04-09 18:57+0300\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,76 +17,76 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
 #, no-wrap
 msgid "LIVE-BOOT"
 msgstr ""
 
 #. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2012-04-05"
+msgid "2012-04-09"
 msgstr ""
 
 #. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "3.0~a26-1"
+msgid "3.0~a27-1"
 msgstr ""
 
 #. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
 #, no-wrap
 msgid "Debian Live Project"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:3 en/live-snapshot.1:3 en/live.persist.5:3
+#: en/live-boot.7:3 en/live-persistence.conf.5:3 en/live-snapshot.1:3
 #, no-wrap
 msgid "NAME"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:6 en/live-snapshot.1:17 en/live.persist.5:7
+#: en/live-boot.7:6 en/live-persistence.conf.5:7 en/live-snapshot.1:17
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:28 en/live-snapshot.1:20 en/live.persist.5:57
+#: en/live-boot.7:28 en/live-persistence.conf.5:57 en/live-snapshot.1:20
 #, no-wrap
 msgid "OPTIONS"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:162 en/live-snapshot.1:54 en/live.persist.5:191
+#: en/live-boot.7:160 en/live-persistence.conf.5:191 en/live-snapshot.1:54
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:168 en/live-snapshot.1:58 en/live.persist.5:195
+#: en/live-boot.7:166 en/live-persistence.conf.5:195 en/live-snapshot.1:58
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:170 en/live-snapshot.1:60 en/live.persist.5:197
+#: en/live-boot.7:168 en/live-persistence.conf.5:197 en/live-snapshot.1:60
 msgid "I<live-config>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:172 en/live-snapshot.1:62 en/live.persist.5:199
+#: en/live-boot.7:170 en/live-persistence.conf.5:199 en/live-snapshot.1:62
 msgid "I<live-tools>(7)"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:173 en/live-snapshot.1:63 en/live.persist.5:200
+#: en/live-boot.7:171 en/live-persistence.conf.5:200 en/live-snapshot.1:63
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:175 en/live-snapshot.1:65 en/live.persist.5:204
+#: en/live-boot.7:173 en/live-persistence.conf.5:204 en/live-snapshot.1:65
 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 "
@@ -94,13 +94,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:176 en/live-snapshot.1:66 en/live.persist.5:205
+#: en/live-boot.7:174 en/live-persistence.conf.5:205 en/live-snapshot.1:66
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:178 en/live-snapshot.1:68 en/live.persist.5:210
+#: en/live-boot.7:176 en/live-persistence.conf.5:210 en/live-snapshot.1:68
 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 "
@@ -109,107 +109,109 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:179 en/live-snapshot.1:69 en/live.persist.5:211
+#: en/live-boot.7:177 en/live-persistence.conf.5:211 en/live-snapshot.1:69
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:6
-msgid "B<live.persist> - Configuration file for persistent media in live-boot"
+#: en/live-persistence.conf.5:6
+msgid ""
+"B<live-persistence.conf> - Configuration file for persistence media in live-"
+"boot"
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:13
+#: en/live-persistence.conf.5:13
 msgid ""
-"If live-boot probes a persistent volume with the label (or GPT name, or file "
-"name, but from now on we will just say \"label\") \"custom-ov\", that "
-"volume's persistence is fully customizable through the B<live.persist> file "
-"stored on the root of its file system. Any such labeled volume must have "
-"such a file, or it will be ignored."
+"If live-boot probes a persistence volume with the label (or GPT name, or "
+"file name, but from now on we will just say \"label\") \"custom-ov\", that "
+"volume's persistence is fully customizable through the B<live-persistence."
+"conf> file stored on the root of its file system. Any such labeled volume "
+"must have such a file, or it will be ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:17
+#: en/live-persistence.conf.5:17
 msgid ""
-"The format of B<live.persist> allow empty lines and lines starting with a \"#"
-"\" (used for comments), both which will be ignored. A so called \"custom "
-"mount\" has the format:"
+"The format of B<live-persistence.conf> allow empty lines and lines starting "
+"with a \"#\" (used for comments), both which will be ignored. A so called "
+"\"custom mount\" has the format:"
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:20
+#: en/live-persistence.conf.5:20
 msgid "I<DIR> [I<OPTION>]..."
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:24
+#: en/live-persistence.conf.5:24
 msgid ""
-"which roughly translates to \"make I<DIR> persistent in the way described by "
-"the list of I<OPTION>s\"."
+"which roughly translates to \"make I<DIR> persistence in the way described "
+"by the list of I<OPTION>s\"."
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:35
+#: en/live-persistence.conf.5:35
 msgid ""
 "For each custom mount I<DIR> must be an absolute path that cannot contain "
 "white spaces or the special . and .. path components, and cannot be /live "
 "(or any of its sub-directories), or / (for the latter, use \"full-ov\" "
 "persistence instead). Once activated all changes (file deletion, creation "
 "and modification) to I<DIR> on the live file system are stored persistently "
-"into a path equivalent to I<DIR> on the persistent media, called the source "
+"into a path equivalent to I<DIR> on the persistence media, called the source "
 "directory. The default way to achieve persistence is to simply bind-mount "
 "the corresponding source directory to I<DIR>, but this can be changed "
 "through the use of I<OPTION>s."
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:48
+#: en/live-persistence.conf.5:48
 msgid ""
 "All custom mounts will be done in an order so that no two custom mounts can "
 "\"hide\" each other. For instance, if we have the two I<DIR>:s /a and /a/b "
 "it would always be the case that /a is mounted first, then /a/b. This "
-"remains true no matter how the lines in B<live.persist> are ordered, or if "
-"several B<live.persist> files on different persistent media are used at the "
-"same time. However, it is forbidden for custom mounts to have their source "
-"directory inside the source directory of another custom mount, so the source "
-"directories that are auto-created by live-boot does not support \"nested\" "
-"mounts like /a and /a/b on the same media. In this case you must use the "
-"B<source> option (see below) to make sure that they are stored in different "
-"source directories."
+"remains true no matter how the lines in B<live-persistence.conf> are "
+"ordered, or if several B<live-persistence.conf> files on different "
+"persistence media are used at the same time. However, it is forbidden for "
+"custom mounts to have their source directory inside the source directory of "
+"another custom mount, so the source directories that are auto-created by "
+"live-boot does not support \"nested\" mounts like /a and /a/b on the same "
+"media. In this case you must use the B<source> option (see below) to make "
+"sure that they are stored in different source directories."
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:56
+#: en/live-persistence.conf.5:56
 msgid ""
-"When a source directory doesn't exist on the persistent media for a certain "
+"When a source directory doesn't exist on the persistence media for a certain "
 "custom mount, it will be created automatically, and permissions and "
 "ownership will be optimistically set according to I<DIR>. It will also be "
 "bootstrapped by copying the contents of the I<DIR> into its source directory "
-"on the persistent media. The bootstrapping will not happen when the "
-"B<linkfiles> or B<union> options are used (see below)."
+"on the persistence media. The bootstrapping will not happen when the B<link> "
+"or B<union> options are used (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:60
+#: en/live-persistence.conf.5:60
 msgid ""
-"Custom mounts defined in B<live.persist> accept the following options in a "
-"coma-separated list:"
+"Custom mounts defined in B<live-persistence.conf> accept the following "
+"options in a coma-separated list:"
 msgstr ""
 
 #. type: IP
-#: en/live.persist.5:60
+#: en/live-persistence.conf.5:60
 #, no-wrap
 msgid "B<source>=I<PATH>"
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:69
+#: en/live-persistence.conf.5:69
 msgid ""
-"When given, store the persistent changes into I<PATH> on the persistent "
-"media. I<PATH> must be a relative path (w.r.t. the persistent media root) "
+"When given, store the persistence changes into I<PATH> on the persistence "
+"media. I<PATH> must be a relative path (w.r.t. the persistence media root) "
 "that cannot contain white spaces or the special . or .. path components, "
-"with the exception that it can be just . which means the persistent media "
+"with the exception that it can be just . which means the persistence media "
 "root. This option is mostly relevant if you want to nest custom mounts, "
 "which otherwise would cause errors, or if you want to make the whole media "
 "root available (similar to the now deprecated B<home-rw> type of "
@@ -217,33 +219,33 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:72
+#: en/live-persistence.conf.5:72
 msgid ""
 "The following options are mutually exclusive (only the last given one will "
 "be in effect):"
 msgstr ""
 
 #. type: IP
-#: en/live.persist.5:72
+#: en/live-persistence.conf.5:72
 #, no-wrap
 msgid "B<bind>"
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:74
+#: en/live-persistence.conf.5:74
 msgid "Bind-mount the source directory to I<DIR>. This is the default."
 msgstr ""
 
 #. type: IP
-#: en/live.persist.5:74
+#: en/live-persistence.conf.5:74
 #, no-wrap
-msgid "B<linkfiles>"
+msgid "B<link>"
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:83
+#: en/live-persistence.conf.5:83
 msgid ""
-"Create the directory structure of the source directory on the persistent "
+"Create the directory structure of the source directory on the persistence "
 "media in I<DIR> and create symbolic links from the corresponding place in "
 "I<DIR> to each file in the source directory.  Existing files or directories "
 "with the same name as any link will be overwritten. Note that deleting the "
@@ -253,27 +255,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:91
+#: en/live-persistence.conf.5:91
 msgid ""
-"Effectively B<linkfiles> will make only files already in the source "
-"directory persistent, not any other files in I<DIR>. These files must be "
-"manually added to the source directory to make use of this option, and they "
-"will appear in I<DIR> in addition to files already there. This option is "
-"useful when only certain files need to be persistent, not the whole "
-"directory they're in, e.g. some configuration files in a user's home "
-"directory."
+"Effectively B<link> will make only files already in the source directory "
+"persistent, not any other files in I<DIR>. These files must be manually "
+"added to the source directory to make use of this option, and they will "
+"appear in I<DIR> in addition to files already there. This option is useful "
+"when only certain files need to be persistent, not the whole directory "
+"they're in, e.g. some configuration files in a user's home directory."
 msgstr ""
 
 #. type: IP
-#: en/live.persist.5:91
+#: en/live-persistence.conf.5:91
 #, no-wrap
 msgid "B<union>"
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:101
+#: en/live-persistence.conf.5:101
 msgid ""
-"Save the rw branch of a union on the persistent media, so only the changes "
+"Save the rw branch of a union on the persistence media, so only the changes "
 "are stored persistently. This can potentially reduce disk usage compared to "
 "bind-mounts, and will not hide files added to the read-only media. One "
 "caveat is that the union will use I<DIR> from the image's read-only file "
@@ -284,121 +285,122 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live.persist.5:102
+#: en/live-persistence.conf.5:102
 #, no-wrap
 msgid "DIRECTORIES"
 msgstr ""
 
 #. type: IP
-#: en/live.persist.5:103
+#: en/live-persistence.conf.5:103
 #, no-wrap
-msgid "B</live/persistent>"
+msgid "B</live/persistence>"
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:109
+#: en/live-persistence.conf.5:109
 msgid ""
-"All persistent volumes will be mounted here (in a directory corresponding to "
-"the device name). The B<live.persist> file can easily be edited through this "
-"mount, as well as any source directories (which is especially practical for "
-"custom mounts using the B<linkfiles> option)."
+"All persistence volumes will be mounted here (in a directory corresponding "
+"to the device name). The B<live-persistence.conf> file can easily be edited "
+"through this mount, as well as any source directories (which is especially "
+"practical for custom mounts using the B<link> option)."
 msgstr ""
 
 #. type: SH
-#: en/live.persist.5:110
+#: en/live-persistence.conf.5:110
 #, no-wrap
 msgid "EXAMPLES"
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:115
+#: en/live-persistence.conf.5:115
 msgid ""
-"Let's say we have a persistent volume I<VOL> with the a B<live.persist> file "
-"containing the following four lines (numbered for ease of reference):"
+"Let's say we have a persistence volume I<VOL> with the a B<live-persistence."
+"conf> file containing the following four lines (numbered for ease of "
+"reference):"
 msgstr ""
 
 #. type: TP
-#: en/live.persist.5:115 en/live.persist.5:129
+#: en/live-persistence.conf.5:115 en/live-persistence.conf.5:129
 #, no-wrap
 msgid "1."
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:118
-msgid "/home/user1 linkfiles,source=config-files/user1"
+#: en/live-persistence.conf.5:118
+msgid "/home/user1 link,source=config-files/user1"
 msgstr ""
 
 #. type: TP
-#: en/live.persist.5:118 en/live.persist.5:133
+#: en/live-persistence.conf.5:118 en/live-persistence.conf.5:133
 #, no-wrap
 msgid "2."
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:121
-msgid "/home/user2 linkfiles,source=config-files/user2"
+#: en/live-persistence.conf.5:121
+msgid "/home/user2 link,source=config-files/user2"
 msgstr ""
 
 #. type: TP
-#: en/live.persist.5:121 en/live.persist.5:137
+#: en/live-persistence.conf.5:121 en/live-persistence.conf.5:137
 #, no-wrap
 msgid "3."
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:124
+#: en/live-persistence.conf.5:124
 msgid "/home"
 msgstr ""
 
 #. type: TP
-#: en/live.persist.5:124 en/live.persist.5:140
+#: en/live-persistence.conf.5:124 en/live-persistence.conf.5:140
 #, no-wrap
 msgid "4."
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:127
+#: en/live-persistence.conf.5:127
 msgid "/usr union"
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:129
+#: en/live-persistence.conf.5:129
 msgid "The corresponding source directories are:"
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:133
+#: en/live-persistence.conf.5:133
 msgid ""
 "I<VOL>/config-files/user1 (but it would be I<VOL>/home/user1 without the "
 "B<source> option)"
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:137
+#: en/live-persistence.conf.5:137
 msgid ""
 "I<VOL>/config-files/user2 (but it would be I<VOL>/home/user2 without the "
 "B<source> option)"
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:140
+#: en/live-persistence.conf.5:140
 msgid "I<VOL>/home"
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:143
+#: en/live-persistence.conf.5:143
 msgid "I<VOL>/usr"
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:146
+#: en/live-persistence.conf.5:146
 msgid ""
 "It was necessary to set the B<source> options for 1 and 2, since they "
-"otherwise would become nested with 3's source, which is illegal."
+"otherwise would become nested with 3's source, which is invalid."
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:151
+#: en/live-persistence.conf.5:151
 msgid ""
 "Line 3 will be taken care of before line 1 and 2 in order to prevent custom "
 "mounts 1 and 2 from being hidden by 3. When line 3 is handled, I<VOL>/home "
@@ -407,88 +409,89 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: en/live.persist.5:151
+#: en/live-persistence.conf.5:151
 #, no-wrap
 msgid "a."
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:154
+#: en/live-persistence.conf.5:154
 msgid "I<VOL>/config-files/user1/.emacs"
 msgstr ""
 
 #. type: TP
-#: en/live.persist.5:154
+#: en/live-persistence.conf.5:154
 #, no-wrap
 msgid "b."
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:157
+#: en/live-persistence.conf.5:157
 msgid "I<VOL>/config-files/user2/.bashrc"
 msgstr ""
 
 #. type: TP
-#: en/live.persist.5:157
+#: en/live-persistence.conf.5:157
 #, no-wrap
 msgid "c."
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:160
+#: en/live-persistence.conf.5:160
 msgid "I<VOL>/config-files/user2/.ssh/config"
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:162
+#: en/live-persistence.conf.5:162
 msgid "Then the following links and directories will be created:"
 msgstr ""
 
 #. type: TP
-#: en/live.persist.5:162 en/live.persist.5:165 en/live.persist.5:171
+#: en/live-persistence.conf.5:162 en/live-persistence.conf.5:165
+#: en/live-persistence.conf.5:171
 #, no-wrap
 msgid "Link:"
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:165
+#: en/live-persistence.conf.5:165
 msgid "/home/user1/.emacs -E<gt> I<VOL>/config-files/user1/.emacs (from a)"
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:168
+#: en/live-persistence.conf.5:168
 msgid "/home/user2/.bashrc -E<gt> I<VOL>/config-files/user2/.bashrc (from b)"
 msgstr ""
 
 #. type: TP
-#: en/live.persist.5:168
+#: en/live-persistence.conf.5:168
 #, no-wrap
 msgid "Dir:"
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:171
+#: en/live-persistence.conf.5:171
 msgid "/homea/user2/.ssh (from c)"
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:175
+#: en/live-persistence.conf.5:175
 msgid ""
 "/home/user2/.ssh/config -E<gt> I<VOL>/config-files/user2/.ssh/config (from c)"
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:181
+#: en/live-persistence.conf.5:181
 msgid ""
-"One could argue, though, that lines 1 and 2 in the example B<live.persist> "
-"file above are unnecessary since line 3 already would make all of /home "
-"persistent. The B<linkfiles> option is intended for situations where you "
-"don't want a complete directory to be persistent, only certain files in it "
-"or its sub-directories."
+"One could argue, though, that lines 1 and 2 in the example B<live-"
+"persistence.conf> file above are unnecessary since line 3 already would make "
+"all of /home persistent. The B<link> option is intended for situations where "
+"you don't want a complete directory to be persistent, only certain files in "
+"it or its sub-directories."
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:190
+#: en/live-persistence.conf.5:190
 msgid ""
 "Line 4 can be mounted at any time since its I<DIR> (and source directory) is "
 "completely disjoint from all the other custom mounts. When mounted, I<VOL>/"
@@ -500,12 +503,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:193
+#: en/live-persistence.conf.5:193
 msgid "I<live-boot>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live.persist.5:213
+#: en/live-persistence.conf.5:213
 msgid ""
 "live.persist was written by anonym E<lt>I<anonym@lavabit.com>E<gt> for the "
 "Debian project."