Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitd9ff01f

Browse files
committed
Installer Fixes
1 parent04136a6 commitd9ff01f

File tree

4 files changed

+60
-59
lines changed

4 files changed

+60
-59
lines changed

‎nsis/postgres32.nsh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
!define PRODUCT_VERSION"9.4 (x86)"
44
!define PRODUCT_PUBLISHER"Postgres Professional Russia"
55
!define PRODUCT_WEB_SITE"http://postgrespro.ru"
6-
!define PRODUCT_DIR_REGKEY"Software\PostgresPro\PostgreSQL\9.4"
6+
!define PRODUCT_DIR_REGKEY"SOFTWARE\PostgresPro\x86\PostgreSQL\9.4"
77

8-
!define PG_REG_KEY"SOFTWARE\PostgreSQL\Installations\postgresql-9.4"
9-
!define PG_REG_SERVICE_KEY"SOFTWARE\PostgreSQL\Services\postgresql-9.4"
8+
!define PG_REG_KEY"SOFTWARE\PostgreSQL\x86\Installations\postgresql-9.4"
9+
!define PG_REG_SERVICE_KEY"SOFTWARE\PostgreSQL\x86\Services\postgresql-9.4"
1010

1111
!define PG_DEF_PORT"5432"
1212
!define PG_DEF_SUPERUSER"postgres"
1313
!define PG_DEF_SERVICEACCOUNT"NT AUTHORITY\NetworkService"
1414

15-
!define PG_DEF_SERVICEID"postgresql-9.4"
15+
!define PG_DEF_SERVICEID"postgresql-x86-9.4"
1616
!define PG_DEF_VERSION"9.4.4"
1717
!define PG_DEF_VERSION_SHORT"9.4"
1818
!define PG_DEF_BRANDING"PostgreSQL 9.4 (x86)"

‎nsis/postgres64.nsh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
; Common basic defines
22
!define PRODUCT_NAME"PostgreSQL"
3-
!define PRODUCT_VERSION"9.4"
3+
!define PRODUCT_VERSION"9.4 (x64)"
44
!define PRODUCT_PUBLISHER"Postgres Professional Russia"
55
!define PRODUCT_WEB_SITE"http://postgrespro.ru"
6-
!define PRODUCT_DIR_REGKEY"Software\PostgresPro\PostgreSQL\9.4"
6+
!define PRODUCT_DIR_REGKEY"SOFTWARE\PostgresPro\x64\PostgreSQL\9.4"
77

8-
!define PG_REG_KEY"SOFTWARE\PostgreSQL\Installations\postgresql-9.4"
9-
!define PG_REG_SERVICE_KEY"SOFTWARE\PostgreSQL\Services\postgresql-9.4"
8+
!define PG_REG_KEY"SOFTWARE\PostgreSQL\x64\Installations\postgresql-9.4"
9+
!define PG_REG_SERVICE_KEY"SOFTWARE\PostgreSQL\x64\Services\postgresql-9.4"
1010

1111
!define PG_DEF_PORT"5432"
1212
!define PG_DEF_SUPERUSER"postgres"
1313
!define PG_DEF_SERVICEACCOUNT"NT AUTHORITY\NetworkService"
1414

15-
!define PG_DEF_SERVICEID"postgresql-9.4"
15+
!define PG_DEF_SERVICEID"postgresql-x64-9.4"
1616
!define PG_DEF_VERSION"9.4.4"
1717
!define PG_DEF_VERSION_SHORT"9.4"
18-
!define PG_DEF_BRANDING"PostgreSQL 9.4"
18+
!define PG_DEF_BRANDING"PostgreSQL 9.4 (x64)"
1919

2020
!define PG_INS_SUFFIX"64bit_Setup.exe"
2121
!define PG_INS_SOURCE_DIR"C:\pg\distr_X64_9.4.4\postgresql\*.*"

