diff --git a/depends/wxpython b/depends/wxpython index 7c6b4bd98..21bf66f3e 160000 --- a/depends/wxpython +++ b/depends/wxpython @@ -1 +1 @@ -Subproject commit 7c6b4bd986fbb8cc0516940be620b5e3fe91d1e9 +Subproject commit 21bf66f3eb5479e5bcd652f4a5408e34b3fb8496 diff --git a/src/locale/en/LC_MESSAGES/outwiker.mo b/src/locale/en/LC_MESSAGES/outwiker.mo index 6d57a20e9..e821221c6 100644 Binary files a/src/locale/en/LC_MESSAGES/outwiker.mo and b/src/locale/en/LC_MESSAGES/outwiker.mo differ diff --git a/src/locale/en/LC_MESSAGES/outwiker.po b/src/locale/en/LC_MESSAGES/outwiker.po index edd094b40..fdecc488b 100644 --- a/src/locale/en/LC_MESSAGES/outwiker.po +++ b/src/locale/en/LC_MESSAGES/outwiker.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: outwiker 3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-12-09 09:34+0300\n" +"POT-Creation-Date: 2024-12-14 14:46+0300\n" "PO-Revision-Date: \n" "Last-Translator: Eugeniy Ilin \n" "Language-Team: Jenyay \n" @@ -477,7 +477,7 @@ msgstr "Begin search and replace on page" #: outwiker/app/actions/switchto.py:63 #: outwiker/app/gui/mainpanes/attachmainpane.py:40 #: outwiker/app/gui/mainwindow.py:460 -#: outwiker/app/gui/preferences/prefcontroller.py:138 +#: outwiker/app/gui/preferences/prefcontroller.py:141 #: outwiker/app/gui/preferences/wikieditorpanel.py:37 #: outwiker/gui/controls/filestreectrl.py:84 #: outwiker/pages/wiki/parser/commands/attachlist.py:34 @@ -533,6 +533,7 @@ msgid "Set focus to main panel" msgstr "Set focus to main panel" #: outwiker/app/actions/switchto.py:40 +#: outwiker/app/gui/preferences/prefcontroller.py:136 msgid "Notes tree" msgstr "Notes tree" @@ -811,7 +812,7 @@ msgid "Insert the current date" msgstr "Insert the current date" #: outwiker/app/gui/actionslist.py:391 -#: outwiker/app/gui/preferences/prefcontroller.py:161 +#: outwiker/app/gui/preferences/prefcontroller.py:164 msgid "Spell checking" msgstr "Spell checking" @@ -1071,8 +1072,8 @@ msgid "{count} file(s) - {size} KB" msgstr "{count} file(s) - {size} KB" #: outwiker/app/gui/basepagedialog.py:129 outwiker/app/gui/mainwindow.py:158 -#: outwiker/app/gui/preferences/prefcontroller.py:132 -#: outwiker/app/gui/preferences/prefcontroller.py:160 +#: outwiker/app/gui/preferences/prefcontroller.py:134 +#: outwiker/app/gui/preferences/prefcontroller.py:163 #: outwiker/pages/wiki/wikipagecontroller.py:67 msgid "General" msgstr "General" @@ -1220,7 +1221,7 @@ msgstr "New tag name" #: outwiker/app/gui/preferences/iconsetpanel.py:342 #: outwiker/core/textprinter.py:98 #: outwiker/gui/controls/toastercontroller.py:50 -#: outwiker/gui/pagedialogpanels/appearancepanel.py:116 +#: outwiker/gui/pagedialogpanels/appearancepanel.py:129 #: outwiker/pages/html/basehtmlpanel.py:339 msgid "Error" msgstr "Error" @@ -1288,7 +1289,7 @@ msgid "Toolbars" msgstr "Toolbars" #: outwiker/app/gui/mainwindow.py:164 -#: outwiker/app/gui/preferences/prefcontroller.py:177 +#: outwiker/app/gui/preferences/prefcontroller.py:180 msgid "Plugins" msgstr "Plugins" @@ -1324,11 +1325,11 @@ msgstr "" "Can't save config.\n" "%s" -#: outwiker/app/gui/notestree.py:191 outwiker/app/services/tree.py:235 +#: outwiker/app/gui/notestree.py:204 outwiker/app/services/tree.py:235 msgid "You can't rename the root element" msgstr "You can't rename the root element" -#: outwiker/app/gui/notestree.py:445 +#: outwiker/app/gui/notestree.py:458 #, python-brace-format msgid "" "Attach files to the note '{title}'?\n" @@ -1339,7 +1340,7 @@ msgstr "" "\n" "{files}" -#: outwiker/app/gui/notestree.py:452 +#: outwiker/app/gui/notestree.py:465 msgid "Attach files to the note?" msgstr "Attach files to the note?" @@ -1413,7 +1414,7 @@ msgid "Show hidden folders" msgstr "Show hidden folders" #: outwiker/app/gui/preferences/colorspanel.py:29 -#: outwiker/app/gui/preferences/prefcontroller.py:133 +#: outwiker/app/gui/preferences/prefcontroller.py:135 msgid "Main window" msgstr "Main window" @@ -1492,7 +1493,7 @@ msgid "Recent used" msgstr "Recent used" #: outwiker/app/gui/preferences/generalpanel.py:40 -#: outwiker/app/gui/preferences/prefcontroller.py:136 +#: outwiker/app/gui/preferences/prefcontroller.py:139 #: outwiker/pages/html/basehtmlpanel.py:219 msgid "Preview" msgstr "Preview" @@ -1696,6 +1697,15 @@ msgstr "Relative path to current page" msgid "Main window title format" msgstr "Main window title format" +#: outwiker/app/gui/preferences/notestreepanel.py:27 +#: outwiker/pages/wiki/fontsizeselector.py:35 +msgid "Font size" +msgstr "Font size" + +#: outwiker/app/gui/preferences/notestreepanel.py:33 +msgid "Default size" +msgstr "Default size" + #: outwiker/app/gui/preferences/pluginspanel.py:33 msgid "Download more plugins" msgstr "Download more plugins" @@ -1716,51 +1726,51 @@ msgstr "Description" msgid "Site" msgstr "Site" -#: outwiker/app/gui/preferences/prefcontroller.py:134 +#: outwiker/app/gui/preferences/prefcontroller.py:137 msgid "Colors" msgstr "Colors" -#: outwiker/app/gui/preferences/prefcontroller.py:135 +#: outwiker/app/gui/preferences/prefcontroller.py:138 msgid "Tray icon" msgstr "Tray icon" -#: outwiker/app/gui/preferences/prefcontroller.py:137 +#: outwiker/app/gui/preferences/prefcontroller.py:140 msgid "Tags cloud" msgstr "Tags cloud" -#: outwiker/app/gui/preferences/prefcontroller.py:139 +#: outwiker/app/gui/preferences/prefcontroller.py:142 msgid "Hotkeys" msgstr "Hotkeys" -#: outwiker/app/gui/preferences/prefcontroller.py:140 +#: outwiker/app/gui/preferences/prefcontroller.py:143 msgid "Formats" msgstr "Formats" -#: outwiker/app/gui/preferences/prefcontroller.py:144 +#: outwiker/app/gui/preferences/prefcontroller.py:147 msgid "Interface" msgstr "Interface" -#: outwiker/app/gui/preferences/prefcontroller.py:162 +#: outwiker/app/gui/preferences/prefcontroller.py:165 msgid "HTML editor" msgstr "HTML editor" -#: outwiker/app/gui/preferences/prefcontroller.py:163 +#: outwiker/app/gui/preferences/prefcontroller.py:166 msgid "Wiki editor" msgstr "Wiki editor" -#: outwiker/app/gui/preferences/prefcontroller.py:167 +#: outwiker/app/gui/preferences/prefcontroller.py:170 msgid "Editor" msgstr "Editor" -#: outwiker/app/gui/preferences/prefcontroller.py:186 +#: outwiker/app/gui/preferences/prefcontroller.py:189 msgid "Text printout" msgstr "Text printout" -#: outwiker/app/gui/preferences/prefcontroller.py:194 +#: outwiker/app/gui/preferences/prefcontroller.py:197 msgid "User's iconset" msgstr "User's iconset" -#: outwiker/app/gui/preferences/prefcontroller.py:200 +#: outwiker/app/gui/preferences/prefcontroller.py:203 #: outwiker/gui/controls/treebook2.py:48 msgid "Preferences" msgstr "Preferences" @@ -2213,11 +2223,11 @@ msgstr "Owerwrite?" msgid "Lines" msgstr "Lines" -#: outwiker/gui/controls/colorcombobox.py:42 +#: outwiker/gui/controls/colorcombobox.py:47 msgid "Default color" msgstr "Default color" -#: outwiker/gui/controls/colorcombobox.py:44 +#: outwiker/gui/controls/colorcombobox.py:49 msgid "Select color..." msgstr "Select color..." @@ -2390,23 +2400,23 @@ msgstr "Custom icon" msgid "Default icon" msgstr "Default icon" -#: outwiker/gui/pagedialogpanels/appearancepanel.py:29 +#: outwiker/gui/pagedialogpanels/appearancepanel.py:31 msgid "Title color" msgstr "Title color" -#: outwiker/gui/pagedialogpanels/appearancepanel.py:34 +#: outwiker/gui/pagedialogpanels/appearancepanel.py:36 msgid "Page style" msgstr "Page style" -#: outwiker/gui/pagedialogpanels/appearancepanel.py:116 +#: outwiker/gui/pagedialogpanels/appearancepanel.py:129 msgid "Can't set page style\n" msgstr "Can't set page style\n" -#: outwiker/gui/pagedialogpanels/appearancepanel.py:164 +#: outwiker/gui/pagedialogpanels/appearancepanel.py:178 msgid "Do not change" msgstr "Do not change" -#: outwiker/gui/pagedialogpanels/appearancepanel.py:166 +#: outwiker/gui/pagedialogpanels/appearancepanel.py:180 msgid "Default style" msgstr "Default style" @@ -2833,10 +2843,6 @@ msgstr "" msgid "Select font size" msgstr "Select font size" -#: outwiker/pages/wiki/fontsizeselector.py:35 -msgid "Font size" -msgstr "Font size" - #: outwiker/pages/wiki/gui/listitemstyledialog.py:15 msgid "List item style" msgstr "List item style" diff --git a/src/locale/outwiker.pot b/src/locale/outwiker.pot index 41fe87e0b..2be62ee00 100644 --- a/src/locale/outwiker.pot +++ b/src/locale/outwiker.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: OutWiker\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-12-09 09:34+0300\n" +"POT-Creation-Date: 2024-12-14 14:46+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: Eugene Ilin \n" @@ -482,7 +482,7 @@ msgstr "" #: outwiker/app/actions/switchto.py:63 #: outwiker/app/gui/mainpanes/attachmainpane.py:40 #: outwiker/app/gui/mainwindow.py:460 -#: outwiker/app/gui/preferences/prefcontroller.py:138 +#: outwiker/app/gui/preferences/prefcontroller.py:141 #: outwiker/app/gui/preferences/wikieditorpanel.py:37 #: outwiker/gui/controls/filestreectrl.py:84 #: outwiker/pages/wiki/parser/commands/attachlist.py:34 @@ -539,6 +539,7 @@ msgid "Set focus to main panel" msgstr "" #: outwiker/app/actions/switchto.py:40 +#: outwiker/app/gui/preferences/prefcontroller.py:136 msgid "Notes tree" msgstr "" @@ -818,7 +819,7 @@ msgid "Insert the current date" msgstr "" #: outwiker/app/gui/actionslist.py:391 -#: outwiker/app/gui/preferences/prefcontroller.py:161 +#: outwiker/app/gui/preferences/prefcontroller.py:164 msgid "Spell checking" msgstr "" @@ -1078,8 +1079,8 @@ msgid "{count} file(s) - {size} KB" msgstr "" #: outwiker/app/gui/basepagedialog.py:129 outwiker/app/gui/mainwindow.py:158 -#: outwiker/app/gui/preferences/prefcontroller.py:132 -#: outwiker/app/gui/preferences/prefcontroller.py:160 +#: outwiker/app/gui/preferences/prefcontroller.py:134 +#: outwiker/app/gui/preferences/prefcontroller.py:163 #: outwiker/pages/wiki/wikipagecontroller.py:67 msgid "General" msgstr "" @@ -1229,7 +1230,7 @@ msgstr "" #: outwiker/app/gui/preferences/iconsetpanel.py:342 #: outwiker/core/textprinter.py:98 #: outwiker/gui/controls/toastercontroller.py:50 -#: outwiker/gui/pagedialogpanels/appearancepanel.py:116 +#: outwiker/gui/pagedialogpanels/appearancepanel.py:129 #: outwiker/pages/html/basehtmlpanel.py:339 msgid "Error" msgstr "" @@ -1297,7 +1298,7 @@ msgid "Toolbars" msgstr "" #: outwiker/app/gui/mainwindow.py:164 -#: outwiker/app/gui/preferences/prefcontroller.py:177 +#: outwiker/app/gui/preferences/prefcontroller.py:180 msgid "Plugins" msgstr "" @@ -1328,11 +1329,11 @@ msgid "" "%s" msgstr "" -#: outwiker/app/gui/notestree.py:191 outwiker/app/services/tree.py:235 +#: outwiker/app/gui/notestree.py:204 outwiker/app/services/tree.py:235 msgid "You can't rename the root element" msgstr "" -#: outwiker/app/gui/notestree.py:445 +#: outwiker/app/gui/notestree.py:458 #, python-brace-format msgid "" "Attach files to the note '{title}'?\n" @@ -1340,7 +1341,7 @@ msgid "" "{files}" msgstr "" -#: outwiker/app/gui/notestree.py:452 +#: outwiker/app/gui/notestree.py:465 msgid "Attach files to the note?" msgstr "" @@ -1414,7 +1415,7 @@ msgid "Show hidden folders" msgstr "" #: outwiker/app/gui/preferences/colorspanel.py:29 -#: outwiker/app/gui/preferences/prefcontroller.py:133 +#: outwiker/app/gui/preferences/prefcontroller.py:135 msgid "Main window" msgstr "" @@ -1491,7 +1492,7 @@ msgid "Recent used" msgstr "" #: outwiker/app/gui/preferences/generalpanel.py:40 -#: outwiker/app/gui/preferences/prefcontroller.py:136 +#: outwiker/app/gui/preferences/prefcontroller.py:139 #: outwiker/pages/html/basehtmlpanel.py:219 msgid "Preview" msgstr "" @@ -1691,6 +1692,15 @@ msgstr "" msgid "Main window title format" msgstr "" +#: outwiker/app/gui/preferences/notestreepanel.py:27 +#: outwiker/pages/wiki/fontsizeselector.py:35 +msgid "Font size" +msgstr "" + +#: outwiker/app/gui/preferences/notestreepanel.py:33 +msgid "Default size" +msgstr "" + #: outwiker/app/gui/preferences/pluginspanel.py:33 msgid "Download more plugins" msgstr "" @@ -1711,51 +1721,51 @@ msgstr "" msgid "Site" msgstr "" -#: outwiker/app/gui/preferences/prefcontroller.py:134 +#: outwiker/app/gui/preferences/prefcontroller.py:137 msgid "Colors" msgstr "" -#: outwiker/app/gui/preferences/prefcontroller.py:135 +#: outwiker/app/gui/preferences/prefcontroller.py:138 msgid "Tray icon" msgstr "" -#: outwiker/app/gui/preferences/prefcontroller.py:137 +#: outwiker/app/gui/preferences/prefcontroller.py:140 msgid "Tags cloud" msgstr "" -#: outwiker/app/gui/preferences/prefcontroller.py:139 +#: outwiker/app/gui/preferences/prefcontroller.py:142 msgid "Hotkeys" msgstr "" -#: outwiker/app/gui/preferences/prefcontroller.py:140 +#: outwiker/app/gui/preferences/prefcontroller.py:143 msgid "Formats" msgstr "" -#: outwiker/app/gui/preferences/prefcontroller.py:144 +#: outwiker/app/gui/preferences/prefcontroller.py:147 msgid "Interface" msgstr "" -#: outwiker/app/gui/preferences/prefcontroller.py:162 +#: outwiker/app/gui/preferences/prefcontroller.py:165 msgid "HTML editor" msgstr "" -#: outwiker/app/gui/preferences/prefcontroller.py:163 +#: outwiker/app/gui/preferences/prefcontroller.py:166 msgid "Wiki editor" msgstr "" -#: outwiker/app/gui/preferences/prefcontroller.py:167 +#: outwiker/app/gui/preferences/prefcontroller.py:170 msgid "Editor" msgstr "" -#: outwiker/app/gui/preferences/prefcontroller.py:186 +#: outwiker/app/gui/preferences/prefcontroller.py:189 msgid "Text printout" msgstr "" -#: outwiker/app/gui/preferences/prefcontroller.py:194 +#: outwiker/app/gui/preferences/prefcontroller.py:197 msgid "User's iconset" msgstr "" -#: outwiker/app/gui/preferences/prefcontroller.py:200 +#: outwiker/app/gui/preferences/prefcontroller.py:203 #: outwiker/gui/controls/treebook2.py:48 msgid "Preferences" msgstr "" @@ -2184,11 +2194,11 @@ msgstr "" msgid "Lines" msgstr "" -#: outwiker/gui/controls/colorcombobox.py:42 +#: outwiker/gui/controls/colorcombobox.py:47 msgid "Default color" msgstr "" -#: outwiker/gui/controls/colorcombobox.py:44 +#: outwiker/gui/controls/colorcombobox.py:49 msgid "Select color..." msgstr "" @@ -2361,23 +2371,23 @@ msgstr "" msgid "Default icon" msgstr "" -#: outwiker/gui/pagedialogpanels/appearancepanel.py:29 +#: outwiker/gui/pagedialogpanels/appearancepanel.py:31 msgid "Title color" msgstr "" -#: outwiker/gui/pagedialogpanels/appearancepanel.py:34 +#: outwiker/gui/pagedialogpanels/appearancepanel.py:36 msgid "Page style" msgstr "" -#: outwiker/gui/pagedialogpanels/appearancepanel.py:116 +#: outwiker/gui/pagedialogpanels/appearancepanel.py:129 msgid "Can't set page style\n" msgstr "" -#: outwiker/gui/pagedialogpanels/appearancepanel.py:164 +#: outwiker/gui/pagedialogpanels/appearancepanel.py:178 msgid "Do not change" msgstr "" -#: outwiker/gui/pagedialogpanels/appearancepanel.py:166 +#: outwiker/gui/pagedialogpanels/appearancepanel.py:180 msgid "Default style" msgstr "" @@ -2796,10 +2806,6 @@ msgstr "" msgid "Select font size" msgstr "" -#: outwiker/pages/wiki/fontsizeselector.py:35 -msgid "Font size" -msgstr "" - #: outwiker/pages/wiki/gui/listitemstyledialog.py:15 msgid "List item style" msgstr "" diff --git a/src/locale/ru/LC_MESSAGES/outwiker.mo b/src/locale/ru/LC_MESSAGES/outwiker.mo index 8fd401c5c..2c43fe6f5 100644 Binary files a/src/locale/ru/LC_MESSAGES/outwiker.mo and b/src/locale/ru/LC_MESSAGES/outwiker.mo differ diff --git a/src/locale/ru/LC_MESSAGES/outwiker.po b/src/locale/ru/LC_MESSAGES/outwiker.po index 421ad8e53..406aa8ef9 100644 --- a/src/locale/ru/LC_MESSAGES/outwiker.po +++ b/src/locale/ru/LC_MESSAGES/outwiker.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: outwiker 1.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-12-09 09:34+0300\n" +"POT-Creation-Date: 2024-12-14 14:46+0300\n" "PO-Revision-Date: \n" "Last-Translator: Eugeniy Ilin \n" "Language-Team: Jenyay \n" @@ -477,7 +477,7 @@ msgstr "Начать поиск и замену по странице" #: outwiker/app/actions/switchto.py:63 #: outwiker/app/gui/mainpanes/attachmainpane.py:40 #: outwiker/app/gui/mainwindow.py:460 -#: outwiker/app/gui/preferences/prefcontroller.py:138 +#: outwiker/app/gui/preferences/prefcontroller.py:141 #: outwiker/app/gui/preferences/wikieditorpanel.py:37 #: outwiker/gui/controls/filestreectrl.py:84 #: outwiker/pages/wiki/parser/commands/attachlist.py:34 @@ -533,6 +533,7 @@ msgid "Set focus to main panel" msgstr "Установить фокус на главную панель" #: outwiker/app/actions/switchto.py:40 +#: outwiker/app/gui/preferences/prefcontroller.py:136 msgid "Notes tree" msgstr "Дерево заметок" @@ -811,7 +812,7 @@ msgid "Insert the current date" msgstr "Вставить текущую дату" #: outwiker/app/gui/actionslist.py:391 -#: outwiker/app/gui/preferences/prefcontroller.py:161 +#: outwiker/app/gui/preferences/prefcontroller.py:164 msgid "Spell checking" msgstr "Проверка орфографии" @@ -1071,8 +1072,8 @@ msgid "{count} file(s) - {size} KB" msgstr "{count} файл(ов) - {size} КБ" #: outwiker/app/gui/basepagedialog.py:129 outwiker/app/gui/mainwindow.py:158 -#: outwiker/app/gui/preferences/prefcontroller.py:132 -#: outwiker/app/gui/preferences/prefcontroller.py:160 +#: outwiker/app/gui/preferences/prefcontroller.py:134 +#: outwiker/app/gui/preferences/prefcontroller.py:163 #: outwiker/pages/wiki/wikipagecontroller.py:67 msgid "General" msgstr "Общие" @@ -1227,7 +1228,7 @@ msgstr "Новое имя метки" #: outwiker/app/gui/preferences/iconsetpanel.py:342 #: outwiker/core/textprinter.py:98 #: outwiker/gui/controls/toastercontroller.py:50 -#: outwiker/gui/pagedialogpanels/appearancepanel.py:116 +#: outwiker/gui/pagedialogpanels/appearancepanel.py:129 #: outwiker/pages/html/basehtmlpanel.py:339 msgid "Error" msgstr "Ошибка" @@ -1295,7 +1296,7 @@ msgid "Toolbars" msgstr "Панели инструментов" #: outwiker/app/gui/mainwindow.py:164 -#: outwiker/app/gui/preferences/prefcontroller.py:177 +#: outwiker/app/gui/preferences/prefcontroller.py:180 msgid "Plugins" msgstr "Плагины" @@ -1331,11 +1332,11 @@ msgstr "" "Невозможно сохранить настройки.\n" "%s" -#: outwiker/app/gui/notestree.py:191 outwiker/app/services/tree.py:235 +#: outwiker/app/gui/notestree.py:204 outwiker/app/services/tree.py:235 msgid "You can't rename the root element" msgstr "Нельзя переименовать корневой элемент" -#: outwiker/app/gui/notestree.py:445 +#: outwiker/app/gui/notestree.py:458 #, python-brace-format msgid "" "Attach files to the note '{title}'?\n" @@ -1346,7 +1347,7 @@ msgstr "" "\n" "{files}" -#: outwiker/app/gui/notestree.py:452 +#: outwiker/app/gui/notestree.py:465 msgid "Attach files to the note?" msgstr "Прикрепить файлы к заметке?" @@ -1420,7 +1421,7 @@ msgid "Show hidden folders" msgstr "Показывать скрытые папки" #: outwiker/app/gui/preferences/colorspanel.py:29 -#: outwiker/app/gui/preferences/prefcontroller.py:133 +#: outwiker/app/gui/preferences/prefcontroller.py:135 msgid "Main window" msgstr "Главное окно" @@ -1499,7 +1500,7 @@ msgid "Recent used" msgstr "Последний используемый" #: outwiker/app/gui/preferences/generalpanel.py:40 -#: outwiker/app/gui/preferences/prefcontroller.py:136 +#: outwiker/app/gui/preferences/prefcontroller.py:139 #: outwiker/pages/html/basehtmlpanel.py:219 msgid "Preview" msgstr "Просмотр" @@ -1703,6 +1704,15 @@ msgstr "Относительный путь до текущей страницы msgid "Main window title format" msgstr "Формат заголовка главного окна" +#: outwiker/app/gui/preferences/notestreepanel.py:27 +#: outwiker/pages/wiki/fontsizeselector.py:35 +msgid "Font size" +msgstr "Размер шрифта" + +#: outwiker/app/gui/preferences/notestreepanel.py:33 +msgid "Default size" +msgstr "Размер по умолчанию" + #: outwiker/app/gui/preferences/pluginspanel.py:33 msgid "Download more plugins" msgstr "Скачать другие плагины" @@ -1723,51 +1733,51 @@ msgstr "Описание" msgid "Site" msgstr "Сайт" -#: outwiker/app/gui/preferences/prefcontroller.py:134 +#: outwiker/app/gui/preferences/prefcontroller.py:137 msgid "Colors" msgstr "Цвета" -#: outwiker/app/gui/preferences/prefcontroller.py:135 +#: outwiker/app/gui/preferences/prefcontroller.py:138 msgid "Tray icon" msgstr "Значок в панели задач" -#: outwiker/app/gui/preferences/prefcontroller.py:137 +#: outwiker/app/gui/preferences/prefcontroller.py:140 msgid "Tags cloud" msgstr "Облако меток" -#: outwiker/app/gui/preferences/prefcontroller.py:139 +#: outwiker/app/gui/preferences/prefcontroller.py:142 msgid "Hotkeys" msgstr "Сочетания клавиш" -#: outwiker/app/gui/preferences/prefcontroller.py:140 +#: outwiker/app/gui/preferences/prefcontroller.py:143 msgid "Formats" msgstr "Форматы" -#: outwiker/app/gui/preferences/prefcontroller.py:144 +#: outwiker/app/gui/preferences/prefcontroller.py:147 msgid "Interface" msgstr "Интерфейс" -#: outwiker/app/gui/preferences/prefcontroller.py:162 +#: outwiker/app/gui/preferences/prefcontroller.py:165 msgid "HTML editor" msgstr "HTML-редактор" -#: outwiker/app/gui/preferences/prefcontroller.py:163 +#: outwiker/app/gui/preferences/prefcontroller.py:166 msgid "Wiki editor" msgstr "Викиредактор" -#: outwiker/app/gui/preferences/prefcontroller.py:167 +#: outwiker/app/gui/preferences/prefcontroller.py:170 msgid "Editor" msgstr "Редактор" -#: outwiker/app/gui/preferences/prefcontroller.py:186 +#: outwiker/app/gui/preferences/prefcontroller.py:189 msgid "Text printout" msgstr "Печать текста" -#: outwiker/app/gui/preferences/prefcontroller.py:194 +#: outwiker/app/gui/preferences/prefcontroller.py:197 msgid "User's iconset" msgstr "Значки пользователя" -#: outwiker/app/gui/preferences/prefcontroller.py:200 +#: outwiker/app/gui/preferences/prefcontroller.py:203 #: outwiker/gui/controls/treebook2.py:48 msgid "Preferences" msgstr "Параметры" @@ -2221,11 +2231,11 @@ msgstr "Перезаписать?" msgid "Lines" msgstr "Строки" -#: outwiker/gui/controls/colorcombobox.py:42 +#: outwiker/gui/controls/colorcombobox.py:47 msgid "Default color" msgstr "Цвет по умолчанию" -#: outwiker/gui/controls/colorcombobox.py:44 +#: outwiker/gui/controls/colorcombobox.py:49 msgid "Select color..." msgstr "Выбрать цвет..." @@ -2398,23 +2408,23 @@ msgstr "Пользовательский значок" msgid "Default icon" msgstr "Значок по умолчанию" -#: outwiker/gui/pagedialogpanels/appearancepanel.py:29 +#: outwiker/gui/pagedialogpanels/appearancepanel.py:31 msgid "Title color" msgstr "Цвет заголовка" -#: outwiker/gui/pagedialogpanels/appearancepanel.py:34 +#: outwiker/gui/pagedialogpanels/appearancepanel.py:36 msgid "Page style" msgstr "Стиль страницы" -#: outwiker/gui/pagedialogpanels/appearancepanel.py:116 +#: outwiker/gui/pagedialogpanels/appearancepanel.py:129 msgid "Can't set page style\n" msgstr "Ошибка установки стиля страницы\n" -#: outwiker/gui/pagedialogpanels/appearancepanel.py:164 +#: outwiker/gui/pagedialogpanels/appearancepanel.py:178 msgid "Do not change" msgstr "Не изменять" -#: outwiker/gui/pagedialogpanels/appearancepanel.py:166 +#: outwiker/gui/pagedialogpanels/appearancepanel.py:180 msgid "Default style" msgstr "Стиль по умолчанию" @@ -2841,10 +2851,6 @@ msgstr "" msgid "Select font size" msgstr "Выберите размер шрифта" -#: outwiker/pages/wiki/fontsizeselector.py:35 -msgid "Font size" -msgstr "Размер шрифта" - #: outwiker/pages/wiki/gui/listitemstyledialog.py:15 msgid "List item style" msgstr "Стиль элемента списка" diff --git a/src/outwiker/app/gui/preferences/notestreepanel.py b/src/outwiker/app/gui/preferences/notestreepanel.py index 39d191bf9..3b18a883f 100644 --- a/src/outwiker/app/gui/preferences/notestreepanel.py +++ b/src/outwiker/app/gui/preferences/notestreepanel.py @@ -34,7 +34,7 @@ def _createFontSizeGUI(self, main_sizer): self._fontSizeComboBox = wx.ComboBox( self, choices=font_size_items, style=wx.CB_DROPDOWN | wx.CB_READONLY ) - self._fontSizeComboBox.SetMinSize((150, -1)) + self._fontSizeComboBox.SetMinSize((200, -1)) self._fontSizeSizer = wx.FlexGridSizer(cols=2) self._fontSizeSizer.AddGrowableCol(1)