GNOME.org
 

[frogr] Fix broken build system integrating the new help files.

commit 033836b58bca08e8f90a32d37a3bf48bb5d3a989
Author: Pierre-Yves Luyten <pyluyten laposte net>
Date:   Mon May 30 22:27:59 2011 +0200

    Fix broken build system integrating the new help files.
    
    Created help/Makefile.am and help/en_GB, updated autogen.sh,
    configure.ac and toplevel Makefile.am.

 Makefile.am                                   |    4 +-
 autogen.sh                                    |    1 +
 configure.ac                                  |    3 +
 help/Makefile.am                              |   27 +++
 help/en_GB/add-pictures.page                  |   13 ++
 help/en_GB/common-problems.page               |   20 +++
 help/en_GB/create-account.page                |   15 ++
 help/en_GB/display.page                       |   13 ++
 help/en_GB/en_GB.mo                           |  Bin 0 -> 5618 bytes
 help/en_GB/en_GB.po                           |  224 +++++++++++++++++++++++++
 help/en_GB/figures/edit-picture-details.png   |  Bin 0 -> 35275 bytes
 help/en_GB/figures/frogr-remote-organizer.png |  Bin 0 -> 97700 bytes
 help/en_GB/figures/preferences-connection.png |  Bin 0 -> 11196 bytes
 help/en_GB/figures/preferences-general.png    |  Bin 0 -> 28932 bytes
 help/en_GB/group-pictures.page                |   13 ++
 help/en_GB/index.page                         |   34 ++++
 help/en_GB/introduction.page                  |   34 ++++
 help/en_GB/organize.page                      |   11 ++
 help/en_GB/pictures.page                      |   13 ++
 help/en_GB/preferences.page                   |   36 ++++
 help/en_GB/remove-pictures.page               |   13 ++
 help/en_GB/set-pictures.page                  |   13 ++
 help/en_GB/tag.page                           |   13 ++
 help/en_GB/upload-pictures.page               |   13 ++
 m4/gnome-doc-utils.m4                         |   56 ++++++
 m4/intltool.m4                                |  216 ++++++++++++++++++++++++
 26 files changed, 784 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 38b7346..a692dd5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,7 @@ MAINTAINERCLEANFILES = \
 	missing \
 	mkinstalldirs
 
-SUBDIRS = src po examples
+SUBDIRS = src po examples help
 
 ACLOCAL_AMFLAGS=-I m4
 
@@ -99,6 +99,8 @@ EXTRA_DIST = \
 	$(images_DATA) \
 	$(man1_MANS)
 
+DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
+
 dist-hook:
 	@if test -d "$(srcdir)/.git"; \
 	then \
diff --git a/autogen.sh b/autogen.sh
index 9f90162..390c697 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,6 +4,7 @@ set -e
 aclocal
 autoconf --force
 autoheader --force
+gnome-doc-prepare
 automake --add-missing --copy --force-missing --foreign
 glib-gettextize --force --copy
 intltoolize --copy --force --automake
diff --git a/configure.ac b/configure.ac
index ee5cca2..56f55a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,9 @@ AM_INIT_AUTOMAKE([-Wall foreign])
 AC_PROG_CC
 AC_PROG_RANLIB
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 IT_PROG_INTLTOOL([0.35.0])
+GNOME_DOC_INIT([0.17.3])
 
 # Support silent build rules, requires at least automake-1.11. Disable
 # by either passing --disable-silent-rules to configure or passing V=1
@@ -193,6 +195,7 @@ AC_CONFIG_FILES([
         src/flicksoup/Makefile
         examples/Makefile
         po/Makefile.in
+        help/Makefile
 ])
 AC_OUTPUT
 