‎nsis/postgresql.nsi

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ OutFile "${PRODUCT_NAME}_${PG_DEF_VERSION}_${PG_INS_SUFFIX}"
4949
InstallDir"$PROGRAMFILES32\${PRODUCT_NAME}\${PG_DEF_VERSION_SHORT}"
5050
!endif
5151

52-
BrandingText"PostgresPro.ru"
52+
BrandingText"Postgres Professional"
5353

5454
;Get installation folder from registry if available
5555
InstallDirRegKeyHKLM"${PRODUCT_DIR_REGKEY}"""
@@ -243,7 +243,7 @@ Section "PostgreSQL Server" sec1
243243
ClearErrors
244244
FileOpen$0$INSTDIR\scripts\runpgsql.bat w
245245
IfErrors creatBatErr2
246-
FileWrite$0'echo off$\r$\nchcp 1251$\r$\n"$INSTDIR\bin\psql.exe" -h localhost -U "$UserName_text" -d postgres -p $TextPort_text$\r$\npause'
246+
FileWrite$0'echo off$\r$\n"$INSTDIR\bin\psql.exe" -h localhost -U "$UserName_text" -d postgres -p $TextPort_text$\r$\npause'
247247
FileClose$0
248248

249249
creatBatErr2:
@@ -286,7 +286,7 @@ Section "PostgreSQL Server" sec1
286286
; set font Lucida Console for shortcut psql
287287
ReadRegStr$0HKCU"Console\SQL Shell (psql)""FaceName"
288288
${if}$0==""
289-
WriteRegStrHKCU"Console\SQL Shell (psql)""FaceName""Lucida Console"
289+
WriteRegStrHKCU"Console\SQL Shell (psql)""FaceName""Consolas"
290290
WriteRegDWORDHKCU"Console\SQL Shell (psql)""FontWeight""400"
291291
WriteRegDWORDHKCU"Console\SQL Shell (psql)""FontSize""917504"
292292
WriteRegDWORDHKCU"Console\SQL Shell (psql)""FontFamily""54"
@@ -457,6 +457,7 @@ Section "PostgreSQL Server" sec1
457457
Sleep1000
458458

459459
nsExec::ExecToStack /TIMEOUT=60000'sc start "$ServiceID_text"'
460+
Sleep5000
460461
Pop$0# return value/error/timeout
461462
Pop$1# printed text, up to ${NSIS_MAX_STRLEN}
462463

‎nsis/translates.nsi

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,112 @@
11

2-
LangString DATADIR_MESS${LANG_ENGLISH}"Please select a directory under which to store your data."
3-
LangString DATADIR_MESS${LANG_RUSSIAN}"Базы данных будут установлены в следующий каталог."
2+
LangString DATADIR_MESS${LANG_ENGLISH}"Please select a directory under which to store your data"
3+
LangString DATADIR_MESS${LANG_RUSSIAN}"Áàçû äàííûõ áóäóò óñòàíîâëåíû â ñëåäóþùèé êàòàëîã"
44

5-
LangString DATADIR_TITLE${LANG_ENGLISH}"Data directory."
6-
LangString DATADIR_TITLE${LANG_RUSSIAN}"Каталог для установки баз данных."
5+
LangString DATADIR_TITLE${LANG_ENGLISH}"Data directory"
6+
LangString DATADIR_TITLE${LANG_RUSSIAN}"Êàòàëîã äëÿ óñòàíîâêè áàç äàííûõ"
77

88
LangString BROWSE_BUTTON${LANG_ENGLISH}"Browse ..."
9-
LangString BROWSE_BUTTON${LANG_RUSSIAN}"Обзор ..."
9+
LangString BROWSE_BUTTON${LANG_RUSSIAN}"Îáçîð ..."
1010

1111

