anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 21:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Unify wording for statistics

Browse Source 
Use 'no blanks' uniformly.

Also remove separator in zoom menu.
This commit is contained in:
Jean-Marc Lasgouttes 2022-09-13 12:42:28 +02:00
parent 974534f28a
commit 8319bdbbbe
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ui/stdcontext.inc
View File

@ -739,7 +739,7 @@ Menuset
Separator Separator
Item "Word Count|W" "ui-toggle statistics-w" Item "Word Count|W" "ui-toggle statistics-w"
Item "Character Count|C" "ui-toggle statistics-cb" Item "Character Count|C" "ui-toggle statistics-cb"
Item "Character Count (Without Blanks)|h" "ui-toggle statistics-c" Item "Character Count (No Blanks)|h" "ui-toggle statistics-c"
End End
End End

10
src/BufferView.cpp
View File

@ -1876,16 +1876,14 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
message += _("One word"); message += _("One word");
message += "\n"; message += "\n";
if (chars_blanks != 1) if (chars_blanks != 1)
message += bformat(_("%1$d characters (including blanks)"), message += bformat(_("%1$d characters"), chars_blanks);
chars_blanks);
else else
message += _("One character (including blanks)"); message += _("One character");
message += "\n"; message += "\n";
if (chars != 1) if (chars != 1)
message += bformat(_("%1$d characters (excluding blanks)"), message += bformat(_("%1$d characters (no blanks)"), chars);
chars);
else else
message += _("One character (excluding blanks)"); message += _("One character (no blanks)");
Alert::information(_("Statistics"), message); Alert::information(_("Statistics"), message);
} }

1
src/frontends/qt/Menus.cpp
View File

@ -1831,7 +1831,6 @@ void MenuDefinition::expandZoomOptions(BufferView const * bv)
toqstr(bformat(_("Reset to Default (%1$d%)|R"), toqstr(bformat(_("Reset to Default (%1$d%)|R"),
lyxrc.defaultZoom)), lyxrc.defaultZoom)),
FuncRequest(LFUN_BUFFER_ZOOM))); FuncRequest(LFUN_BUFFER_ZOOM)));
add(MenuItem(MenuItem::Separator));
add(MenuItem(MenuItem::Command, qt_("Zoom In|I"), add(MenuItem(MenuItem::Command, qt_("Zoom In|I"),
FuncRequest(LFUN_BUFFER_ZOOM_IN))); FuncRequest(LFUN_BUFFER_ZOOM_IN)));
add(MenuItem(MenuItem::Command, qt_("Zoom Out|O"), add(MenuItem(MenuItem::Command, qt_("Zoom Out|O"),