summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2010-03-03 13:22:40 +0100
committerIvo Hinkelmann <ihi@openoffice.org>2010-03-03 13:22:40 +0100
commit60c0e59fd450e39902d85918d2243fb83c02a21d (patch)
treedf61bb60027d7ed2474bb39958773a27ad4ca69f
parent7514bbabcf33c821feeba352eac665a03d0957ad (diff)
parent47b07b31e8710f0be5b24cfad78034330158fa48 (diff)
CWS-TOOLING: integrate CWS native278
Notes
split repo tag: components_ooo/DEV300_m74
-rw-r--r--setup_native/scripts/javaloader.sh4
-rw-r--r--setup_native/source/mac/macinstall.ulf2
2 files changed, 3 insertions, 3 deletions
diff --git a/setup_native/scripts/javaloader.sh b/setup_native/scripts/javaloader.sh
index 22b1eb927625..e23505f586b0 100644
--- a/setup_native/scripts/javaloader.sh
+++ b/setup_native/scripts/javaloader.sh
@@ -242,7 +242,7 @@ install_linux_rpm()
# start to install jre
echo "Extracting ..."
olddir=`pwd`
- cd $tempdir
+ cd "$tempdir"
rpm2cpio $tempjrefile | cpio -i --make-directories
rm -f $tempjrefile # we do not need it anymore, so conserve discspace
@@ -330,7 +330,7 @@ install_linux_rpm()
fi
echo "Done."
- cd $olddir
+ cd "$olddir"
}
find_rpm2cpio()
diff --git a/setup_native/source/mac/macinstall.ulf b/setup_native/source/mac/macinstall.ulf
index 4651d93e03ab..2d92e8c260fb 100644
--- a/setup_native/source/mac/macinstall.ulf
+++ b/setup_native/source/mac/macinstall.ulf
@@ -62,7 +62,7 @@ en-US = "Installation failed."
en-US = "Installation of [PRODUCTNAME] language pack completed."
[InstallCompleteText2]
-en-US = "Call 'Tools-Options-Language Settings' to change the user interface language."
+en-US = "Call '[PRODUCTNAME]-Preferences-Language Settings-Languages' to change the user interface language."
[InstallCompleteTextPatch]
en-US = "Installation of [FULLPRODUCTNAME] completed"