Index: openacs-4/packages/acs-core-docs/www/update-translations.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/update-translations.html,v diff -u -r1.13.2.2 -r1.13.2.3 --- openacs-4/packages/acs-core-docs/www/update-translations.html 12 Dec 2010 00:07:03 -0000 1.13.2.2 +++ openacs-4/packages/acs-core-docs/www/update-translations.html 12 Dec 2010 01:37:26 -0000 1.13.2.3 @@ -1,10 +1,5 @@ -<<<<<<< update-translations.html - -How to Update the translations

How to Update the translations

  1. Identify any new locales that have been created. -======= -How to Update the translations

    How to Update the translations

    1. Identify any new locales that have been created. ->>>>>>> 1.15 +How to Update the translations

      How to Update the translations

      1. Identify any new locales that have been created. For each new locale, check the parameters, especially that the locale is in the format [two-letter code for language, lower-case]_[TWO-LETTER CODE FOR COUNTRY,