fixed indentation issues

1 files changed, 157 insertions, 14 deletions

diff --git a/doc/po/ja.po b/doc/po/ja.po
index 53cdb6555..0446b0827 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -7,7 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25.3\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2011-06-09 08:32+0530\n"
+=======
+"POT-Creation-Date: 2011-06-28 16:42+0200\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: 2010-09-07 07:38+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -1357,7 +1361,11 @@ msgstr ""
 "pkgcache</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
+=======
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393
+>>>>>>> MERGE-SOURCE
 #: apt-sortpkgs.1.xml:61
 msgid "<option>-s</option>"
 msgstr "<option>-s</option>"
@@ -1384,12 +1392,20 @@ msgstr ""
 "<literal>Dir::Cache::srcpkgcache</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+=======
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
+>>>>>>> MERGE-SOURCE
 msgid "<option>-q</option>"
 msgstr "<option>-q</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+=======
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
+>>>>>>> MERGE-SOURCE
 msgid "<option>--quiet</option>"
 msgstr "<option>--quiet</option>"
 
@@ -1475,7 +1491,7 @@ msgstr "<option>--no-enhances</option>"
 #, fuzzy
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
-"print all dependencies. This can be twicked with these flags which will omit "
+"print all dependencies. This can be tweaked with these flags which will omit "
 "the specified dependency type.  Configuration Item: <literal>APT::Cache::"
 "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
 "Cache::ShowRecommends</literal>."
@@ -1505,7 +1521,11 @@ msgstr ""
 "ShowFull</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
+=======
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
+>>>>>>> MERGE-SOURCE
 msgid "<option>-a</option>"
 msgstr "<option>-a</option>"
 
@@ -1627,7 +1647,11 @@ msgstr ""
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><variablelist>
 #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
+<<<<<<< TREE
 #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
+=======
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570
+>>>>>>> MERGE-SOURCE
 #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
@@ -1647,7 +1671,11 @@ msgstr "&file-sourceslist; &file-statelists;"
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
+<<<<<<< TREE
 #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
+=======
+#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585
+>>>>>>> MERGE-SOURCE
 #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
 #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
 #: sources.list.5.xml:234
@@ -1663,7 +1691,11 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
+<<<<<<< TREE
 #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
+=======
+#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591
+>>>>>>> MERGE-SOURCE
 #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
 msgid "Diagnostics"
 msgstr "診断メッセージ"
@@ -1805,7 +1837,11 @@ msgid "Options"
 msgstr "オプション"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
+=======
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345
+>>>>>>> MERGE-SOURCE
 msgid "<option>-d</option>"
 msgstr "<option>-d</option>"
 
@@ -2075,7 +2111,11 @@ msgstr "設定箇所の内容を表示するだけです。"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
+=======
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
+>>>>>>> MERGE-SOURCE
 #: apt-sortpkgs.1.xml:73
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
@@ -3308,11 +3348,19 @@ msgid ""
 "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
 "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
 "replaceable>::<replaceable>Checksum</replaceable></literal> where "
+<<<<<<< TREE
 "<literal>Index</literal> can be <literal>Packages</literal>, "
 "<literal>Sources</literal> or <literal>Release</literal> and "
 "<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
 "literal> or <literal>SHA256</literal>."
-msgstr ""
+=======
+"<literal><replaceable>Index</replaceable></literal> can be "
+"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
+"literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
+"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
+>>>>>>> MERGE-SOURCE
+msgstr ""
+<<<<<<< TREE
 "Release ファイルの追加メタデータフィールドの値は、<literal>APT::FTPArchive::"
 "Release</literal> 以下の相当する値 (例: <literal>APT::FTPArchive::Release::"
 "Origin</literal>) をとります。サポートするフィールドは、<literal>Origin</"
@@ -3320,15 +3368,25 @@ msgstr ""
 "<literal>Version</literal>, <literal>Codename</literal>, <literal>Date</"
 "literal>, <literal>Valid-Until</literal>, <literal>Architectures</literal>, "
 "<literal>Components</literal>, <literal>Description</literal> です。"
+=======
+>>>>>>> MERGE-SOURCE
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:539
+=======
+#: apt-ftparchive.1.xml:540
+>>>>>>> MERGE-SOURCE
 msgid "<option>--db</option>"
 msgstr "<option>--db</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:541
+=======
+#: apt-ftparchive.1.xml:542
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3338,7 +3396,11 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:547
+=======
+#: apt-ftparchive.1.xml:548
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3351,13 +3413,21 @@ msgstr ""
 "<literal>quiet</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:553
+=======
+#: apt-ftparchive.1.xml:554
+>>>>>>> MERGE-SOURCE
 msgid "<option>--delink</option>"
 msgstr "<option>--delink</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:555
+=======
+#: apt-ftparchive.1.xml:556
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -3370,13 +3440,21 @@ msgstr ""
 "<literal>APT::FTPArchive::DeLinkAct</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:561
+=======
+#: apt-ftparchive.1.xml:562
+>>>>>>> MERGE-SOURCE
 msgid "<option>--contents</option>"
 msgstr "<option>--contents</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:563
+=======
+#: apt-ftparchive.1.xml:564
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -3391,13 +3469,21 @@ msgstr ""
 "<literal>APT::FTPArchive::Contents</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:571
+=======
+#: apt-ftparchive.1.xml:572
+>>>>>>> MERGE-SOURCE
 msgid "<option>--source-override</option>"
 msgstr "<option>--source-override</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:573
+=======
+#: apt-ftparchive.1.xml:574
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3407,13 +3493,21 @@ msgstr ""
 "選択します。設定項目 - <literal>APT::FTPArchive::SourceOverride</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:577