12-
LangString DESC_SecMS${LANG_ENGLISH}"Install run-time components that are required to run C++ applications."
13-
LangString DESC_SecMS${LANG_RUSSIAN}"Компоненты среды выполнения, необходимые для выполнения приложений."
12+
LangString DESC_SecMS${LANG_ENGLISH}"Install run-time components that are required to run C++ applications"
13+
LangString DESC_SecMS${LANG_RUSSIAN}"Êîìïîíåíòû ñðåäû âûïîëíåíèÿ, íåîáõîäèìûå äëÿ âûïîëíåíèÿ ïðèëîæåíèé"
1414

15-
LangString DESC_Sec1${LANG_ENGLISH}"Install PostgreSQL server on this computer."
16-
LangString DESC_Sec1${LANG_RUSSIAN}"Установка сервера PostgreSQLна этот компьютер"
15+
LangString DESC_Sec1${LANG_ENGLISH}"Install PostgreSQL server on this computer"
16+
LangString DESC_Sec1${LANG_RUSSIAN}"Óñòàíîâêà ñåðâåðà PostgreSQLíà ýòîò êîìïüþòåð"
1717

18-
LangString DESC_PgAdmin${LANG_ENGLISH}"Install pgAdmin tools on this computer."
19-
LangString DESC_PgAdmin${LANG_RUSSIAN}"Установка pgAdminдля управления сервером."
18+
LangString DESC_PgAdmin${LANG_ENGLISH}"Install pgAdmin tools on this computer"
19+
LangString DESC_PgAdmin${LANG_RUSSIAN}"Óñòàíîâêà pgAdminäëÿ óïðàâëåíèÿ ñåðâåðîì"
2020

21-
LangString DESC_Sec1dir${LANG_ENGLISH}"Please specify the directory where PostgreSQL will be installed."
22-
LangString DESC_Sec1die${LANG_RUSSIAN}"Пожалуйста, задайте директорию для установки PostgreSQL."
21+
LangString DESC_Sec1dir${LANG_ENGLISH}"Please specify the directory where PostgreSQL will be installed"
22+
LangString DESC_Sec1die${LANG_RUSSIAN}"Ïîæàëóéñòà, çàäàéòå äèðåêòîðèþ äëÿ óñòàíîâêè PostgreSQL"
2323

2424
LangString SERVER_SET_TITLE${LANG_ENGLISH}"Server options"
25-
LangString SERVER_SET_TITLE${LANG_RUSSIAN}"Параметры сервера"
25+
LangString SERVER_SET_TITLE${LANG_RUSSIAN}"Ïàðàìåòðû ñåðâåðà"
2626

27-
LangString SERVER_SET_SUBTITLE${LANG_ENGLISH}"Please specify options of server."
28-
LangString SERVER_SET_SUBTITLE${LANG_RUSSIAN}"Пожалуйста, задайте параметры сервера."
27+
LangString SERVER_SET_SUBTITLE${LANG_ENGLISH}"Please specify options of server"
28+
LangString SERVER_SET_SUBTITLE${LANG_RUSSIAN}"Ïîæàëóéñòà, çàäàéòå ïàðàìåòðû ñåðâåðà"
2929

3030
LangString SERVER_EXIST_TITLE${LANG_ENGLISH}"Existing installation"
31-
LangString SERVER_EXIST_TITLE${LANG_RUSSIAN}"Уже имеется установка сервера"
31+
LangString SERVER_EXIST_TITLE${LANG_RUSSIAN}"Óæå èìååòñÿ óñòàíîâêà ñåðâåðà"
3232

3333
LangString SERVER_EXIST_TEXT1${LANG_ENGLISH}"An existing PostgresSQL installation has been found at"
34-
LangString SERVER_EXIST_TEXT1${LANG_RUSSIAN}"Найдена установка сервера PostgresSQLв директории"
34+
LangString SERVER_EXIST_TEXT1${LANG_RUSSIAN}"Íàéäåíà óñòàíîâêà ñåðâåðà PostgresSQLâ äèðåêòîðèè"
3535

