From 529c1ac41c0da37b4b81eb80ba87e2201a1ae0b6 Mon Sep 17 00:00:00 2001
From: Emil Ivov <emcho@jitsi.org>
Date: Tue, 14 Aug 2007 10:26:43 +0000
Subject: [PATCH] i18n improvements by Michael Koch

---
 build.xml                                     | 24 +++++++++++---
 .../impl/gui/i18n/messages.properties         | 31 +++++++++++++++++--
 2 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/build.xml b/build.xml
index a84fe5a50..ab0e8e7c8 100644
--- a/build.xml
+++ b/build.xml
@@ -170,11 +170,11 @@
     </path>
 
     <path id="project.class.path">
-		<pathelement location="${lib}"/>
+        <pathelement location="${lib}"/>
 
         <!-- Add this bundle to the global class path as we need
              the ScLogFormatter there-->
-		<pathelement location="${bundles.dest}/util.jar"/>
+        <pathelement location="${bundles.dest}/util.jar"/>
         <!-- for mac specific plugins -->
         <pathelement location="/System/Library/Java"/>
 
@@ -272,7 +272,6 @@
                 <include name="**/*.png"/>
                 <include name="**/*.PNG"/>
                 <include name="**/*.jpg"/>
-                <include name="**/*.properties"/>
                 <include name="**/*.xml"/>
                 <include name="**/*.themerc"/>
                 <include name="**/gtkrc"/>
@@ -290,6 +289,15 @@
         </copy>
     </target>
 
+    <target name="native2ascii">
+        <!-- internal target -
+             convert property file encoding from UTF-8 to ASCII,
+             save converted files in ${dest} dir -->
+        <native2ascii src="${src}" dest="${dest}" encoding="UTF-8"
+            includes="**/*.properties*" />
+
+    </target>
+
     <!-- JAVADOC -->
     <target name="javadoc"
       description="Generates project javadoc.">
@@ -306,8 +314,7 @@
 
     <!--PACKAGE-->
     <!--Copy resource files and update bundles jars. -->
-    <target name="package" depends="resource,bundles"/>
-
+    <target name="package" depends="resource,native2ascii,bundles"/>
 
     <!--MAKE-->
     <target name="make" depends="clean-bundle-repositories,compile,package"
@@ -762,6 +769,13 @@
             <!-- Setting properties necessary for dependencies on native libs.-->
             <sysproperty key="java.library.path"
                 path="${ld.library.path}:${path}:${dyld.library.path}"/>
+
+            <!-- pass l10n properties from ant call for
+                 easy translation debugging -->
+            <sysproperty key="user.language" value="${user.language}" />
+            <sysproperty key="user.country" value="${user.country}" />
+            <sysproperty key="user.variant" value="${user.variant}" />
+
             <env key="LD_LIBRARY_PATH" path="${ld.library.path}"/>
             <env key="PATH" path="${path}"/>
             <env key="DYLD_LIBRARY_PATH" path="${dyld.library.path}"/>
diff --git a/src/net/java/sip/communicator/impl/gui/i18n/messages.properties b/src/net/java/sip/communicator/impl/gui/i18n/messages.properties
index e6a799e24..cea1ee5d0 100644
--- a/src/net/java/sip/communicator/impl/gui/i18n/messages.properties
+++ b/src/net/java/sip/communicator/impl/gui/i18n/messages.properties
@@ -1,3 +1,30 @@
+# SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
+#
+# Distributable under LGPL license.
+# See terms of license at gnu.org.
+
+# Note to translators:
+# To translate SIP Communicator to your language
+# - copy messages.properties to messages_xx.properties
+#   (where xx is the ISO 639-1 language code of your language)
+# - the file must use UTF-8 encoding
+# - all entries are of the form key=translation, where only the
+#   translation part has to be changed
+# - {0}, {1}... are parameters which will be replaced by the
+#   actual text at runtime, place them as you wish
+# - you don't have to translate all entries, if an entry is not
+#   found in your translation, the text in messages.properties will
+#   be used
+# - \ at the end of a line means that the translation is continued
+#   in the next line
+#
+# To start SIP Communicator with a language that is different
+# from your system's language, pass the language code to ant:
+# ant -Duser.language=xx run
+#
+# The same rules apply to the properties files found in the other
+# directories.
+
 about=&About
 accept=&Accept
 account=Account
@@ -46,7 +73,7 @@ chatRoomAlreadyJoined=The {0} chat room is already joined.
 chatRoomConfiguration={0} chat room configuration
 chatRoomOpenConfigFailed=Failed to obtain the {0} chat room configuration form.
 chatRoomOpenConfigForbidden=Could not obtain the {0} chat room configuration form. Only administrators of the chat room could see and change the configuration form.
-chatRoomConfigFormSubmitFailed=An error occured while trying to submit the configuration form for chat room {0}. 
+chatRoomConfigFormSubmitFailed=An error occured while trying to submit the configuration form for chat room {0}.
 chatRoomUserJoined=has joined {0}
 chatRoomUserLeft=has left {0}
 chatRoomUserKicked=has been kicked from {0}
@@ -210,7 +237,7 @@ save=&Save
 search=&Search
 searchForChatRooms=&Search for chat rooms
 searchForChatRoomsText=Click the below button to show all chat rooms existing in the selected server. Then select the one you would like to join and click the join button.
-securityAuthorityRealm=The {0} server has requested your authentication. 
+securityAuthorityRealm=The {0} server has requested your authentication.
 selectAccount=Select account
 selectAccountRegistration=From the list below select the account registration wizard to use for creating a new account.
 selectAccountRegWizardTitle=Select account registration