Skip to content

Commit 3b8771f

Browse files
committed
Modify translations
1 parent d74a020 commit 3b8771f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+2437
-1062
lines changed

Plugins/Terminal/DlgSettingsTerminal.cpp

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,23 @@ CDlgSettingsTerminal::CDlgSettingsTerminal(CParameterTerminalBase *pPara, QWidge
2727
#elif defined(Q_OS_WIN)
2828
AddShell("C:\\Windows\\System32\\cmd.exe");
2929
AddShell("C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe");
30-
AddShell("C:\\Windows\\System32\\cmd.exe", "msys64");
31-
AddShell("C:\\Windows\\System32\\cmd.exe", "cygwin64");
30+
AddShell("C:\\Windows\\System32\\cmd.exe", "msys64 bash shell");
31+
AddShell("C:\\Windows\\System32\\cmd.exe", "cygwin64 bash shell");
3232
AddShell(qgetenv("ComSpec"));
3333
QString szHelp;
3434
szHelp = tr("Help:") + "\n";
3535
szHelp += tr("- Set bash shell:") + "\n";
3636
szHelp += tr(" cmd shell with parameters:") + " '/k %BASH_PATH% -l'\n";
3737
szHelp += tr(" eg:") + "\n";
38-
szHelp += tr(" msys64 default bash path:") + " 'c:\\msys64\\usr\\bin\\bash.exe'\n";
39-
szHelp += tr(" So that cmd shell with parameters:") + " '/k c:\\msys64\\usr\\bin\\bash.exe -l'\n";
40-
szHelp += tr(" cygwin64 default bash path:") + " 'c:\\cygwin64\\bin\\bash.exe'\n";
41-
szHelp += tr(" So that cmd shell with parameters:") + " '/k c:\\cygwin64\\bin\\bash.exe -l'";
38+
szHelp += tr(" - msys64 bash shell default path:") + " 'c:\\msys64\\usr\\bin\\bash.exe'\n";
39+
szHelp += tr(" So that cmd shell with parameters:") + " '/k c:\\msys64\\usr\\bin\\bash.exe -l'\n";
40+
szHelp += tr(" - cygwin64 bash shell default path:") + " 'c:\\cygwin64\\bin\\bash.exe'\n";
41+
szHelp += tr(" So that cmd shell with parameters:") + " '/k c:\\cygwin64\\bin\\bash.exe -l'\n";
42+
szHelp += tr("- Set sh shell:") + "\n";
43+
szHelp += tr(" cmd shell with parameters:") + " '/k %SH_PATH% -l'\n";
44+
szHelp += tr(" eg:") + "\n";
45+
szHelp += tr(" - cygwin64 sh shell default path:") + " 'c:\\cygwin64\\bin\\sh.exe'\n";
46+
szHelp += tr(" So that cmd shell with parameters:") + " '/k c:\\cygwin64\\bin\\sh.exe -l'\n";
4247
ui->teHelp->setText(szHelp);
4348
ui->teHelp->show();
4449
#endif
@@ -133,10 +138,10 @@ void CDlgSettingsTerminal::on_cbShell_currentIndexChanged(int index)
133138
szName = ui->cbShell->itemText(index);
134139
ui->cbShell->setToolTip(szData);
135140
ui->cbShell->setStatusTip(szData);
136-
if("msys64" == szName && ui->leParameters->text().isEmpty()) {
141+
if("msys64 bash shell" == szName && ui->leParameters->text().isEmpty()) {
137142
ui->leParameters->setText("/k c:\\msys64\\usr\\bin\\bash.exe -l");
138143
}
139-
if("cygwin64" == szName && ui->leParameters->text().isEmpty()) {
144+
if("cygwin64 bash shell" == szName && ui->leParameters->text().isEmpty()) {
140145
ui->leParameters->setText("/k c:\\cygwin64\\bin\\bash.exe -l");
141146
}
142147
}

Plugins/Terminal/Resource/Translations/Terminal_ar.ts

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,47 +44,66 @@
4444
<translation type="unfinished"></translation>
4545
</message>
4646
<message>
47-
<location filename="../../DlgSettingsTerminal.cpp" line="33"/>
47+
<location filename="../../DlgSettingsTerminal.cpp" line="34"/>
4848
<source>Help:</source>
4949
<translation type="unfinished"></translation>
5050
</message>
5151
<message>
52-
<location filename="../../DlgSettingsTerminal.cpp" line="34"/>
52+
<location filename="../../DlgSettingsTerminal.cpp" line="35"/>
5353
<source>- Set bash shell:</source>
5454
<translation type="unfinished"></translation>
5555
</message>
5656
<message>
57-
<location filename="../../DlgSettingsTerminal.cpp" line="35"/>
57+
<location filename="../../DlgSettingsTerminal.cpp" line="36"/>
58+
<location filename="../../DlgSettingsTerminal.cpp" line="43"/>
5859
<source> cmd shell with parameters:</source>
5960
<translation type="unfinished"></translation>
6061
</message>
6162
<message>
62-
<location filename="../../DlgSettingsTerminal.cpp" line="36"/>
63+
<location filename="../../DlgSettingsTerminal.cpp" line="37"/>
64+
<location filename="../../DlgSettingsTerminal.cpp" line="44"/>
6365
<source> eg:</source>
6466
<translation type="unfinished"></translation>
6567
</message>
6668
<message>
67-
<location filename="../../DlgSettingsTerminal.cpp" line="37"/>
68-
<source> msys64 bash path:</source>
69+
<location filename="../../DlgSettingsTerminal.cpp" line="42"/>
70+
<source>- Set sh shell:</source>
6971
<translation type="unfinished"></translation>
7072
</message>
7173
<message>
7274
<location filename="../../DlgSettingsTerminal.cpp" line="38"/>
73-
<source> So that cmd shell with parameters:</source>
75+
<source> - msys64 bash shell default path:</source>
76+
<translation type="unfinished"></translation>
77+
</message>
78+
<message>
79+
<location filename="../../DlgSettingsTerminal.cpp" line="39"/>
80+
<location filename="../../DlgSettingsTerminal.cpp" line="41"/>
81+
<location filename="../../DlgSettingsTerminal.cpp" line="46"/>
82+
<source> So that cmd shell with parameters:</source>
83+
<translation type="unfinished"></translation>
84+
</message>
85+
<message>
86+
<location filename="../../DlgSettingsTerminal.cpp" line="40"/>
87+
<source> - cygwin64 bash shell default path:</source>
88+
<translation type="unfinished"></translation>
89+
</message>
90+
<message>
91+
<location filename="../../DlgSettingsTerminal.cpp" line="45"/>
92+
<source> - cygwin64 sh shell default path:</source>
7493
<translation type="unfinished"></translation>
7594
</message>
7695
<message>
77-
<location filename="../../DlgSettingsTerminal.cpp" line="72"/>
96+
<location filename="../../DlgSettingsTerminal.cpp" line="80"/>
7897
<source>Error</source>
7998
<translation type="unfinished"></translation>
8099
</message>
81100
<message>
82-
<location filename="../../DlgSettingsTerminal.cpp" line="72"/>
101+
<location filename="../../DlgSettingsTerminal.cpp" line="80"/>
83102
<source>The shell is empty</source>
84103
<translation type="unfinished"></translation>
85104
</message>
86105
<message>
87-
<location filename="../../DlgSettingsTerminal.cpp" line="119"/>
106+
<location filename="../../DlgSettingsTerminal.cpp" line="127"/>
88107
<source>Select shell</source>
89108
<translation type="unfinished"></translation>
90109
</message>
@@ -110,12 +129,12 @@
110129
<context>
111130
<name>CTerminal</name>
112131
<message>
113-
<location filename="../../Terminal.cpp" line="76"/>
132+
<location filename="../../Terminal.cpp" line="78"/>
114133
<source>Open working directory with file explorer</source>
115134
<translation type="unfinished"></translation>
116135
</message>
117136
<message>
118-
<location filename="../../Terminal.cpp" line="85"/>
137+
<location filename="../../Terminal.cpp" line="87"/>
119138
<source>Copy working directory to clipboard</source>
120139
<translation type="unfinished"></translation>
121140
</message>

Plugins/Terminal/Resource/Translations/Terminal_ca.ts

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,47 +44,66 @@
4444
<translation type="unfinished"></translation>
4545
</message>
4646
<message>
47-
<location filename="../../DlgSettingsTerminal.cpp" line="33"/>
47+
<location filename="../../DlgSettingsTerminal.cpp" line="34"/>
4848
<source>Help:</source>
4949
<translation type="unfinished"></translation>
5050
</message>
5151
<message>
52-
<location filename="../../DlgSettingsTerminal.cpp" line="34"/>
52+
<location filename="../../DlgSettingsTerminal.cpp" line="35"/>
5353
<source>- Set bash shell:</source>
5454
<translation type="unfinished"></translation>
5555
</message>
5656
<message>
57-
<location filename="../../DlgSettingsTerminal.cpp" line="35"/>
57+
<location filename="../../DlgSettingsTerminal.cpp" line="36"/>
58+
<location filename="../../DlgSettingsTerminal.cpp" line="43"/>
5859
<source> cmd shell with parameters:</source>
5960
<translation type="unfinished"></translation>
6061
</message>
6162
<message>
62-
<location filename="../../DlgSettingsTerminal.cpp" line="36"/>
63+
<location filename="../../DlgSettingsTerminal.cpp" line="37"/>
64+
<location filename="../../DlgSettingsTerminal.cpp" line="44"/>
6365
<source> eg:</source>
6466
<translation type="unfinished"></translation>
6567
</message>
6668
<message>
67-
<location filename="../../DlgSettingsTerminal.cpp" line="37"/>
68-
<source> msys64 bash path:</source>
69+
<location filename="../../DlgSettingsTerminal.cpp" line="42"/>
70+
<source>- Set sh shell:</source>
6971
<translation type="unfinished"></translation>
7072
</message>
7173
<message>
7274
<location filename="../../DlgSettingsTerminal.cpp" line="38"/>
73-
<source> So that cmd shell with parameters:</source>
75+
<source> - msys64 bash shell default path:</source>
76+
<translation type="unfinished"></translation>
77+
</message>
78+
<message>
79+
<location filename="../../DlgSettingsTerminal.cpp" line="39"/>
80+
<location filename="../../DlgSettingsTerminal.cpp" line="41"/>
81+
<location filename="../../DlgSettingsTerminal.cpp" line="46"/>
82+
<source> So that cmd shell with parameters:</source>
83+
<translation type="unfinished"></translation>
84+
</message>
85+
<message>
86+
<location filename="../../DlgSettingsTerminal.cpp" line="40"/>
87+
<source> - cygwin64 bash shell default path:</source>
88+
<translation type="unfinished"></translation>
89+
</message>
90+
<message>
91+
<location filename="../../DlgSettingsTerminal.cpp" line="45"/>
92+
<source> - cygwin64 sh shell default path:</source>
7493
<translation type="unfinished"></translation>
7594
</message>
7695
<message>
77-
<location filename="../../DlgSettingsTerminal.cpp" line="72"/>
96+
<location filename="../../DlgSettingsTerminal.cpp" line="80"/>
7897
<source>Error</source>
7998
<translation type="unfinished"></translation>
8099
</message>
81100
<message>
82-
<location filename="../../DlgSettingsTerminal.cpp" line="72"/>
101+
<location filename="../../DlgSettingsTerminal.cpp" line="80"/>
83102
<source>The shell is empty</source>
84103
<translation type="unfinished"></translation>
85104
</message>
86105
<message>
87-
<location filename="../../DlgSettingsTerminal.cpp" line="119"/>
106+
<location filename="../../DlgSettingsTerminal.cpp" line="127"/>
88107
<source>Select shell</source>
89108
<translation type="unfinished"></translation>
90109
</message>
@@ -110,12 +129,12 @@
110129
<context>
111130
<name>CTerminal</name>
112131
<message>
113-
<location filename="../../Terminal.cpp" line="76"/>
132+
<location filename="../../Terminal.cpp" line="78"/>
114133
<source>Open working directory with file explorer</source>
115134
<translation type="unfinished"></translation>
116135
</message>
117136
<message>
118-
<location filename="../../Terminal.cpp" line="85"/>
137+
<location filename="../../Terminal.cpp" line="87"/>
119138
<source>Copy working directory to clipboard</source>
120139
<translation type="unfinished"></translation>
121140
</message>

Plugins/Terminal/Resource/Translations/Terminal_cs.ts

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,47 +44,66 @@
4444
<translation type="unfinished"></translation>
4545
</message>
4646
<message>
47-
<location filename="../../DlgSettingsTerminal.cpp" line="33"/>
47+
<location filename="../../DlgSettingsTerminal.cpp" line="34"/>
4848
<source>Help:</source>
4949
<translation type="unfinished"></translation>
5050
</message>
5151
<message>
52-
<location filename="../../DlgSettingsTerminal.cpp" line="34"/>
52+
<location filename="../../DlgSettingsTerminal.cpp" line="35"/>
5353
<source>- Set bash shell:</source>
5454
<translation type="unfinished"></translation>
5555
</message>
5656
<message>
57-
<location filename="../../DlgSettingsTerminal.cpp" line="35"/>
57+
<location filename="../../DlgSettingsTerminal.cpp" line="36"/>
58+
<location filename="../../DlgSettingsTerminal.cpp" line="43"/>
5859
<source> cmd shell with parameters:</source>
5960
<translation type="unfinished"></translation>
6061
</message>
6162
<message>
62-
<location filename="../../DlgSettingsTerminal.cpp" line="36"/>
63+
<location filename="../../DlgSettingsTerminal.cpp" line="37"/>
64+
<location filename="../../DlgSettingsTerminal.cpp" line="44"/>
6365
<source> eg:</source>
6466
<translation type="unfinished"></translation>
6567
</message>
6668
<message>
67-
<location filename="../../DlgSettingsTerminal.cpp" line="37"/>
68-
<source> msys64 bash path:</source>
69+
<location filename="../../DlgSettingsTerminal.cpp" line="42"/>
70+
<source>- Set sh shell:</source>
6971
<translation type="unfinished"></translation>
7072
</message>
7173
<message>
7274
<location filename="../../DlgSettingsTerminal.cpp" line="38"/>
73-
<source> So that cmd shell with parameters:</source>
75+
<source> - msys64 bash shell default path:</source>
76+
<translation type="unfinished"></translation>
77+
</message>
78+
<message>
79+
<location filename="../../DlgSettingsTerminal.cpp" line="39"/>
80+
<location filename="../../DlgSettingsTerminal.cpp" line="41"/>
81+
<location filename="../../DlgSettingsTerminal.cpp" line="46"/>
82+
<source> So that cmd shell with parameters:</source>
83+
<translation type="unfinished"></translation>
84+
</message>
85+
<message>
86+
<location filename="../../DlgSettingsTerminal.cpp" line="40"/>
87+
<source> - cygwin64 bash shell default path:</source>
88+
<translation type="unfinished"></translation>
89+
</message>
90+
<message>
91+
<location filename="../../DlgSettingsTerminal.cpp" line="45"/>
92+
<source> - cygwin64 sh shell default path:</source>
7493
<translation type="unfinished"></translation>
7594
</message>
7695
<message>
77-
<location filename="../../DlgSettingsTerminal.cpp" line="72"/>
96+
<location filename="../../DlgSettingsTerminal.cpp" line="80"/>
7897
<source>Error</source>
7998
<translation type="unfinished"></translation>
8099
</message>
81100
<message>
82-
<location filename="../../DlgSettingsTerminal.cpp" line="72"/>
101+
<location filename="../../DlgSettingsTerminal.cpp" line="80"/>
83102
<source>The shell is empty</source>
84103
<translation type="unfinished"></translation>
85104
</message>
86105
<message>
87-
<location filename="../../DlgSettingsTerminal.cpp" line="119"/>
106+
<location filename="../../DlgSettingsTerminal.cpp" line="127"/>
88107
<source>Select shell</source>
89108
<translation type="unfinished"></translation>
90109
</message>
@@ -110,12 +129,12 @@
110129
<context>
111130
<name>CTerminal</name>
112131
<message>
113-
<location filename="../../Terminal.cpp" line="76"/>
132+
<location filename="../../Terminal.cpp" line="78"/>
114133
<source>Open working directory with file explorer</source>
115134
<translation type="unfinished"></translation>
116135
</message>
117136
<message>
118-
<location filename="../../Terminal.cpp" line="85"/>
137+
<location filename="../../Terminal.cpp" line="87"/>
119138
<source>Copy working directory to clipboard</source>
120139
<translation type="unfinished"></translation>
121140
</message>

0 commit comments

Comments
 (0)