diff --git a/Scripts/Functions/Locale/locale.sh b/Scripts/Functions/Locale/locale.sh
index 7500c7f..b87c6c4 100755
--- a/Scripts/Functions/Locale/locale.sh
+++ b/Scripts/Functions/Locale/locale.sh
@@ -29,7 +29,7 @@ function locale {
     # language is already used as translation pattern and there is no
     # translation messages for it.
     if [[ $(cli_getCurrentLocale) =~ '^en' ]];then
-        cli_printMessage "`gettext "Cannot locale English language to itself."`" --as-error-line
+        cli_printMessage "`gettext "Localizing English language to itself isn't supported."`" --as-error-line
     fi
 
     local ACTIONNAMS=''
@@ -86,13 +86,13 @@ function locale {
 
         # Define localization working directory. This is the place
         # where language-specific directories are stored in.
-        WORKDIR=$(echo ${ACTIONVAL} \
+        L10N_WORKDIR=$(echo ${ACTIONVAL} \
             | sed -r -e "s!trunk/(Identity|Scripts|Manuals)!trunk/L10n/\1!")
 
         # Redefine localization working directory to include
         # language-specific directories. This is the place where POT,
         # PO, and MO files are stored in.
-        WORKDIR=$WORKDIR/$(cli_getCurrentLocale)
+        L10N_WORKDIR="${L10N_WORKDIR}/$(cli_getCurrentLocale)"
 
         # Execute action names.
         for ACTIONNAM in $ACTIONNAMS;do
diff --git a/Scripts/Functions/Locale/locale_deleteMessages.sh b/Scripts/Functions/Locale/locale_deleteMessages.sh
index 7721d7c..be98e0a 100755
--- a/Scripts/Functions/Locale/locale_deleteMessages.sh
+++ b/Scripts/Functions/Locale/locale_deleteMessages.sh
@@ -30,13 +30,13 @@ function locale_deleteMessages {
     cli_printMessage '-' --as-separator-line
 
     # Print action message.
-    cli_printMessage "$WORKDIR" --as-deleting-line
+    cli_printMessage "$L10N_WORKDIR" --as-deleting-line
 
     # Verify existence of localization working directory. We cannot
     # remove translation files that don't exist.
-    cli_checkFiles "$WORKDIR"
+    cli_checkFiles "$L10N_WORKDIR"
 
     # Delete localization working directory using subversion quietly.
-    svn del "$WORKDIR" --quiet
+    svn del "$L10N_WORKDIR" --quiet
 
 }
diff --git a/Scripts/Functions/Locale/locale_editMessages.sh b/Scripts/Functions/Locale/locale_editMessages.sh
index 6247999..8027773 100755
--- a/Scripts/Functions/Locale/locale_editMessages.sh
+++ b/Scripts/Functions/Locale/locale_editMessages.sh
@@ -30,19 +30,19 @@ function locale_editMessages {
 
     # Prepare localization working directory to receive translation
     # files.
-    if [[ ! -d ${WORKDIR} ]];then
+    if [[ ! -d ${L10N_WORKDIR} ]];then
 
         # Print separator line.
         cli_printMessage "-" --as-separator-line
 
         # Output action message.
-        cli_printMessage "${WORKDIR}" --as-creating-line
+        cli_printMessage "${L10N_WORKDIR}" --as-creating-line
 
         # Create localization working directory making parent
         # directories as needed. Subversion doesn't create directories
         # recursively, so we use the system's `mkdir' command and then
         # subversion to register the changes.
-        mkdir -p ${WORKDIR}
+        mkdir -p ${L10N_WORKDIR}
 
         # Commit changes from working copy to central repository only.
         # At this point, changes in the repository are not merged in
@@ -57,7 +57,7 @@ function locale_editMessages {
     if [[ $ACTIONVAL =~ "^$(cli_getRepoTLDir)/(Manuals|Identity/Models)/.*$" ]];then
 
         # Define list of locale files for XML-based files.
-        FILES=$(cli_getFilesList ${WORKDIR} --pattern=".*/messages\.po")
+        FILES=$(cli_getFilesList ${L10N_WORKDIR} --pattern=".*/messages\.po")
 
         # Do not create machine objects for XML-based files.
         FLAG_DONT_CREATE_MO='true'
@@ -65,7 +65,7 @@ function locale_editMessages {
     elif [[ $ACTIONVAL =~ "^$(cli_getRepoTLDir)/Scripts$" ]];then
 
         # Define list of locale files for shell script files.
-        FILES=$(cli_getFilesList ${WORKDIR} --pattern=".*/${TEXTDOMAIN}\.po")
+        FILES=$(cli_getFilesList ${L10N_WORKDIR} --pattern=".*/${TEXTDOMAIN}\.po")
 
     else
 
diff --git a/Scripts/Functions/Locale/locale_updateMessageShell.sh b/Scripts/Functions/Locale/locale_updateMessageShell.sh
index 5307c80..69dee62 100755
--- a/Scripts/Functions/Locale/locale_updateMessageShell.sh
+++ b/Scripts/Functions/Locale/locale_updateMessageShell.sh
@@ -33,7 +33,7 @@ function locale_updateMessageShell {
     # Define file name used as reference to create portable object
     # templates (.pot), portable objects (.po) and machine objects
     # (.mo).
-    local FILE="${WORKDIR}/${TEXTDOMAIN}"
+    local FILE="${L10N_WORKDIR}/${TEXTDOMAIN}"
 
     # Define regular expression to match extensions of XML files we
     # use inside the repository.
diff --git a/Scripts/Functions/Locale/locale_updateMessageXml.sh b/Scripts/Functions/Locale/locale_updateMessageXml.sh
index 86846e1..f3a72bf 100755
--- a/Scripts/Functions/Locale/locale_updateMessageXml.sh
+++ b/Scripts/Functions/Locale/locale_updateMessageXml.sh
@@ -31,7 +31,7 @@ function locale_updateMessageXml {
 
     # Define filename used to create both portable object templates
     # (.pot) and portable objects (.po) files.
-    local MESSAGES="${WORKDIR}/messages"
+    local MESSAGES="${L10N_WORKDIR}/messages"
 
     # Define regular expression to match the file extension of all
     # XML-based source files that can be localized inside the working
diff --git a/Scripts/Functions/Locale/locale_updateMessages.sh b/Scripts/Functions/Locale/locale_updateMessages.sh
index 86a06b8..742888d 100755
--- a/Scripts/Functions/Locale/locale_updateMessages.sh
+++ b/Scripts/Functions/Locale/locale_updateMessages.sh
@@ -31,7 +31,7 @@ function locale_updateMessages {
 
     # Verify existence of localization working directory. We cannot
     # update translation files that don't exist.
-    cli_checkFiles $WORKDIR
+    cli_checkFiles $L10N_WORKDIR
 
     local ACTIONNAM=''
 
@@ -54,9 +54,7 @@ function locale_updateMessages {
         locale_updateMessageShell
 
     else
-
-        cli_printMessage "`gettext "The path provided does not support localization."`" --as-error-line
-
+        cli_printMessage "`gettext "The path provided doesn't support localization."`" --as-error-line
     fi
 
 }