gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.archive/attic/gis

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8215 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 34 insertions, 1 deletions

diff --git a/docs/i18n.txt b/docs/i18n.txt
index c221b43718..5269024e96 100644
--- a/docs/i18n.txt
+++ b/docs/i18n.txt
@@ -434,6 +434,12 @@ do the same, but the location of the locale directory is ``locale/LANG/LC_MESSAG
     message file (``conf/locale/en/LC_MESSAGES/django.po``) and use it as a
     starting point; it's just an empty translation file.
 
+.. admonition:: Working on Windows?
+
+   If you're using Windows and need to install the GNU gettext utilites so
+   ``django-admin makemessages`` works see `gettext on Windows`_ for more
+   information.
+
 The format of ``.po`` files is straightforward. Each ``.po`` file contains a
 small bit of metadata, such as the translation maintainer's contact
 information, but the bulk of the file is a list of **messages** -- simple
@@ -513,6 +519,12 @@ That's it. Your translations are ready for use.
 
     .. _Submitting and maintaining translations: ../contributing/
 
+.. admonition:: Working on Windows?
+
+   If you're using Windows and need to install the GNU gettext utilites so
+   ``django-admin compilemessages`` works see `gettext on Windows`_ for more
+   information.
+
 3. How Django discovers language preference
 ===========================================
 
@@ -888,10 +900,31 @@ does translation:
     * The string domain is ``django`` or ``djangojs``. This string domain is
       used to differentiate between different programs that store their data
       in a common message-file library (usually ``/usr/share/locale/``). The
-      ``django`` domain is used for python and template translation strings
+      ``django`` domain is used for Python and template translation strings
       and is loaded into the global translation catalogs. The ``djangojs``
       domain is only used for JavaScript translation catalogs to make sure
       that those are as small as possible.
     * Django doesn't use ``xgettext`` alone. It uses Python wrappers around
       ``xgettext`` and ``msgfmt``. This is mostly for convenience.
 
+``gettext`` on Windows
+======================
+
+This is only needed for people who either want to extract message IDs or
+compile ``.po`` files. Translation work itself just involves editing existing
+``.po`` files, but if you want to create your own .po files, or want to test
+or compile a changed ``.po`` file, you will need the ``gettext`` utilities:
+
+    * Download the following zip files from http://sourceforge.net/projects/gettext
+
+      * ``gettext-runtime-X.bin.woe32.zip``
+      * ``gettext-tools-X.bin.woe32.zip``
+      * ``libiconv-X.bin.woe32.zip``
+
+    * Extract the 3 files in the same folder (i.e. ``C:\Program Files\gettext-utils``)
+
+    * Update the system PATH:
+
+      * ``Control Panel > System > Advanced > Environment Variables``
+      * In the ``System variables`` list, click ``Path``, click ``Edit``
+      * Add ``;C:\Program Files\gettext-utils\bin`` at the end of the ``Variable value``