Skip to content

Commit eec9bb2

Browse files
authored
chore: unify and improve configuration strings (#1383) (#1551)
1 parent 9d72f4c commit eec9bb2

3 files changed

Lines changed: 9 additions & 8 deletions

File tree

src/im/keyboard/keyboard.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ FCITX_CONFIG_ENUM_NAME_WITH_I18N(ChooseModifier, N_("None"), N_("Alt"),
4747

4848
FCITX_CONFIGURATION(
4949
KeyboardEngineConfig,
50-
Option<int, IntConstrain> pageSize{this, "PageSize", _("Page size"), 5,
51-
IntConstrain(3, 10)};
50+
Option<int, IntConstrain> pageSize{
51+
this, "PageSize", _("Candidates per page"), 5, IntConstrain(3, 10)};
5252
KeyListOption prevCandidate{
5353
this,
5454
"PrevCandidate",

src/lib/fcitx/globalconfig.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,9 @@ FCITX_CONFIGURATION(
176176
"the timeout. -1 means there is no limit.")}};);
177177

178178
FCITX_CONFIGURATION(
179-
BehaviorConfig, Option<bool> activeByDefault{this, "ActiveByDefault",
180-
_("Active By Default")};
179+
BehaviorConfig,
180+
Option<bool> activeByDefault{this, "ActiveByDefault",
181+
_("Activate input method by default")};
181182
OptionWithAnnotation<PropertyPropagatePolicy,
182183
PropertyPropagatePolicyI18NAnnotation>
183184
resetStateWhenFocusIn{this, "resetStateWhenFocusIn",
@@ -204,8 +205,8 @@ FCITX_CONFIGURATION(
204205
this, "ShowFirstInputMethodInformation",
205206
_("Show first input method information"), true};
206207
Option<int, IntConstrain> defaultPageSize{this, "DefaultPageSize",
207-
_("Default page size"), 5,
208-
IntConstrain(1, 10)};
208+
_("Default Candidates per page"),
209+
5, IntConstrain(1, 10)};
209210
ConditionalHidden<!hasKeyboard,
210211
OptionWithAnnotation<bool, ToolTipAnnotation>>
211212
overrideXkbOption{
@@ -215,7 +216,7 @@ FCITX_CONFIGURATION(
215216
false,
216217
{},
217218
{},
218-
{_("Whether to override the XKB option from display server. It "
219+
{_("Override the XKB option from display server. It "
219220
"will not affect the XKB option send to display, but just the "
220221
"XKB options for custom XKB layout. This is a workaround when "
221222
"there is no way to get the current XKB option from Wayland "

src/modules/wayland/waylandmodule.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ void WaylandModule::selfDiagnose() {
678678
_("Fcitx should be launched by KWin under KDE Wayland in order "
679679
"to use Wayland input method frontend. This can improve the "
680680
"experience when using Fcitx on Wayland. To "
681-
"configure this, you need to go to \"System Settings\" -> "
681+
"configure this, you need to go to \"System Settings\" > "
682682
"\"Virtual "
683683
"keyboard\" and select \"Fcitx 5\" from it. You may also "
684684
"need to disable tools that launches input method, such as "

0 commit comments

Comments
 (0)