+=======
+#: apt-ftparchive.1.xml:578
+>>>>>>> MERGE-SOURCE
 msgid "<option>--readonly</option>"
 msgstr "<option>--readonly</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:579
+=======
+#: apt-ftparchive.1.xml:580
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -3422,13 +3516,21 @@ msgstr ""
 "FTPArchive::ReadOnlyDB</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:583
+=======
+#: apt-ftparchive.1.xml:584
+>>>>>>> MERGE-SOURCE
 msgid "<option>--arch</option>"
 msgstr "<option>--arch</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:584
+=======
+#: apt-ftparchive.1.xml:585
+>>>>>>> MERGE-SOURCE
 #, fuzzy
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
@@ -3442,12 +3544,20 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:590
+=======
+#: apt-ftparchive.1.xml:591
+>>>>>>> MERGE-SOURCE
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr "<option>--version</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:592
+=======
+#: apt-ftparchive.1.xml:593
+>>>>>>> MERGE-SOURCE
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -3461,12 +3571,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:602
+=======
+#: apt-ftparchive.1.xml:603
+>>>>>>> MERGE-SOURCE
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr "<option>APT::FTPArchive::LongDescription</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:604
+=======
+#: apt-ftparchive.1.xml:605
+>>>>>>> MERGE-SOURCE
 #, fuzzy
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
@@ -3482,14 +3600,22 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+=======
+#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+>>>>>>> MERGE-SOURCE
 #: sources.list.5.xml:198
 msgid "Examples"
 msgstr "サンプル"
 
 # type: Content of: <refentry><refsect1><para><programlisting>
 #. type: Content of: <refentry><refsect1><para><programlisting>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:622
+=======
+#: apt-ftparchive.1.xml:623
+>>>>>>> MERGE-SOURCE
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr ""
@@ -3498,7 +3624,11 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:618
+=======
+#: apt-ftparchive.1.xml:619
+>>>>>>> MERGE-SOURCE
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3508,7 +3638,11 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:632
+=======
+#: apt-ftparchive.1.xml:633
+>>>>>>> MERGE-SOURCE
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -3984,7 +4118,7 @@ msgstr ""
 #: apt-get.8.xml:282
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
-"current directoy."
+"current directory."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -5730,11 +5864,12 @@ msgstr "<envar>APT_CONFIG</envar> 環境変数で指定したファイル (存�
 #| "period (.) characters - otherwise they will be silently ignored."
 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
-"order which have no or \"<literal>conf</literal>\" as filename extension and "
-"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
-"characters.  Otherwise APT will print a notice that it has ignored a file if "
-"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
-"literal> configuration list - in this case it will be silently ignored."
+"order which have either no or \"<literal>conf</literal>\" as filename "
+"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+"and period (.) characters.  Otherwise APT will print a notice that it has "
+"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+"Ignore-Files-Silently</literal> configuration list - in this case it will be "
+"silently ignored."
 msgstr ""
 "<literal>Dir::Etc::Parts</literal> にあるすべてのファイルを英数字の昇順に。"
 "ファイル名には拡張子がないか、\"<literal>conf</literal>\" となっており、英数"
@@ -6729,9 +6864,9 @@ msgid ""
 "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
 "replaceable></literal> will be checked: If this setting exists the method "
 "will only be used if this file exists, e.g. for the bzip2 method (the "
-"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also "
-"that list entries specified on the command line will be added at the end of "
-"the list specified in the configuration files, but before the default "
+"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note "
+"also that list entries specified on the command line will be added at the "
+"end of the list specified in the configuration files, but before the default "
 "entries. To prefer a type in this case over the ones specified in the "
 "configuration files you can set the option direct - not in list style.  This "
 "will not override the defined list, it will only prefix the list with this "
@@ -6751,7 +6886,7 @@ msgstr ""
 #: apt.conf.5.xml:449
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
-"uncompressed files a preference, but note that most archives doesn't provide "
+"uncompressed files a preference, but note that most archives don't provide "
 "uncompressed files so this is mostly only useable for local mirrors."
 msgstr ""
 
@@ -7887,8 +8022,8 @@ msgstr ""
 msgid ""
 "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
 "directory are parsed in alphanumeric ascending order and need to obey the "
-"following naming convention: The files have no or \"<literal>pref</literal>"
-"\" as filename extension and which only contain alphanumeric, hyphen (-), "
+"following naming convention: The files have either no or \"<literal>pref</"
+"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
 "underscore (_) and period (.) characters.  Otherwise APT will print a notice "
 "that it has ignored a file if the file doesn't match a pattern in the "
 "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
@@ -8353,7 +8488,11 @@ msgid ""
 "APT also supports pinning by glob() expressions and regular expressions "
 "surrounded by /. For example, the following example assigns the priority 500 "
 "to all packages from experimental where the name starts with gnome (as a glob"
+<<<<<<< TREE
 "()-like expression or contains the word kde (as a POSIX extended regular "
+=======
+"()-like expression) or contains the word kde (as a POSIX extended regular "
+>>>>>>> MERGE-SOURCE
 "expression surrounded by slashes)."
 msgstr ""
 
@@ -8379,7 +8518,11 @@ msgstr ""
 #: apt_preferences.5.xml:279
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
+<<<<<<< TREE
 "string can occur. Those, the following pin assigns the priority 990 to all "
+=======
+"string can occur. Thus, the following pin assigns the priority 990 to all "
+>>>>>>> MERGE-SOURCE
 "packages from a release starting with karmic."
 msgstr ""