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

Commit108784e

Browse files
committed
Add PRODUCT_NAME_SHORT to generated file postgres.def.nsh
1 parent0e9833c commit108784e

File tree

2 files changed

+53
-49
lines changed

2 files changed

+53
-49
lines changed

‎build/helpers/postgres_nsis_installer.cmd

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,20 +99,24 @@ IF "%ARCH%" == "X64" (
9999
IF"%PRODUCT_NAME%"=="PostgreSQL" (
100100
>>%NSIS_RES_DIR%\postgres.def.nshECHO !define myLicenseFile_ru"license.txt"
101101
>>%NSIS_RES_DIR%\postgres.def.nshECHO !define myLicenseFile_en"license.txt"
102+
>>%NSIS_RES_DIR%\postgres.def.nshECHO !define PRODUCT_NAME_SHORT"PostgreSQL"
102103
GOTO :ENDLIC
103104
)
104105
IF"%PRODUCT_NAME%"=="PostgresPro" (
105106
>>%NSIS_RES_DIR%\postgres.def.nshECHO !define myLicenseFile_ru"license.txt"
106107
>>%NSIS_RES_DIR%\postgres.def.nshECHO !define myLicenseFile_en"license.txt"
108+
>>%NSIS_RES_DIR%\postgres.def.nshECHO !define PRODUCT_NAME_SHORT"Postgres Pro"
107109
GOTO :ENDLIC
108110
)
109111
IF"%PRODUCT_NAME%"=="PostgresProEnterprise" (
110112
>>%NSIS_RES_DIR%\postgres.def.nshECHO !define myLicenseFile_ru"license.txt"
111113
>>%NSIS_RES_DIR%\postgres.def.nshECHO !define myLicenseFile_en"license.txt"
114+
>>%NSIS_RES_DIR%\postgres.def.nshECHO !define PRODUCT_NAME_SHORT"Postgres Pro"
112115
GOTO :ENDLIC
113116
)
114117
>>%NSIS_RES_DIR%\postgres.def.nshECHO !define myLicenseFile_ru"license.txt"
115118
>>%NSIS_RES_DIR%\postgres.def.nshECHO !define myLicenseFile_en"license.txt"
119+
>>%NSIS_RES_DIR%\postgres.def.nshECHO !define PRODUCT_NAME_SHORT"PostgreSQL"
116120

117121
:ENDLIC
118122

‎nsis/translates.nsi

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
LangString PostgreSQLString${LANG_ENGLISH}"PostgreSQL server"
2-
LangString PostgreSQLString${LANG_RUSSIAN}"ÑåðâåðPostgreSQL"
1+
LangString PostgreSQLString${LANG_ENGLISH}"${PRODUCT_NAME_SHORT} server"
2+
LangString PostgreSQLString${LANG_RUSSIAN}"Ñåðâåð${PRODUCT_NAME_SHORT}"
33

4-
LangString DATADIR_MESS${LANG_ENGLISH}"Please select a directory under which to store your data"
4+
LangString DATADIR_MESS${LANG_ENGLISH}"Select a directory under which to store your data"
55
LangString DATADIR_MESS${LANG_RUSSIAN}"Áàçû äàííûõ áóäóò óñòàíîâëåíû â ñëåäóþùèé êàòàëîã"
66

77
LangString DATADIR_TITLE${LANG_ENGLISH}"Data directory"
@@ -13,80 +13,80 @@ LangString PostgreSQLString ${LANG_RUSSIAN} "
1313
LangString DESC_SecMS${LANG_ENGLISH}"Install run-time components that are required to run C++ applications"
1414
LangString DESC_SecMS${LANG_RUSSIAN}"Êîìïîíåíòû ñðåäû âûïîëíåíèÿ, íåîáõîäèìûå äëÿ âûïîëíåíèÿ ïðèëîæåíèé C++"
1515

16-
LangString DESC_Sec1${LANG_ENGLISH}"InstallPostgreSQL serveron this computer"
17-
LangString DESC_Sec1${LANG_RUSSIAN}"Óñòàíîâêà ñåðâåðàPostgreSQL íà ýòîò êîìïüþòåð"
16+
LangString DESC_Sec1${LANG_ENGLISH}"Install${PRODUCT_NAME_SHORT} servercomponents."
17+
LangString DESC_Sec1${LANG_RUSSIAN}"Óñòàíîâêàôàéëîâñåðâåðà${PRODUCT_NAME_SHORT}."
1818

19-
LangString DESC_PgAdmin${LANG_ENGLISH}"Install pgAdmin toolson this computer"
20-
LangString DESC_PgAdmin${LANG_RUSSIAN}"Óñòàíîâêà pgAdmin äëÿ óïðàâëåíèÿ ñåðâåðîì"
19+
LangString DESC_PgAdmin${LANG_ENGLISH}"Install pgAdmin toolsfor server administration."
20+
LangString DESC_PgAdmin${LANG_RUSSIAN}"Óñòàíîâêà pgAdmin äëÿ óïðàâëåíèÿ ñåðâåðîì."
2121

22-
LangString DESC_Sec1dir${LANG_ENGLISH}"Please specifythe directory wherePostgreSQL will be installed"
23-
LangString DESC_Sec1die${LANG_RUSSIAN}"Ïîæàëóéñòà, çàäàéòåêàòàëîã, êóäà áóäåò óñòàíîâëåíPostgreSQL"
22+
LangString DESC_Sec1dir${LANG_ENGLISH}"Specifythe directory where${PRODUCT_NAME_SHORT} will be installed"
23+
LangString DESC_Sec1die${LANG_RUSSIAN}"Çàäàéòåêàòàëîã, êóäà áóäåò óñòàíîâëåí${PRODUCT_NAME_SHORT}"
2424

2525
LangString SERVER_SET_TITLE${LANG_ENGLISH}"Server options"
2626
LangString SERVER_SET_TITLE${LANG_RUSSIAN}"Ïàðàìåòðû ñåðâåðà"
2727

28-
LangString SERVER_SET_SUBTITLE${LANG_ENGLISH}"Please specify options of server"
29-
LangString SERVER_SET_SUBTITLE${LANG_RUSSIAN}"Ïîæàëóéñòà, çàäàéòå ïàðàìåòðû ñåðâåðà"
28+
LangString SERVER_SET_SUBTITLE${LANG_ENGLISH}"Specify server options"
29+
LangString SERVER_SET_SUBTITLE${LANG_RUSSIAN}"Çàäàéòå ïàðàìåòðû ñåðâåðà"
3030

31-
LangString SERVER_EXIST_TITLE${LANG_ENGLISH}"Existinginstallation"
31+
LangString SERVER_EXIST_TITLE${LANG_ENGLISH}"ExistingInstallation"
3232
LangString SERVER_EXIST_TITLE${LANG_RUSSIAN}"Ñóùåñòâóþùàÿ èíñòàëëÿöèÿ"
3333

34-
LangString SERVER_EXIST_TEXT1${LANG_ENGLISH}"An existingPostgresSQL installation has been found at"
35-
LangString SERVER_EXIST_TEXT1${LANG_RUSSIAN}"Íàéäåíà èíñòàëëÿöèÿ ñåðâåðàPostgresSQL â êàòàëîãå"
34+
LangString SERVER_EXIST_TEXT1${LANG_ENGLISH}"An existing${PRODUCT_NAME_SHORT} installation has been found at"
35+
LangString SERVER_EXIST_TEXT1${LANG_RUSSIAN}"Íàéäåíà èíñòàëëÿöèÿ ñåðâåðà${PRODUCT_NAME_SHORT} â êàòàëîãå"
3636

37-
LangString SERVER_EXIST_TEXT2${LANG_ENGLISH}"Thisinstalation will be upgraded.$\n$\nIn order to upgrade, we may needtorestart thePostgreSQL server"
38-
LangString SERVER_EXIST_TEXT2${LANG_RUSSIAN}"Ýòàóñòàíîâêà áóäåò îáíîâëåíà.$\n$\nÄëÿ çàâåðøåíèÿ îáíîâëåíèÿìîæåò ïîòðåáîâàòüñÿ ïåðåçàïóñòèòü PostgreSQL ñåðâåð"
37+
LangString SERVER_EXIST_TEXT2${LANG_ENGLISH}"Thisinstallation will be upgraded.$\n$\nServer restart is requiredtocomplete theupgrade."
38+
LangString SERVER_EXIST_TEXT2${LANG_RUSSIAN}"Ýòàèíñòàëëÿöèÿ áóäåò îáíîâëåíà.$\n$\nÄëÿ çàâåðøåíèÿ îáíîâëåíèÿòðåáóåòñÿ ïåðåçàïóñê ñåðâåðà."
3939

40-
LangString DATADIR_EXIST_TITLE${LANG_ENGLISH}"Existingdata directory"
40+
LangString DATADIR_EXIST_TITLE${LANG_ENGLISH}"ExistingData Directory"
4141
LangString DATADIR_EXIST_TITLE${LANG_RUSSIAN}"Óæå èìååòñÿ êàòàëîã ñ äàííûìè"
4242

43-
LangString DATADIR_EXIST_TEXT1${LANG_ENGLISH}"An existing data directoryinstallationhas been found at $DATA_DIR , port $TextPort_text . This directory will be used for this installation."
43+
LangString DATADIR_EXIST_TEXT1${LANG_ENGLISH}"An existing data directory has been found at $DATA_DIR , port $TextPort_text . This directory will be used for this installation."
4444
LangString DATADIR_EXIST_TEXT1${LANG_RUSSIAN}"Óæå èìååòñÿ êàòàëîã ñ äàííûìè $DATA_DIR , ïîðò $TextPort_text . Ýòîò êàòàëîã áóäåò èñïîëüçîâàí äëÿ äàííîé èíñòàëëÿöèè ñåðâåðà."
4545

46-
LangString DATADIR_EXIST_ERROR1${LANG_ENGLISH}"An existing file with name $DATA_DIR has been found.Can notcreate directory with this name"
47-
LangString DATADIR_EXIST_ERROR1${LANG_RUSSIAN}"Íàéäåí ôàéë ñ èìåíåì $DATA_DIR. Ñîçäàòü êàòàëîã ñ ýòèì èìåíåì íåâîçìîæíî"
46+
LangString DATADIR_EXIST_ERROR1${LANG_ENGLISH}"An existing file with name $DATA_DIR has been found.Cannotcreateadirectory with this name."
47+
LangString DATADIR_EXIST_ERROR1${LANG_RUSSIAN}"Íàéäåí ôàéë ñ èìåíåì $DATA_DIR. Ñîçäàòü êàòàëîã ñ ýòèì èìåíåì íåâîçìîæíî."
4848

49-
LangString UNINSTALL_END${LANG_ENGLISH}"Uninstallation has beenended.$\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_ENGLISH}"${PRODUCT_NAME_SHORT} has beenuninstalled.$\n$\nYou may need to restart your computer as service '$ServiceID_text'stillexists.$\n$\nData directory has not been removed:"
5050
LangString UNINSTALL_END${LANG_RUSSIAN}"Óäàëåíèå çàâåðøåíî.$\n$\nÂîçìîæíî, âàì ïîòðåáóåòñÿ ïåðåçàãðóçèòü êîìïüþòåð, òàê êàê ñóùåñòâóåò ñëóæáà '$ServiceID_text'.$\n$\nÊàòàëîã ñ äàííûìè íå óäàë¸í:"
5151

5252

53-
LangString MESS_PASS1${LANG_ENGLISH}"PasswordsDo Not Match!"
54-
LangString MESS_PASS1${LANG_RUSSIAN}"Ââåäåííûå ïàðîëü è ïîäòâåðæäåíèå ðàçëè÷àþòñÿ!"
53+
LangString MESS_PASS1${LANG_ENGLISH}"Passwordsdo not match."
54+
LangString MESS_PASS1${LANG_RUSSIAN}"Ââåäåííûå ïàðîëü è ïîäòâåðæäåíèå ðàçëè÷àþòñÿ."
5555

56-
LangString MESS_PASS2${LANG_ENGLISH}"Youdo notenter a password! Do youconfirm the installation without a password?"
57-
LangString MESS_PASS2${LANG_RUSSIAN}"Âû íå ââåëè ïàðîëü!$\n$\nÏîäòâåðæäàåòå óñòàíîâêó áåç ïàðîëÿ?"
56+
LangString MESS_PASS2${LANG_ENGLISH}"Youhave notentered the password. Do youwant to continue without a password?"
57+
LangString MESS_PASS2${LANG_RUSSIAN}"Âû íå ââåëè ïàðîëü.$\n$\nÏîäòâåðæäàåòå óñòàíîâêó áåç ïàðîëÿ?"
5858

59-
LangString MESS_PASS3${LANG_ENGLISH}"You enteredthe password with non-Latin characters. Do youwishusethat password?"
59+
LangString MESS_PASS3${LANG_ENGLISH}"Youhaveentereda password with non-Latin characters. Do youwant tousethis password?"
6060
LangString MESS_PASS3${LANG_RUSSIAN}"Âû èñïîëüçîâàëè â ïàðîëå íåëàòèíñêèå ñèìâîëû. Ýòî ìîæåò âûçâàòü \
61-
ïðîáëåìû ñ ââîäîì ïàðîëÿ! Ïðîäîëæèòü?"
61+
ïðîáëåìû ñ ââîäîì ïàðîëÿ. Ïðîäîëæèòü?"
6262

63-
LangString MESS_UNSUPPORTED_WINDOWS${LANG_ENGLISH}"YourVersion ofWindows is too old. At least Windows 2008 Server or Windows 7 is required to run this product."
64-
LangString MESS_UNSUPPORTED_WINDOWS${LANG_RUSSIAN}"Âàøà âåðñèÿWindow íå ïîääåðæèâàåòñÿ. Äëÿ äàííîãî ïðîäóêòà òðåáóåòñÿ Windows 2008 Server èëè Windows 7 è âûøå."
63+
LangString MESS_UNSUPPORTED_WINDOWS${LANG_ENGLISH}"Your Windowsversionis too old. At least Windows 2008 Server or Windows 7 SP1 is required to run this product."
64+
LangString MESS_UNSUPPORTED_WINDOWS${LANG_RUSSIAN}"Âàøà âåðñèÿWindows íå ïîääåðæèâàåòñÿ. Äëÿ äàííîãî ïðîäóêòà òðåáóåòñÿ Windows 2008 Server èëè Windows 7 SP1 è âûøå."
6565

6666
LangString DLG_PORT${LANG_ENGLISH}"Port:"
6767
LangString DLG_PORT${LANG_RUSSIAN}"Ïîðò:"
6868

6969
LangString DLG_ADR1${LANG_ENGLISH}"Addresses:"
7070
LangString DLG_ADR1${LANG_RUSSIAN}"Àäðåñà:"
7171

72-
LangString DLG_ADR2${LANG_ENGLISH}"Allow connections from any IP address:"
73-
LangString DLG_ADR2${LANG_RUSSIAN}"Ðàçðåøàòü ïîäêëþ÷åíèÿ ñ ëþáûõ IP-àäðåñîâ:"
72+
LangString DLG_ADR2${LANG_ENGLISH}"Allow connections from any IP address"
73+
LangString DLG_ADR2${LANG_RUSSIAN}"Ðàçðåøàòü ïîäêëþ÷åíèÿ ñ ëþáûõ IP-àäðåñîâ"
7474

7575
LangString DLG_LOCALE${LANG_ENGLISH}"Locale:"
7676
LangString DLG_LOCALE${LANG_RUSSIAN}"Ëîêàëü:"
7777

78-
LangString DLG_SUPERUSER${LANG_ENGLISH}"Super user:"
79-
LangString DLG_SUPERUSER${LANG_RUSSIAN}"Ñóïåð- ïîëüçîâàòåëü:"
78+
LangString DLG_SUPERUSER${LANG_ENGLISH}"Superuser:"
79+
LangString DLG_SUPERUSER${LANG_RUSSIAN}"Ñóïåðïîëüçîâàòåëü:"
8080

8181
LangString DLG_PASS1${LANG_ENGLISH}"Password:"
8282
LangString DLG_PASS1${LANG_RUSSIAN}"Ïàðîëü:"
8383

8484
LangString DLG_PASS2${LANG_ENGLISH}"Confirm:"
8585
LangString DLG_PASS2${LANG_RUSSIAN}"Ïîäòâåðæäåíèå:"
8686

87-
LangString DLG_OPT1${LANG_ENGLISH}"It is possible to optimize server performancebased on the amount of memory installed $AllMemMb. \
88-
The server will allocatemore memory. \
89-
The parameters are written to thefile$DATA_DIR\postgresql.conf"
87+
LangString DLG_OPT1${LANG_ENGLISH}"Server performance can be optimizedbased on the amount of memory installed: $AllMemMB. \
88+
This setting allocatesmore memory to the server. \
89+
Configuration parameters are written to the $DATA_DIR\postgresql.conf file."
9090

9191
LangString DLG_OPT1${LANG_RUSSIAN}"Ìîæíî ïðîâåñòè îïòèìèçàöèþ ïðîèçâîäèòåëüíîñòè ñåðâåðà, èñõîäÿ èç îáú¸ìà óñòàíîâëåííîé ïàìÿòè $AllMem ÌÁ. \
9292
Ñåðâåðó áóäåò âûäåëåíî áîëüøå îïåðàòèâíîé ïàìÿòè. \
@@ -97,7 +97,7 @@ The parameters are written to the file $DATA_DIR\postgresql.conf"
9797

9898

9999

100-
LangString DLG_OPT2${LANG_ENGLISH}"Make optimizations"
100+
LangString DLG_OPT2${LANG_ENGLISH}"Tune configuration parameters"
101101
LangString DLG_OPT2${LANG_RUSSIAN}"Ïðîâåñòè îïòèìèçàöèþ ïàðàìåòðîâ"
102102

103103
LangString DLG_OPT3${LANG_ENGLISH}"Use default settings"
@@ -108,17 +108,17 @@ The parameters are written to the file $DATA_DIR\postgresql.conf"
108108

109109

110110

111-
LangString MESS_STOP_SERVER${LANG_ENGLISH}"Previous installation was found.$\n$\nIn order to upgrade the service needs to restart!$\n$\nContinue?"
112-
LangString MESS_STOP_SERVER${LANG_RUSSIAN}"Îáíàðóæåíà ïðåäûäóùàÿ èíñòàëëÿöèÿ.$\n$\nÄëÿ îáíîâëåíèÿñëóæáû ïîòðåáóåòñÿ ïåðåçàãðóçêà.$\n$\nÏðîäîëæèòü?"
111+
LangString MESS_STOP_SERVER${LANG_ENGLISH}"Previous installation was found.$\n$\nTo complete the upgrade, the service needs to restart.$\n$\nDo you want to continue?"
112+
LangString MESS_STOP_SERVER${LANG_RUSSIAN}"Îáíàðóæåíà ïðåäûäóùàÿ èíñòàëëÿöèÿ.$\n$\nÄëÿ îáíîâëåíèÿòðåáóåòñÿ ïåðåçàïóñê ñëóæáû.$\n$\nÏðîäîëæèòü?"
113113

114-
LangString MESS_ERROR_SERVER${LANG_ENGLISH}"An error occurred while initializing the server! PerhapsServer service failed to start."
115-
LangString MESS_ERROR_SERVER${LANG_RUSSIAN}"Ïðè èíèöèàëèçàöèè ñåðâåðà ïðîèçîøëà îøèáêà! Âîçìîæíî, ñëóæáà ñåðâåðà íå ñìîãëà çàïóñòèòüñÿ."
114+
LangString MESS_ERROR_SERVER${LANG_ENGLISH}"An error occurred while initializing the server.Server service may have failed to start."
115+
LangString MESS_ERROR_SERVER${LANG_RUSSIAN}"Ïðè èíèöèàëèçàöèè ñåðâåðà ïðîèçîøëà îøèáêà. Âîçìîæíî, ñëóæáà ñåðâåðà íå ñìîãëà çàïóñòèòüñÿ."
116116

117-
LangString MESS_ERROR_INITDB${LANG_ENGLISH}"An error occurred while initializing the database!"
118-
LangString MESS_ERROR_INITDB${LANG_RUSSIAN}"Ïðè èíèöèàëèçàöèè áàçû äàííûõ ïðîèçîøëà îøèáêà!"
117+
LangString MESS_ERROR_INITDB${LANG_ENGLISH}"An error occurred while initializing the database."
118+
LangString MESS_ERROR_INITDB${LANG_RUSSIAN}"Ïðè èíèöèàëèçàöèè áàçû äàííûõ ïðîèçîøëà îøèáêà."
119119

120-
LangString MESS_ERROR_INITDB2${LANG_ENGLISH}"An error occurred while initializing the database! IsMicrosoft Visual C++ Redistributable installed?"
121-
LangString MESS_ERROR_INITDB2${LANG_RUSSIAN}"Ïðè èíèöèàëèçàöèè áàçû äàííûõ ïðîèçîøëà îøèáêà! Óñòàíîâëåí ëèïàêåò Microsoft Visual C ++ Redistributable?"
120+
LangString MESS_ERROR_INITDB2${LANG_ENGLISH}"An error occurred while initializing the database. Make sure thatMicrosoft Visual C++ Redistributableisinstalled."
121+
LangString MESS_ERROR_INITDB2${LANG_RUSSIAN}"Ïðè èíèöèàëèçàöèè áàçû äàííûõ ïðîèçîøëà îøèáêà. Óáåäèòåñü, ÷òî óñòàíîâëåíïàêåò Microsoft Visual C ++ Redistributable."
122122

123123

124124
LangString componentServer${LANG_ENGLISH}"Server components"
@@ -131,8 +131,8 @@ LangString componentClient ${LANG_RUSSIAN} "
131131
LangString componentDeveloper${LANG_ENGLISH}"Developer components"
132132
LangString componentDeveloper${LANG_RUSSIAN}"Êîìïîíåíòû ðàçðàáîò÷èêà"
133133

134-
LangString DESC_componentClient${LANG_ENGLISH}"InstallPostgreSQL clients components anddocumetation"
135-
LangString DESC_componentClient${LANG_RUSSIAN}"Óñòàíîâêà ôàéëîâ êëèåíòàPostgreSQL è äîêóìåíòàöèè"
134+
LangString DESC_componentClient${LANG_ENGLISH}"Install${PRODUCT_NAME_SHORT} client components anddocumentation"
135+
LangString DESC_componentClient${LANG_RUSSIAN}"Óñòàíîâêà ôàéëîâ êëèåíòà${PRODUCT_NAME_SHORT} è äîêóìåíòàöèè."
136136

137-
LangString DESC_componentDeveloper${LANG_ENGLISH}"InstallPostgreSQL developer components"
138-
LangString DESC_componentDeveloper${LANG_RUSSIAN}"Óñòàíîâêà ôàéëîâPostgreSQL äëÿ ðàçðàáîò÷èêà"
137+
LangString DESC_componentDeveloper${LANG_ENGLISH}"Install${PRODUCT_NAME_SHORT} developer components"
138+
LangString DESC_componentDeveloper${LANG_RUSSIAN}"Óñòàíîâêà ôàéëîâ${PRODUCT_NAME_SHORT} äëÿ ðàçðàáîò÷èêà."

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp