diff options
author | sb <sb@openoffice.org> | 2010-03-04 23:05:27 +0100 |
---|---|---|
committer | sb <sb@openoffice.org> | 2010-03-04 23:05:27 +0100 |
commit | d11e7c65afe7eb24f8c696b5bd18898ae095f382 (patch) | |
tree | b8fe110f9c1c918d69579e38e176c4e8c9804e13 /setup_native | |
parent | 8213de345f24af0c55b587802d5738e611b7009c (diff) | |
parent | 60c0e59fd450e39902d85918d2243fb83c02a21d (diff) |
merged in re/DEV300_next towards DEV300_m74
Diffstat (limited to 'setup_native')
-rw-r--r-- | setup_native/scripts/javaloader.sh | 4 | ||||
-rw-r--r-- | setup_native/source/mac/macinstall.ulf | 2 |
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" |