2.2.0-beta1 : Layer notes as tooltip

aeag · Aug 23, 2024 · ba0b3e0 · ba0b3e0
1 parent 17a3dc3
commit ba0b3e0
Show file tree

Hide file tree

Showing 8 changed files with 358 additions and 153 deletions.
diff --git a/menu_from_project/i18n/fr.qm b/menu_from_project/i18n/fr.qm
diff --git a/menu_from_project/i18n/fr.ts b/menu_from_project/i18n/fr.ts
@@ -89,35 +89,30 @@
         <translation>Options</translation>
     </message>
     <message>
-        <location filename="../ui/menu_conf_dlg.py" line="72"/>
+        <location filename="../ui/menu_conf_dlg.py" line="68"/>
         <source>New menu</source>
         <translation>Nouveau menu</translation>
     </message>
     <message>
-        <location filename="../ui/menu_conf_dlg.py" line="76"/>
+        <location filename="../ui/menu_conf_dlg.py" line="72"/>
         <source>Add layer menu</source>
         <translation>Ajouter une couche</translation>
     </message>
     <message>
-        <location filename="../ui/menu_conf_dlg.py" line="80"/>
+        <location filename="../ui/menu_conf_dlg.py" line="76"/>
         <source>Merge with previous</source>
         <translation>Intégrer dans le précédent</translation>
     </message>
     <message>
-        <location filename="../ui/conf_dialog.ui" line="381"/>
+        <location filename="../ui/conf_dialog.ui" line="391"/>
         <source>OGC QGis Server metadata</source>
         <translation>métadonnées OGC QGis server</translation>
     </message>
     <message>
-        <location filename="../ui/conf_dialog.ui" line="397"/>
+        <location filename="../ui/conf_dialog.ui" line="428"/>
         <source>Layer metadata</source>
         <translation>métadonnées de la couche</translation>
     </message>
-    <message>
-        <location filename="../ui/conf_dialog.ui" line="362"/>
-        <source>Show title &amp;&amp; abstract in tooltip. Priority to :</source>
-        <translation>Afficher titre et résumé en info bulle. En priorité :</translation>
-    </message>
     <message>
         <location filename="../ui/conf_dialog.ui" line="345"/>
         <source>Opens with layer, layers linked by &apos;relations&apos; or joins.</source>
@@ -128,67 +123,112 @@
         <source>Also load linked layers.</source>
         <translation>Ouvrir aussi les couches liées.</translation>
     </message>
+    <message>
+        <location filename="../ui/conf_dialog.ui" line="362"/>
+        <source>Show title &amp;&amp; abstract in tooltip - click to move the item to the first position</source>
+        <translation type="unfinished">Afficher titre et résumé en info bulle. Cliquer sur un item...</translation>
+    </message>
+    <message>
+        <location filename="../ui/conf_dialog.ui" line="365"/>
+        <source>Tooltip. Priority to :</source>
+        <translation>Info bulle. En priorité :</translation>
+    </message>
+    <message>
+        <location filename="../ui/conf_dialog.ui" line="384"/>
+        <source>1 :</source>
+        <translation>1 :</translation>
+    </message>
+    <message>
+        <location filename="../ui/conf_dialog.ui" line="416"/>
+        <source>2 :</source>
+        <translation>2 :</translation>
+    </message>
+    <message>
+        <location filename="../ui/conf_dialog.ui" line="444"/>
+        <source>3 :</source>
+        <translation>3 :</translation>
+    </message>
+    <message>
+        <location filename="../ui/conf_dialog.ui" line="456"/>
+        <source>Layer notes</source>
+        <translation>Notes de couche</translation>
+    </message>
 </context>
 <context>
     <name>MenuConfDialog</name>
     <message>
-        <location filename="../ui/menu_conf_dlg.py" line="108"/>
+        <location filename="../ui/menu_conf_dlg.py" line="98"/>
         <source>Add from file</source>
         <translation>Fichier QGS/QGZ</translation>
     </message>
     <message>
-        <location filename="../ui/menu_conf_dlg.py" line="113"/>
+        <location filename="../ui/menu_conf_dlg.py" line="103"/>
         <source>Add from PostgreSQL database</source>
         <translation>Base de données PostgreSQL</translation>
     </message>
     <message>
-        <location filename="../ui/menu_conf_dlg.py" line="118"/>
+        <location filename="../ui/menu_conf_dlg.py" line="108"/>
         <source>Add from URL</source>
         <translation>Serveur HTTP</translation>
     </message>
     <message>
-        <location filename="../ui/menu_conf_dlg.py" line="372"/>
+        <location filename="../ui/menu_conf_dlg.py" line="342"/>
         <source>Use project title</source>
         <translation>Utiliser le titre du projet</translation>
     </message>
     <message>
