[Gnucash-changes] r14269 - htdocs/branches/published - Merge htdocs trunk->published to (testing the post-commit hook)

[Derek Atkins]

Author: warlord
Date: 2006-05-30 19:22:39 -0400 (Tue, 30 May 2006)
New Revision: 14269
Trac: http://svn.gnucash.org/trac/changeset/14269

Modified:
   htdocs/branches/published/README
Log:
Merge htdocs trunk->published to (testing the post-commit hook)
Merged -r 14264:14268


Modified: htdocs/branches/published/README
===================================================================
--- htdocs/branches/published/README	2006-05-30 23:20:57 UTC (rev 14268)
+++ htdocs/branches/published/README	2006-05-30 23:22:39 UTC (rev 14269)
@@ -10,7 +10,6 @@
 - get gettext working on www.gnucash.org
 - update features screenshots
 - revise docs.phtml
-- pull mail-search into htdocs
 
 -------------------------------------------------
 Notes about multi-lingual gnucash website content
@@ -75,9 +74,11 @@
 Preparing translations
 ----------------------
 
-    $ make po/POTFILES
-    $ make po/gnucash-htdocs.pot
+First, make sure the pot file is up to date.  You can do that by running
+the command:
 
+    $ make pot
+
 Now merge the new content into your translation, substituting the name of 
 your po file in the command:
 
@@ -87,17 +88,14 @@
 
     $ msgfmt -c --statistics po/en_GB.po
 
-Whilst editing the translation, run the msgfmt command from time to time to catch
-errors and let you know how much is left to do.
+Whilst editing the translation, run the msgfmt command from time to
+time to catch errors and let you know how much is left to do.
 
 When you come across fuzzy markers: (#, fuzzy), remove them.
 
-When you have no fuzzy and no untranslated messages, update the binary translation file:
+When you have no fuzzy and no untranslated messages, update the binary
+translation file for your locale:
 
-    $ msgfmt po/en_GB.po -o en_GB/LC_MESSAGES/gnucash-htdocs.mo
-
-Or:
-
     $ make de [fr nl ...]
 
 Which will build an individual translation, or:
@@ -105,3 +103,22 @@
     $ make mos
 
 Which will make all the known translations.
+
+----------------------
+Publishing the website
+----------------------
+
+Once you've got the website content up to date, you need to publish
+the content from the beta site to the main website (and beta search
+site to the main search site).  To do this, you need to merge your
+changes from the 'trunk' into the 'published' branch.  Here's how you
+do that:
+
+  svn checkout .../repo/htdocs/branches/published htdocs-pub
+  cd htdocs-pub
+  svn log --stop-on-copy emulate-globals.php
+  # find the last merge point from trunk
+  svn merge -r <last_merge_point>:<head_rev> .../htdocs/trunk
+  # resolve conflicts
+  svn commit
+  # Make sure you put <head_rev> into your comment!!!!!!!