36-
LangString SERVER_EXIST_TEXT2${LANG_ENGLISH}"This instalation will be upgraded.$\n$\nIn order to upgrade, we may need to restart the server."
37-
LangString SERVER_EXIST_TEXT2${LANG_RUSSIAN}"Эта установка будет обновлена.$\n$\nВо время обновления потребуется перезапуск службы сервера."
36+
LangString SERVER_EXIST_TEXT2${LANG_ENGLISH}"This instalation will be upgraded.$\n$\nIn order to upgrade, we may need to restart the server"
37+
LangString SERVER_EXIST_TEXT2${LANG_RUSSIAN}"Ýòà óñòàíîâêà áóäåò îáíîâëåíà.$\n$\nÂî âðåìÿ îáíîâëåíèÿ ïîòðåáóåòñÿ ïåðåçàïóñê ñëóæáû ñåðâåðà"
3838

3939
LangString DATADIR_EXIST_TITLE${LANG_ENGLISH}"Existing data directory"
40-
LangString DATADIR_EXIST_TITLE${LANG_RUSSIAN}"Уже имеется директория с данными"
40+
LangString DATADIR_EXIST_TITLE${LANG_RUSSIAN}"Óæå èìååòñÿ äèðåêòîðèÿ ñ äàííûìè"
4141

4242
LangString DATADIR_EXIST_TEXT1${LANG_ENGLISH}"An existing data directory installation has been found at $DATA_DIR , port $TextPort_text . This directory will be used for this installation."
43-
LangString DATADIR_EXIST_TEXT1${LANG_RUSSIAN}"Уже имеется директория с данными $DATA_DIR ,порт $TextPort_text .Эта директория будет использована для этой установки сервера."
43+
LangString DATADIR_EXIST_TEXT1${LANG_RUSSIAN}"Óæå èìååòñÿ äèðåêòîðèÿ ñ äàííûìè $DATA_DIR ,ïîðò $TextPort_text .Ýòà äèðåêòîðèÿ áóäåò èñïîëüçîâàíà äëÿ ýòîé óñòàíîâêè ñåðâåðà."
4444

45-
LangString DATADIR_EXIST_ERROR1${LANG_ENGLISH}"An existing file with name $DATA_DIR has been found. Can not create directory with this name."
46-
LangString DATADIR_EXIST_ERROR1${LANG_RUSSIAN}"Эта директория и ее конфигурация будет использована для этой установки сервера."
45+
LangString DATADIR_EXIST_ERROR1${LANG_ENGLISH}"An existing file with name $DATA_DIR has been found. Can not create directory with this name"
46+
LangString DATADIR_EXIST_ERROR1${LANG_RUSSIAN}"Ýòà äèðåêòîðèÿ è åå êîíôèãóðàöèÿ áóäåò èñïîëüçîâàíà äëÿ ýòîé óñòàíîâêè ñåðâåðà"
4747

48-
LangString UNINSTALL_END${LANG_ENGLISH}"Uninstallation has been ended.$\n$\nThe data directory has not been removed:"
49-
LangString UNINSTALL_END${LANG_RUSSIAN}"Удаление PostgreSQLсервера окончено.$\n$\Директория с данными не удалена:"
48+
LangString UNINSTALL_END${LANG_ENGLISH}"Uninstallation has been ended.$\n$\nPerhaps you need to restart your computer as service '$ServiceID_text' exists.$\n$\nThe data directory has not been removed:"
49+
LangString UNINSTALL_END${LANG_RUSSIAN}"Óäàëåíèå PostgreSQLñåðâåðà îêîí÷åíî.$\n$\nÂîçìîæíî, âàì íóæíî áóäåò ïåðåçàãðóçèòü êîìïüþòåð, åñëè ñåðâèñ '$ServiceID_text' ñóùåñòâóåò.$\n$\nÄèðåêòîðèÿ ñ äàííûìè íå óäàëåíà:"
5050

