Re: GNOME release notes: don't include <figure> in <para>



Danilo, I'll let you decide whether to apply this string-freeze-breaking
patch, on behalf of translators.

On Fri, 2005-03-04 at 14:51 +0100, Luca Ferretti wrote:
> Hi
> 
> I'm translating the release notes in the Italian language: somewhere
> (rnapplets, rnapplications, rncontrolcenter, rnsysadmin and
> release-notes) there are something like
> 
>         <para> buzz buzzz buzz
>         
>         <figure> .... </figure>
>         </para>
>         
> This will produce in PO files, for example:
> 
>         #: ../rnapplets.xml:43
>         msgid ""
>         "GNOME 2.10 features an optional trashcan for your Panel. "
>         "Just like the trashcan on your desktop, you can now drag "
>         "and drop files and other items into the trash without "
>         "minimising your open windows. <figure id="
>         "\"rnscreenshot-applet-trash\"><placeholder-1/"
>         "><screenshot><mediaobject><imageobject><imagedata "
>         "fileref=\"&urlfiguresbase; figure-applet-trash.png\" format="
>         "\"PNG\"/></imageobject><textobject><phrase>Drag trash to your"
>         "panel</phrase></textobject></mediaobject></screenshot></figure>"
>         msgstr ""
>         
> forcing translators to edit the entire <figure> XML tree. Here is a
> patch (a very dirty patch, so take care to apply it; and please note I
> tested it only in Yelp, not in HTML generation) to convert XML sources
> in this format:
> 
>         <para>buzz buzz buzz</para>
>         <figure>
>           ...
>         </figure>
> 
> Those changes will produce in PO files something like:
> 
>         #: ../rnapplets.xml:43 <para>
>         msgid ""
>         "GNOME 2.10 features an optional trashcan for your Panel. "
>         "Just like the trashcan on your desktop, you can now drag "
>         "and drop files and other items into the trash without "
>         "minimising your open windows."
>         msgstr ""
>         
>         #: ../rnapplets.xml:47 <phrase>
>         msgid "Drag trash to your panel"
>         msgstr ""
> 
> This format is much more better for translators. Too late to apply?
> 
> Moreover it seems that localized xml files generated from the
> figure-inside-para format don't show (at least in Yelp 2.6) those
> figures. But I'm not sure about it and I've to test and check better
> localized XML files.
> 
> PS s/minimising/minimizing ?
> 
> -- 
> Luca Ferretti <elle uca libero it>
-- 
Murray Cumming
murrayc murrayc com
www.murrayc.com
www.openismus.com
diff -Naur 2.10rnotes/release-notes.xml 2.10rnotes-new/release-notes.xml
--- 2.10rnotes/release-notes.xml	2005-03-03 12:47:03.000000000 +0100
+++ 2.10rnotes-new/release-notes.xml	2005-03-04 14:14:01.190252392 +0100
@@ -17,7 +17,7 @@
 
     <abstract>
       <title>Introduction</title>
-      <para>
+
       <screenshot>
         <mediaobject>
           <imageobject><imagedata fileref="&urlfiguresbase;figure-gnome-desktop.png" format="PNG"/>
@@ -25,6 +25,7 @@
         <textobject><phrase>The GNOME Desktop</phrase></textobject>
       </mediaobject>
     </screenshot>
+    <para>
 The GNOME &version; Desktop is the latest release of the ever popular, multi-platform free desktop environment.</para>
 
       <para>The GNOME desktop releases continue to arrive on schedule. GNOME &version; includes a number of interesting new features and hundreds of bug fixes. This time GNOME also includes a video player and a CD-ripping utility. You can learn more in the following sections.</para>
diff -Naur 2.10rnotes/rnapplets.xml 2.10rnotes-new/rnapplets.xml
--- 2.10rnotes/rnapplets.xml	2005-03-03 12:47:04.000000000 +0100
+++ 2.10rnotes-new/rnapplets.xml	2005-03-04 13:11:56.000000000 +0100
@@ -22,6 +22,7 @@
   <title>Integrated Modem Control</title>
   <para>
    GNOME &version; introduces a new applet for controlling your Modem, integrated with GNOME System Tools.
+  </para>
 
    <figure id="rnscreenshot-applet-modem">
     <title>The new modem control applet</title>
@@ -34,7 +35,6 @@
     </screenshot>
   </figure>
    
-  </para>
   </sect3>
 
   <sect3 id="rnapplets-trash">
@@ -44,6 +44,7 @@
    GNOME &version; features an optional trashcan for your Panel.
    Just like the trashcan on your desktop, you can now drag and drop files and other items into the trash
    without minimising your open windows.
+  </para>
 
   <figure id="rnscreenshot-applet-trash">
     <title>a Trashcan on your Panel</title>
@@ -55,7 +56,7 @@
       </mediaobject>
     </screenshot>
   </figure>
-  </para>
+
   </sect3>
 
   <sect3 id="rnapplets-drivemount">
