Merge branch 'gtk4-port'

7 files changed, 37 insertions, 82 deletions

diff --git a/help/C/l10n.txt b/help/C/l10n.txt
index f03a73f..d91b277 100755..100644
--- a/help/C/l10n.txt
+++ b/help/C/l10n.txt
@@ -1,16 +1,6 @@
-Zenity Manual V2.0
-
-------------------------
-SUMMARY OF CHANGES
-------------------------
-
-Created by: Breda McColgan
-Date: July 2004
-Manual version: 2.0
-
-------------------------
-SCREENSHOT INSTRUCTIONS
-------------------------
+---------------------------------------
+SCREENSHOT INSTRUCTIONS FOR TRANSLATORS
+---------------------------------------
 
 To create the screenshots, perform the following steps:
 1. Create a directory called /tmp/l10n_scripts.
@@ -37,7 +27,6 @@ zenity-entry-screenshot.png
 <script-name> = text_entry.sh
 
 
-
 zenity-error-screenshot.png
 ===========================
 
@@ -62,6 +51,18 @@ zenity-list-screenshot.png
 <script-name> = list.sh
 
 
+zenity-notification-screenshot.png
+==========================
+
+<script-name> = notification.sh
+
+
+zenity-notification-listen-screenshot.png
+==========================
+
+<script-name> = notification-listen.sh
+
+
 zenity-progress-screenshot.png
 ==============================
 
@@ -78,8 +79,8 @@ zenity-text-screenshot.png
 ==========================
 
 <script-name> = text_info.sh
-Select cvs.txt from the File Selector dialog.
-Resize the window so that only the text appears -- no blank space.
+Before running, be prepared to open a text file of your choice (traditionally,
+COPYING has been used).
 
 
 zenity-warning-screenshot.png
diff --git a/help/C/l10n_scripts/cvs.txt b/help/C/l10n_scripts/cvs.txt
deleted file mode 100755
index f470f66..0000000
--- a/help/C/l10n_scripts/cvs.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-Getting the most out of CVS in GNOME
-====================================
-
-Introductory Beginnings-
-
-Current Versions System, CVS, is a powerful
-method of allowing many developers
-to work on the same source code. It is used
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-                                                                                                     
diff --git a/help/C/l10n_scripts/notification-listen.sh b/help/C/l10n_scripts/notification-listen.sh
new file mode 100755
index 0000000..d773a89
--- /dev/null
+++ b/help/C/l10n_scripts/notification-listen.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+cat << EOH| zenity --notification --listen
+message: this is the message text
+EOH
diff --git a/help/C/l10n_scripts/notification.sh b/help/C/l10n_scripts/notification.sh
index b7de9ab..fe5e482 100755
--- a/help/C/l10n_scripts/notification.sh
+++ b/help/C/l10n_scripts/notification.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
                                                                                                                                                              
-/gnome/head/cvs/zenity/src/zenity --notification \
---window-icon="info" \
+zenity --notification \
 --text="There are system updates necessary!"
diff --git a/help/C/notification.page b/help/C/notification.page
index f7ff3c9..d458133 100644
--- a/help/C/notification.page
+++ b/help/C/notification.page
@@ -7,7 +7,7 @@
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
   </info>
   <title>Notification Icon</title>
-    <p>Use the <cmd>--notification</cmd> option to create a notification icon.</p>
+    <p>Use the <cmd>--notification</cmd> option to create a passive desktop notification.</p>
 
   <terms>
     <item>
@@ -15,11 +15,20 @@
       <p>Specifies the text that is displayed in the notification area.</p>
     </item>
     <item>
-      <title><cmd>--listen</cmd>=icon: '<var>text</var>', message: '<var>text</var>', tooltip: '<var>text</var>', visible: '<var>text</var>',</title>
+      <title><cmd>--icon</cmd>=<var>path</var></title>
+      <p>Set the notification icon using a string containing a path to a valid icon on the system.</p>
+    </item>
+    <item>
+      <title><cmd>--listen</cmd></title>
       <p>Listens for commands at standard input. At least one command must be specified. Commands are comma separated. A command must be followed by a colon and a value. </p>
       <note style="tip">
-        <p>The <cmd>icon</cmd> command also accepts four stock icon values such as <var>error</var>, <var>info</var>, <var>question</var> and <var>warning</var>.</p>
+        <p>The <cmd>icon</cmd> command also accepts icon theme name values in accordance with the FreeDesktop.org Icon Naming Specification such as <var>dialog-error</var>, <var>dialog-info</var>, <var>security-high</var> and <var>starred</var>.</p>
       </note>
+      <p>Examples include:</p>
+      <code>
+      message: Hello, my name is Joe
+      icon: /usr/share/pixmaps/monitor.xpm
+      </code>
     </item>
   </terms>
 
@@ -27,8 +36,8 @@
   <code>
   #!/bin/sh
 
-  zenity --notification\
-    --window-icon="info" \
+  zenity --notification \
+    --icon="/usr/share/pixmaps/monitor.xpm" \
     --text="There are system updates necessary!"
   </code>
 
diff --git a/help/C/usage.page b/help/C/usage.page
index 8aa88cc..c219eed 100644
--- a/help/C/usage.page
+++ b/help/C/usage.page
@@ -121,14 +121,6 @@
       </item>
 
       <item>
-        <title><cmd>--window-icon</cmd>=<var>icon_path</var></title>
-	<p>Specifies the icon that is displayed in the window frame of the dialog. There are
-	      4 stock icons also available by providing the following keywords - 'info', 'warning', 'question' and
-	      'error'.
-        </p>
-      </item>
-
-      <item>
         <title><cmd>--width</cmd>=<var>width</var></title>
 	<p>Specifies the width of the dialog.</p>
       </item>
diff --git a/help/ChangeLog b/help/ChangeLog.pre-git
index e8b8ee5..e8b8ee5 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog.pre-git