5151

5252
LangString MESS_PASS1${LANG_ENGLISH}"Passwords Do Not Match!"
53-
LangString MESS_PASS1${LANG_RUSSIAN}"Введенные пароль и подтвтерждение различаются!"
53+
LangString MESS_PASS1${LANG_RUSSIAN}"Ââåäåííûå ïàðîëü è ïîäòâòåðæäåíèå ðàçëè÷àþòñÿ!"
5454

5555
LangString MESS_PASS2${LANG_ENGLISH}"You do not enter a password! Do you confirm the installation without a password?"
56-
LangString MESS_PASS2${LANG_RUSSIAN}"Вы не ввели пароль!$\n$\nПодтверждаете установку без пароля?"
56+
LangString MESS_PASS2${LANG_RUSSIAN}"Âû íå ââåëè ïàðîëü!$\n$\nÏîäòâåðæäàåòå óñòàíîâêó áåç ïàðîëÿ?"
5757

5858
LangString MESS_PASS3${LANG_ENGLISH}"You entered the password with non-Latin characters. Do you wish use that password?"
59-
LangString MESS_PASS3${LANG_RUSSIAN}"Вы использовали в пароле нелатинские символы. Это может вызвать \
60-
проблемы с вводом пароля! Продолжить"
59+
LangString MESS_PASS3${LANG_RUSSIAN}"Âû èñïîëüçîâàëè â ïàðîëå íåëàòèíñêèå ñèìâîëû. Ýòî ìîæåò âûçâàòü \
60+
ïðîáëåìû ñ ââîäîì ïàðîëÿ! Ïðîäîëæèòü"
6161

6262

6363
LangString DLG_PORT${LANG_ENGLISH}"Port:"
64-
LangString DLG_PORT${LANG_RUSSIAN}"Порт:"
64+
LangString DLG_PORT${LANG_RUSSIAN}"Ïîðò:"
6565

6666
LangString DLG_ADR1${LANG_ENGLISH}"Addresses:"
67-
LangString DLG_ADR1${LANG_RUSSIAN}"Адреса:"
67+
LangString DLG_ADR1${LANG_RUSSIAN}"Àäðåñà:"
6868

6969
LangString DLG_ADR2${LANG_ENGLISH}"Allow connections from any IP address:"
70-
LangString DLG_ADR2${LANG_RUSSIAN}"Поддерживать подсоединения с любых IPадресов."
70+
LangString DLG_ADR2${LANG_RUSSIAN}"Ïîääåðæèâàòü ïîäñîåäèíåíèÿ ñ ëþáûõ IPàäðåñîâ:"
7171

7272
LangString DLG_LOCALE${LANG_ENGLISH}"Locale:"
73-
LangString DLG_LOCALE${LANG_RUSSIAN}"Локаль:"
73+
LangString DLG_LOCALE${LANG_RUSSIAN}"Ëîêàëü:"
7474

7575
LangString DLG_SUPERUSER${LANG_ENGLISH}"Super user:"
76-
LangString DLG_SUPERUSER${LANG_RUSSIAN}"Супер пользователь:"
76+
LangString DLG_SUPERUSER${LANG_RUSSIAN}"Ñóïåð ïîëüçîâàòåëü:"
7777

7878
LangString DLG_PASS1${LANG_ENGLISH}"Password:"
79-
LangString DLG_PASS1${LANG_RUSSIAN}"Пароль:"
79+
LangString DLG_PASS1${LANG_RUSSIAN}"Ïàðîëü:"
8080

8181
LangString DLG_PASS2${LANG_ENGLISH}"Confirm:"
82-
LangString DLG_PASS2${LANG_RUSSIAN}"Подтверждение:"
82+
LangString DLG_PASS2${LANG_RUSSIAN}"Ïîäòâåðæäåíèå:"
8383

