merge main then update document files

OSGeo-jp · Aug 27, 2024 · 9df3f1c · 9df3f1c
1 parent ca8b38e
commit 9df3f1c
Show file tree

Hide file tree

Showing 76 changed files with 166 additions and 94 deletions.
diff --git a/doc/Makefile b/doc/Makefile
@@ -78,7 +78,7 @@ update: gettext
 
 .PHONY: html latexpdf
 html: generated_rst_files
-<<<<<<< HEAD
+	@echo "Building HTML with the following options: $(SPHINXOPTS) $(SPHINXINTLOPTS) $(LA)"
 	echo "$(SPHINXOPTS) $(SPHINXINTLOPTS) $(LA)"
 	$(SPHINXBUILD) -M html "$(SOURCEDIR)" "$(BUILDDIR)/$(LA)" $(SPHINXOPTS) $(O)
 	# Hack to hide the TOC
@@ -94,10 +94,10 @@ html: generated_rst_files
 	cp -r $(BUILDDIR)/doxygen_html $(BUILDDIR)/$(LA)/html/doxygen
 	ln -sf ../latex/gdal.pdf $(BUILDDIR)/$(LA)/html
 	cp -f "source/sponsors/Sustainable GDAL Sponsorship Prospectus.pdf" $(BUILDDIR)/$(LA)/html/sponsors
-=======
-	BUILDDIR="${BUILDDIR}" $(SPHINXBUILD) -M html "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
-	ln -sf ../latex/gdal.pdf $(BUILDDIR)/html
->>>>>>> master
+#=======
+#	BUILDDIR="${BUILDDIR}" $(SPHINXBUILD) -M html "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+#	ln -sf ../latex/gdal.pdf $(BUILDDIR)/html
+#>>>>>>> master
 
 man: generated_rst_files
 	$(SPHINXBUILD) -M man "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

diff --git a/doc/source/locale/en/LC_MESSAGES/about.po b/doc/source/locale/en/LC_MESSAGES/about.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GDAL \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-20 02:24+0900\n"
+"POT-Creation-Date: 2024-08-28 04:14+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -35,15 +35,19 @@ msgid ""
 "release."
 msgstr ""
 
+#: ../../source/about_no_title.rst:5
+msgid "|offline-download|"
+msgstr ""
+
 #: ../../source/about_no_title.rst:-1
 msgid "OSGeo project"
 msgstr ""
 
-#: ../../source/about_no_title.rst:10
+#: ../../source/about_no_title.rst:14
 msgid "See :ref:`software_using_gdal`"
 msgstr ""
 
-#: ../../source/about_no_title.rst:16
+#: ../../source/about_no_title.rst:20
 msgid ""
 "You may quote GDAL in publications by using the following Digital Object "
 "Identifier: |DOI|"

diff --git a/doc/source/locale/en/LC_MESSAGES/about_no_title.po b/doc/source/locale/en/LC_MESSAGES/about_no_title.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GDAL \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-20 02:24+0900\n"
+"POT-Creation-Date: 2024-08-28 04:14+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -31,15 +31,19 @@ msgid ""
 "release."
 msgstr ""
 
+#: ../../source/about_no_title.rst:5
+msgid "|offline-download|"
+msgstr ""
+
 #: ../../source/about_no_title.rst:-1
 msgid "OSGeo project"
 msgstr ""
 
-#: ../../source/about_no_title.rst:10
+#: ../../source/about_no_title.rst:14
 msgid "See :ref:`software_using_gdal`"
 msgstr ""
 
-#: ../../source/about_no_title.rst:16
+#: ../../source/about_no_title.rst:20
 msgid ""
 "You may quote GDAL in publications by using the following Digital Object "
 "Identifier: |DOI|"

diff --git a/doc/source/locale/en/LC_MESSAGES/api/java/index.po b/doc/source/locale/en/LC_MESSAGES/api/java/index.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GDAL \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-01 04:49+0900\n"
+"POT-Creation-Date: 2024-08-28 04:14+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -17,7 +17,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.14.0\n"
+"Generated-By: Babel 2.15.0\n"
 
 #: ../../source/api/java/index.rst:5
 msgid "Java bindings"
@@ -30,8 +30,8 @@ msgstr ""
 #: ../../source/api/java/index.rst:9
 msgid ""
 "Generally speaking the classes and methods mostly match those of the GDAL"
-" and OGR C++ classes. You can find the `Javadoc "
-"<http://gdal.org/java>`__ of the API of the Java bindings."
+" and OGR C++ classes. You can find the `Javadoc <../../java>`__ of the "
+"API of the Java bindings."
 msgstr ""
 
 #: ../../source/api/java/index.rst:11
@@ -93,7 +93,7 @@ msgstr ""
 
 #: ../../source/api/java/index.rst:55
 msgid ""
-"The Java bindings are available from the `Maven Central "
+"The Java bindings are available from the `Maven Central "
 "<http://search.maven.org/>`__ repository. All that is needed is to "
 "declare a dependency."
 msgstr ""
@@ -103,7 +103,7 @@ msgid "Useful Links"
 msgstr ""
 
 #: ../../source/api/java/index.rst:71
-msgid "`Javadoc <http://gdal.org/java>`__ of the API of the Java bindings."
+msgid "`Javadoc <../../java>`__ of the API of the Java bindings."
 msgstr ""
 
 #: ../../source/api/java/index.rst:72
@@ -137,3 +137,21 @@ msgid ""
 "latest released GDAL version)"
 msgstr ""
 
+#~ msgid ""
+#~ "Generally speaking the classes and "
+#~ "methods mostly match those of the "
+#~ "GDAL and OGR C++ classes. You can"
+#~ " find the `Javadoc <http://gdal.org/java>`__ "
+#~ "of the API of the Java bindings."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The Java bindings are available from "
+#~ "the `Maven Central <http://search.maven.org/>`__"
+#~ " repository. All that is needed is"
+#~ " to declare a dependency."
+#~ msgstr ""
+
+#~ msgid "`Javadoc <http://gdal.org/java>`__ of the API of the Java bindings."
+#~ msgstr ""
+
diff --git a/doc/source/locale/en/LC_MESSAGES/index.po b/doc/source/locale/en/LC_MESSAGES/index.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GDAL \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-20 02:24+0900\n"
+"POT-Creation-Date: 2024-08-28 04:14+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.15.0\n"
 
-#: ../../source/index.rst:12
+#: ../../source/index.rst:7
 msgid "User"
 msgstr ""
 
@@ -43,15 +43,19 @@ msgid ""
 "release."
 msgstr ""
 
+#: ../../source/about_no_title.rst:5
+msgid "|offline-download|"
+msgstr ""
+
 #: ../../source/about_no_title.rst:-1
 msgid "OSGeo project"
 msgstr ""
 
-#: ../../source/about_no_title.rst:10
+#: ../../source/about_no_title.rst:14
 msgid "See :ref:`software_using_gdal`"
 msgstr ""
 
-#: ../../source/about_no_title.rst:16
+#: ../../source/about_no_title.rst:20
 msgid ""
 "You may quote GDAL in publications by using the following Digital Object "
 "Identifier: |DOI|"
@@ -61,20 +65,11 @@ msgstr ""
 msgid "DOI 10.5281/zenodo.5884351"
 msgstr ""
 
-#: ../../source/index.rst:7
-msgid ""
-"This documentation is also available as a `PDF file <gdal.pdf>`_, and `a "
-".ZIP of individual HTML pages <https://github.com/OSGeo/gdal-"
-"docs/archive/refs/heads/master.zip>`_ for offline browsing. (The .ZIP "
-"also includes that .PDF.) The documentation reflects the latest state of "
-"the development branch of the software."
-msgstr ""
-
-#: ../../source/index.rst:30
+#: ../../source/index.rst:25
 msgid "Index"
 msgstr ""
 
-#: ../../source/index.rst:32
+#: ../../source/index.rst:27
 msgid ":ref:`genindex`"
 msgstr ""
 
@@ -95,3 +90,15 @@ msgstr ""
 #~ "the June 2024 GDAL/OGR 3.9.1 release."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "This documentation is also available as"