@@ -66,6 +67,7 @@
    Now the volume mounter applet helps you to use these volumes without the difficulty of finding their icons on the desktop, behind 
    your open windows. The applet shows the currently mounted (or unmountable) volumes, allowing 
    you to mount them, eject them, or open them in the file manager.
+  </para>
    
    <figure id="rnscreenshot-applet-drivemount">
     <title>Drive Mount</title>
@@ -78,7 +80,6 @@
     </screenshot>
   </figure>
   
-  </para>
   </sect3>
 
   <sect3 id="rnapplets-gweather">
@@ -87,6 +88,7 @@
    The weather monitor can now show even more locations then before, and the 
    location names have been translated into non-english languages where appropriate.
    In addition, the forecast now includes sunrise and sunset calculations for most locations.
+  </para>
 
    <figure id="rnscreenshot-applet-weather">
     <title>Weather Report</title>
@@ -99,7 +101,6 @@
     </screenshot>
   </figure>
    
-  </para>
   </sect3>
 
   <sect3 id="rnapplets-mixer">
@@ -112,6 +113,7 @@
    and a variety of third-party applications, so changing the GNOME volume 
    via the panel will change the volume of all these applications.
   </para>
+
    <figure id="rnscreenshot-applet-mixer">
     <title>all new mixer for your panel</title>
       <screenshot>
@@ -132,7 +134,7 @@
   <para>And sticky notes now stay on top other windows, so you can't lose them. To hide the notes,
    simply use the applet's right-click menu. 
   </para>
-  </sect3>
+
    <figure id="rnscreenshot-applet-stickies">
     <title>Sticky Notes</title>
       <screenshot>
@@ -143,6 +145,7 @@
       </mediaobject>
     </screenshot>
   </figure>
+  </sect3>
 
   <sect3 id="rnapplet-cpufreq">
   <title>Specially for laptops</title>
@@ -151,6 +154,8 @@
    Frequency Monitor watches variable-speed processors (such as those with 
    Intel Speedstep or AMD PowerNow) to show their current status. You may even choose 
    a different speed if you don't have automatic frequency scaling enabled.
+  </para>   
+
    <figure id="rnscreenshot-applet-cpufreq">
     <title>Monitor CPU Frequency Scaling</title>
       <screenshot>
@@ -161,7 +166,6 @@
       </mediaobject>
     </screenshot>
   </figure>
-  </para>
   </sect3>
 
   <sect3 id="rnapplet-removed">
diff -Naur 2.10rnotes/rnapplications.xml 2.10rnotes-new/rnapplications.xml
--- 2.10rnotes/rnapplications.xml	2005-03-03 12:47:04.000000000 +0100
+++ 2.10rnotes-new/rnapplications.xml	2005-03-04 13:15:19.000000000 +0100
@@ -11,7 +11,11 @@
     <title>Video Player</title>
    
    <para>
-   GNOME &version; now includes the popular Totem video player, using GNOME's GStreamer multimedia framework. Totem provides the intuitive user interface that GNOME users expect, with automatic hardware detection instead of complex configuration.
+   GNOME &version; now includes the popular Totem video player, using
+   GNOME's GStreamer multimedia framework. Totem provides the
+   intuitive user interface that GNOME users expect, with automatic
+   hardware detection instead of complex configuration.
+   </para>
  
    <figure id="rnscreenshot-totem">
       <title>The video player</title>
@@ -23,8 +27,6 @@
       </screenshot>
     </figure>
 
-   </para>    
-
   </sect3>
 
   <sect3 id="rnsoundjuicer">
@@ -32,6 +34,7 @@
    
    <para>
    The much-loved Sound Juicer "CD ripper" easily extracts audio from CDs for later playback on your PC or portable music player. Thanks to automatic downloading of song titles, you won't need to click more than a couple of buttons.
+   </para>
    
    <figure id="rnscreenshot-soundjuicer">
       <title>The audio extractor</title>
@@ -43,8 +46,6 @@
       </screenshot>
     </figure>
 
-   </para>    
-
   </sect3>
 
   <sect3 id="rnbrowser">
@@ -59,7 +60,6 @@
     </itemizedlist>
     </para>
    
-    <para>
     <figure id="rnscreenshot-epiphany">
       <title>The web browser</title>
         <screenshot>
@@ -69,7 +69,6 @@
         </mediaobject>
       </screenshot>
     </figure>
-    </para>
 
   </sect3>
 
@@ -110,7 +109,6 @@
      </itemizedlist>
    </para>
 
-   <para>
    <figure id="rnscreenshot-evolution-mail">
       <title>The email client</title>
       <screenshot>
@@ -121,8 +119,6 @@
       </screenshot>
     </figure>
 
-   </para>    
-
   </sect3>
 
   <sect3 id="rngnomemeeting">
@@ -132,7 +128,12 @@
     In GNOME &version; the address book is now shared with our Evolution email client, so you don't need to enter 
     contact information in more than one place.
     </para>
