From ea399e29f5155b2ac4f13809c76bb9d77c8b7a2a Mon Sep 17 00:00:00 2001 From: Alf Gaida <agaida@siduction.org> Date: Sat, 3 Oct 2015 19:29:30 +0200 Subject: [PATCH] Adding upstream version 0.9.0+20150929. --- libfm-qt/proxyfoldermodel.cpp | 4 + libfm-qt/proxyfoldermodel.h | 3 +- libfm-qt/translations/libfm-qt_ru.ts | 251 +++++++++++++-- libfm-qt/translations/libfm-qt_ru_RU.ts | 251 +++++++++++++-- pcmanfm/main-win.ui | 34 +- pcmanfm/mainwindow.cpp | 26 +- pcmanfm/mainwindow.h | 2 + pcmanfm/tabpage.cpp | 61 +++- pcmanfm/tabpage.h | 39 ++- pcmanfm/translations/pcmanfm-qt_ru.ts | 366 +++++++++++----------- pcmanfm/translations/pcmanfm-qt_ru_RU.ts | 376 ++++++++++++----------- 11 files changed, 979 insertions(+), 434 deletions(-) diff --git a/libfm-qt/proxyfoldermodel.cpp b/libfm-qt/proxyfoldermodel.cpp index ce815c6..4c7538b 100644 --- a/libfm-qt/proxyfoldermodel.cpp +++ b/libfm-qt/proxyfoldermodel.cpp @@ -254,6 +254,10 @@ void ProxyFolderModel::removeFilter(ProxyFolderModelFilter* filter) { Q_EMIT sortFilterChanged(); } +void ProxyFolderModel::updateFilters() { + invalidate(); + Q_EMIT sortFilterChanged(); +} #if 0 void ProxyFolderModel::reloadAllThumbnails() { diff --git a/libfm-qt/proxyfoldermodel.h b/libfm-qt/proxyfoldermodel.h index dc2f6d6..091fda0 100644 --- a/libfm-qt/proxyfoldermodel.h +++ b/libfm-qt/proxyfoldermodel.h @@ -50,7 +50,7 @@ public: virtual void setSourceModel(QAbstractItemModel* model); void setShowHidden(bool show); - bool showHidden() { + bool showHidden() const { return showHidden_; } @@ -81,6 +81,7 @@ public: void addFilter(ProxyFolderModelFilter* filter); void removeFilter(ProxyFolderModelFilter* filter); + void updateFilters(); Q_SIGNALS: void sortFilterChanged(); diff --git a/libfm-qt/translations/libfm-qt_ru.ts b/libfm-qt/translations/libfm-qt_ru.ts index d76bcac..df1d7e2 100644 --- a/libfm-qt/translations/libfm-qt_ru.ts +++ b/libfm-qt/translations/libfm-qt_ru.ts @@ -398,83 +398,83 @@ What do you want to do with it?</source> <context> <name>Fm::FileMenu</name> <message> - <location filename="../filemenu.cpp" line="81"/> + <location filename="../filemenu.cpp" line="94"/> <source>Open</source> <translation>Открыть</translation> </message> <message> - <location filename="../filemenu.cpp" line="85"/> + <location filename="../filemenu.cpp" line="98"/> <source>Open With...</source> <translation>Открыть с помощью...</translation> </message> <message> - <location filename="../filemenu.cpp" line="113"/> + <location filename="../filemenu.cpp" line="126"/> <source>Other Applications</source> <translation>Другие приложения</translation> </message> <message> - <location filename="../filemenu.cpp" line="119"/> + <location filename="../filemenu.cpp" line="132"/> <source>Create &New</source> <translation>&Создать</translation> </message> <message> - <location filename="../filemenu.cpp" line="138"/> + <location filename="../filemenu.cpp" line="151"/> <source>&Restore</source> <translation>&Восстановить</translation> </message> <message> - <location filename="../filemenu.cpp" line="144"/> + <location filename="../filemenu.cpp" line="157"/> <source>Cut</source> <translation>Вырезать</translation> </message> <message> - <location filename="../filemenu.cpp" line="148"/> + <location filename="../filemenu.cpp" line="161"/> <source>Copy</source> <translation>Копировать</translation> </message> <message> - <location filename="../filemenu.cpp" line="152"/> + <location filename="../filemenu.cpp" line="165"/> <source>Paste</source> <translation>Вставить</translation> </message> <message> - <location filename="../filemenu.cpp" line="156"/> - <location filename="../filemenu.cpp" line="349"/> + <location filename="../filemenu.cpp" line="169"/> + <location filename="../filemenu.cpp" line="363"/> <source>&Move to Trash</source> <translation>&Переместить в корзину</translation> </message> <message> - <location filename="../filemenu.cpp" line="160"/> + <location filename="../filemenu.cpp" line="173"/> <source>Rename</source> <translation>Переименовать</translation> </message> <message> - <location filename="../filemenu.cpp" line="187"/> + <location filename="../filemenu.cpp" line="200"/> <source>Extract to...</source> <translation>Распаковать в ...</translation> </message> <message> - <location filename="../filemenu.cpp" line="192"/> + <location filename="../filemenu.cpp" line="205"/> <source>Extract Here</source> <translation>Распаковать здесь</translation> </message> <message> - <location filename="../filemenu.cpp" line="198"/> + <location filename="../filemenu.cpp" line="211"/> <source>Compress</source> <translation>Сжать</translation> </message> <message> - <location filename="../filemenu.cpp" line="208"/> + <location filename="../filemenu.cpp" line="221"/> <source>Properties</source> <translation>Свойства</translation> </message> <message> - <location filename="../filemenu.cpp" line="299"/> + <location filename="../filemenu.cpp" line="312"/> <source>Output</source> <translation>Вывод</translation> </message> <message> - <location filename="../filemenu.cpp" line="349"/> + <location filename="../filemenu.cpp" line="363"/> <source>&Delete</source> <translation>&Удалить</translation> </message> @@ -636,6 +636,24 @@ Do you want to delete them instead?</source> <translation>Применить изменения рекурсивно ко всем файлам и подпапкам?</translation> </message> </context> +<context> + <name>Fm::FileSearchDialog</name> + <message> + <location filename="../filesearchdialog.cpp" line="120"/> + <source>Error</source> + <translation>Ошибка</translation> + </message> + <message> + <location filename="../filesearchdialog.cpp" line="120"/> + <source>You should add at least add one directory to search.</source> + <translation>Вы должны добавить не менее одного места для поиска.</translation> + </message> + <message> + <location filename="../filesearchdialog.cpp" line="127"/> + <source>Select a folder</source> + <translation>Выберите папку</translation> + </message> +</context> <context> <name>Fm::FolderMenu</name> <message> @@ -814,53 +832,53 @@ Do you want to delete them instead?</source> <context> <name>Fm::PlacesView</name> <message> - <location filename="../placesview.cpp" line="343"/> + <location filename="../placesview.cpp" line="346"/> <source>Empty Trash</source> <translation>Очистить корзину</translation> </message> <message> - <location filename="../placesview.cpp" line="331"/> + <location filename="../placesview.cpp" line="334"/> <source>Open in New Tab</source> <translation>Открыть в новой вкладке</translation> </message> <message> - <location filename="../placesview.cpp" line="334"/> + <location filename="../placesview.cpp" line="337"/> <source>Open in New Window</source> <translation>Открыть в новом окне</translation> </message> <message> - <location filename="../placesview.cpp" line="352"/> + <location filename="../placesview.cpp" line="355"/> <source>Move Bookmark Up</source> <translation>Сдвинуть закладку вверх</translation> </message> <message> - <location filename="../placesview.cpp" line="357"/> + <location filename="../placesview.cpp" line="360"/> <source>Move Bookmark Down</source> <translation>Сдвинуть закладку вниз</translation> </message> <message> - <location filename="../placesview.cpp" line="361"/> + <location filename="../placesview.cpp" line="364"/> <source>Rename Bookmark</source> <translation>Переименовать закладку</translation> </message> <message> - <location filename="../placesview.cpp" line="364"/> + <location filename="../placesview.cpp" line="367"/> <source>Remove Bookmark</source> <translation>Удалить закладку</translation> </message> <message> - <location filename="../placesview.cpp" line="373"/> - <location filename="../placesview.cpp" line="390"/> + <location filename="../placesview.cpp" line="376"/> + <location filename="../placesview.cpp" line="393"/> <source>Unmount</source> <translation>Отключить</translation> </message> <message> - <location filename="../placesview.cpp" line="377"/> + <location filename="../placesview.cpp" line="380"/> <source>Mount</source> <translation>Подключить</translation> </message> <message> - <location filename="../placesview.cpp" line="383"/> + <location filename="../placesview.cpp" line="386"/> <source>Eject</source> <translation>Извлечь</translation> </message> @@ -1079,4 +1097,181 @@ Modified: %3</source> <translation>Запомнить выбор для всех уже существующих файлов</translation> </message> </context> +<context> + <name>SearchDialog</name> + <message> + <location filename="../filesearch.ui" line="14"/> + <source>Search Files</source> + <translation>Искать файлы</translation> + </message> + <message> + <location filename="../filesearch.ui" line="29"/> + <source>Name/Location</source> + <translation>Имя/Расположение</translation> + </message> + <message> + <location filename="../filesearch.ui" line="35"/> + <source>File Name Patterns:</source> + <translation>Шаблоны имени файла:</translation> + </message> + <message> + <location filename="../filesearch.ui" line="41"/> + <source>*</source> + <translation></translation> + </message> + <message> + <location filename="../filesearch.ui" line="48"/> + <source>Case insensitive</source> + <translation>Нечувствительный к регистру поиск</translation> + </message> + <message> + <location filename="../filesearch.ui" line="55"/> + <source>Use regular expression</source> + <translation>Использовать регулярные выражения</translation> + </message> + <message> + <location filename="../filesearch.ui" line="65"/> + <source>Places to Search:</source> + <translation>Места для поиска:</translation> + </message> + <message> + <location filename="../filesearch.ui" line="78"/> + <source>&Add</source> + <translation>&Добавить</translation> + </message> + <message> + <location filename="../filesearch.ui" line="90"/> + <source>&Remove</source> + <translation>&Удалить</translation> + </message> + <message> + <location filename="../filesearch.ui" line="119"/> + <source>Search in sub directories</source> + <translation>Искать в подпапках</translation> + </message> + <message> + <location filename="../filesearch.ui" line="126"/> + <source>Search for hidden files</source> + <translation>Искать скрытые файлы</translation> + </message> + <message> + <location filename="../filesearch.ui" line="137"/> + <source>File Type</source> + <translation>Тип файла</translation> + </message> + <message> + <location filename="../filesearch.ui" line="143"/> + <source>Only search for files of following types:</source> + <translation>Искать файлы только следующих типов:</translation> + </message> + <message> + <location filename="../filesearch.ui" line="149"/> + <source>Text files</source> + <translation>Текстовые файлы</translation> + </message> + <message> + <location filename="../filesearch.ui" line="156"/> + <source>Image files</source> + <translation>Изображения</translation> + </message> + <message> + <location filename="../filesearch.ui" line="163"/> + <source>Audio files</source> + <translation>Аудиофайлы</translation> + </message> + <message> + <location filename="../filesearch.ui" line="170"/> + <source>Video files</source> + <translation>Видеофайлы</translation> + </message> + <message> + <location filename="../filesearch.ui" line="177"/> + <source>Documents</source> + <translation>Документы</translation> + </message> + <message> + <location filename="../filesearch.ui" line="184"/> + <source>Folders</source> + <translation>Папки</translation> + </message> + <message> + <location filename="../filesearch.ui" line="208"/> + <source>Content</source> + <translation>Содержание</translation> + </message> + <message> + <location filename="../filesearch.ui" line="214"/> + <source>File contains:</source> + <translation>Файл содержит:</translation> + </message> + <message> + <location filename="../filesearch.ui" line="223"/> + <source>Case insensiti&ve</source> + <translation>Нечувствительн&ый к регистру поиск</translation> + </message> + <message> + <location filename="../filesearch.ui" line="230"/> + <source>&Use regular expression</source> + <translation>&Использовать регулярные выражения</translation> + </message> + <message> + <location filename="../filesearch.ui" line="254"/> + <source>Properties</source> + <translation>Свойства</translation> + </message> + <message> + <location filename="../filesearch.ui" line="260"/> + <source>File Size:</source> + <translation>Размер файла:</translation> + </message> + <message> + <location filename="../filesearch.ui" line="266"/> + <source>Larger than:</source> + <translation>Больше, чем:</translation> + </message> + <message> + <location filename="../filesearch.ui" line="282"/> + <location filename="../filesearch.ui" line="323"/> + <source>Bytes</source> + <translation>Байт</translation> + </message> + <message> + <location filename="../filesearch.ui" line="287"/> + <location filename="../filesearch.ui" line="328"/> + <source>KiB</source> + <translation>КиБ</translation> + </message> + <message> + <location filename="../filesearch.ui" line="292"/> + <location filename="../filesearch.ui" line="333"/> + <source>MiB</source> + <translation>МиБ</translation> + </message> + <message> + <location filename="../filesearch.ui" line="297"/> + <location filename="../filesearch.ui" line="338"/> + <source>GiB</source> + <translation>ГиБ</translation> + </message> + <message> + <location filename="../filesearch.ui" line="307"/> + <source>Smaller than:</source> + <translation>Меньше, чем:</translation> + </message> + <message> + <location filename="../filesearch.ui" line="351"/> + <source>Last Modified Time:</source> + <translation>Время последнего изменения:</translation> + </message> + <message> + <location filename="../filesearch.ui" line="357"/> + <source>Earlier than:</source> + <translation>Раньше, чем:</translation> + </message> + <message> + <location filename="../filesearch.ui" line="364"/> + <source>Later than:</source> + <translation>Позже, чем:</translation> + </message> +</context> </TS> diff --git a/libfm-qt/translations/libfm-qt_ru_RU.ts b/libfm-qt/translations/libfm-qt_ru_RU.ts index 187f3b3..d52c09a 100644 --- a/libfm-qt/translations/libfm-qt_ru_RU.ts +++ b/libfm-qt/translations/libfm-qt_ru_RU.ts @@ -398,83 +398,83 @@ What do you want to do with it?</source> <context> <name>Fm::FileMenu</name> <message> - <location filename="../filemenu.cpp" line="81"/> + <location filename="../filemenu.cpp" line="94"/> <source>Open</source> <translation>Открыть</translation> </message> <message> - <location filename="../filemenu.cpp" line="85"/> + <location filename="../filemenu.cpp" line="98"/> <source>Open With...</source> <translation>Открыть с помощью...</translation> </message> <message> - <location filename="../filemenu.cpp" line="113"/> + <location filename="../filemenu.cpp" line="126"/> <source>Other Applications</source> <translation>Другие приложения</translation> </message> <message> - <location filename="../filemenu.cpp" line="119"/> + <location filename="../filemenu.cpp" line="132"/> <source>Create &New</source> <translation>&Создать</translation> </message> <message> - <location filename="../filemenu.cpp" line="138"/> + <location filename="../filemenu.cpp" line="151"/> <source>&Restore</source> <translation>&Восстановить</translation> </message> <message> - <location filename="../filemenu.cpp" line="144"/> + <location filename="../filemenu.cpp" line="157"/> <source>Cut</source> <translation>Вырезать</translation> </message> <message> - <location filename="../filemenu.cpp" line="148"/> + <location filename="../filemenu.cpp" line="161"/> <source>Copy</source> <translation>Копировать</translation> </message> <message> - <location filename="../filemenu.cpp" line="152"/> + <location filename="../filemenu.cpp" line="165"/> <source>Paste</source> <translation>Вставить</translation> </message> <message> - <location filename="../filemenu.cpp" line="156"/> - <location filename="../filemenu.cpp" line="349"/> + <location filename="../filemenu.cpp" line="169"/> + <location filename="../filemenu.cpp" line="363"/> <source>&Move to Trash</source> <translation>&Переместить в корзину</translation> </message> <message> - <location filename="../filemenu.cpp" line="160"/> + <location filename="../filemenu.cpp" line="173"/> <source>Rename</source> <translation>Переименовать</translation> </message> <message> - <location filename="../filemenu.cpp" line="187"/> + <location filename="../filemenu.cpp" line="200"/> <source>Extract to...</source> <translation>Распаковать в ...</translation> </message> <message> - <location filename="../filemenu.cpp" line="192"/> + <location filename="../filemenu.cpp" line="205"/> <source>Extract Here</source> <translation>Распаковать здесь</translation> </message> <message> - <location filename="../filemenu.cpp" line="198"/> + <location filename="../filemenu.cpp" line="211"/> <source>Compress</source> <translation>Сжать</translation> </message> <message> - <location filename="../filemenu.cpp" line="208"/> + <location filename="../filemenu.cpp" line="221"/> <source>Properties</source> <translation>Свойства</translation> </message> <message> - <location filename="../filemenu.cpp" line="299"/> + <location filename="../filemenu.cpp" line="312"/> <source>Output</source> <translation>Вывод</translation> </message> <message> - <location filename="../filemenu.cpp" line="349"/> + <location filename="../filemenu.cpp" line="363"/> <source>&Delete</source> <translation>&Удалить</translation> </message> @@ -636,6 +636,24 @@ Do you want to delete them instead?</source> <translation>Применить изменения рекурсивно ко всем файлам и подпапкам?</translation> </message> </context> +<context> + <name>Fm::FileSearchDialog</name> + <message> + <location filename="../filesearchdialog.cpp" line="120"/> + <source>Error</source> + <translation>Ошибка</translation> + </message> + <message> + <location filename="../filesearchdialog.cpp" line="120"/> + <source>You should add at least add one directory to search.</source> + <translation>Вы должны добавить не менее одного места для поиска.</translation> + </message> + <message> + <location filename="../filesearchdialog.cpp" line="127"/> + <source>Select a folder</source> + <translation>Выберите папку</translation> + </message> +</context> <context> <name>Fm::FolderMenu</name> <message> @@ -814,53 +832,53 @@ Do you want to delete them instead?</source> <context> <name>Fm::PlacesView</name> <message> - <location filename="../placesview.cpp" line="343"/> + <location filename="../placesview.cpp" line="346"/> <source>Empty Trash</source> <translation>Очистить корзину</translation> </message> <message> - <location filename="../placesview.cpp" line="331"/> + <location filename="../placesview.cpp" line="334"/> <source>Open in New Tab</source> <translation>Открыть в новой вкладке</translation> </message> <message> - <location filename="../placesview.cpp" line="334"/> + <location filename="../placesview.cpp" line="337"/> <source>Open in New Window</source> <translation>Открыть в новом окне</translation> </message> <message> - <location filename="../placesview.cpp" line="352"/> + <location filename="../placesview.cpp" line="355"/> <source>Move Bookmark Up</source> <translation>Сдвинуть закладку вверх</translation> </message> <message> - <location filename="../placesview.cpp" line="357"/> + <location filename="../placesview.cpp" line="360"/> <source>Move Bookmark Down</source> <translation>Сдвинуть закладку вниз</translation> </message> <message> - <location filename="../placesview.cpp" line="361"/> + <location filename="../placesview.cpp" line="364"/> <source>Rename Bookmark</source> <translation>Переименовать закладку</translation> </message> <message> - <location filename="../placesview.cpp" line="364"/> + <location filename="../placesview.cpp" line="367"/> <source>Remove Bookmark</source> <translation>Удалить закладку</translation> </message> <message> - <location filename="../placesview.cpp" line="373"/> - <location filename="../placesview.cpp" line="390"/> + <location filename="../placesview.cpp" line="376"/> + <location filename="../placesview.cpp" line="393"/> <source>Unmount</source> <translation>Отключить</translation> </message> <message> - <location filename="../placesview.cpp" line="377"/> + <location filename="../placesview.cpp" line="380"/> <source>Mount</source> <translation>Подключить</translation> </message> <message> - <location filename="../placesview.cpp" line="383"/> + <location filename="../placesview.cpp" line="386"/> <source>Eject</source> <translation>Извлечь</translation> </message> @@ -1079,4 +1097,181 @@ Modified: %3</source> <translation>Запомнить выбор для всех уже существующих файлов</translation> </message> </context> +<context> + <name>SearchDialog</name> + <message> + <location filename="../filesearch.ui" line="14"/> + <source>Search Files</source> + <translation>Искать файлы</translation> + </message> + <message> + <location filename="../filesearch.ui" line="29"/> + <source>Name/Location</source> + <translation>Имя/Расположение</translation> + </message> + <message> + <location filename="../filesearch.ui" line="35"/> + <source>File Name Patterns:</source> + <translation>Шаблоны имени файла:</translation> + </message> + <message> + <location filename="../filesearch.ui" line="41"/> + <source>*</source> + <translation></translation> + </message> + <message> + <location filename="../filesearch.ui" line="48"/> + <source>Case insensitive</source> + <translation>Нечувствительный к регистру поиск</translation> + </message> + <message> + <location filename="../filesearch.ui" line="55"/> + <source>Use regular expression</source> + <translation>Использовать регулярные выражения</translation> + </message> + <message> + <location filename="../filesearch.ui" line="65"/> + <source>Places to Search:</source> + <translation>Места для поиска:</translation> + </message> + <message> + <location filename="../filesearch.ui" line="78"/> + <source>&Add</source> + <translation>&Добавить</translation> + </message> + <message> + <location filename="../filesearch.ui" line="90"/> + <source>&Remove</source> + <translation>&Удалить</translation> + </message> + <message> + <location filename="../filesearch.ui" line="119"/> + <source>Search in sub directories</source> + <translation>Искать в подпапках</translation> + </message> + <message> + <location filename="../filesearch.ui" line="126"/> + <source>Search for hidden files</source> + <translation>Искать скрытые файлы</translation> + </message> + <message> + <location filename="../filesearch.ui" line="137"/> + <source>File Type</source> + <translation>Тип файла</translation> + </message> + <message> + <location filename="../filesearch.ui" line="143"/> + <source>Only search for files of following types:</source> + <translation>Искать файлы только следующих типов:</translation> + </message> + <message> + <location filename="../filesearch.ui" line="149"/> + <source>Text files</source> + <translation>Текстовые файлы</translation> + </message> + <message> + <location filename="../filesearch.ui" line="156"/> + <source>Image files</source> + <translation>Изображения</translation> + </message> + <message> + <location filename="../filesearch.ui" line="163"/> + <source>Audio files</source> + <translation>Аудиофайлы</translation> + </message> + <message> + <location filename="../filesearch.ui" line="170"/> + <source>Video files</source> + <translation>Видеофайлы</translation> + </message> + <message> + <location filename="../filesearch.ui" line="177"/> + <source>Documents</source> + <translation>Документы</translation> + </message> + <message> + <location filename="../filesearch.ui" line="184"/> + <source>Folders</source> + <translation>Папки</translation> + </message> + <message> + <location filename="../filesearch.ui" line="208"/> + <source>Content</source> + <translation>Содержание</translation> + </message> + <message> + <location filename="../filesearch.ui" line="214"/> + <source>File contains:</source> + <translation>Файл содержит:</translation> + </message> + <message> + <location filename="../filesearch.ui" line="223"/> + <source>Case insensiti&ve</source> + <translation>Нечувствительн&ый к регистру поиск</translation> + </message> + <message> + <location filename="../filesearch.ui" line="230"/> + <source>&Use regular expression</source> + <translation>&Использовать регулярные выражения</translation> + </message> + <message> + <location filename="../filesearch.ui" line="254"/> + <source>Properties</source> + <translation>Свойства</translation> + </message> + <message> + <location filename="../filesearch.ui" line="260"/> + <source>File Size:</source> + <translation>Размер файла:</translation> + </message> + <message> + <location filename="../filesearch.ui" line="266"/> + <source>Larger than:</source> + <translation>Больше, чем:</translation> + </message> + <message> + <location filename="../filesearch.ui" line="282"/> + <location filename="../filesearch.ui" line="323"/> + <source>Bytes</source> + <translation>Байт</translation> + </message> + <message> + <location filename="../filesearch.ui" line="287"/> + <location filename="../filesearch.ui" line="328"/> + <source>KiB</source> + <translation>КиБ</translation> + </message> + <message> + <location filename="../filesearch.ui" line="292"/> + <location filename="../filesearch.ui" line="333"/> + <source>MiB</source> + <translation>МиБ</translation> + </message> + <message> + <location filename="../filesearch.ui" line="297"/> + <location filename="../filesearch.ui" line="338"/> + <source>GiB</source> + <translation>ГиБ</translation> + </message> + <message> + <location filename="../filesearch.ui" line="307"/> + <source>Smaller than:</source> + <translation>Меньше, чем:</translation> + </message> + <message> + <location filename="../filesearch.ui" line="351"/> + <source>Last Modified Time:</source> + <translation>Время последнего изменения:</translation> + </message> + <message> + <location filename="../filesearch.ui" line="357"/> + <source>Earlier than:</source> + <translation>Раньше, чем:</translation> + </message> + <message> + <location filename="../filesearch.ui" line="364"/> + <source>Later than:</source> + <translation>Позже, чем:</translation> + </message> +</context> </TS> diff --git a/pcmanfm/main-win.ui b/pcmanfm/main-win.ui index 408c4a6..df38284 100644 --- a/pcmanfm/main-win.ui +++ b/pcmanfm/main-win.ui @@ -58,13 +58,35 @@ </sizepolicy> </property> </widget> - <widget class="QStackedWidget" name="stackedWidget"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <widget class="QFrame" name="frame"> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QStackedWidget" name="stackedWidget"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="filterBar"> + <property name="placeholderText"> + <string>Filter by string...</string> + </property> + <property name="clearButtonEnabled"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> </widget> </widget> </item> diff --git a/pcmanfm/mainwindow.cpp b/pcmanfm/mainwindow.cpp index fa8cc21..05e7b1c 100644 --- a/pcmanfm/mainwindow.cpp +++ b/pcmanfm/mainwindow.cpp @@ -96,6 +96,8 @@ MainWindow::MainWindow(FmPath* path): connect(ui.tabBar, &QTabBar::tabMoved, this, &MainWindow::onTabBarTabMoved); connect(ui.stackedWidget, &QStackedWidget::widgetRemoved, this, &MainWindow::onStackedWidgetWidgetRemoved); + connect(ui.filterBar, &QLineEdit::textChanged, this, &MainWindow::onFilterStringChanged); + // side pane ui.sidePane->setIconSize(QSize(settings.sidePaneIconSize(), settings.sidePaneIconSize())); ui.sidePane->setMode(settings.sidePaneMode()); @@ -181,6 +183,12 @@ MainWindow::MainWindow(FmPath* path): shortcut = new QShortcut(QKeySequence(Qt::SHIFT + Qt::Key_Delete), this); connect(shortcut, &QShortcut::activated, this, &MainWindow::on_actionDelete_triggered); + if(QToolButton* clearButton = ui.filterBar->findChild<QToolButton*>()) { + clearButton->setToolTip(tr("Clear text (Ctrl+K)")); + shortcut = new QShortcut(Qt::CTRL + Qt::Key_K, this); + connect(shortcut, &QShortcut::activated, ui.filterBar, &QLineEdit::clear); + } + if(path) addTab(path); @@ -201,6 +209,7 @@ void MainWindow::chdir(FmPath* path) { TabPage* page = currentPage(); if(page) { + ui.filterBar->clear(); page->chdir(path, true); updateUIForCurrentPage(); } @@ -239,6 +248,7 @@ void MainWindow::on_actionGoUp_triggered() { TabPage* page = currentPage(); if(page) { + ui.filterBar->clear(); page->up(); updateUIForCurrentPage(); } @@ -248,6 +258,7 @@ void MainWindow::on_actionGoBack_triggered() { TabPage* page = currentPage(); if(page) { + ui.filterBar->clear(); page->backward(); updateUIForCurrentPage(); } @@ -257,6 +268,7 @@ void MainWindow::on_actionGoForward_triggered() { TabPage* page = currentPage(); if(page) { + ui.filterBar->clear(); page->forward(); updateUIForCurrentPage(); } @@ -477,6 +489,16 @@ void MainWindow::onTabBarTabMoved(int from, int to) { } } +void MainWindow::onFilterStringChanged(QString str) { + if(TabPage* tabPage = currentPage()) { + // appy filter only if needed (not if tab is changed) + if(str != tabPage->getFilterStr()) { + tabPage->setFilterStr(str); + tabPage->applyFilter(); + } + } +} + void MainWindow::closeTab(int index) { QWidget* page = ui.stackedWidget->widget(index); if(page) { @@ -516,6 +538,8 @@ void MainWindow::closeEvent(QCloseEvent *event) void MainWindow::onTabBarCurrentChanged(int index) { ui.stackedWidget->setCurrentIndex(index); + if(TabPage* page = static_cast<TabPage*>(ui.stackedWidget->widget(index))) + ui.filterBar->setText(page->getFilterStr()); updateUIForCurrentPage(); } @@ -605,7 +629,6 @@ void MainWindow::updateUIForCurrentPage() { } } - void MainWindow::onStackedWidgetWidgetRemoved(int index) { // qDebug("onStackedWidgetWidgetRemoved: %d", index); // need to remove associated tab from tabBar @@ -863,6 +886,7 @@ void MainWindow::onBackForwardContextMenu(QPoint pos) { QAction* selectedAction = menu.exec(btn->mapToGlobal(pos)); if(selectedAction) { int index = menu.actions().indexOf(selectedAction); + ui.filterBar->clear(); page->jumpToHistory(index); updateUIForCurrentPage(); } diff --git a/pcmanfm/mainwindow.h b/pcmanfm/mainwindow.h index a36ec93..6b9d792 100644 --- a/pcmanfm/mainwindow.h +++ b/pcmanfm/mainwindow.h @@ -119,6 +119,8 @@ protected Q_SLOTS: void onTabBarCurrentChanged(int index); void onTabBarTabMoved(int from, int to); + void onFilterStringChanged(QString str); + void onShortcutPrevTab(); void onShortcutNextTab(); void onShortcutJumpToTab(); diff --git a/pcmanfm/tabpage.cpp b/pcmanfm/tabpage.cpp index 1cb7ab0..7f56092 100644 --- a/pcmanfm/tabpage.cpp +++ b/pcmanfm/tabpage.cpp @@ -31,11 +31,42 @@ #include "application.h" #include "cachedfoldermodel.h" #include <QTimer> +#include <QTextStream> using namespace Fm; namespace PCManFM { +bool ProxyFilter::filterAcceptsRow(const Fm::ProxyFolderModel* model, FmFileInfo* info) const { + if(!model || !info) + return true; + QString baseName(fm_file_info_get_name(info)); + if(!virtHiddenList_.isEmpty() && !model->showHidden() && virtHiddenList_.contains(baseName)) + return false; + if(!filterStr_.isEmpty() && !baseName.contains(filterStr_, Qt::CaseInsensitive)) + return false; + return true; +} + +void ProxyFilter::setVirtHidden(FmFolder* folder) { + virtHiddenList_ = QStringList(); // reset the list + if(!folder) return; + if(FmPath* path = fm_folder_get_path(folder)) { + char* pathStr = fm_path_to_str(path); + if(pathStr) { + QString dotHidden = QString(pathStr) + QString("/.hidden"); + g_free(pathStr); + QFile file(dotHidden); + if(file.open(QIODevice::ReadOnly | QIODevice::Text)) { + QTextStream in(&file); + while(!in.atEnd()) + virtHiddenList_.append(in.readLine()); + file.close(); + } + } + } +} + TabPage::TabPage(FmPath* path, QWidget* parent): QWidget(parent), folder_(NULL), @@ -60,6 +91,9 @@ TabPage::TabPage(FmPath* path, QWidget* parent): connect(folderView_, &View::clickedBack, this, &TabPage::backwardRequested); connect(folderView_, &View::clickedForward, this, &TabPage::forwardRequested); + proxyFilter_ = new ProxyFilter(); + proxyModel_->addFilter(proxyFilter_); + // FIXME: this is very dirty folderView_->setModel(proxyModel_); verticalLayout->addWidget(folderView_); @@ -70,6 +104,8 @@ TabPage::TabPage(FmPath* path, QWidget* parent): TabPage::~TabPage() { qDebug("delete TabPage"); freeFolder(); + if(proxyFilter_) + delete proxyFilter_; if(proxyModel_) delete proxyModel_; if(folderModel_) @@ -319,6 +355,11 @@ void TabPage::chdir(FmPath* newPath, bool addHistory) { g_free(disp_name); folder_ = fm_folder_from_path(newPath); + proxyFilter_->setVirtHidden(folder_); + if(addHistory) { + // add current path to browse history + history_.add(path()); + } g_signal_connect(folder_, "start-loading", G_CALLBACK(onFolderStartLoading), this); g_signal_connect(folder_, "finish-loading", G_CALLBACK(onFolderFinishLoading), this); g_signal_connect(folder_, "error", G_CALLBACK(onFolderError), this); @@ -342,11 +383,6 @@ void TabPage::chdir(FmPath* newPath, bool addHistory) { } else onFolderStartLoading(folder_, this); - - if(addHistory) { - // add current path to browse history - history_.add(path()); - } } void TabPage::selectAll() { @@ -473,4 +509,19 @@ void TabPage::updateFromSettings(Settings& settings) { folderView_->updateFromSettings(settings); } +void TabPage::setShowHidden(bool showHidden) { + if(!proxyModel_ || showHidden == proxyModel_->showHidden()) + return; + proxyModel_->setShowHidden(showHidden); + statusText_[StatusTextNormal] = formatStatusText(); + Q_EMIT statusChanged(StatusTextNormal, statusText_[StatusTextNormal]); +} + +void TabPage:: applyFilter() { + if(!proxyModel_) return; + proxyModel_->updateFilters(); + statusText_[StatusTextNormal] = formatStatusText(); + Q_EMIT statusChanged(StatusTextNormal, statusText_[StatusTextNormal]); +} + }; diff --git a/pcmanfm/tabpage.h b/pcmanfm/tabpage.h index 5d3ab24..199f3bb 100644 --- a/pcmanfm/tabpage.h +++ b/pcmanfm/tabpage.h @@ -40,6 +40,23 @@ namespace PCManFM { class Settings; class Launcher; +class ProxyFilter : public Fm::ProxyFolderModelFilter { +public: + bool filterAcceptsRow(const Fm::ProxyFolderModel* model, FmFileInfo* info) const; + virtual ~ProxyFilter() {} + void setVirtHidden(FmFolder* folder); + QString getFilterStr() { + return filterStr_; + } + void setFilterStr(QString str) { + filterStr_ = str; + } + +private: + QString filterStr_; + QStringList virtHiddenList_; +}; + class TabPage : public QWidget { Q_OBJECT @@ -98,9 +115,7 @@ public: return proxyModel_->showHidden(); } - void setShowHidden(bool showHidden) { - proxyModel_->setShowHidden(showHidden); - } + void setShowHidden(bool showHidden); FmPath* path() { return folder_ ? fm_folder_get_path(folder_) : NULL; @@ -137,8 +152,10 @@ public: void invertSelection(); void reload() { - if(folder_) + if(folder_) { + proxyFilter_->setVirtHidden(folder_); // reread ".hidden" fm_folder_reload(folder_); + } } QString title() const { @@ -177,6 +194,19 @@ public: return folderView_->fileLauncher(); } + QString getFilterStr() { + if(proxyFilter_) + return proxyFilter_->getFilterStr(); + return QString(); + } + + void setFilterStr(QString str) { + if(proxyFilter_) + proxyFilter_->setFilterStr(str); + } + + void applyFilter(); + Q_SIGNALS: void statusChanged(int type, QString statusText); void titleChanged(QString title); @@ -207,6 +237,7 @@ private: View* folderView_; Fm::CachedFolderModel* folderModel_; Fm::ProxyFolderModel* proxyModel_; + ProxyFilter* proxyFilter_; QVBoxLayout* verticalLayout; FmFolder* folder_; QString title_; diff --git a/pcmanfm/translations/pcmanfm-qt_ru.ts b/pcmanfm/translations/pcmanfm-qt_ru.ts index 202dbf6..aea61d8 100644 --- a/pcmanfm/translations/pcmanfm-qt_ru.ts +++ b/pcmanfm/translations/pcmanfm-qt_ru.ts @@ -144,7 +144,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, </message> <message> <location filename="../desktop-preferences.ui" line="94"/> - <location filename="../desktop-preferences.ui" line="242"/> + <location filename="../desktop-preferences.ui" line="255"/> <source>Image file</source> <translation>Файл изображения</translation> </message> @@ -155,7 +155,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, </message> <message> <location filename="../desktop-preferences.ui" line="107"/> - <location filename="../desktop-preferences.ui" line="255"/> + <location filename="../desktop-preferences.ui" line="268"/> <source>&Browse</source> <translation>&Обзор</translation> </message> @@ -180,32 +180,32 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, <translation>Выбрать шрифт:</translation> </message> <message> - <location filename="../desktop-preferences.ui" line="213"/> + <location filename="../desktop-preferences.ui" line="226"/> <source>Window Manager</source> <translation>Оконный менеджер</translation> </message> <message> - <location filename="../desktop-preferences.ui" line="229"/> + <location filename="../desktop-preferences.ui" line="242"/> <source>Desktop</source> <translation>Рабочий стол</translation> </message> <message> - <location filename="../desktop-preferences.ui" line="235"/> + <location filename="../desktop-preferences.ui" line="248"/> <source>Desktop folder:</source> <translation>Папка рабочего стола:</translation> </message> <message> - <location filename="../desktop-preferences.ui" line="248"/> + <location filename="../desktop-preferences.ui" line="261"/> <source>Folder path</source> <translation>Путь к папке</translation> </message> <message> - <location filename="../desktop-preferences.ui" line="207"/> + <location filename="../desktop-preferences.ui" line="220"/> <source>Advanced</source> <translation>Расширенные</translation> </message> <message> - <location filename="../desktop-preferences.ui" line="219"/> + <location filename="../desktop-preferences.ui" line="232"/> <source>Show menus provided by window managers when desktop is clicked</source> <translation>Показывать меню, предоставляемые оконными менеджерами по клику на рабочий стол</translation> </message> @@ -234,13 +234,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, </message> <message> <location filename="../file-search.ui" line="46"/> - <location filename="../file-search.ui" line="220"/> + <location filename="../file-search.ui" line="221"/> <source>Case insensitive</source> <translation>Регистрочувствительный</translation> </message> <message> <location filename="../file-search.ui" line="53"/> - <location filename="../file-search.ui" line="227"/> + <location filename="../file-search.ui" line="228"/> <source>Use regular expression</source> <translation>Использовать регулярные выражения</translation> </message> @@ -255,98 +255,98 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, <translation>Добавить</translation> </message> <message> - <location filename="../file-search.ui" line="86"/> + <location filename="../file-search.ui" line="88"/> <source>Remove</source> <translation>Удалить</translation> </message> <message> - <location filename="../file-search.ui" line="113"/> + <location filename="../file-search.ui" line="117"/> <source>Search in sub directories</source> <translation>Искать в подпапках</translation> </message> <message> - <location filename="../file-search.ui" line="120"/> + <location filename="../file-search.ui" line="124"/> <source>Search hidden files</source> <translation>Искать скрытые файлы</translation> </message> <message> - <location filename="../file-search.ui" line="134"/> - <location filename="../file-search.ui" line="140"/> + <location filename="../file-search.ui" line="135"/> + <location filename="../file-search.ui" line="141"/> <source>File Type</source> <translation>Тип файла</translation> </message> <message> - <location filename="../file-search.ui" line="146"/> + <location filename="../file-search.ui" line="147"/> <source>Only search for files of following types:</source> <translation>Искать только следующие типы файлов:</translation> </message> <message> - <location filename="../file-search.ui" line="153"/> + <location filename="../file-search.ui" line="154"/> <source>Text files</source> <translation>Текстовые файлы</translation> </message> <message> - <location filename="../file-search.ui" line="160"/> + <location filename="../file-search.ui" line="161"/> <source>Image files</source> <translation>Файлы изображений</translation> </message> <message> - <location filename="../file-search.ui" line="167"/> + <location filename="../file-search.ui" line="168"/> <source>Audio files</source> <translation>Аудиофайлы</translation> </message> <message> - <location filename="../file-search.ui" line="174"/> + <location filename="../file-search.ui" line="175"/> <source>Video files</source> <translation>Видеофайлы</translation> </message> <message> - <location filename="../file-search.ui" line="181"/> + <location filename="../file-search.ui" line="182"/> <source>Documents</source> <translation>Документы</translation> </message> <message> - <location filename="../file-search.ui" line="205"/> + <location filename="../file-search.ui" line="206"/> <source>Content</source> <translation>Содержание</translation> </message> <message> - <location filename="../file-search.ui" line="211"/> + <location filename="../file-search.ui" line="212"/> <source>File contains</source> <translation>Содержание файла</translation> </message> <message> - <location filename="../file-search.ui" line="251"/> + <location filename="../file-search.ui" line="252"/> <source>Properties</source> <translation>Свойства</translation> </message> <message> - <location filename="../file-search.ui" line="257"/> + <location filename="../file-search.ui" line="258"/> <source>File Size</source> <translation>Размер файла</translation> </message> <message> - <location filename="../file-search.ui" line="263"/> + <location filename="../file-search.ui" line="264"/> <source>Bigger than:</source> <translation>Больше чем:</translation> </message> <message> - <location filename="../file-search.ui" line="284"/> + <location filename="../file-search.ui" line="289"/> <source>Smaller than:</source> <translation>Меньше чем:</translation> </message> <message> - <location filename="../file-search.ui" line="308"/> + <location filename="../file-search.ui" line="317"/> <source>Last Modified Time</source> <translation>Время последнего изменения</translation> </message> <message> - <location filename="../file-search.ui" line="314"/> + <location filename="../file-search.ui" line="323"/> <source>Earlier than:</source> <translation>Раньше чем:</translation> </message> <message> - <location filename="../file-search.ui" line="321"/> + <location filename="../file-search.ui" line="340"/> <source>Later than:</source> <translation>Позже чем:</translation> </message> @@ -359,417 +359,427 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, <translation>Диспетчер файлов</translation> </message> <message> - <location filename="../main-win.ui" line="645"/> - <source>Folder</source> - <translation>Папка</translation> - </message> - <message> - <location filename="../main-win.ui" line="648"/> + <location filename="../main-win.ui" line="660"/> <source>Ctrl+Shift+N</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="656"/> - <source>Blank File</source> - <translation>Пустой файл</translation> - </message> - <message> - <location filename="../main-win.ui" line="659"/> + <location filename="../main-win.ui" line="673"/> <source>Ctrl+Alt+N</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="75"/> + <location filename="../main-win.ui" line="84"/> <source>&File</source> <translation>&Файл</translation> </message> <message> - <location filename="../main-win.ui" line="79"/> + <location filename="../main-win.ui" line="88"/> <source>C&reate New</source> <translation>С&оздать новое</translation> </message> <message> - <location filename="../main-win.ui" line="97"/> + <location filename="../main-win.ui" line="106"/> <source>&Help</source> <translation>&Справка</translation> </message> <message> - <location filename="../main-win.ui" line="103"/> + <location filename="../main-win.ui" line="112"/> <source>&View</source> <translation>&Вид</translation> </message> <message> - <location filename="../main-win.ui" line="107"/> + <location filename="../main-win.ui" line="116"/> <source>&Sorting</source> <translation>&Сортировка</translation> </message> <message> - <location filename="../main-win.ui" line="133"/> + <location filename="../main-win.ui" line="142"/> <source>&Edit</source> <translation>&Правка</translation> </message> <message> - <location filename="../main-win.ui" line="148"/> + <location filename="../main-win.ui" line="157"/> <source>&Bookmarks</source> <translation>&Закладки</translation> </message> <message> - <location filename="../main-win.ui" line="155"/> + <location filename="../main-win.ui" line="164"/> <source>&Go</source> <translation>&Перейти</translation> </message> <message> - <location filename="../main-win.ui" line="170"/> + <location filename="../main-win.ui" line="179"/> <source>&Tool</source> <translation>&Инструмент</translation> </message> <message> - <location filename="../main-win.ui" line="186"/> + <location filename="../main-win.ui" line="196"/> <source>Main Toolbar</source> <translation>Главная панель инструментов</translation> </message> <message> - <location filename="../main-win.ui" line="214"/> + <location filename="../main-win.ui" line="224"/> <source>Go &Up</source> <translation>Перейти &вверх</translation> </message> <message> - <location filename="../main-win.ui" line="217"/> + <location filename="../main-win.ui" line="227"/> <source>Go Up</source> <translation>Перейти вверх</translation> </message> <message> - <location filename="../main-win.ui" line="220"/> + <location filename="../main-win.ui" line="230"/> <source>Alt+Up</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="230"/> - <source>Home</source> - <translation>Домой</translation> + <location filename="../main-win.ui" line="240"/> + <source>&Home</source> + <translation>&Домой</translation> </message> <message> - <location filename="../main-win.ui" line="233"/> + <location filename="../main-win.ui" line="243"/> <source>Alt+Home</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="243"/> + <location filename="../main-win.ui" line="253"/> <source>&Reload</source> <translation>&Обновить</translation> </message> <message> - <location filename="../main-win.ui" line="246"/> + <location filename="../main-win.ui" line="256"/> <source>F5</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="256"/> + <location filename="../main-win.ui" line="266"/> <source>Go</source> <translation>Перейти</translation> </message> <message> - <location filename="../main-win.ui" line="266"/> + <location filename="../main-win.ui" line="276"/> <source>Quit</source> <translation>Выйти</translation> </message> <message> - <location filename="../main-win.ui" line="276"/> + <location filename="../main-win.ui" line="286"/> <source>&About</source> <translation>&О программе</translation> </message> <message> - <location filename="../main-win.ui" line="286"/> + <location filename="../main-win.ui" line="296"/> <source>&New Window</source> <translation>&Новое окно</translation> </message> <message> - <location filename="../main-win.ui" line="289"/> + <location filename="../main-win.ui" line="299"/> <source>New Window</source> <translation>Новое окно</translation> </message> <message> - <location filename="../main-win.ui" line="292"/> + <location filename="../main-win.ui" line="302"/> <source>Ctrl+N</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="300"/> + <location filename="../main-win.ui" line="310"/> <source>Show &Hidden</source> <translation>Показать &скрытые</translation> </message> <message> - <location filename="../main-win.ui" line="303"/> + <location filename="../main-win.ui" line="313"/> <source>Ctrl+H</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="313"/> + <location filename="../main-win.ui" line="323"/> <source>&Computer</source> <translation>&Компьютер</translation> </message> <message> - <location filename="../main-win.ui" line="323"/> + <location filename="../main-win.ui" line="333"/> <source>&Trash</source> <translation>&Корзина</translation> </message> <message> - <location filename="../main-win.ui" line="328"/> + <location filename="../main-win.ui" line="338"/> <source>&Network</source> <translation>&Сеть</translation> </message> <message> - <location filename="../main-win.ui" line="338"/> + <location filename="../main-win.ui" line="348"/> <source>&Desktop</source> <translation>&Рабочий стол</translation> </message> <message> - <location filename="../main-win.ui" line="348"/> + <location filename="../main-win.ui" line="358"/> <source>&Add to Bookmarks</source> <translation>&Добавить в закладки</translation> </message> <message> - <location filename="../main-win.ui" line="353"/> + <location filename="../main-win.ui" line="363"/> <source>&Applications</source> <translation>&Приложения</translation> </message> <message> - <location filename="../main-win.ui" line="358"/> + <location filename="../main-win.ui" line="368"/> <source>Reload</source> <translation>Обновить</translation> </message> <message> - <location filename="../main-win.ui" line="366"/> + <location filename="../main-win.ui" line="376"/> <source>&Icon View</source> <translation>Просмотр &значками</translation> </message> <message> - <location filename="../main-win.ui" line="374"/> + <location filename="../main-win.ui" line="384"/> <source>&Compact View</source> <translation>&Компактный просмотр</translation> </message> <message> - <location filename="../main-win.ui" line="382"/> + <location filename="../main-win.ui" line="392"/> <source>&Detailed List</source> <translation>Просмотр &подробным списком</translation> </message> <message> - <location filename="../main-win.ui" line="390"/> + <location filename="../main-win.ui" line="400"/> <source>&Thumbnail View</source> <translation>Просмотр &эскизами</translation> </message> <message> - <location filename="../main-win.ui" line="400"/> + <location filename="../main-win.ui" line="410"/> <source>Cu&t</source> <translation>&Вырезать</translation> </message> <message> - <location filename="../main-win.ui" line="403"/> + <location filename="../main-win.ui" line="413"/> <source>Ctrl+X</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="413"/> + <location filename="../main-win.ui" line="423"/> <source>&Copy</source> <translation>&Копировать</translation> </message> <message> - <location filename="../main-win.ui" line="416"/> + <location filename="../main-win.ui" line="426"/> <source>Ctrl+C</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="426"/> + <location filename="../main-win.ui" line="436"/> <source>&Paste</source> <translation>&Вставить</translation> </message> <message> - <location filename="../main-win.ui" line="429"/> + <location filename="../main-win.ui" line="439"/> <source>Ctrl+V</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="434"/> + <location filename="../main-win.ui" line="444"/> <source>Select &All</source> <translation>Выделить &всё</translation> </message> <message> - <location filename="../main-win.ui" line="437"/> + <location filename="../main-win.ui" line="447"/> <source>Ctrl+A</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="442"/> + <location filename="../main-win.ui" line="452"/> <source>Pr&eferences</source> <translation>&Настройки</translation> </message> <message> - <location filename="../main-win.ui" line="450"/> - <source>Ascending</source> - <translation>По возрастанию</translation> + <location filename="../main-win.ui" line="460"/> + <source>&Ascending</source> + <translation>По &возрастанию</translation> </message> <message> - <location filename="../main-win.ui" line="458"/> - <source>Descending</source> - <translation>По убыванию</translation> + <location filename="../main-win.ui" line="468"/> + <source>&Descending</source> + <translation>По &убыванию</translation> </message> <message> - <location filename="../main-win.ui" line="466"/> - <source>By File Name</source> - <translation>По имени файла</translation> + <location filename="../main-win.ui" line="476"/> + <source>&By File Name</source> + <translation>&По имени файла</translation> </message> <message> - <location filename="../main-win.ui" line="474"/> - <source>By Modification Time</source> - <translation>По времени изменения</translation> + <location filename="../main-win.ui" line="484"/> + <source>By &Modification Time</source> + <translation>По времени &изменения</translation> </message> <message> - <location filename="../main-win.ui" line="482"/> - <source>By File Type</source> - <translation>По типу файла</translation> + <location filename="../main-win.ui" line="492"/> + <source>By File &Type</source> + <translation>По &типу файла</translation> </message> <message> - <location filename="../main-win.ui" line="490"/> - <source>By Owner</source> - <translation>По владельцу</translation> - </message> - <message> - <location filename="../main-win.ui" line="498"/> - <source>Folder First</source> - <translation>Сначала папки</translation> + <location filename="../main-win.ui" line="500"/> + <source>By &Owner</source> + <translation>По &владельцу</translation> </message> <message> <location filename="../main-win.ui" line="508"/> + <source>&Folder First</source> + <translation>Сначала &папки</translation> + </message> + <message> + <location filename="../main-win.ui" line="611"/> + <source>&Case Sensitive</source> + <translation>&Регистрочувствительная</translation> + </message> + <message> + <location filename="../main-win.ui" line="619"/> + <source>By File &Size</source> + <translation>По &размеру файла</translation> + </message> + <message> + <location filename="../main-win.ui" line="624"/> + <source>&Close Window</source> + <translation>&Закрыть окно</translation> + </message> + <message> + <location filename="../main-win.ui" line="657"/> + <source>&Folder</source> + <translation>&Папка</translation> + </message> + <message> + <location filename="../main-win.ui" line="670"/> + <source>&Blank File</source> + <translation>&Пустой файл</translation> + </message> + <message> + <location filename="../main-win.ui" line="678"/> + <source>&Find Files</source> + <translation>&Найти файлы</translation> + </message> + <message> + <location filename="../main-win.ui" line="681"/> + <source>F3</source> + <translation></translation> + </message> + <message> + <location filename="../main-win.ui" line="518"/> <source>New &Tab</source> <translation>Новая &вкладка</translation> </message> <message> - <location filename="../main-win.ui" line="511"/> + <location filename="../main-win.ui" line="521"/> <source>New Tab</source> <translation>Новая вкладка</translation> </message> <message> - <location filename="../main-win.ui" line="514"/> + <location filename="../main-win.ui" line="524"/> <source>Ctrl+T</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="524"/> + <location filename="../main-win.ui" line="534"/> <source>Go &Back</source> <translation>Перейти &назад</translation> </message> <message> - <location filename="../main-win.ui" line="527"/> + <location filename="../main-win.ui" line="537"/> <source>Go Back</source> <translation>Перейти назад</translation> </message> <message> - <location filename="../main-win.ui" line="530"/> + <location filename="../main-win.ui" line="540"/> <source>Alt+Left</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="540"/> + <location filename="../main-win.ui" line="550"/> <source>Go &Forward</source> <translation>Перейти &вперёд</translation> </message> <message> - <location filename="../main-win.ui" line="543"/> + <location filename="../main-win.ui" line="553"/> <source>Go Forward</source> <translation>Перейти вперёд</translation> </message> <message> - <location filename="../main-win.ui" line="546"/> + <location filename="../main-win.ui" line="556"/> <source>Alt+Right</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="551"/> + <location filename="../main-win.ui" line="561"/> <source>&Invert Selection</source> <translation>&Инвертировать выделение</translation> </message> <message> - <location filename="../main-win.ui" line="561"/> + <location filename="../main-win.ui" line="571"/> <source>&Delete</source> <translation>&Удалить</translation> </message> <message> - <location filename="../main-win.ui" line="564"/> + <location filename="../main-win.ui" line="574"/> <source>Del</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="569"/> + <location filename="../main-win.ui" line="579"/> <source>&Rename</source> <translation>&Переименовать</translation> </message> <message> - <location filename="../main-win.ui" line="572"/> + <location filename="../main-win.ui" line="582"/> <source>F2</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="577"/> + <location filename="../main-win.ui" line="587"/> <source>C&lose Tab</source> <translation>&Закрыть вкладку</translation> </message> <message> - <location filename="../main-win.ui" line="580"/> + <location filename="../main-win.ui" line="590"/> <source>Ctrl+W</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="585"/> + <location filename="../main-win.ui" line="595"/> <source>File &Properties</source> <translation>&Свойства файла</translation> </message> <message> - <location filename="../main-win.ui" line="588"/> + <location filename="../main-win.ui" line="598"/> <source>Alt+Return</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="593"/> + <location filename="../main-win.ui" line="603"/> <source>&Folder Properties</source> <translation>&Свойства папки</translation> </message> <message> - <location filename="../main-win.ui" line="601"/> - <source>Case Sensitive</source> - <translation>Регистрочувствительная</translation> - </message> - <message> - <location filename="../main-win.ui" line="609"/> - <source>By File Size</source> - <translation>По размеру файла</translation> - </message> - <message> - <location filename="../main-win.ui" line="614"/> - <source>Close Window</source> - <translation>Закрыть окно</translation> - </message> - <message> - <location filename="../main-win.ui" line="619"/> + <location filename="../main-win.ui" line="629"/> <source>Edit Bookmarks</source> <translation>Изменить закладки</translation> </message> <message> - <location filename="../main-win.ui" line="624"/> + <location filename="../main-win.ui" line="634"/> <source>Open &Terminal</source> <translation>Открыть &терминал</translation> </message> <message> - <location filename="../main-win.ui" line="627"/> + <location filename="../main-win.ui" line="637"/> <source>F4</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="632"/> + <location filename="../main-win.ui" line="642"/> <source>Open as &Root</source> <translation>Открыть от имени &суперпользователя</translation> </message> <message> - <location filename="../main-win.ui" line="637"/> + <location filename="../main-win.ui" line="647"/> <source>&Edit Bookmarks</source> <translation>&Изменить закладки</translation> </message> @@ -777,99 +787,99 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, <context> <name>PCManFM::Application</name> <message> - <location filename="../application.cpp" line="126"/> + <location filename="../application.cpp" line="127"/> <source>Name of configuration profile</source> <translation>Имя профиля конфигурации</translation> </message> <message> - <location filename="../application.cpp" line="126"/> + <location filename="../application.cpp" line="127"/> <source>PROFILE</source> <translation>ПРОФИЛЬ</translation> </message> <message> - <location filename="../application.cpp" line="129"/> + <location filename="../application.cpp" line="130"/> <source>Run PCManFM as a daemon</source> <translation>Запустить PCManFM как демон</translation> </message> <message> - <location filename="../application.cpp" line="132"/> + <location filename="../application.cpp" line="133"/> <source>Quit PCManFM</source> <translation>Выйти из PCManFM</translation> </message> <message> - <location filename="../application.cpp" line="135"/> + <location filename="../application.cpp" line="136"/> <source>Launch desktop manager</source> <translation>Запустить менеджер рабочего стола</translation> </message> <message> - <location filename="../application.cpp" line="138"/> + <location filename="../application.cpp" line="139"/> <source>Turn off desktop manager if it's running</source> <translation>Отключить менеджер рабочего стола, если он запущен</translation> </message> <message> - <location filename="../application.cpp" line="141"/> + <location filename="../application.cpp" line="142"/> <source>Open desktop preference dialog on the page with the specified name</source> <translation>Открыть диалог настроек рабочего стола на странице с указанным именем</translation> </message> <message> - <location filename="../application.cpp" line="141"/> - <location filename="../application.cpp" line="157"/> + <location filename="../application.cpp" line="142"/> + <location filename="../application.cpp" line="158"/> <source>NAME</source> <translation>ИМЯ</translation> </message> <message> - <location filename="../application.cpp" line="150"/> + <location filename="../application.cpp" line="151"/> <source>Set desktop wallpaper from image FILE</source> <translation>Выбрать обои рабочего стола из ФАЙЛА изображения</translation> </message> <message> - <location filename="../application.cpp" line="150"/> + <location filename="../application.cpp" line="151"/> <source>FILE</source> <translation>ФАЙЛ</translation> </message> <message> - <location filename="../application.cpp" line="154"/> + <location filename="../application.cpp" line="155"/> <source>Set mode of desktop wallpaper. MODE=(color|stretch|fit|center|tile)</source> <translation>Выбрать режим обоев рабочего стола. РЕЖИМ=(цвет|растянуть|вместить|по центру|черепицей)</translation> </message> <message> - <location filename="../application.cpp" line="154"/> + <location filename="../application.cpp" line="155"/> <source>MODE</source> <translation>РЕЖИМ</translation> </message> <message> - <location filename="../application.cpp" line="157"/> + <location filename="../application.cpp" line="158"/> <source>Open Preferences dialog on the page with the specified name</source> <translation>Открыть диалог настроек на странице с указанным именем</translation> </message> <message> - <location filename="../application.cpp" line="144"/> + <location filename="../application.cpp" line="145"/> <source>Open new window</source> <translation>Открыть новое окно</translation> </message> <message> - <location filename="../application.cpp" line="147"/> + <location filename="../application.cpp" line="148"/> <source>Open Find Files utility</source> <translation>Открыть утилиту поиска файлов</translation> </message> <message> - <location filename="../application.cpp" line="160"/> + <location filename="../application.cpp" line="161"/> <source>[FILE1, FILE2,...]</source> <translation>[ФАЙЛ1, ФАЙЛ2,...]</translation> </message> <message> - <location filename="../application.cpp" line="160"/> + <location filename="../application.cpp" line="161"/> <source>Files or directories to open</source> <translation>Файлы или папки для открытия</translation> </message> <message> - <location filename="../application.cpp" line="422"/> - <location filename="../application.cpp" line="429"/> + <location filename="../application.cpp" line="436"/> + <location filename="../application.cpp" line="443"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../application.cpp" line="429"/> + <location filename="../application.cpp" line="443"/> <source>Terminal emulator is not set.</source> <translation>Эмулятор терминала не указан.</translation> </message> @@ -915,7 +925,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, <translation>Плиточное заполнение всего экрана изображением</translation> </message> <message> - <location filename="../desktoppreferencesdialog.cpp" line="128"/> + <location filename="../desktoppreferencesdialog.cpp" line="141"/> <source>Image Files</source> <translation>Файлы изображений</translation> </message> @@ -936,28 +946,28 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, <context> <name>PCManFM::MainWindow</name> <message> - <location filename="../mainwindow.cpp" line="433"/> + <location filename="../mainwindow.cpp" line="435"/> <source>Version: %1</source> <translation>Версия: %1</translation> </message> <message> - <location filename="../mainwindow.cpp" line="873"/> + <location filename="../mainwindow.cpp" line="875"/> <source>&Move to Trash</source> <translation>&Переместить в корзину</translation> </message> <message> - <location filename="../mainwindow.cpp" line="873"/> + <location filename="../mainwindow.cpp" line="875"/> <source>&Delete</source> <translation>&Удалить</translation> </message> <message> - <location filename="../mainwindow.cpp" line="935"/> - <location filename="../mainwindow.cpp" line="946"/> + <location filename="../mainwindow.cpp" line="937"/> + <location filename="../mainwindow.cpp" line="948"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../mainwindow.cpp" line="946"/> + <location filename="../mainwindow.cpp" line="948"/> <source>Switch user command is not set.</source> <translation>Команда переключения пользователя не задана.</translation> </message> diff --git a/pcmanfm/translations/pcmanfm-qt_ru_RU.ts b/pcmanfm/translations/pcmanfm-qt_ru_RU.ts index 66fba5b..5419802 100644 --- a/pcmanfm/translations/pcmanfm-qt_ru_RU.ts +++ b/pcmanfm/translations/pcmanfm-qt_ru_RU.ts @@ -144,7 +144,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, </message> <message> <location filename="../desktop-preferences.ui" line="94"/> - <location filename="../desktop-preferences.ui" line="242"/> + <location filename="../desktop-preferences.ui" line="255"/> <source>Image file</source> <translation>Файл изображения</translation> </message> @@ -155,7 +155,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, </message> <message> <location filename="../desktop-preferences.ui" line="107"/> - <location filename="../desktop-preferences.ui" line="255"/> + <location filename="../desktop-preferences.ui" line="268"/> <source>&Browse</source> <translation>&Обзор</translation> </message> @@ -180,32 +180,32 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, <translation>Выбрать шрифт:</translation> </message> <message> - <location filename="../desktop-preferences.ui" line="213"/> + <location filename="../desktop-preferences.ui" line="226"/> <source>Window Manager</source> <translation>Оконный менеджер</translation> </message> <message> - <location filename="../desktop-preferences.ui" line="229"/> + <location filename="../desktop-preferences.ui" line="242"/> <source>Desktop</source> <translation>Рабочий стол</translation> </message> <message> - <location filename="../desktop-preferences.ui" line="235"/> + <location filename="../desktop-preferences.ui" line="248"/> <source>Desktop folder:</source> <translation>Папка рабочего стола:</translation> </message> <message> - <location filename="../desktop-preferences.ui" line="248"/> + <location filename="../desktop-preferences.ui" line="261"/> <source>Folder path</source> <translation>Путь к папке</translation> </message> <message> - <location filename="../desktop-preferences.ui" line="207"/> + <location filename="../desktop-preferences.ui" line="220"/> <source>Advanced</source> <translation>Расширенные</translation> </message> <message> - <location filename="../desktop-preferences.ui" line="219"/> + <location filename="../desktop-preferences.ui" line="232"/> <source>Show menus provided by window managers when desktop is clicked</source> <translation>Показывать меню, предоставляемые оконными менеджерами по клику на рабочий стол</translation> </message> @@ -234,13 +234,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, </message> <message> <location filename="../file-search.ui" line="46"/> - <location filename="../file-search.ui" line="220"/> + <location filename="../file-search.ui" line="221"/> <source>Case insensitive</source> <translation>Регистрочувствительный</translation> </message> <message> <location filename="../file-search.ui" line="53"/> - <location filename="../file-search.ui" line="227"/> + <location filename="../file-search.ui" line="228"/> <source>Use regular expression</source> <translation>Использовать регулярные выражения</translation> </message> @@ -255,98 +255,98 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, <translation>Добавить</translation> </message> <message> - <location filename="../file-search.ui" line="86"/> + <location filename="../file-search.ui" line="88"/> <source>Remove</source> <translation>Удалить</translation> </message> <message> - <location filename="../file-search.ui" line="113"/> + <location filename="../file-search.ui" line="117"/> <source>Search in sub directories</source> <translation>Искать в подпапках</translation> </message> <message> - <location filename="../file-search.ui" line="120"/> + <location filename="../file-search.ui" line="124"/> <source>Search hidden files</source> <translation>Искать скрытые файлы</translation> </message> <message> - <location filename="../file-search.ui" line="134"/> - <location filename="../file-search.ui" line="140"/> + <location filename="../file-search.ui" line="135"/> + <location filename="../file-search.ui" line="141"/> <source>File Type</source> <translation>Тип файла</translation> </message> <message> - <location filename="../file-search.ui" line="146"/> + <location filename="../file-search.ui" line="147"/> <source>Only search for files of following types:</source> <translation>Искать только следующие типы файлов:</translation> </message> <message> - <location filename="../file-search.ui" line="153"/> + <location filename="../file-search.ui" line="154"/> <source>Text files</source> <translation>Текстовые файлы</translation> </message> <message> - <location filename="../file-search.ui" line="160"/> + <location filename="../file-search.ui" line="161"/> <source>Image files</source> <translation>Файлы изображений</translation> </message> <message> - <location filename="../file-search.ui" line="167"/> + <location filename="../file-search.ui" line="168"/> <source>Audio files</source> <translation>Аудиофайлы</translation> </message> <message> - <location filename="../file-search.ui" line="174"/> + <location filename="../file-search.ui" line="175"/> <source>Video files</source> <translation>Видеофайлы</translation> </message> <message> - <location filename="../file-search.ui" line="181"/> + <location filename="../file-search.ui" line="182"/> <source>Documents</source> <translation>Документы</translation> </message> <message> - <location filename="../file-search.ui" line="205"/> + <location filename="../file-search.ui" line="206"/> <source>Content</source> <translation>Содержание</translation> </message> <message> - <location filename="../file-search.ui" line="211"/> + <location filename="../file-search.ui" line="212"/> <source>File contains</source> <translation>Содержание файла</translation> </message> <message> - <location filename="../file-search.ui" line="251"/> + <location filename="../file-search.ui" line="252"/> <source>Properties</source> <translation>Свойства</translation> </message> <message> - <location filename="../file-search.ui" line="257"/> + <location filename="../file-search.ui" line="258"/> <source>File Size</source> <translation>Размер файла</translation> </message> <message> - <location filename="../file-search.ui" line="263"/> + <location filename="../file-search.ui" line="264"/> <source>Bigger than:</source> <translation>Больше чем:</translation> </message> <message> - <location filename="../file-search.ui" line="284"/> + <location filename="../file-search.ui" line="289"/> <source>Smaller than:</source> <translation>Меньше чем:</translation> </message> <message> - <location filename="../file-search.ui" line="308"/> + <location filename="../file-search.ui" line="317"/> <source>Last Modified Time</source> <translation>Время последнего изменения</translation> </message> <message> - <location filename="../file-search.ui" line="314"/> + <location filename="../file-search.ui" line="323"/> <source>Earlier than:</source> <translation>Раньше чем:</translation> </message> <message> - <location filename="../file-search.ui" line="321"/> + <location filename="../file-search.ui" line="340"/> <source>Later than:</source> <translation>Позже чем:</translation> </message> @@ -359,417 +359,427 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, <translation>Диспетчер файлов</translation> </message> <message> - <location filename="../main-win.ui" line="645"/> - <source>Folder</source> - <translation>Папка</translation> - </message> - <message> - <location filename="../main-win.ui" line="648"/> + <location filename="../main-win.ui" line="660"/> <source>Ctrl+Shift+N</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="656"/> - <source>Blank File</source> - <translation>Пустой файл</translation> - </message> - <message> - <location filename="../main-win.ui" line="659"/> + <location filename="../main-win.ui" line="673"/> <source>Ctrl+Alt+N</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="75"/> + <location filename="../main-win.ui" line="84"/> <source>&File</source> <translation>&Файл</translation> </message> <message> - <location filename="../main-win.ui" line="79"/> + <location filename="../main-win.ui" line="88"/> <source>C&reate New</source> <translation>С&оздать новое</translation> </message> <message> - <location filename="../main-win.ui" line="97"/> + <location filename="../main-win.ui" line="106"/> <source>&Help</source> <translation>&Справка</translation> </message> <message> - <location filename="../main-win.ui" line="103"/> + <location filename="../main-win.ui" line="112"/> <source>&View</source> <translation>&Вид</translation> </message> <message> - <location filename="../main-win.ui" line="107"/> + <location filename="../main-win.ui" line="116"/> <source>&Sorting</source> <translation>&Сортировка</translation> </message> <message> - <location filename="../main-win.ui" line="133"/> + <location filename="../main-win.ui" line="142"/> <source>&Edit</source> <translation>&Правка</translation> </message> <message> - <location filename="../main-win.ui" line="148"/> + <location filename="../main-win.ui" line="157"/> <source>&Bookmarks</source> <translation>&Закладки</translation> </message> <message> - <location filename="../main-win.ui" line="155"/> + <location filename="../main-win.ui" line="164"/> <source>&Go</source> <translation>&Перейти</translation> </message> <message> - <location filename="../main-win.ui" line="170"/> + <location filename="../main-win.ui" line="179"/> <source>&Tool</source> <translation>&Инструмент</translation> </message> <message> - <location filename="../main-win.ui" line="186"/> + <location filename="../main-win.ui" line="196"/> <source>Main Toolbar</source> <translation>Главная панель инструментов</translation> </message> <message> - <location filename="../main-win.ui" line="214"/> + <location filename="../main-win.ui" line="224"/> <source>Go &Up</source> <translation>Перейти &вверх</translation> </message> <message> - <location filename="../main-win.ui" line="217"/> + <location filename="../main-win.ui" line="227"/> <source>Go Up</source> <translation>Перейти вверх</translation> </message> <message> - <location filename="../main-win.ui" line="220"/> + <location filename="../main-win.ui" line="230"/> <source>Alt+Up</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="230"/> - <source>Home</source> - <translation>Домой</translation> + <location filename="../main-win.ui" line="240"/> + <source>&Home</source> + <translation>&Домой</translation> </message> <message> - <location filename="../main-win.ui" line="233"/> + <location filename="../main-win.ui" line="243"/> <source>Alt+Home</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="243"/> + <location filename="../main-win.ui" line="253"/> <source>&Reload</source> <translation>&Обновить</translation> </message> <message> - <location filename="../main-win.ui" line="246"/> + <location filename="../main-win.ui" line="256"/> <source>F5</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="256"/> + <location filename="../main-win.ui" line="266"/> <source>Go</source> <translation>Перейти</translation> </message> <message> - <location filename="../main-win.ui" line="266"/> + <location filename="../main-win.ui" line="276"/> <source>Quit</source> <translation>Выйти</translation> </message> <message> - <location filename="../main-win.ui" line="276"/> + <location filename="../main-win.ui" line="286"/> <source>&About</source> <translation>&О программе</translation> </message> <message> - <location filename="../main-win.ui" line="286"/> + <location filename="../main-win.ui" line="296"/> <source>&New Window</source> <translation>&Новое окно</translation> </message> <message> - <location filename="../main-win.ui" line="289"/> + <location filename="../main-win.ui" line="299"/> <source>New Window</source> <translation>Новое окно</translation> </message> <message> - <location filename="../main-win.ui" line="292"/> + <location filename="../main-win.ui" line="302"/> <source>Ctrl+N</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="300"/> + <location filename="../main-win.ui" line="310"/> <source>Show &Hidden</source> <translation>Показать &скрытые</translation> </message> <message> - <location filename="../main-win.ui" line="303"/> + <location filename="../main-win.ui" line="313"/> <source>Ctrl+H</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="313"/> + <location filename="../main-win.ui" line="323"/> <source>&Computer</source> <translation>&Компьютер</translation> </message> <message> - <location filename="../main-win.ui" line="323"/> + <location filename="../main-win.ui" line="333"/> <source>&Trash</source> <translation>&Корзина</translation> </message> <message> - <location filename="../main-win.ui" line="328"/> + <location filename="../main-win.ui" line="338"/> <source>&Network</source> <translation>&Сеть</translation> </message> <message> - <location filename="../main-win.ui" line="338"/> + <location filename="../main-win.ui" line="348"/> <source>&Desktop</source> <translation>&Рабочий стол</translation> </message> <message> - <location filename="../main-win.ui" line="348"/> + <location filename="../main-win.ui" line="358"/> <source>&Add to Bookmarks</source> <translation>&Добавить в закладки</translation> </message> <message> - <location filename="../main-win.ui" line="353"/> + <location filename="../main-win.ui" line="363"/> <source>&Applications</source> <translation>&Приложения</translation> </message> <message> - <location filename="../main-win.ui" line="358"/> + <location filename="../main-win.ui" line="368"/> <source>Reload</source> <translation>Обновить</translation> </message> <message> - <location filename="../main-win.ui" line="366"/> + <location filename="../main-win.ui" line="376"/> <source>&Icon View</source> <translation>Просмотр &значками</translation> </message> <message> - <location filename="../main-win.ui" line="374"/> + <location filename="../main-win.ui" line="384"/> <source>&Compact View</source> <translation>&Компактный просмотр</translation> </message> <message> - <location filename="../main-win.ui" line="382"/> + <location filename="../main-win.ui" line="392"/> <source>&Detailed List</source> <translation>Просмотр &подробным списком</translation> </message> <message> - <location filename="../main-win.ui" line="390"/> + <location filename="../main-win.ui" line="400"/> <source>&Thumbnail View</source> <translation>Просмотр &эскизами</translation> </message> <message> - <location filename="../main-win.ui" line="400"/> + <location filename="../main-win.ui" line="410"/> <source>Cu&t</source> <translation>&Вырезать</translation> </message> <message> - <location filename="../main-win.ui" line="403"/> + <location filename="../main-win.ui" line="413"/> <source>Ctrl+X</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="413"/> + <location filename="../main-win.ui" line="423"/> <source>&Copy</source> <translation>&Копировать</translation> </message> <message> - <location filename="../main-win.ui" line="416"/> + <location filename="../main-win.ui" line="426"/> <source>Ctrl+C</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="426"/> + <location filename="../main-win.ui" line="436"/> <source>&Paste</source> <translation>&Вставить</translation> </message> <message> - <location filename="../main-win.ui" line="429"/> + <location filename="../main-win.ui" line="439"/> <source>Ctrl+V</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="434"/> + <location filename="../main-win.ui" line="444"/> <source>Select &All</source> <translation>Выделить &всё</translation> </message> <message> - <location filename="../main-win.ui" line="437"/> + <location filename="../main-win.ui" line="447"/> <source>Ctrl+A</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="442"/> + <location filename="../main-win.ui" line="452"/> <source>Pr&eferences</source> <translation>&Настройки</translation> </message> <message> - <location filename="../main-win.ui" line="450"/> - <source>Ascending</source> - <translation>По возрастанию</translation> + <location filename="../main-win.ui" line="460"/> + <source>&Ascending</source> + <translation>По &возрастанию</translation> </message> <message> - <location filename="../main-win.ui" line="458"/> - <source>Descending</source> - <translation>По убыванию</translation> + <location filename="../main-win.ui" line="468"/> + <source>&Descending</source> + <translation>По &убыванию</translation> </message> <message> - <location filename="../main-win.ui" line="466"/> - <source>By File Name</source> - <translation>По имени файла</translation> + <location filename="../main-win.ui" line="476"/> + <source>&By File Name</source> + <translation>&По имени файла</translation> </message> <message> - <location filename="../main-win.ui" line="474"/> - <source>By Modification Time</source> - <translation>По времени изменения</translation> + <location filename="../main-win.ui" line="484"/> + <source>By &Modification Time</source> + <translation>По времени &изменения</translation> </message> <message> - <location filename="../main-win.ui" line="482"/> - <source>By File Type</source> - <translation>По типу файла</translation> + <location filename="../main-win.ui" line="492"/> + <source>By File &Type</source> + <translation>По &типу файла</translation> </message> <message> - <location filename="../main-win.ui" line="490"/> - <source>By Owner</source> - <translation>По владельцу</translation> - </message> - <message> - <location filename="../main-win.ui" line="498"/> - <source>Folder First</source> - <translation>Сначала папки</translation> + <location filename="../main-win.ui" line="500"/> + <source>By &Owner</source> + <translation>По &владельцу</translation> </message> <message> <location filename="../main-win.ui" line="508"/> + <source>&Folder First</source> + <translation>Сначала &папки</translation> + </message> + <message> + <location filename="../main-win.ui" line="611"/> + <source>&Case Sensitive</source> + <translation>&Регистрочувствительная</translation> + </message> + <message> + <location filename="../main-win.ui" line="619"/> + <source>By File &Size</source> + <translation>По &размеру файла</translation> + </message> + <message> + <location filename="../main-win.ui" line="624"/> + <source>&Close Window</source> + <translation>&Закрыть окно</translation> + </message> + <message> + <location filename="../main-win.ui" line="657"/> + <source>&Folder</source> + <translation>&Папка</translation> + </message> + <message> + <location filename="../main-win.ui" line="670"/> + <source>&Blank File</source> + <translation>&Пустой файл</translation> + </message> + <message> + <location filename="../main-win.ui" line="678"/> + <source>&Find Files</source> + <translation>&Найти файлы</translation> + </message> + <message> + <location filename="../main-win.ui" line="681"/> + <source>F3</source> + <translation></translation> + </message> + <message> + <location filename="../main-win.ui" line="518"/> <source>New &Tab</source> <translation>Новая &вкладка</translation> </message> <message> - <location filename="../main-win.ui" line="511"/> + <location filename="../main-win.ui" line="521"/> <source>New Tab</source> <translation>Новая вкладка</translation> </message> <message> - <location filename="../main-win.ui" line="514"/> + <location filename="../main-win.ui" line="524"/> <source>Ctrl+T</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="524"/> + <location filename="../main-win.ui" line="534"/> <source>Go &Back</source> <translation>Перейти &назад</translation> </message> <message> - <location filename="../main-win.ui" line="527"/> + <location filename="../main-win.ui" line="537"/> <source>Go Back</source> <translation>Перейти назад</translation> </message> <message> - <location filename="../main-win.ui" line="530"/> + <location filename="../main-win.ui" line="540"/> <source>Alt+Left</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="540"/> + <location filename="../main-win.ui" line="550"/> <source>Go &Forward</source> <translation>Перейти &вперёд</translation> </message> <message> - <location filename="../main-win.ui" line="543"/> + <location filename="../main-win.ui" line="553"/> <source>Go Forward</source> <translation>Перейти вперёд</translation> </message> <message> - <location filename="../main-win.ui" line="546"/> + <location filename="../main-win.ui" line="556"/> <source>Alt+Right</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="551"/> + <location filename="../main-win.ui" line="561"/> <source>&Invert Selection</source> <translation>&Инвертировать выделение</translation> </message> <message> - <location filename="../main-win.ui" line="561"/> + <location filename="../main-win.ui" line="571"/> <source>&Delete</source> <translation>&Удалить</translation> </message> <message> - <location filename="../main-win.ui" line="564"/> + <location filename="../main-win.ui" line="574"/> <source>Del</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="569"/> + <location filename="../main-win.ui" line="579"/> <source>&Rename</source> <translation>&Переименовать</translation> </message> <message> - <location filename="../main-win.ui" line="572"/> + <location filename="../main-win.ui" line="582"/> <source>F2</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="577"/> + <location filename="../main-win.ui" line="587"/> <source>C&lose Tab</source> <translation>&Закрыть вкладку</translation> </message> <message> - <location filename="../main-win.ui" line="580"/> + <location filename="../main-win.ui" line="590"/> <source>Ctrl+W</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="585"/> + <location filename="../main-win.ui" line="595"/> <source>File &Properties</source> <translation>&Свойства файла</translation> </message> <message> - <location filename="../main-win.ui" line="588"/> + <location filename="../main-win.ui" line="598"/> <source>Alt+Return</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="593"/> + <location filename="../main-win.ui" line="603"/> <source>&Folder Properties</source> <translation>&Свойства папки</translation> </message> <message> - <location filename="../main-win.ui" line="601"/> - <source>Case Sensitive</source> - <translation>Регистрочувствительная</translation> - </message> - <message> - <location filename="../main-win.ui" line="609"/> - <source>By File Size</source> - <translation>По размеру файла</translation> - </message> - <message> - <location filename="../main-win.ui" line="614"/> - <source>Close Window</source> - <translation>Закрыть окно</translation> - </message> - <message> - <location filename="../main-win.ui" line="619"/> + <location filename="../main-win.ui" line="629"/> <source>Edit Bookmarks</source> <translation>Изменить закладки</translation> </message> <message> - <location filename="../main-win.ui" line="624"/> + <location filename="../main-win.ui" line="634"/> <source>Open &Terminal</source> <translation>Открыть &терминал</translation> </message> <message> - <location filename="../main-win.ui" line="627"/> + <location filename="../main-win.ui" line="637"/> <source>F4</source> <translation></translation> </message> <message> - <location filename="../main-win.ui" line="632"/> + <location filename="../main-win.ui" line="642"/> <source>Open as &Root</source> <translation>Открыть от имени &суперпользователя</translation> </message> <message> - <location filename="../main-win.ui" line="637"/> + <location filename="../main-win.ui" line="647"/> <source>&Edit Bookmarks</source> <translation>&Изменить закладки</translation> </message> @@ -777,99 +787,99 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, <context> <name>PCManFM::Application</name> <message> - <location filename="../application.cpp" line="126"/> + <location filename="../application.cpp" line="127"/> <source>Name of configuration profile</source> <translation>Имя профиля конфигурации</translation> </message> <message> - <location filename="../application.cpp" line="126"/> + <location filename="../application.cpp" line="127"/> <source>PROFILE</source> <translation>ПРОФИЛЬ</translation> </message> <message> - <location filename="../application.cpp" line="129"/> + <location filename="../application.cpp" line="130"/> <source>Run PCManFM as a daemon</source> <translation>Запустить PCManFM как демон</translation> </message> <message> - <location filename="../application.cpp" line="132"/> + <location filename="../application.cpp" line="133"/> <source>Quit PCManFM</source> <translation>Выйти из PCManFM</translation> </message> <message> - <location filename="../application.cpp" line="135"/> + <location filename="../application.cpp" line="136"/> <source>Launch desktop manager</source> <translation>Запустить менеджер рабочего стола</translation> </message> <message> - <location filename="../application.cpp" line="138"/> + <location filename="../application.cpp" line="139"/> <source>Turn off desktop manager if it's running</source> <translation>Отключить менеджер рабочего стола, если он запущен</translation> </message> <message> - <location filename="../application.cpp" line="141"/> + <location filename="../application.cpp" line="142"/> <source>Open desktop preference dialog on the page with the specified name</source> <translation>Открыть диалог настроек рабочего стола на странице с указанным именем</translation> </message> <message> - <location filename="../application.cpp" line="141"/> - <location filename="../application.cpp" line="157"/> + <location filename="../application.cpp" line="142"/> + <location filename="../application.cpp" line="158"/> <source>NAME</source> <translation>ИМЯ</translation> </message> <message> - <location filename="../application.cpp" line="150"/> + <location filename="../application.cpp" line="151"/> <source>Set desktop wallpaper from image FILE</source> <translation>Выбрать обои рабочего стола из ФАЙЛА изображения</translation> </message> <message> - <location filename="../application.cpp" line="150"/> + <location filename="../application.cpp" line="151"/> <source>FILE</source> <translation>ФАЙЛ</translation> </message> <message> - <location filename="../application.cpp" line="154"/> + <location filename="../application.cpp" line="155"/> <source>Set mode of desktop wallpaper. MODE=(color|stretch|fit|center|tile)</source> <translation>Выбрать режим обоев рабочего стола. РЕЖИМ=(цвет|растянуть|вместить|по центру|черепицей)</translation> </message> <message> - <location filename="../application.cpp" line="154"/> + <location filename="../application.cpp" line="155"/> <source>MODE</source> <translation>РЕЖИМ</translation> </message> <message> - <location filename="../application.cpp" line="157"/> + <location filename="../application.cpp" line="158"/> <source>Open Preferences dialog on the page with the specified name</source> <translation>Открыть диалог настроек на странице с указанным именем</translation> </message> <message> - <location filename="../application.cpp" line="144"/> + <location filename="../application.cpp" line="145"/> <source>Open new window</source> <translation>Открыть новое окно</translation> </message> <message> - <location filename="../application.cpp" line="147"/> + <location filename="../application.cpp" line="148"/> <source>Open Find Files utility</source> <translation>Открыть утилиту поиска файлов</translation> </message> <message> - <location filename="../application.cpp" line="160"/> + <location filename="../application.cpp" line="161"/> <source>[FILE1, FILE2,...]</source> <translation>[ФАЙЛ1, ФАЙЛ2,...]</translation> </message> <message> - <location filename="../application.cpp" line="160"/> + <location filename="../application.cpp" line="161"/> <source>Files or directories to open</source> <translation>Файлы или папки для открытия</translation> </message> <message> - <location filename="../application.cpp" line="422"/> - <location filename="../application.cpp" line="429"/> + <location filename="../application.cpp" line="436"/> + <location filename="../application.cpp" line="443"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../application.cpp" line="429"/> + <location filename="../application.cpp" line="443"/> <source>Terminal emulator is not set.</source> <translation>Эмулятор терминала не указан.</translation> </message> @@ -915,7 +925,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, <translation>Плиточное заполнение всего экрана изображением</translation> </message> <message> - <location filename="../desktoppreferencesdialog.cpp" line="128"/> + <location filename="../desktoppreferencesdialog.cpp" line="141"/> <source>Image Files</source> <translation>Файлы изображений</translation> </message> @@ -936,28 +946,28 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, <context> <name>PCManFM::MainWindow</name> <message> - <location filename="../mainwindow.cpp" line="433"/> + <location filename="../mainwindow.cpp" line="435"/> <source>Version: %1</source> <translation>Версия: %1</translation> </message> <message> - <location filename="../mainwindow.cpp" line="873"/> + <location filename="../mainwindow.cpp" line="875"/> <source>&Move to Trash</source> <translation>&Переместить в корзину</translation> </message> <message> - <location filename="../mainwindow.cpp" line="873"/> + <location filename="../mainwindow.cpp" line="875"/> <source>&Delete</source> <translation>&Удалить</translation> </message> <message> - <location filename="../mainwindow.cpp" line="935"/> - <location filename="../mainwindow.cpp" line="946"/> + <location filename="../mainwindow.cpp" line="937"/> + <location filename="../mainwindow.cpp" line="948"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../mainwindow.cpp" line="946"/> + <location filename="../mainwindow.cpp" line="948"/> <source>Switch user command is not set.</source> <translation>Команда переключения пользователя не задана.</translation> </message> @@ -988,17 +998,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, <context> <name>PCManFM::TabPage</name> <message> - <location filename="../tabpage.cpp" line="210"/> + <location filename="../tabpage.cpp" line="212"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../tabpage.cpp" line="223"/> + <location filename="../tabpage.cpp" line="225"/> <source>Free space: %1 (Total: %2)</source> <translation>Свободное место: %1 (всего: %2)</translation> </message> <message numerus="yes"> - <location filename="../tabpage.cpp" line="238"/> + <location filename="../tabpage.cpp" line="240"/> <source>%n item(s)</source> <translation> <numerusform>%n объект</numerusform> @@ -1007,7 +1017,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, </translation> </message> <message numerus="yes"> - <location filename="../tabpage.cpp" line="240"/> + <location filename="../tabpage.cpp" line="242"/> <source> (%n hidden)</source> <translation> <numerusform> (%n скрыт)</numerusform> @@ -1016,7 +1026,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Бостон, MA 02110-1301, </translation> </message> <message> - <location filename="../tabpage.cpp" line="388"/> + <location filename="../tabpage.cpp" line="390"/> <source>%1 item(s) selected</source> <translation>%1 объекта(ов) выделено</translation> </message>