+#~ " a `PDF file <gdal.pdf>`_, and `a "
+#~ ".ZIP of individual HTML pages "
+#~ "<https://github.com/OSGeo/gdal-"
+#~ "docs/archive/refs/heads/master.zip>`_ for offline "
+#~ "browsing. (The .ZIP also includes that"
+#~ " .PDF.) The documentation reflects the "
+#~ "latest state of the development branch"
+#~ " of the software."
+#~ msgstr ""
+
diff --git a/doc/source/locale/en/LC_MESSAGES/sponsors/index.po b/doc/source/locale/en/LC_MESSAGES/sponsors/index.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GDAL \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-15 10:14+0900\n"
+"POT-Creation-Date: 2024-08-28 04:14+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -80,14 +80,18 @@ msgid "`Space Intelligence <https://www.space-intelligence.com>`__"
 msgstr ""
 
 #: ../../source/sponsors/index.rst:152
-msgid "`Umbra <https://umbra.space/>`__"
+msgid "`T-Kartor USA <https://www.t-kartorusa.com/>`__"
 msgstr ""
 
 #: ../../source/sponsors/index.rst:156
+msgid "`Umbra <https://umbra.space/>`__"
+msgstr ""
+
+#: ../../source/sponsors/index.rst:160
 msgid "`Vortex f.d.c. <https://vortexfdc.com/>`__"
 msgstr ""
 
-#: ../../source/sponsors/index.rst:198
+#: ../../source/sponsors/index.rst:202
 msgid ""
 "The GDAL Project is hosted by `OSGeo <https://www.osgeo.org>`__, and a "
 "fiscally sponsored project of `NumFOCUS <https://numfocus.org>`__, a "
@@ -97,19 +101,19 @@ msgid ""
 "support our efforts."
 msgstr ""
 
-#: ../../source/sponsors/index.rst:204
+#: ../../source/sponsors/index.rst:208
 msgid ""
 "NumFOCUS is 501(c)(3) non-profit charity in the United States; as such, "
 "donations to NumFOCUS are tax-deductible as allowed by law. As with any "
 "donation, you should consult with your personal tax adviser or the IRS "
 "about your particular tax situation."
 msgstr ""
 
-#: ../../source/sponsors/index.rst:225
+#: ../../source/sponsors/index.rst:229
 msgid "Sponsoring"
 msgstr ""
 
-#: ../../source/sponsors/index.rst:227
+#: ../../source/sponsors/index.rst:231
 msgid ""
 "If your organization benefits from GDAL we recommend joining the group of"
 " sponsors above to \"pay it forward\" and ensure the project has the "
@@ -120,15 +124,15 @@ msgid ""
 "contact [email protected]."
 msgstr ""
 
-#: ../../source/sponsors/index.rst:235
+#: ../../source/sponsors/index.rst:239
 msgid "Related resources"
 msgstr ""
 
-#: ../../source/sponsors/index.rst:237
+#: ../../source/sponsors/index.rst:241
 msgid "`Sustainable GDAL Sponsorship Prospectus`_."
 msgstr ""
 
-#: ../../source/sponsors/index.rst:238
+#: ../../source/sponsors/index.rst:242
 msgid ":ref:`Sponsoring frequently asked questions (FAQ) <sponsoring-faq>`."
 msgstr ""
 
diff --git a/doc/source/locale/ja/LC_MESSAGES/about.mo b/doc/source/locale/ja/LC_MESSAGES/about.mo
diff --git a/doc/source/locale/ja/LC_MESSAGES/about.po b/doc/source/locale/ja/LC_MESSAGES/about.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GDAL \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-20 02:24+0900\n"
+"POT-Creation-Date: 2024-08-28 04:14+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Yoichi Kayama <[email protected]>\\nLanguage: ja\n"
 "Language-Team: ja <[email protected]>\n"
@@ -34,20 +34,22 @@ msgid ""
 msgstr ""
 "GDAL はラスターとベクターの空間データ形式をを変換するライブラリです。これは MIT スタイル :ref:`license` の "
 "オープンソースとして `Open Source Geospatial Foundation`_ から公開されています. "