-    <para>Now you can even browse for other Gnome Meeting users on your local network without discovering their contact details first. And you can view your own video output side by side with the video from your conversation partner, so you see what they see.
+    <para>Now you can even browse for other Gnome Meeting users on
+    your local network without discovering their contact details
+    first. And you can view your own video output side by side with
+    the video from your conversation partner, so you see what they
+    see.
+    </para>
 
     <figure id="rnscreenshot-gnomemeeting">
       <title>The internet telephony and video conferencing client</title>
@@ -144,8 +145,6 @@
       </screenshot>
     </figure>
 
-    </para>
-
   </sect3>
 
   
diff -Naur 2.10rnotes/rncontrolcenter.xml 2.10rnotes-new/rncontrolcenter.xml
--- 2.10rnotes/rncontrolcenter.xml	2005-03-03 12:47:04.000000000 +0100
+++ 2.10rnotes-new/rncontrolcenter.xml	2005-03-04 13:18:37.000000000 +0100
@@ -12,6 +12,7 @@
 
     <para>Selecting a keyboard layout is now simpler with the Keyboard control panel. Just click Add to choose from a list 
 of international keyboard layouts. Before making your choice you can see the effect of key presses in the layout preview. The Layout Options section has also been reorganized as a simpler list of choices.
+    </para>
 
     <figure id="rnscreenshot-controlpanel-keyboardlayouts">
       <title>Keyboard Preferences - Layouts</title>
@@ -23,7 +24,6 @@
         </mediaobject>
       </screenshot>
     </figure>
-    </para>
 
   </sect3>
 
diff -Naur 2.10rnotes/rnsysadmin.xml 2.10rnotes-new/rnsysadmin.xml
--- 2.10rnotes/rnsysadmin.xml	2005-02-21 14:52:31.000000000 +0100
+++ 2.10rnotes-new/rnsysadmin.xml	2005-03-04 13:20:35.000000000 +0100
@@ -29,7 +29,6 @@
     </itemizedlist>
     </para>
    
-    <para>
     <figure id="rnscreenshot-sysadmin-systemtools">
       <title>The Clock, Network, and Users/Groups tools</title>
         <screenshot>
@@ -40,7 +39,7 @@
         </mediaobject>
       </screenshot>
     </figure>
-    </para>
+
     </sect3>
 
     <sect3 id="rnsysadmin-logviewer">
@@ -53,6 +52,7 @@
       <listitem><para>Open archived logs and logs on networked drives.</para></listitem>
       <listitem><para>Copy logs to the clipboard.</para></listitem>
     </itemizedlist>
+    </para>
 
     <figure id="rnscreenshot-sysadmin-logviewer">
       <title>The Log Viewer</title>
@@ -64,7 +64,7 @@
         </mediaobject>
       </screenshot>
     </figure>
-    </para>
+
     </sect3>
 
  
diff -Naur 2.10rnotes/rnutilities.xml 2.10rnotes-new/rnutilities.xml
--- 2.10rnotes/rnutilities.xml	2005-03-03 12:47:04.000000000 +0100
+++ 2.10rnotes-new/rnutilities.xml	2005-03-04 13:16:22.000000000 +0100
@@ -15,6 +15,7 @@
     <para>The GNOME text editor can now highlight the current line and when editing program source code, it highlights matching braces. Spell checking is improved too. It now only highlights mispelled words when you have actually finished typing the word, and many extra languages are supported and automatically identified.</para>
 
    <para>Many people will be glad to see that it no longer suggests saving changes when all changes have actually been undone. And in addition it even starts faster than previous versions.
+   </para>
 
     <figure id="rnscreenshot-gedit">
     <title>Text Editor</title>
@@ -25,7 +26,6 @@
         </mediaobject>
       </screenshot>
     </figure>
-    </para>
 
   </sect3>
 
@@ -33,6 +33,7 @@
     <title>Archive Manager</title>
 
     <para>The GNOME archive manager can now open more types of archive, including AR, Debian, and 7-zip archives, and password-protected RAR archives. And if you use the single-click preference in the file manager, then the archive manager will now use single clicks too.
+    </para>
 
     <figure id="rnscreenshot-fileroller">
     <title>Archive Manager</title>
@@ -43,7 +44,6 @@
         </mediaobject>
       </screenshot>
     </figure>
-    </para>
 
   </sect3>
 
@@ -52,6 +52,7 @@
     <title>Dictionary</title>
 
     <para>The GNOME Dictionary now suggests words when you aren't sure how to spell something. The definitions also contain links to external dictionary web sites, and the definitions can be printed.
+    </para>
 
     <figure id="rnscreenshot-dictionary">
     <title>Dictionary</title>
@@ -62,7 +63,6 @@
         </mediaobject>
       </screenshot>
     </figure>
-    </para>
 
   </sect3>
 
@@ -70,6 +70,7 @@
     <title>Floppy Formatter</title>
 
     <para>The GNOME Floppy Formatter utility now supports removable drives, such as USB drives, using the standard HAL system from freedesktop.org.
+    </para>
 
     <figure id="rnscreenshot-floppy">
     <title>Floppy Formatter</title>
@@ -80,7 +81,6 @@
         </mediaobject>
       </screenshot>
     </figure>
-    </para>
 
   </sect3>
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]