Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 366B29DED for ; Thu, 16 Feb 2012 15:44:59 +0000 (UTC) Received: (qmail 98750 invoked by uid 500); 16 Feb 2012 15:44:59 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 98692 invoked by uid 500); 16 Feb 2012 15:44:59 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 98684 invoked by uid 99); 16 Feb 2012 15:44:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Feb 2012 15:44:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Feb 2012 15:44:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id F1EA72388860 for ; Thu, 16 Feb 2012 15:44:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1245049 - /directory/studio/trunk/application/application-win32-x86_64-exe/src/main/resources/installer.nsi Date: Thu, 16 Feb 2012 15:44:37 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120216154437.F1EA72388860@eris.apache.org> Author: pamarcelot Date: Thu Feb 16 15:44:37 2012 New Revision: 1245049 URL: http://svn.apache.org/viewvc?rev=1245049&view=rev Log: Fix for DIRSTUDIO-782 (Improve Windows installer with JRE detection and creation of 'Apache Directory Studio.ini' file). Modified: directory/studio/trunk/application/application-win32-x86_64-exe/src/main/resources/installer.nsi Modified: directory/studio/trunk/application/application-win32-x86_64-exe/src/main/resources/installer.nsi URL: http://svn.apache.org/viewvc/directory/studio/trunk/application/application-win32-x86_64-exe/src/main/resources/installer.nsi?rev=1245049&r1=1245048&r2=1245049&view=diff ============================================================================== --- directory/studio/trunk/application/application-win32-x86_64-exe/src/main/resources/installer.nsi (original) +++ directory/studio/trunk/application/application-win32-x86_64-exe/src/main/resources/installer.nsi Thu Feb 16 15:44:37 2012 @@ -205,9 +205,9 @@ # Functions # # Internationalized strings - LangString message ${LANG_ENGLISH} "${Application} is already installed.$\n$\nClick 'OK' to remove the previous version$\nor 'Cancel' to cancel this installation." - LangString message ${LANG_FRENCH} "${Application} est déjà installé.$\n$\nCliquez sur 'OK' pour supprimer la version précédente$\nou sur 'Annuler' pour annuler cette installation." - LangString message ${LANG_GERMAN} "${Application} ist bereits installiert.$\n$\nKlicke 'OK' um die frühere Version zu entfernen$\noder 'Abbruch' um die Installation abzubrechen." + LangString alreadyInstalledMessage ${LANG_ENGLISH} "${Application} is already installed.$\n$\nClick 'OK' to remove the previous version$\nor 'Cancel' to cancel this installation." + LangString alreadyInstalledMessage ${LANG_FRENCH} "${Application} est déjà installé.$\n$\nCliquez sur 'OK' pour supprimer la version précédente$\nou sur 'Annuler' pour annuler cette installation." + LangString alreadyInstalledMessage ${LANG_GERMAN} "${Application} ist bereits installiert.$\n$\nKlicke 'OK' um die frühere Version zu entfernen$\noder 'Abbruch' um die Installation abzubrechen." LangString javaPageTitle ${LANG_ENGLISH} "Java Home Directory" LangString javaPageTitle ${LANG_FRENCH} "Répertoire Java Home"