-        <location filename="../ui/menu_conf_dlg.py" line="593"/>
+        <location filename="../ui/menu_conf_dlg.py" line="541"/>
         <source>Edit this project</source>
         <translation>Modifier la source</translation>
     </message>
     <message>
-        <location filename="../ui/menu_conf_dlg.py" line="279"/>
+        <location filename="../ui/menu_conf_dlg.py" line="253"/>
         <source>No HTTP Browser, simply paste your URL into the &apos;project&apos; column.</source>
         <translation>Copiez simplement l&apos;url du projet dans la cellule &apos;projet QGis&apos;.</translation>
     </message>
 </context>
 <context>
     <name>MenuFromProject</name>
     <message>
-        <location filename="../menu_from_project.py" line="1073"/>
+        <location filename="../menu_from_project.py" line="1048"/>
         <source>Load all</source>
         <translation>Tout ajouter</translation>
     </message>
     <message>
-        <location filename="../menu_from_project.py" line="683"/>
+        <location filename="../menu_from_project.py" line="696"/>
         <source>Projects configuration</source>
         <translation>Configurer les projets</translation>
     </message>
     <message>
-        <location filename="../menu_from_project.py" line="698"/>
+        <location filename="../menu_from_project.py" line="707"/>
         <source>Help</source>
         <translation>Aide</translation>
     </message>
+    <message>
+        <location filename="../menu_from_project.py" line="204"/>
+        <source>QGis Server metadata</source>
+        <translation>QGis server</translation>
+    </message>
+    <message>
+        <location filename="../menu_from_project.py" line="205"/>
+        <source>Layer Metadata</source>
+        <translation>Méta-données de la couche</translation>
+    </message>
+    <message>
+        <location filename="../menu_from_project.py" line="206"/>
+        <source>Layer Notes</source>
+        <translation>Notes de couche</translation>
+    </message>
 </context>
 <context>
     <name>menu_from_project</name>
     <message>
-        <location filename="../ui/menu_conf_dlg.py" line="244"/>
+        <location filename="../ui/menu_conf_dlg.py" line="222"/>
         <source>Projects configuration</source>
         <translation>Configurer les projets</translation>
     </message>
     <message>
-        <location filename="../ui/menu_conf_dlg.py" line="244"/>
+        <location filename="../ui/menu_conf_dlg.py" line="222"/>
         <source>QGIS projects (*.qgs *.qgz)</source>
         <translation>Projets QGIS (*.qgs *.qgz)</translation>
     </message>

diff --git a/menu_from_project/i18n/ja.qm b/menu_from_project/i18n/ja.qm
diff --git a/menu_from_project/i18n/ja.ts b/menu_from_project/i18n/ja.ts
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="2.0" language="ja_JP" sourcelanguage="en_EN">
+<!DOCTYPE TS>
+<TS version="2.1" language="ja_JP" sourcelanguage="en">
 <context>
     <name>ConfDialog</name>
     <message>
@@ -88,106 +89,146 @@
         <translation>グループを作成</translation>
     </message>
     <message>
-        <location filename="../ui/conf_dialog.ui" line="362"/>
-        <source>Show title &amp;&amp; abstract in tooltip. Priority to :</source>
-        <translation>タイトルと抄録をツールチップに表示する。優先順位：</translation>
-    </message>
-    <message>
-        <location filename="../ui/conf_dialog.ui" line="381"/>
+        <location filename="../ui/conf_dialog.ui" line="391"/>
         <source>OGC QGis Server metadata</source>
-        <translation>OGC QGisサーバーメタデータ</translation>
+        <translation>サーバーメタデータ</translation>
     </message>
     <message>
-        <location filename="../ui/conf_dialog.ui" line="397"/>
+        <location filename="../ui/conf_dialog.ui" line="428"/>
         <source>Layer metadata</source>
         <translation>レイヤメタデータ</translation>
     </message>
     <message>
-        <location filename="../ui/menu_conf_dlg.py" line="72"/>
+        <location filename="../ui/menu_conf_dlg.py" line="68"/>
         <source>New menu</source>
         <translation>新規メニュー</translation>
     </message>
     <message>
-        <location filename="../ui/menu_conf_dlg.py" line="76"/>
+        <location filename="../ui/menu_conf_dlg.py" line="72"/>
         <source>Add layer menu</source>
         <translation>レイヤメニューを追加</translation>
     </message>
     <message>
-        <location filename="../ui/menu_conf_dlg.py" line="80"/>
+        <location filename="../ui/menu_conf_dlg.py" line="76"/>
         <source>Merge with previous</source>
         <translation>従来のものと統合</translation>
     </message>
     <message>
         <location filename="../ui/conf_dialog.ui" line="345"/>
         <source>Opens with layer, layers linked by &apos;relations&apos; or joins.</source>
