Index: openacs-4/packages/acs-core-docs/www/i18n.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/i18n.html,v diff -u -r1.30.2.1 -r1.30.2.2 --- openacs-4/packages/acs-core-docs/www/i18n.html 18 Jun 2010 21:29:34 -0000 1.30.2.1 +++ openacs-4/packages/acs-core-docs/www/i18n.html 12 Dec 2010 00:07:02 -0000 1.30.2.2 @@ -1,7 +1,14 @@ +<<<<<<< i18n.html Chapter 14. Internationalization

Chapter 14. Internationalization

Table of Contents

Internationalization and Localization Overview
How Internationalization/Localization works in OpenACS
How to Internationalize a Package
Design Notes
Translator's Guide

By Peter Marklund and Lars Pind +======= + +Chapter 13. Internationalization

Chapter 13. Internationalization

+ By Peter Marklund + and Lars Pind +>>>>>>> 1.32

OpenACS docs are written by the named authors, and may be edited by OpenACS documentation staff.