diff --git a/help/Makefile.am b/help/Makefile.am
new file mode 100644
index 0000000..971e6ef
--- /dev/null
+++ b/help/Makefile.am
@@ -0,0 +1,27 @@
+include $(top_srcdir)/gnome-doc-utils.make
+
+DOC_ID = frogr
+DOC_FIGURES = \
+	figures/edit-pictures-details.png \
+	figures/frogr-remote-organizer.png \
+	figures/preferences-connection.png \
+	figures/preferences-general.png
+
+DOC_PAGES = \
+	add-pictures.page \
+	group-pictures.page \
+	preferences.page \
+	common-problems.page \
+	index.page \
+	remove-pictures.page \
+	create-account.page \
+	introduction.page \
+	set-pictures.page \
+	display.page \
+	organize.page \
+	tag.page \
+	pictures.page \
+	upload-pictures.page
+
+DOC_LINGUAS = de en_GB
+dist-hook: doc-dist-hook
diff --git a/help/en_GB/add-pictures.page b/help/en_GB/add-pictures.page
new file mode 100644
index 0000000..6a7fcdb
--- /dev/null
+++ b/help/en_GB/add-pictures.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="add-pictures" xml:lang="en_GB">
+
+  <info>
+    <link type="guide" xref="pictures"/>
+    <revision pkgversion="0" version="0.6" date="2011-01-06" status="draft"/>
+    <desc>Add Pictures</desc>
+  </info>
+
+  <title>Add Pictures</title>
+  <p>You can add a picture using the toolbar <gui>Plus</gui> button. Or, you can use the menu <guiseq><gui>File</gui><gui>Add Pictures</gui></guiseq>.</p>
+  
+</page>
diff --git a/help/en_GB/common-problems.page b/help/en_GB/common-problems.page
new file mode 100644
index 0000000..3cf388f
--- /dev/null
+++ b/help/en_GB/common-problems.page
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="common-problems" xml:lang="en_GB">
+  
+  <info>
+    <link type="guide" xref="index#common-problems"/>
+    <revision pkgversion="0" version="0.6" date="2011-01-06" status="draft"/>
+    <desc>Frequently Asked Questions</desc>
+  </info>
+
+  <title>Frogr Introduction</title>
+    
+  <list>
+
+    <item><title>Authorization browser window is not be launched</title>
+      <p>Check if you are using a proxy. This is a know bug.</p>
+    </item>
+
+  </list>
+
+</page>
diff --git a/help/en_GB/create-account.page b/help/en_GB/create-account.page
new file mode 100644
index 0000000..309e2f1
--- /dev/null
+++ b/help/en_GB/create-account.page
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="create-account" xml:lang="en_GB">
+  <info>
+    <link type="guide" xref="index#account"/>
+    <revision pkgversion="0" version="0.6" date="2011-01-06" status="draft"/>
+    <desc>How to create your Account</desc>
+  </info>
+
+  <title>How to create your Account</title>
+  <p>First create an Account</p>
+  <p>When you first run <app>Frogr</app>, it displays a window explaining you'll have to create an account.</p>
+  <p>Click Ok, it will run your favorite web browser. On your favourite web browser, either create a Flickr account or log in to an existing account.</p>
+  <p>Then, authorize <app>Frogr</app> to access to this account. You may now go back to <app>Frogr</app> window and use it to upload any picture !</p>
+  
+</page>
diff --git a/help/en_GB/display.page b/help/en_GB/display.page
new file mode 100644
index 0000000..6dad474
--- /dev/null
+++ b/help/en_GB/display.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="display" xml:lang="en_GB">
+
+  <info>
+    <link type="guide" xref="index#view"/>
+    <revision pkgversion="0" version="0.6" date="2011-01-06" status="draft"/>
+    <desc>Amending view</desc>
+  </info>
+
+  <title>Display Pictures</title>
+  <p>You can sort pictures by title, by date, or as loaded. Click on the menuy <gui>View</gui> and select the proper way to sort.</p>
+
+</page>
diff --git a/help/en_GB/en_GB.mo b/help/en_GB/en_GB.mo
new file mode 100644
index 0000000..940a93b
Binary files /dev/null and b/help/en_GB/en_GB.mo differ
diff --git a/help/en_GB/en_GB.po b/help/en_GB/en_GB.po
new file mode 100644
index 0000000..b54c37c
--- /dev/null
+++ b/help/en_GB/en_GB.po
@@ -0,0 +1,224 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2011-05-28 19:32+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL ADDRESS>\n"
+"Language-Team: LANGUAGE <LL li org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: upload-pictures.page:9(desc) upload-pictures.page:12(title)
+msgid "Upload Pictures"
+msgstr "Upload Pictures"
+
+#: upload-pictures.page:13(gui)
+msgid "arrow"
+msgstr "arrow"
+
+#: upload-pictures.page:13(gui) tag.page:14(gui)
+msgid "Actions"
+msgstr "Actions"
+
+#: upload-pictures.page:13(gui)
+msgid "Upload All"
+msgstr "Upload All"
+
+#: upload-pictures.page:13(p)
+msgid "You can upload a picture using the toolbar <placeholder-1/> button. Or, you can use the menu <guiseq><placeholder-2/><placeholder-3/></guiseq>."
+msgstr "You can upload a picture using the toolbar <placeholder-1/> button. Or, you can use the menu <guiseq><placeholder-2/><placeholder-3/></guiseq>."
+
+#: tag.page:9(desc) tag.page:12(title)
+msgid "Tag Pictures"
+msgstr "Tag Pictures"
+
+#: tag.page:13(p)
+msgid "You can assign several tags to any picture. Flickr allows you to define your own tags. It allows you to easily find any picture you did upload."
+msgstr "You can assign several tags to any picture. Flickr allows you to define your own tags. It allows you to easily find any picture you did upload."
+
+#: tag.page:14(gui) tag.page:14(gui)
+msgid "Add tags"
+msgstr "Add tags"
+
+#: tag.page:14(p)
+msgid "Right-click on a picture, and choose <placeholder-1/>. Or click on the menu <placeholder-2/>, and choose <placeholder-3/>. Or, when you're editing picture's detail, you can see and edit the tags"
+msgstr "Right-click on a picture, and choose <placeholder-1/>. Or click on the menu <placeholder-2/>, and choose <placeholder-3/>. Or, when you're editing picture's detail, you can see and edit the tags"
+
+#: set-pictures.page:9(desc) set-pictures.page:12(title)
+msgid "Set Pictures"
+msgstr "Set Pictures"
+
+#: set-pictures.page:13(p) group-pictures.page:13(p)
+msgid "Todo"
+msgstr "Todo"
+
+#: remove-pictures.page:9(desc) remove-pictures.page:12(title) remove-pictures.page:13(gui)
+msgid "Remove Pictures"
+msgstr "Remove Pictures"
+
+#: remove-pictures.page:13(gui)
+msgid "Minus"
+msgstr "Minus"
+
+#: remove-pictures.page:13(gui) preferences.page:14(gui) add-pictures.page:13(gui)
+msgid "File"
+msgstr "File"
+
+#: remove-pictures.page:13(p) add-pictures.page:13(p)
+msgid "You can add a picture using the toolbar <placeholder-1/> button. Or, you can use the menu <guiseq><placeholder-2/><placeholder-3/></guiseq>."
+msgstr "You can add a picture using the toolbar <placeholder-1/> button. Or, you can use the menu <guiseq><placeholder-2/><placeholder-3/></guiseq>."
+
+#: preferences.page:9(desc) preferences.page:12(title) preferences.page:14(gui)
+msgid "Preferences"
+msgstr "Preferences"
+
+#: preferences.page:14(p)
+msgid "Go to Preferences using menu <guiseq><placeholder-1/><placeholder-2/></guiseq>."
+msgstr "Go to Preferences using menu <guiseq><placeholder-1/><placeholder-2/></guiseq>."
+
+#: preferences.page:17(title)
+msgid "General Preferences"
+msgstr "General Preferences"
+
+#: preferences.page:19(title) preferences.page:30(title) introduction.page:15(title)
+msgid "<gui>Frogr </gui> window"
+msgstr "<gui>Frogr </gui> window"
+
+#: preferences.page:20(app) preferences.page:22(app) preferences.page:31(app) preferences.page:33(app) introduction.page:9(app) introduction.page:13(app) introduction.page:13(app) introduction.page:16(app) introduction.page:18(app) create-account.page:13(app) create-account.page:15(app) create-account.page:15(app)
+msgid "Frogr"
+msgstr "Frogr"
+
+#: preferences.page:20(desc) preferences.page:31(desc) introduction.page:16(desc)
+msgid "<placeholder-1/> main window"
+msgstr "<placeholder-1/> main window"
+
+#: preferences.page:22(p) preferences.page:33(p) introduction.page:18(p)
+msgid "<placeholder-1/> main window."
+msgstr "<placeholder-1/> main window."
+
+#: preferences.page:28(title)
+msgid "Connection Preferences"
+msgstr "Connection Preferences"
+
+#: pictures.page:9(desc) pictures.page:12(title)
+msgid "Pictures"
+msgstr "Pictures"
+
+#: pictures.page:13(p)
+msgid "Add, remove, or upload pictures"
+msgstr "Add, remove, or upload pictures"
+
+#: organize.page:8(desc) organize.page:11(title)
+msgid "Organize"
+msgstr "Organize"
+
+#: introduction.page:8(desc)
+msgid "Introduction to the <placeholder-1/> Remote Organizer."
+msgstr "Introduction to the <placeholder-1/> Remote Organizer."
+
+#: introduction.page:12(title) common-problems.page:12(title)
+msgid "Frogr Introduction"
+msgstr "Frogr Introduction"
+
+#: introduction.page:13(link)
+msgid "Flickr"
+msgstr "Flickr"
+
+#: introduction.page:13(p)
+msgid "<placeholder-1/> is a <placeholder-2/> Remote Organizer. <placeholder-3/> is a small application for the GNOME desktop that allows users to manage their accounts in the Flickr image hosting website.."
+msgstr "<placeholder-1/> is a <placeholder-2/> Remote Organizer. <placeholder-3/> is a small application for the GNOME desktop that allows users to manage their accounts in the Flickr image hosting website.."
+
+#: index.page:8(title)
+msgid "Frogr Help"
+msgstr "Frogr Help"
+
+#: index.page:11(title)
+msgid "Managing Your Flickr Account"
+msgstr "Managing Your Flickr Account"
+
+#: index.page:15(title)
+msgid "Managing Your Pictures"
+msgstr "Managing Your Pictures"
+
+#: index.page:19(title)
+msgid "Organize Your Pictures"
+msgstr "Organize Your Pictures"
+
+#: index.page:23(title)
+msgid "Sort Pictures"
+msgstr "Sort Pictures"
+
+#: index.page:27(title)
+msgid "Set Up Frogr"
+msgstr "Set Up Frogr"
+
+#: index.page:31(title)
+msgid "Frenquently Asked Questions"
+msgstr "Frenquently Asked Questions"
+
+#: group-pictures.page:9(desc) group-pictures.page:12(title)
+msgid "Group Pictures"
+msgstr "Group Pictures"
+
+#: display.page:9(desc)
+msgid "Amending view"
+msgstr "Amending view"
+
+#: display.page:12(title)
+msgid "Display Pictures"
+msgstr "Display Pictures"
+
+#: display.page:13(gui)
+msgid "View"
+msgstr "View"
+
+#: display.page:13(p)
+msgid "You can sort pictures by title, by date, or as loaded. Click on the menuy <placeholder-1/> and select the proper way to sort."
+msgstr ""
+
+#: create-account.page:8(desc) create-account.page:11(title)
+msgid "How to create your Account"
+msgstr "How to create your Account"
+
+#: create-account.page:12(p)
+msgid "First create an Account"
+msgstr "First create an Account"
+
+#: create-account.page:13(p)
+msgid "When you first run <placeholder-1/>, it displays a window explaining you'll have to create an account."
+msgstr "When you first run <placeholder-1/>, it displays a window explaining you'll have to create an account."
+
+#: create-account.page:14(p)
+msgid "Click Ok, it will run your favorite web browser. On your favourite web browser, either create a Flickr account or log in to an existing account."
+msgstr "Click Ok, it will run your favorite web browser. On your favourite web browser, either create a Flickr account or log in to an existing account."
+
+#: create-account.page:15(p)
+msgid "Then, authorize <placeholder-1/> to access to this account. You may now go back to <placeholder-2/> window and use it to upload any picture !"
+msgstr "Then, authorize <placeholder-1/> to access to this account. You may now go back to <placeholder-2/> window and use it to upload any picture !"
+
+#: common-problems.page:9(desc)
+msgid "Frequently Asked Questions"
+msgstr "Frequently Asked Questions"
+
+#: common-problems.page:16(title)
+msgid "Authorization browser window is not be launched"
+msgstr "Authorization browser window is not be launched"
+
+#: common-problems.page:17(p)
+msgid "Check if you are using a proxy. This is a know bug."
+msgstr "Check if you are using a proxy. This is a know bug."
+
+#: add-pictures.page:9(desc) add-pictures.page:12(title) add-pictures.page:13(gui)
+msgid "Add Pictures"
+msgstr "Add Pictures"
+
+#: add-pictures.page:13(gui)
+msgid "Plus"
+msgstr "Plus"
+
+#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
+#: add-pictures.page:0(None)
+msgid "translator-credits"
+msgstr "translator-credits"
+
diff --git a/help/en_GB/figures/edit-picture-details.png b/help/en_GB/figures/edit-picture-details.png
new file mode 100644
index 0000000..3c66ff0
Binary files /dev/null and b/help/en_GB/figures/edit-picture-details.png differ
diff --git a/help/en_GB/figures/frogr-remote-organizer.png b/help/en_GB/figures/frogr-remote-organizer.png
new file mode 100644
index 0000000..9126be0
Binary files /dev/null and b/help/en_GB/figures/frogr-remote-organizer.png differ
diff --git a/help/en_GB/figures/preferences-connection.png b/help/en_GB/figures/preferences-connection.png
new file mode 100644
index 0000000..33e63f8
Binary files /dev/null and b/help/en_GB/figures/preferences-connection.png differ
diff --git a/help/en_GB/figures/preferences-general.png b/help/en_GB/figures/preferences-general.png
new file mode 100644
index 0000000..734f57c
Binary files /dev/null and b/help/en_GB/figures/preferences-general.png differ
diff --git a/help/en_GB/group-pictures.page b/help/en_GB/group-pictures.page
new file mode 100644
index 0000000..8d617f9
--- /dev/null
+++ b/help/en_GB/group-pictures.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/"; type="guide" id="group-pictures" xml:lang="en_GB">
+
+  <info>
+    <link type="guide" xref="organize"/>
+    <revision pkgversion="0" version="0.6" date="2011-01-06" status="draft"/>
+    <desc>Group Pictures</desc>
+  </info>
+
+  <title>Group Pictures</title>
+  <p>Todo</p>
+
+</page>
diff --git a/help/en_GB/index.page b/help/en_GB/index.page
new file mode 100644
index 0000000..bfc5483
--- /dev/null
+++ b/help/en_GB/index.page
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:e="http://projectmallard.org/experimental/"; type="guide" id="index" xml:lang="en_GB">
+  
+  <info>
+    <revision pkgversion="0" version="0.6" date="2011-01-06" status="draft"/>
+  </info>
+
+  <title>Frogr Help</title>
+
+  <section id="account">
+    <title>Managing Your Flickr Account</title>
+  </section>
+
+  <section id="pictures">
+    <title>Managing Your Pictures</title>
+  </section>
+
+  <section id="organize">
+    <title>Organize Your Pictures</title>
+  </section>
+
+  <section id="view">
+    <title>Sort Pictures</title>
+  </section>
+
+  <section id="customize">
+    <title>Set Up Frogr</title>
+  </section>
+
+  <section id="common-problems">
+    <title>Frenquently Asked Questions</title>
+  </section>
+
+</page>
diff --git a/help/en_GB/introduction.page b/help/en_GB/introduction.page
new file mode 100644
index 0000000..53e4d5e
--- /dev/null
+++ b/help/en_GB/introduction.page
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="introduction" xml:lang="en_GB">
+<info>
+  <link type="guide" xref="index"/>
+  <revision pkgversion="0" version="0.6" date="2011-01-06" status="draft"/>
+  <desc>
+    Introduction to the <app>Frogr</app> Remote Organizer.
+  </desc>
+</info>
+<title>Frogr Introduction</title>
+<p><app>Frogr</app> is a <link href="http://www.flickr.com/";>Flickr</link> Remote Organizer. <app>Frogr</app>  is a small application for the GNOME desktop that allows users to manage their accounts in the Flickr image hosting website..</p>
+  <figure>
+    <title><gui>Frogr </gui> window</title>
+    <desc><app>Frogr</app> main window</desc>
+    <media type="image" src="figures/frogr-remote-organizer.png" mime="image/png" style="right">
+      <p><app>Frogr</app> main window.</p>
+    </media>
+  </figure>
+  
+  <section><title>Flickr</title>
+    <p><link href="http://www.flickr.com/";>Flickr</link> is a website allowing hosting of both images and videos.</p>
+  </section>
+
+  <section><title>Main Features</title>
+    <list>
+      <item><p>Allow to upload pictures to flickr</p></item>
+      <item><p>Allow uploading pictures located in remote machines</p></item>
+      <item><p>Allow adding tags to pictures</p></item>
+      <item><p>Allow specifying sets and group pools for the pictures to be added to after the upload process.</p></item>
+      <item><p>Support for handling multiple Flickr accounts.</p></item>
+    </list>
+
+  </section>
+</page>
diff --git a/help/en_GB/organize.page b/help/en_GB/organize.page
new file mode 100644
index 0000000..45b0484
--- /dev/null
+++ b/help/en_GB/organize.page
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/"; type="guide" id="organize" xml:lang="en_GB">
+  <info>
+    <link type="guide" xref="index#organize"/>
+    <revision pkgversion="0" version="0.6" date="2011-01-06" status="draft"/>
+    <desc>Organize</desc>
+  </info>
+
+  <title>Organize</title>
+  
+</page>
diff --git a/help/en_GB/pictures.page b/help/en_GB/pictures.page
new file mode 100644
index 0000000..4f083ff
--- /dev/null
+++ b/help/en_GB/pictures.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/"; type="guide" id="pictures" xml:lang="en_GB">
+
+  <info>
+    <link type="guide" xref="index#pictures"/>
+    <revision pkgversion="0" version="0.6" date="2011-01-06" status="draft"/>
+    <desc>Pictures</desc>
+  </info>
+
+  <title>Pictures</title>
+  <p>Add, remove, or upload pictures</p>
+  
+</page>
diff --git a/help/en_GB/preferences.page b/help/en_GB/preferences.page
new file mode 100644
index 0000000..39f8b1a
--- /dev/null
+++ b/help/en_GB/preferences.page
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/"; type="guide" id="preferences" xml:lang="en_GB">
+
+  <info>
+    <link type="guide" xref="index#customize"/>
+    <revision pkgversion="0" version="0.6" date="2011-01-06" status="draft"/>
+    <desc>Preferences</desc>
+  </info>
+
+  <title>Preferences</title>
+
+  <p>Go to Preferences using menu <guiseq><gui>File</gui><gui>Preferences</gui></guiseq>.</p>
+  
+  <section id="preferences-general">
+    <title>General Preferences</title>
+    <figure>
+      <title><gui>Frogr </gui> window</title>
+      <desc><app>Frogr</app> main window</desc>
+      <media type="image" src="figures/preferences-general.png" mime="image/png" style="right">
+        <p><app>Frogr</app> main window.</p>
+      </media>
+    </figure>
+  </section>
+
+  <section id="preferences-connection">
+    <title>Connection Preferences</title>
+    <figure>
+      <title><gui>Frogr </gui> window</title>
+      <desc><app>Frogr</app> main window</desc>
+      <media type="image" src="figures/preferences-connection.png" mime="image/png" style="right">
+        <p><app>Frogr</app> main window.</p>
+      </media>
+    </figure>
+  </section>
+
+</page>
diff --git a/help/en_GB/remove-pictures.page b/help/en_GB/remove-pictures.page
new file mode 100644
index 0000000..d0eb6ea
--- /dev/null
+++ b/help/en_GB/remove-pictures.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="remove-pictures" xml:lang="en_GB">
+
+  <info>
+    <link type="guide" xref="pictures"/>
+    <revision pkgversion="0" version="0.6" date="2011-01-06" status="draft"/>
+    <desc>Remove Pictures</desc>
+  </info>
+
+  <title>Remove Pictures</title>
+  <p>You can add a picture using the toolbar <gui>Minus</gui> button. Or, you can use the menu <guiseq><gui>File</gui><gui>Remove Pictures</gui></guiseq>.</p>
+  
+</page>
diff --git a/help/en_GB/set-pictures.page b/help/en_GB/set-pictures.page
new file mode 100644
index 0000000..1d63a7e
--- /dev/null
+++ b/help/en_GB/set-pictures.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/"; type="guide" id="set-pictures" xml:lang="en_GB">
+
+  <info>
+    <link type="guide" xref="organize"/>
+    <revision pkgversion="0" version="0.6" date="2011-01-06" status="draft"/>
+    <desc>Set Pictures</desc>
+  </info>
+
+  <title>Set Pictures</title>
+  <p>Todo</p>
+
+</page>
diff --git a/help/en_GB/tag.page b/help/en_GB/tag.page
new file mode 100644
index 0000000..694ff3f
--- /dev/null
+++ b/help/en_GB/tag.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/"; type="guide" id="tag-pictures" xml:lang="en_GB">
+
+  <info>
+    <link type="guide" xref="organize"/>
+    <revision pkgversion="0" version="0.6" date="2011-01-06" status="draft"/>
+    <desc>Tag Pictures</desc>
+  </info>
+
+  <title>Tag Pictures</title>
+  <p>You can assign several tags to any picture. Flickr allows you to define your own tags. It allows you to easily find any picture you did upload.</p>
+  <p>Right-click on a picture, and choose <gui>Add tags</gui>. Or click on the menu <gui>Actions</gui>, and choose <gui>Add tags</gui>. Or, when you're editing picture's detail, you can see and edit the tags</p>
+</page>
diff --git a/help/en_GB/upload-pictures.page b/help/en_GB/upload-pictures.page
new file mode 100644
index 0000000..7f01599
--- /dev/null
+++ b/help/en_GB/upload-pictures.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="upload-pictures" xml:lang="en_GB">
+
+  <info>
+    <link type="guide" xref="pictures"/>
+    <revision pkgversion="0" version="0.6" date="2011-01-06" status="draft"/>
+    <desc>Upload Pictures</desc>
+  </info>
+
+  <title>Upload Pictures</title>
+  <p>You can upload a picture using the toolbar <gui>arrow</gui> button. Or, you can use the menu <guiseq><gui>Actions</gui><gui>Upload All</gui></guiseq>.</p>
+  
+</page>
diff --git a/m4/gnome-doc-utils.m4 b/m4/gnome-doc-utils.m4
new file mode 100644
index 0000000..402bb3e
--- /dev/null
+++ b/m4/gnome-doc-utils.m4
@@ -0,0 +1,56 @@
+dnl Do not call GNOME_DOC_DEFINES directly.  It is split out from
+dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself.
+AC_DEFUN([GNOME_DOC_DEFINES],
+[
+AC_ARG_WITH([help-dir],
+  AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),,
+  [with_help_dir='${datadir}/gnome/help'])
+HELP_DIR="$with_help_dir"
+AC_SUBST(HELP_DIR)
+
+AC_ARG_WITH([omf-dir],
+  AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),,
+  [with_omf_dir='${datadir}/omf'])
+OMF_DIR="$with_omf_dir"
+AC_SUBST(OMF_DIR)
+
+AC_ARG_WITH([help-formats],
+  AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),,
+  [with_help_formats=''])
+DOC_USER_FORMATS="$with_help_formats"
+AC_SUBST(DOC_USER_FORMATS)
+
+AC_ARG_ENABLE([scrollkeeper],
+	[AC_HELP_STRING([--disable-scrollkeeper],
+			[do not make updates to the scrollkeeper database])],,
+	enable_scrollkeeper=yes)
+AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"])
+
+dnl disable scrollkeeper automatically for distcheck
+DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
+AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
+
+AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"])
+])
+
+# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
+#
+AC_DEFUN([GNOME_DOC_INIT],
+[AC_REQUIRE([AC_PROG_LN_S])dnl
+
+ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1])
+
+AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required])
+PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required],
+	[gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no])
+
+if test "$gdu_cv_have_gdu" = "yes"; then
+	AC_MSG_RESULT([yes])
+	ifelse([$2],,[:],[$2])
+else
+	AC_MSG_RESULT([no])
+	ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3])
+fi
+
+GNOME_DOC_DEFINES
+])
diff --git a/m4/intltool.m4 b/m4/intltool.m4
new file mode 100644
index 0000000..839e855
--- /dev/null
+++ b/m4/intltool.m4
@@ -0,0 +1,216 @@
+## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*-
+## Copyright (C) 2001 Eazel, Inc.
+## Author: Maciej Stachowiak <mjs noisehavoc org>
+##         Kenneth Christiansen <kenneth gnu org>
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+##
+## As a special exception to the GNU General Public License, if you
+## distribute this file as part of a program that contains a
+## configuration script generated by Autoconf, you may include it under
+## the same distribution terms that you use for the rest of that program.
+
+dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
+# serial 40 IT_PROG_INTLTOOL
+AC_DEFUN([IT_PROG_INTLTOOL], [
+AC_PREREQ([2.50])dnl
+AC_REQUIRE([AM_NLS])dnl
+
+case "$am__api_version" in
+    1.[01234])
+	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
+    ;;
+    *)
+    ;;
+esac
+
+if test -n "$1"; then
+    AC_MSG_CHECKING([for intltool >= $1])
+
+    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+    [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+    ]
+    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
+    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
+fi
+
+AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
+AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
+AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+    AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
+fi
+
+  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
+     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' 
+      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+
+_IT_SUBST(INTLTOOL_DESKTOP_RULE)
+_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
+_IT_SUBST(INTLTOOL_KEYS_RULE)
+_IT_SUBST(INTLTOOL_PROP_RULE)
+_IT_SUBST(INTLTOOL_OAF_RULE)
+_IT_SUBST(INTLTOOL_PONG_RULE)
+_IT_SUBST(INTLTOOL_SERVER_RULE)
+_IT_SUBST(INTLTOOL_SHEET_RULE)
+_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
+_IT_SUBST(INTLTOOL_UI_RULE)
+_IT_SUBST(INTLTOOL_XAM_RULE)
+_IT_SUBST(INTLTOOL_KBD_RULE)
+_IT_SUBST(INTLTOOL_XML_RULE)
+_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
+_IT_SUBST(INTLTOOL_CAVES_RULE)
+_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
+_IT_SUBST(INTLTOOL_THEME_RULE)
+_IT_SUBST(INTLTOOL_SERVICE_RULE)
+_IT_SUBST(INTLTOOL_POLICY_RULE)
+
+# Check the gettext tools to make sure they are GNU
+AC_PATH_PROG(XGETTEXT, xgettext)
+AC_PATH_PROG(MSGMERGE, msgmerge)
+AC_PATH_PROG(MSGFMT, msgfmt)
+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
+
+AC_PATH_PROG(INTLTOOL_PERL, perl)
+if test -z "$INTLTOOL_PERL"; then
+   AC_MSG_ERROR([perl not found])
+fi
+AC_MSG_CHECKING([for perl >= 5.8.1])
+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+if test $? -ne 0; then
+   AC_MSG_ERROR([perl 5.8.1 is required for intltool])
+else
+   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+   AC_MSG_RESULT([$IT_PERL_VERSION])
+fi
+if test "x$2" != "xno-xml"; then
+   AC_MSG_CHECKING([for XML::Parser])
+   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+       AC_MSG_RESULT([ok])
+   else
+       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
+   fi
+fi
+
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
+AC_SUBST(ALL_LINGUAS)
+
+# Set DATADIRNAME correctly if it is not set yet
+# (copied from glib-gettext.m4)
+if test -z "$DATADIRNAME"; then
+  AC_LINK_IFELSE(
+    [AC_LANG_PROGRAM([[]],
+                     [[extern int _nl_msg_cat_cntr;
+                       return _nl_msg_cat_cntr]])],
+    [DATADIRNAME=share],
+    [case $host in
+    *-*-solaris*)
+    dnl On Solaris, if bind_textdomain_codeset is in libc,
+    dnl GNU format message catalog is always supported,
+    dnl since both are added to the libc all together.
+    dnl Hence, we'd like to go with DATADIRNAME=share
+    dnl in this case.
+    AC_CHECK_FUNC(bind_textdomain_codeset,
+      [DATADIRNAME=share], [DATADIRNAME=lib])
+    ;;
+    *)
+    [DATADIRNAME=lib]
+    ;;
+    esac])
+fi
+AC_SUBST(DATADIRNAME)
+
+IT_PO_SUBDIR([po])
+
+])
+
+
+# IT_PO_SUBDIR(DIRNAME)
+# ---------------------
+# All po subdirs have to be declared with this macro; the subdir "po" is
+# declared by IT_PROG_INTLTOOL.
+#
+AC_DEFUN([IT_PO_SUBDIR],
+[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
+dnl
+dnl The following CONFIG_COMMANDS should be executed at the very end
+dnl of config.status.
+AC_CONFIG_COMMANDS_PRE([
+  AC_CONFIG_COMMANDS([$1/stamp-it], [
+    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
+       AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
+    fi
+    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
+    >"$1/stamp-it.tmp"
+    [sed '/^#/d
+	 s/^[[].*] *//
+	 /^[ 	]*$/d
+	'"s|^|	$ac_top_srcdir/|" \
+      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
+    ]
+    [sed '/^POTFILES =/,/[^\\]$/ {
+		/^POTFILES =/!d
+		r $1/POTFILES
+	  }
+	 ' "$1/Makefile.in" >"$1/Makefile"]
+    rm -f "$1/Makefile.tmp"
+    mv "$1/stamp-it.tmp" "$1/stamp-it"
+  ])
+])dnl
+])
+
+# _IT_SUBST(VARIABLE)
+# -------------------
+# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+#
+AC_DEFUN([_IT_SUBST],
+[
+AC_SUBST([$1])
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
+]
+)
+
+# deprecated macros
+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
+# A hint is needed for aclocal from Automake <= 1.9.4:
+# AC_DEFUN([AC_PROG_INTLTOOL], ...)
+
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]