-        <translation type="unfinished"></translation>
+        <translation>レイヤー、関係または結合によってリンクされたレイヤーとともに開きます。</translation>
+    </message>
+    <message>
+        <location filename="../ui/conf_dialog.ui" line="362"/>
+        <source>Show title &amp;&amp; abstract in tooltip - click to move the item to the first position</source>
+        <translation>ツールチップにタイトルと概要を表示 - クリックすると項目が最初の位置に移動します</translation>
+    </message>
+    <message>
+        <location filename="../ui/conf_dialog.ui" line="365"/>
+        <source>Tooltip. Priority to :</source>
+        <translation>ツールチップ。優先度:</translation>
+    </message>
+    <message>
+        <location filename="../ui/conf_dialog.ui" line="456"/>
+        <source>Layer notes</source>
+        <translation>レイヤーノート</translation>
     </message>
     <message>
         <location filename="../ui/conf_dialog.ui" line="348"/>
         <source>Also load linked layers.</source>
-        <translation type="unfinished"></translation>
+        <translation>リンクされたレイヤーも読み込みます。</translation>
+    </message>
+    <message>
+        <location filename="../ui/conf_dialog.ui" line="384"/>
+        <source>1 :</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/conf_dialog.ui" line="416"/>
+        <source>2 :</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/conf_dialog.ui" line="444"/>
+        <source>3 :</source>
+        <translation></translation>
     </message>
 </context>
 <context>
     <name>MenuConfDialog</name>
     <message>
-        <location filename="../ui/menu_conf_dlg.py" line="108"/>
+        <location filename="../ui/menu_conf_dlg.py" line="98"/>
         <source>Add from file</source>
         <translation>ファイルから追加</translation>
     </message>
     <message>
-        <location filename="../ui/menu_conf_dlg.py" line="113"/>
+        <location filename="../ui/menu_conf_dlg.py" line="103"/>
         <source>Add from PostgreSQL database</source>
         <translation>PostgreSQLデータベースから追加</translation>
     </message>
     <message>
-        <location filename="../ui/menu_conf_dlg.py" line="118"/>
+        <location filename="../ui/menu_conf_dlg.py" line="108"/>
         <source>Add from URL</source>
         <translation>URLから追加</translation>
     </message>
     <message>
-        <location filename="../ui/menu_conf_dlg.py" line="372"/>
+        <location filename="../ui/menu_conf_dlg.py" line="342"/>
         <source>Use project title</source>
         <translation>プロジェクトのタイトルを使用</translation>
     </message>
     <message>
-        <location filename="../ui/menu_conf_dlg.py" line="279"/>
+        <location filename="../ui/menu_conf_dlg.py" line="253"/>
         <source>No HTTP Browser, simply paste your URL into the &apos;project&apos; column.</source>
         <translation>HTTPブラウザを使わず、「プロジェクト」欄にURLを貼り付ける。</translation>
     </message>
     <message>
-        <location filename="../ui/menu_conf_dlg.py" line="593"/>
+        <location filename="../ui/menu_conf_dlg.py" line="541"/>
         <source>Edit this project</source>
         <translation>このプロジェクトを編集</translation>
     </message>
 </context>
 <context>
     <name>MenuFromProject</name>
     <message>
-        <location filename="../menu_from_project.py" line="1073"/>
+        <location filename="../menu_from_project.py" line="1048"/>
         <source>Load all</source>
         <translation>すべてを読み込む</translation>
     </message>
     <message>
-        <location filename="../menu_from_project.py" line="683"/>
+        <location filename="../menu_from_project.py" line="696"/>
         <source>Projects configuration</source>
         <translation>プロジェクトのコンフィグ</translation>
     </message>
     <message>
-        <location filename="../menu_from_project.py" line="698"/>
+        <location filename="../menu_from_project.py" line="707"/>
         <source>Help</source>
         <translation>ヘルプ</translation>
     </message>
+    <message>
+        <location filename="../menu_from_project.py" line="204"/>
+        <source>QGis Server metadata</source>
+        <translation>サーバーメタデータ</translation>
+    </message>
+    <message>
+        <location filename="../menu_from_project.py" line="205"/>
+        <source>Layer Metadata</source>
+        <translation>レイヤメタデータ</translation>
+    </message>
+    <message>
+        <location filename="../menu_from_project.py" line="206"/>
+        <source>Layer Notes</source>
+        <translation>レイヤーノート</translation>
+    </message>
 </context>
 <context>
     <name>menu_from_project</name>
     <message>
-        <location filename="../ui/menu_conf_dlg.py" line="244"/>
+        <location filename="../ui/menu_conf_dlg.py" line="222"/>
         <source>Projects configuration</source>
         <translation>プロジェクトのコンフィグ</translation>
     </message>
     <message>
-        <location filename="../ui/menu_conf_dlg.py" line="244"/>
+        <location filename="../ui/menu_conf_dlg.py" line="222"/>
         <source>QGIS projects (*.qgs *.qgz)</source>
         <translation>QGISプロジェクト(*.qgs *.qgz)</translation>
     </message>