GNOME.org
 

gimp-help-2 r2700 - in trunk: . images/fr/using src/concepts stylesheets

Author: ulfehlert
Date: Fri Jan 23 13:05:38 2009
New Revision: 2700
URL: http://svn.gnome.org/viewvc/gimp-help-2?rev=2700&view=rev

Log:
2009-01-23  Ulf-D. Ehlert  <ulfehlert svn gnome org>

	* images/fr/using/colormanagement-workflow1.png: removed, this image
	  was just a copy of the English file; bug #564737 is still open

	* src/concepts/intro.xml: changed MS Windows command-line example
	  according to a bugfix provided by Michael Schumacher (bug #568420)

	* stylesheets/gimp-help-draft.css: added background color as fallback

	* Makefile.GNU: fixed missing images for html previews; fixed call with
	  multiple compendium files
	* Makefile.am: fixed missing images for html previews; added code for
	  using msgmerge's "--compendium" feature


Removed:
   trunk/images/fr/using/colormanagement-workflow1.png
Modified:
   trunk/ChangeLog
   trunk/Makefile.GNU
   trunk/Makefile.am
   trunk/src/concepts/intro.xml
   trunk/stylesheets/gimp-help-draft.css

Modified: trunk/Makefile.GNU
==============================================================================
--- trunk/Makefile.GNU	(original)
+++ trunk/Makefile.GNU	Fri Jan 23 13:05:38 2009
@@ -166,7 +166,7 @@
 #     $2 - translation language
 #     $3 - output PO file
 pot2po = if [ -s $(3) ]; then \
-             with_compendium=$(shell $(call get_compendium,$3)); \
+             with_compendium="$(shell $(call get_compendium,$3))"; \
              tmpfile=$(3).tmp; \
              $(MSGFMT)   $(MSGFMTFLAGS)   $(3); \
              $(MSGMERGE) $(MSGMERGEFLAGS) $${with_compendium} $(3) $(1) \
@@ -472,7 +472,7 @@
 	test -n "$${id}" || id=noname; \
 	lang=$(shell echo $< | sed -e 's,^xml/,,; s,/.*,,'); \
 	destdir=html/$${lang}; \
-	$(mkdir_p) $${destdir}; \
+	test -d $${destdir}/images || $(RMAKE) $${destdir}/images; \
 	cp -f $(srcdir)/stylesheets/*.css $(srcdir)/stylesheets/$${lang}/*.css\
 	    $${destdir} 2>/dev/null; \
 	if [ "$${lang}" = "no" ]; then lang="nn"; fi; \
@@ -494,14 +494,14 @@
 preview-po/%.po: preview-xml/%.xml ;
 else
 preview-po/%.po: preview-xml/%.xml
-	$(cmd) if type xdg-open >/dev/null 2>&1; then \
+	$(cmd) if type "$(XDGOPEN)" >/dev/null 2>&1; then \
 		xml=$(shell echo $< | sed -e 's|preview-||'); \
 		lang=`echo $${xml} | sed -e 's,^xml/,,; s,/.*,,'`; \
 		id=`sed -e 's/.*id=.//; tmatch; d; \
 		            :match; s/["'"'"'].*//; q' $${xml}`; \
 		test -n "$${id}" || id=noname; \
 		destfile="html/$${lang}/$${id}-draft.html"; \
-		test -e $${destfile} && xdg-open $${destfile}; \
+		test -e $${destfile} && $(XDGOPEN) $${destfile}; \
 	fi
 endif
 

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Fri Jan 23 13:05:38 2009
@@ -226,8 +226,7 @@
           | $(MSGCAT) $(MSGCATFLAGS) - > "$(2)") 2>&1 \
           | $(SED) -e '/image file .* not found/d'
 
-# Merge template (pot) and message catalog (po)
-# or create a new catalog
+# Merge template (pot) and message catalog (po) or create a new catalog
 #
 # Usage:
 #     $(call pot2po,pot-file,language,po-file)
@@ -235,11 +234,11 @@
 #     $1 - input POT file
 #     $2 - translation language
 #     $3 - output PO file
-# TODO: include compendium (cf. "info msgmerge")
 pot2po = if [ -s $(3) ]; then \
+             with_compendium="$(shell $(call get_compendium,$3))"; \
              tmpfile=$(3).tmp; \
              $(MSGFMT)   $(MSGFMTFLAGS)   $(3); \
-             $(MSGMERGE) $(MSGMERGEFLAGS) $(3) $(1) \
+             $(MSGMERGE) $(MSGMERGEFLAGS) $${with_compendium} $(3) $(1) \
              > $${tmpfile}; \
              test -s  $${tmpfile} && mv -f $${tmpfile} $(3) || rm -f $${tmpfile}; \
          else \
@@ -267,12 +266,29 @@
 
 #--------------------------------------------------------------#
 #       Helper functions                                       #