8484
LangString DLG_OPT1${LANG_ENGLISH}"It is possible to optimize server performance based on the amount of memory installed $AllMem Mb. \
8585
The server will allocate more memory. \
8686
The parameters are written to the file $DATA_DIR\postgresql.conf"
8787

88-
LangString DLG_OPT1${LANG_RUSSIAN}"Можно провести оптимизацию производительности сервера исходя из объема установленной памяти $AllMem Mb. \
89-
Cерверу будет выделено больше оперативной памяти. \
90-
Параметры будут записаны в файл $DATA_DIR\postgresql.conf"
88+
LangString DLG_OPT1${LANG_RUSSIAN}"Ìîæíî ïðîâåñòè îïòèìèçàöèþ ïðîèçâîäèòåëüíîñòè ñåðâåðà èñõîäÿ èç îáúåìà óñòàíîâëåííîé ïàìÿòè $AllMem Mb. \
89+
Cåðâåðó áóäåò âûäåëåíî áîëüøå îïåðàòèâíîé ïàìÿòè. \
90+
Ïàðàìåòðû áóäóò çàïèñàíû â ôàéë $DATA_DIR\postgresql.conf"
9191

9292
LangString DLG_ENVVAR${LANG_ENGLISH}"Set up environment variables"
93-
LangString DLG_ENVVAR${LANG_RUSSIAN}"Настроить переменные среды"
93+
LangString DLG_ENVVAR${LANG_RUSSIAN}"Íàñòðîèòü ïåðåìåííûå ñðåäû"
9494

9595

9696

9797
LangString DLG_OPT2${LANG_ENGLISH}"Make optimizations"
98-
LangString DLG_OPT2${LANG_RUSSIAN}"Провести оптимизацию параметров"
98+
LangString DLG_OPT2${LANG_RUSSIAN}"Ïðîâåñòè îïòèìèçàöèþ ïàðàìåòðîâ"
9999

100100
LangString DLG_OPT3${LANG_ENGLISH}"Use default settings"
101-
LangString DLG_OPT3${LANG_RUSSIAN}"Использовать параметры по умолчанию"
101+
LangString DLG_OPT3${LANG_RUSSIAN}"Èñïîëüçîâàòü ïàðàìåòðû ïî óìîë÷àíèþ"
102102

103103
LangString DEF_LOCALE_NAME${LANG_ENGLISH}"Default"
104-
LangString DEF_LOCALE_NAME${LANG_RUSSIAN}"Настройка ОС"
104+
LangString DEF_LOCALE_NAME${LANG_RUSSIAN}"Íàñòðîéêà ÎÑ"
105105

106106

107107

108108
LangString MESS_STOP_SERVER${LANG_ENGLISH}"In order to upgrade, we may need to restart the server!$\n$\nContinue?"
109-
LangString MESS_STOP_SERVER${LANG_RUSSIAN}"Во время обновления потребуется перезапуск службы сервера!$\n$\nПродолжить?"
109+
LangString MESS_STOP_SERVER${LANG_RUSSIAN}"Âî âðåìÿ îáíîâëåíèÿ ïîòðåáóåòñÿ ïåðåçàïóñê ñëóæáû ñåðâåðà!$\n$\nÏðîäîëæèòü?"
110110

111111
LangString MESS_ERROR_SERVER${LANG_ENGLISH}"An error occurred while initializing the server! Perhaps Server service failed to start."
112-
LangString MESS_ERROR_SERVER${LANG_RUSSIAN}"Возникла ошибка при инициализации сервера! Возможно служба сервера не смогла запуститься."
112+
LangString MESS_ERROR_SERVER${LANG_RUSSIAN}"Âîçíèêëà îøèáêà ïðè èíèöèàëèçàöèè ñåðâåðà! Âîçìîæíî ñëóæáà ñåðâåðà íå ñìîãëà çàïóñòèòüñÿ."

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp