- Notifications
You must be signed in to change notification settings - Fork18
Fixes#2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Fixes#2
Changes fromall commits
Commits
Show all changes
3 commits Select commitHold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
8 changes: 4 additions & 4 deletionsnsis/postgres32.nsh
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
12 changes: 6 additions & 6 deletionsnsis/postgres64.nsh
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,21 @@ | ||
; Common basic defines | ||
!define PRODUCT_NAME "PostgreSQL" | ||
!define PRODUCT_VERSION "9.4 (x64)" | ||
!define PRODUCT_PUBLISHER "Postgres Professional Russia" | ||
!define PRODUCT_WEB_SITE "http://postgrespro.ru" | ||
!define PRODUCT_DIR_REGKEY "SOFTWARE\PostgresPro\x64\PostgreSQL\9.4" | ||
!define PG_REG_KEY "SOFTWARE\PostgreSQL\x64\Installations\postgresql-9.4" | ||
!define PG_REG_SERVICE_KEY "SOFTWARE\PostgreSQL\x64\Services\postgresql-9.4" | ||
!define PG_DEF_PORT "5432" | ||
!define PG_DEF_SUPERUSER "postgres" | ||
!define PG_DEF_SERVICEACCOUNT "NT AUTHORITY\NetworkService" | ||
!define PG_DEF_SERVICEID "postgresql-x64-9.4" | ||
!define PG_DEF_VERSION "9.4.4" | ||
!define PG_DEF_VERSION_SHORT "9.4" | ||
!define PG_DEF_BRANDING "PostgreSQL 9.4 (x64)" | ||
!define PG_INS_SUFFIX "64bit_Setup.exe" | ||
!define PG_INS_SOURCE_DIR "C:\pg\distr_X64_9.4.4\postgresql\*.*" |
7 changes: 4 additions & 3 deletionsnsis/postgresql.nsi
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
92 changes: 46 additions & 46 deletionsnsis/translates.nsi
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,112 +1,112 @@ | ||
LangString DATADIR_MESS ${LANG_ENGLISH} "Please select a directory under which to store your data" | ||
LangString DATADIR_MESS ${LANG_RUSSIAN} "���� ������ ����� ����������� � ��������� �������" | ||
LangString DATADIR_TITLE ${LANG_ENGLISH} "Data directory" | ||
LangString DATADIR_TITLE ${LANG_RUSSIAN} "������� ��� ��������� ��� ������" | ||
LangString BROWSE_BUTTON ${LANG_ENGLISH} "Browse ..." | ||
LangString BROWSE_BUTTON ${LANG_RUSSIAN} "����� ..." | ||
LangString DESC_SecMS ${LANG_ENGLISH} "Install run-time components that are required to run C++ applications" | ||
LangString DESC_SecMS ${LANG_RUSSIAN} "���������� ����� ����������, ����������� ��� ���������� ����������" | ||
LangString DESC_Sec1 ${LANG_ENGLISH} "Install PostgreSQL server on this computer" | ||
LangString DESC_Sec1 ${LANG_RUSSIAN} "��������� ������� PostgreSQL�� ���� ���������" | ||
LangString DESC_PgAdmin ${LANG_ENGLISH} "Install pgAdmin tools on this computer" | ||
LangString DESC_PgAdmin ${LANG_RUSSIAN} "��������� pgAdmin��� ���������� ��������" | ||
LangString DESC_Sec1dir ${LANG_ENGLISH} "Please specify the directory where PostgreSQL will be installed" | ||
LangString DESC_Sec1die ${LANG_RUSSIAN} "����������, ������� ���������� ��� ��������� PostgreSQL" | ||
LangString SERVER_SET_TITLE ${LANG_ENGLISH} "Server options" | ||
LangString SERVER_SET_TITLE ${LANG_RUSSIAN} "��������� �������" | ||
LangString SERVER_SET_SUBTITLE ${LANG_ENGLISH} "Please specify options of server" | ||
LangString SERVER_SET_SUBTITLE ${LANG_RUSSIAN} "����������, ������� ��������� �������" | ||
LangString SERVER_EXIST_TITLE ${LANG_ENGLISH} "Existing installation" | ||
LangString SERVER_EXIST_TITLE ${LANG_RUSSIAN} "��� ������� ��������� �������" | ||
LangString SERVER_EXIST_TEXT1 ${LANG_ENGLISH} "An existing PostgresSQL installation has been found at " | ||
LangString SERVER_EXIST_TEXT1 ${LANG_RUSSIAN} "������� ��������� ������� PostgresSQL� ���������� " | ||
LangString SERVER_EXIST_TEXT2 ${LANG_ENGLISH} "This instalation will be upgraded.$\n$\nIn order to upgrade, we may need to restart the server " | ||
LangString SERVER_EXIST_TEXT2 ${LANG_RUSSIAN} "��� ��������� ����� ���������.$\n$\n�� ����� ���������� ����������� ���������� ������ ������� " | ||
LangString DATADIR_EXIST_TITLE ${LANG_ENGLISH} "Existing data directory" | ||
LangString DATADIR_EXIST_TITLE ${LANG_RUSSIAN} "��� ������� ���������� � �������" | ||
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." | ||
LangString DATADIR_EXIST_TEXT1 ${LANG_RUSSIAN} "��� ������� ���������� � ������� $DATA_DIR ,���� $TextPort_text .��� ���������� ����� ������������ ��� ���� ��������� �������." | ||
LangString DATADIR_EXIST_ERROR1 ${LANG_ENGLISH} "An existing file with name $DATA_DIR has been found. Can not create directory with this name" | ||
LangString DATADIR_EXIST_ERROR1 ${LANG_RUSSIAN} "��� ���������� � �� ������������ ����� ������������ ��� ���� ��������� �������" | ||
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: " | ||
LangString UNINSTALL_END ${LANG_RUSSIAN} "�������� PostgreSQL������� ��������.$\n$\n��������, ��� ����� ����� ������������� ���������, ���� ������ '$ServiceID_text' ����������.$\n$\n���������� � ������� �� �������: " | ||
LangString MESS_PASS1 ${LANG_ENGLISH} "Passwords Do Not Match!" | ||
LangString MESS_PASS1 ${LANG_RUSSIAN} "��������� ������ � �������������� �����������!" | ||
LangString MESS_PASS2 ${LANG_ENGLISH} "You do not enter a password! Do you confirm the installation without a password?" | ||
LangString MESS_PASS2 ${LANG_RUSSIAN} "�� �� ����� ������!$\n$\n������������� ��������� ��� ������?" | ||
LangString MESS_PASS3 ${LANG_ENGLISH} "You entered the password with non-Latin characters. Do you wish use that password?" | ||
LangString MESS_PASS3 ${LANG_RUSSIAN} "�� ������������ � ������ ����������� �������. ��� ����� ������� \ | ||
�������� � ������ ������! ����������" | ||
LangString DLG_PORT ${LANG_ENGLISH} "Port:" | ||
LangString DLG_PORT ${LANG_RUSSIAN} "����:" | ||
LangString DLG_ADR1 ${LANG_ENGLISH} "Addresses:" | ||
LangString DLG_ADR1 ${LANG_RUSSIAN} "������:" | ||
LangString DLG_ADR2 ${LANG_ENGLISH} "Allow connections from any IP address:" | ||
LangString DLG_ADR2 ${LANG_RUSSIAN} "������������ ������������� � ����� IP�������:" | ||
LangString DLG_LOCALE ${LANG_ENGLISH} "Locale:" | ||
LangString DLG_LOCALE ${LANG_RUSSIAN} "������:" | ||
LangString DLG_SUPERUSER ${LANG_ENGLISH} "Super user:" | ||
LangString DLG_SUPERUSER ${LANG_RUSSIAN} "����� ������������:" | ||
LangString DLG_PASS1 ${LANG_ENGLISH} "Password:" | ||
LangString DLG_PASS1 ${LANG_RUSSIAN} "������:" | ||
LangString DLG_PASS2 ${LANG_ENGLISH} "Confirm:" | ||
LangString DLG_PASS2 ${LANG_RUSSIAN} "�������������:" | ||
LangString DLG_OPT1 ${LANG_ENGLISH} "It is possible to optimize server performance based on the amount of memory installed $AllMem Mb. \ | ||
The server will allocate more memory. \ | ||
The parameters are written to the file $DATA_DIR\postgresql.conf" | ||
LangString DLG_OPT1 ${LANG_RUSSIAN} "����� �������� ����������� ������������������ ������� ������ �� ������ ������������� ������ $AllMem Mb. \ | ||
C������ ����� �������� ������ ����������� ������. \ | ||
��������� ����� �������� � ���� $DATA_DIR\postgresql.conf" | ||
LangString DLG_ENVVAR ${LANG_ENGLISH} "Set up environment variables" | ||
LangString DLG_ENVVAR ${LANG_RUSSIAN} "��������� ���������� �����" | ||
LangString DLG_OPT2 ${LANG_ENGLISH} "Make optimizations" | ||
LangString DLG_OPT2 ${LANG_RUSSIAN} "�������� ����������� ����������" | ||
LangString DLG_OPT3 ${LANG_ENGLISH} "Use default settings" | ||
LangString DLG_OPT3 ${LANG_RUSSIAN} "������������ ��������� �� ���������" | ||
LangString DEF_LOCALE_NAME ${LANG_ENGLISH} "Default" | ||
LangString DEF_LOCALE_NAME ${LANG_RUSSIAN} "��������� ��" | ||
LangString MESS_STOP_SERVER ${LANG_ENGLISH} "In order to upgrade, we may need to restart the server!$\n$\nContinue?" | ||
LangString MESS_STOP_SERVER ${LANG_RUSSIAN} "�� ����� ���������� ����������� ���������� ������ �������!$\n$\n����������?" | ||
LangString MESS_ERROR_SERVER ${LANG_ENGLISH} "An error occurred while initializing the server! Perhaps Server service failed to start." | ||
LangString MESS_ERROR_SERVER ${LANG_RUSSIAN} "�������� ������ ��� ������������� �������! �������� ������ ������� �� ������ �����������." |
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.