+#                                                              #
+#       (special thanks to automake for resorting - of         #
+#       course you know it better than any human author!)      #
 #--------------------------------------------------------------#
 
 make_target_dir = f=$(1); d=$${f%/*}; test -d $$d || $(MKDIR_P) $$d
 
 copy = $(LN_S) $(abs_srcdir)/$(1) $(2)
 
+# HIDE FROM AUTOMAKE #ifneq ($(COMPENDIUM),"")
+# HIDE FROM AUTOMAKE #get_compendium = \
+# HIDE FROM AUTOMAKE #	dir="$(1)"; dir=$${dir%/*}; \
+# HIDE FROM AUTOMAKE #	while test "$${dir}" != "po"; do \
+# HIDE FROM AUTOMAKE #		if test -f $${dir}/$(COMPENDIUM); then \
+# HIDE FROM AUTOMAKE #			opt="$${opt} --compendium=$${dir}/$(COMPENDIUM)"; \
+# HIDE FROM AUTOMAKE #		fi; \
+# HIDE FROM AUTOMAKE #		dir="$${dir%/*}"; \
+# HIDE FROM AUTOMAKE #	done; \
+# HIDE FROM AUTOMAKE #	if test -n "$${opt}"; then echo $${opt}; fi
+# HIDE FROM AUTOMAKE #else
+# HIDE FROM AUTOMAKE #get_compendium =
+# HIDE FROM AUTOMAKE #endif
+
 
 ########################################################################
 ####            Make pot files:  XML(en) --> POT                    ####
@@ -567,7 +583,7 @@
 	test -n "$${id}" || id=noname; \
 	lang=$(shell echo $< | sed -e 's,^xml/,,; s,/.*,,'); \
 	destdir=html/$${lang}; \
-	$(mkdir_p) $${destdir}; \
+	test -d $${destdir}/images || $(RMAKE) $${destdir}/images; \
 	cp -f $(srcdir)/stylesheets/*.css $(srcdir)/stylesheets/$${lang}/*.css\
 	    $${destdir} 2>/dev/null; \
 	if [ "$${lang}" = "no" ]; then lang="nn"; fi; \

Modified: trunk/src/concepts/intro.xml
==============================================================================
--- trunk/src/concepts/intro.xml	(original)
+++ trunk/src/concepts/intro.xml	Fri Jan 23 13:05:38 2009
@@ -9,18 +9,7 @@
   2005-12-16: made valid docbook and reviewed by lexa
 -->
 <sect1 id="gimp-concepts-running">
-  <sect1info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-12-29</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info>
-  <title>
-    <phrase>Running GIMP</phrase>
-  </title>
+  <title>Running GIMP</title>
   <indexterm>
     <primary>Running GIMP</primary>
   </indexterm>
@@ -28,7 +17,7 @@
     Most often, you start GIMP either by clicking on an icon (if your system
     is set up to provide you with one), or by typing <command>gimp</command>
     on a command line. If you have multiple versions of GIMP installed,
-    you may need to type <command>gimp-2.4</command>
+    you may need to type <command>gimp-2.6</command>
     to get the latest version. You can, if you want, give a list of image
     files on the command line after the program name, and they will
     automatically be opened by GIMP as it starts. It is also possible, though,
@@ -40,9 +29,7 @@
     it to start automatically when icons for them are double-clicked.
   </para>
   <sect2 id="introduction-platforms">
-    <title>
-      <phrase>Known Platforms</phrase>
-    </title>
+    <title>Known Platforms</title>
     <para>
       The <acronym>GIMP</acronym> is the most widely supported image
       manipulation available today. The platforms that The
@@ -68,9 +55,7 @@
     </para>
   </sect2>
   <sect2 id="gimp-concepts-running-language">
-    <title>
-      <phrase>Language</phrase>
-    </title>
+    <title>Language</title>
     <indexterm>
       <primary>Languages</primary>
     </indexterm>
@@ -96,7 +81,13 @@
       <varlistentry>
         <term>Windows XP</term>
         <listitem>
-          <para><menuchoice><guimenu>Control Panel</guimenu><guisubmenu>System</guisubmenu><guisubmenu>Advanced</guisubmenu><guimenuitem>Environment</guimenuitem></menuchoice>
+          <para>
+            <menuchoice>
+              <guimenu>Control Panel</guimenu>
+              <guisubmenu>System</guisubmenu>
+              <guisubmenu>Advanced</guisubmenu>
+              <guimenuitem>Environment</guimenuitem>
+            </menuchoice>
             button in <quote>System Variables</quote> area:
             <guibutton>Add</guibutton> button: Enter LANG for Name and fr or
             de... for Value. Watch out! You have to click on three successive
@@ -105,11 +96,12 @@
           <para>
             If you often change language, you can create a batch file. Open
             NotePad. Type the following commands (for french for instance):
-            <literallayout>
-              set lang=fr
-              cd c:\Program Files\GIMP-2.0\bin
-              GIMP-2.4.exe
-            </literallayout>
+            <userinput>
+              <literallayout>
+                set lang=fr
+                start gimp-2.6.exe
+              </literallayout>
+            </userinput>
             Save this file as GIMP-FR.BAT (or another name, but always with a
             .BAT extension). Create shortcut and drag it to your desktop.
           </para>
@@ -140,9 +132,7 @@
     </variablelist>
   </sect2>
   <sect2 id="gimp-concepts-running-command-line">
-    <title>
-      <phrase>Command Line Arguments</phrase>
-    </title>
+    <title>Command Line Arguments</title>
     <indexterm>
       <primary>Command line Arguments</primary>
     </indexterm>
@@ -156,7 +146,7 @@
     <para>
       To use the command line options, you have to put them in the command
       line which you use to start GIMP as
-      <command>gimp-2.4 [OPTION...] [FILE|URI...]</command>.
+      <command>gimp-2.6 [OPTION...] [FILE|URI...]</command>.
     </para>
     <variablelist>
       <varlistentry>

Modified: trunk/stylesheets/gimp-help-draft.css
==============================================================================
--- trunk/stylesheets/gimp-help-draft.css	(original)
+++ trunk/stylesheets/gimp-help-draft.css	Fri Jan 23 13:05:38 2009
@@ -7,7 +7,8 @@
 body
 {
     color: white;
-    background: url(images/draft.png);
+    /* red background if no image */
+    background: #800000 url(images/draft.png);
 }
 h1,h2,h3,h4,h5,h6 {
   color: white;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]