-"ライブラリとしてのGDALはすべてのサポートする形式をアプリケーションから単一のラスタ抽象データモデルか単一の"
-"ベクター抽象モデルとして利用する機能を提供しています。またGDALではデータ変換やデータ加工をするための多彩で便利な"
-"コマンドラインユーティリティを提供しています."
+"ライブラリとしてのGDALはすべてのサポートする形式をアプリケーションから単一のラスタ抽象データモデルか単一のベクター抽象モデルとして利用する機能を提供しています。またGDALではデータ変換やデータ加工をするための多彩で便利なコマンドラインユーティリティを提供しています."
 "  `NEWS`_ ページには 2024年 8月の GDAL/OGR 3.9.2 リリースについての情報があります."
 
+#: ../../source/about_no_title.rst:5
+msgid "|offline-download|"
+msgstr ""
+
 #: ../../source/about_no_title.rst:-1
 msgid "OSGeo project"
 msgstr "OSGeoプロジェクト"
 
-#: ../../source/about_no_title.rst:10
+#: ../../source/about_no_title.rst:14
 msgid "See :ref:`software_using_gdal`"
 msgstr "参照 :ref:`software_using_gdal`"
 
-#: ../../source/about_no_title.rst:16
+#: ../../source/about_no_title.rst:20
 msgid ""
 "You may quote GDAL in publications by using the following Digital Object "
 "Identifier: |DOI|"

diff --git a/doc/source/locale/ja/LC_MESSAGES/about_no_title.mo b/doc/source/locale/ja/LC_MESSAGES/about_no_title.mo
diff --git a/doc/source/locale/ja/LC_MESSAGES/about_no_title.po b/doc/source/locale/ja/LC_MESSAGES/about_no_title.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GDAL \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-20 02:24+0900\n"
+"POT-Creation-Date: 2024-08-28 04:14+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Yoichi Kayama <[email protected]>\\nLanguage: ja\n"
 "Language-Team: ja <[email protected]>\n"
@@ -30,20 +30,22 @@ msgid ""
 msgstr ""
 "GDAL はラスターとベクターの空間データ形式をを変換するライブラリです。これは MIT スタイル :ref:`license` の "
 "オープンソースとして `Open Source Geospatial Foundation`_ から公開されています. "
-"ライブラリとしてのGDALはすべてのサポートする形式をアプリケーションから単一のラスタ抽象データモデル"
-"か単一のベクター抽象モデルとして利用する機能を提供しています。またGDALではデータ変換やデータ加工を"
-"するための多彩で便利なコマンドラインユーティリティを提供しています."
+"ライブラリとしてのGDALはすべてのサポートする形式をアプリケーションから単一のラスタ抽象データモデルか単一のベクター抽象モデルとして利用する機能を提供しています。またGDALではデータ変換やデータ加工をするための多彩で便利なコマンドラインユーティリティを提供しています."
 "  `NEWS`_ ページには 2024年 8月の GDAL/OGR 3.9.2 リリースについての情報があります."
 
+#: ../../source/about_no_title.rst:5
+msgid "|offline-download|"
+msgstr ""
+
 #: ../../source/about_no_title.rst:-1
 msgid "OSGeo project"
 msgstr "OSGeoプロジェクト"
 
-#: ../../source/about_no_title.rst:10
+#: ../../source/about_no_title.rst:14
 msgid "See :ref:`software_using_gdal`"
 msgstr "参照 :ref:`software_using_gdal`"
 
-#: ../../source/about_no_title.rst:16
+#: ../../source/about_no_title.rst:20
 msgid ""
 "You may quote GDAL in publications by using the following Digital Object "
 "Identifier: |DOI|"

diff --git a/doc/source/locale/ja/LC_MESSAGES/api/csharp/csharp_usage.mo b/doc/source/locale/ja/LC_MESSAGES/api/csharp/csharp_usage.mo
diff --git a/doc/source/locale/ja/LC_MESSAGES/api/gdal_utils.mo b/doc/source/locale/ja/LC_MESSAGES/api/gdal_utils.mo
diff --git a/doc/source/locale/ja/LC_MESSAGES/api/java/index.mo b/doc/source/locale/ja/LC_MESSAGES/api/java/index.mo