r22526 - htdocs/branches/beta - Synchronize beta with trunk

[Geert Janssens]

Author: gjanssens
Date: 2012-11-05 09:05:48 -0500 (Mon, 05 Nov 2012)
New Revision: 22526
Trac: http://svn.gnucash.org/trac/changeset/22526

Added:
   htdocs/branches/beta/.gitignore
   htdocs/branches/beta/images/icons/gc-fb.png
   htdocs/branches/beta/locale/zh_TW/
   htdocs/branches/beta/locale/zh_TW/LC_MESSAGES/
   htdocs/branches/beta/locale/zh_TW/LC_MESSAGES/gnucash-htdocs.mo
   htdocs/branches/beta/news/111020-server-move.news
   htdocs/branches/beta/news/111023-2.4.8.news
   htdocs/branches/beta/news/120110-2.4.9.news
   htdocs/branches/beta/news/120122-windows-errata.news
   htdocs/branches/beta/news/120206-2.4.10.news
   htdocs/branches/beta/news/120212-2.4.10-1.news
   htdocs/branches/beta/news/120714-2.4.11.news
   htdocs/branches/beta/news/121101-Android.news
   htdocs/branches/beta/news/zh_TW/
   htdocs/branches/beta/news/zh_TW/index.html
   htdocs/branches/beta/po/zh_TW.po
Removed:
   htdocs/branches/beta/docs/v1.6/de_DE/image/
   htdocs/branches/beta/docs/v1.6/es/image/
   htdocs/branches/beta/docs/v1.6/pt_PT/image/
Modified:
   htdocs/branches/beta/Makefile
   htdocs/branches/beta/develdocs.phtml
   htdocs/branches/beta/docs.phtml
   htdocs/branches/beta/externals/global_params.php
   htdocs/branches/beta/externals/gnucash.css
   htdocs/branches/beta/externals/header.phtml
   htdocs/branches/beta/features.phtml
   htdocs/branches/beta/images/icons/gc-gplus.png
   htdocs/branches/beta/lang.php
   htdocs/branches/beta/locale/de/LC_MESSAGES/gnucash-htdocs.mo
   htdocs/branches/beta/locale/es/LC_MESSAGES/gnucash-htdocs.mo
   htdocs/branches/beta/locale/fr/LC_MESSAGES/gnucash-htdocs.mo
   htdocs/branches/beta/locale/hu/LC_MESSAGES/gnucash-htdocs.mo
   htdocs/branches/beta/locale/it/LC_MESSAGES/gnucash-htdocs.mo
   htdocs/branches/beta/locale/ja/LC_MESSAGES/gnucash-htdocs.mo
   htdocs/branches/beta/locale/nb/LC_MESSAGES/gnucash-htdocs.mo
   htdocs/branches/beta/locale/nl/LC_MESSAGES/gnucash-htdocs.mo
   htdocs/branches/beta/locale/pl/LC_MESSAGES/gnucash-htdocs.mo
   htdocs/branches/beta/locale/pt_PT/LC_MESSAGES/gnucash-htdocs.mo
   htdocs/branches/beta/locale/zh_CN/LC_MESSAGES/gnucash-htdocs.mo
   htdocs/branches/beta/news/110925-new-website.news
   htdocs/branches/beta/po/de.po
   htdocs/branches/beta/po/en_GB.po
   htdocs/branches/beta/po/es.po
   htdocs/branches/beta/po/fr.po
   htdocs/branches/beta/po/hu.po
   htdocs/branches/beta/po/it.po
   htdocs/branches/beta/po/ja.po
   htdocs/branches/beta/po/nb.po
   htdocs/branches/beta/po/nl.po
   htdocs/branches/beta/po/pl.po
   htdocs/branches/beta/po/pt_PT.po
   htdocs/branches/beta/po/zh_CN.po
   htdocs/branches/beta/robots.txt
   htdocs/branches/beta/viewdoc.phtml
Log:
Synchronize beta with trunk

This will help us avoid unwanted overwrites of newer changes in trunk
when importing successful changes from beta