[swell-foop/mallard-help: 93/93] Fix merge conflict

[Rashi Aswani <aswanirashi src gnome org>]

commit 7a24fc7a7628b05260d8f1196c3d44ac1f35e213
Merge: 5687953 31dbbac
Author: Rashi Aswani <aswanirashi19 gmail com>
Date:   Tue Aug 11 03:09:23 2015 +0200

    Fix merge conflict
    
    Conflicts:
        NEWS
        configure.ac
        po/ca valencia po
        po/de.po
        po/el.po
        po/sl.po

 NEWS                           |    1 +
 configure.ac                   |    1 +
 help/C/figures/logo.png        |  Bin 0 -> 1517 bytes
 help/C/figures/logo32.png      |  Bin 0 -> 2486 bytes
 help/C/figures/play1.png       |  Bin 13304 -> 0 bytes
 help/C/figures/play2.png       |  Bin 10011 -> 0 bytes
 help/C/figures/play3.png       |  Bin 15451 -> 0 bytes
 help/C/figures/play4.png       |  Bin 6827 -> 0 bytes
 help/C/figures/start-up.png    |  Bin 39871 -> 0 bytes
 help/C/index.docbook           |  290 ----------------------------------------
 help/C/index.page              |   42 ++++++
 help/C/introduction.page       |   29 ++++
 help/C/keyboard-shortcuts.page |   37 +++++
 help/C/legal.xml               |   77 +----------
 help/C/play.page               |   35 +++++
 help/C/scores.page             |   89 ++++++++++++
 help/C/settings.page           |   71 ++++++++++
 help/C/start.page              |   33 +++++
 help/C/strategy.page           |   44 ++++++
 help/Makefile.am               |   16 ++-
 po/ca valencia po              |    1 +
 po/de.po                       |    1 +
 po/el.po                       |    1 +
 po/sl.po                       |    1 +
 24 files changed, 399 insertions(+), 370 deletions(-)
---
diff --cc NEWS
index 16d6c88,8c2094b..adf2bcc
--- a/NEWS
+++ b/NEWS
@@@ -157,3 -96,3 +157,4 @@@ swell-foop 3.7.
  ====================
  
  First release split from gnome-games
++
diff --cc configure.ac
index 7feb83a,0fc7065..48c9259
--- a/configure.ac
+++ b/configure.ac
@@@ -65,3 -62,3 +65,4 @@@ help/Makefil
  src/Makefile
  ])
  AC_OUTPUT
++
diff --cc help/Makefile.am
index 682c403,167d954..d410e74
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@@ -2,16 -2,20 +2,20 @@@
  HELP_ID = swell-foop
  
  HELP_MEDIA = \
-       figures/play1.png \
-       figures/play2.png \
-       figures/play3.png \
-       figures/play4.png \
-       figures/start-up.png
+       figures/logo.png \
+       figures/logo32.png
  
  HELP_FILES = \
+       index.page \
+       introduction.page \
+       keyboard-shortcuts.page \
        legal.xml \
-       index.docbook
+       play.page \
+       start.page \
+       scores.page \
+       settings.page \
+       strategy.page
  
 -HELP_LINGUAS = ca cs de el en_GB es eu fr it oc pt_BR ru sl sr sr latin sv zh_CN
 +HELP_LINGUAS = ca cs de el en_GB es eu fr hu it oc pt_BR ru sl sr sr latin sv zh_CN
  
  -include $(top_srcdir)/git.mk
diff --cc po/ca valencia po
index 33e496c,be5cced..3993ecf
--- a/po/ca valencia po
+++ b/po/ca valencia po
@@@ -248,6 -248,6 +248,7 @@@ msgstr "
  msgid "Abandon this game to start a new one?"
  msgstr "Voleu abandonar la partida i començar una de nova?"
  
 -#: ../src/swell-foop.vala:430
 +#: ../src/swell-foop.vala:432
  msgid "_Cancel"
  msgstr "_Cancel·la"
++
diff --cc po/de.po
index b6cd06b,3b25d30..71a92d8
--- a/po/de.po
+++ b/po/de.po
@@@ -274,3 -274,3 +274,4 @@@ msgstr "Soll dieses Spiel abgebrochen u
  #: ../src/swell-foop.vala:430
  msgid "_Cancel"
  msgstr "A_bbrechen"
++
diff --cc po/el.po
index 2903e47,2b6eb89..55c1e38
--- a/po/el.po
+++ b/po/el.po
@@@ -530,3 -497,3 +530,4 @@@ msgstr "_Νέο παιχνίδι
  
  #~ msgid "One hour"
  #~ msgstr "Μία ώρα"
++
diff --cc po/sl.po
index 6ccd9c1,74f6e07..ae3a7a2
--- a/po/sl.po
+++ b/po/sl.po
@@@ -276,3 -256,3 +276,4 @@@ msgstr "_Nova Igra
  
  #~ msgid "GNOME Games web site"
  #~ msgstr "Spletna stran iger GNOME"
++