diff --git a/AUTHORS b/AUTHORS index 437d5d48c..0bff3df81 100644 --- a/AUTHORS +++ b/AUTHORS @@ -23,6 +23,7 @@ Michał Szymanowski (Polish) Jérôme Giry (French) Nicolas Ourceau (French) Vasilis Tsivikis (Greek) +Alexander Maslov (Russian) Special thanks: diff --git a/bin/locale/ru_RU.qm b/bin/locale/ru_RU.qm new file mode 100644 index 000000000..86d426782 Binary files /dev/null and b/bin/locale/ru_RU.qm differ diff --git a/src/app/mainapplication.cpp b/src/app/mainapplication.cpp index 69d239438..6dbe7e50d 100644 --- a/src/app/mainapplication.cpp +++ b/src/app/mainapplication.cpp @@ -121,7 +121,7 @@ MainApplication::MainApplication(const QList &cm } if (isRunning()) { - foreach (QString message, messages) { + foreach(QString message, messages) { sendMessage(message); } m_isExited = true; diff --git a/src/app/mainapplication.h b/src/app/mainapplication.h index 1b39f4f7b..261aa4c91 100644 --- a/src/app/mainapplication.h +++ b/src/app/mainapplication.h @@ -60,7 +60,8 @@ public: explicit MainApplication(const QList &cmdActions, int &argc, char** argv); enum MessageType { SetAdBlockIconEnabled, CheckPrivateBrowsing, ReloadSettings, - HistoryStateChanged, BookmarksChanged, StartPrivateBrowsing }; + HistoryStateChanged, BookmarksChanged, StartPrivateBrowsing + }; void connectDatabase(); void loadSettings(); diff --git a/src/bookmarks/bookmarkicon.cpp b/src/bookmarks/bookmarkicon.cpp index aa06aea12..211cf1333 100644 --- a/src/bookmarks/bookmarkicon.cpp +++ b/src/bookmarks/bookmarkicon.cpp @@ -96,7 +96,7 @@ void BookmarkIcon::setBookmarkDisabled() setToolTip(tr("Bookmark this Page")); } -void BookmarkIcon::mousePressEvent(QMouseEvent *ev) +void BookmarkIcon::mousePressEvent(QMouseEvent* ev) { ClickableLabel::mousePressEvent(ev); diff --git a/src/bookmarks/bookmarkicon.h b/src/bookmarks/bookmarkicon.h index 75ddbb9ca..9cb4f4069 100644 --- a/src/bookmarks/bookmarkicon.h +++ b/src/bookmarks/bookmarkicon.h @@ -41,7 +41,7 @@ private slots: void bookmarkDeleted(const BookmarksModel::Bookmark &bookmark); private: - void mousePressEvent(QMouseEvent *ev); + void mousePressEvent(QMouseEvent* ev); void setBookmarkSaved(); void setBookmarkDisabled(); diff --git a/src/navigation/downicon.cpp b/src/navigation/downicon.cpp index 3f20f8963..22ff5d8cb 100644 --- a/src/navigation/downicon.cpp +++ b/src/navigation/downicon.cpp @@ -1,13 +1,13 @@ #include "downicon.h" -DownIcon::DownIcon(QWidget *parent) +DownIcon::DownIcon(QWidget* parent) : ClickableLabel(parent) { setObjectName("locationbar-down-icon"); setCursor(Qt::ArrowCursor); } -void DownIcon::mousePressEvent(QMouseEvent *ev) +void DownIcon::mousePressEvent(QMouseEvent* ev) { ClickableLabel::mousePressEvent(ev); diff --git a/src/navigation/downicon.h b/src/navigation/downicon.h index 8114e6c2b..d4069014f 100644 --- a/src/navigation/downicon.h +++ b/src/navigation/downicon.h @@ -10,7 +10,7 @@ public: explicit DownIcon(QWidget* parent = 0); private: - void mousePressEvent(QMouseEvent *ev); + void mousePressEvent(QMouseEvent* ev); }; diff --git a/src/navigation/goicon.cpp b/src/navigation/goicon.cpp index d39e94069..3e5f1aa02 100644 --- a/src/navigation/goicon.cpp +++ b/src/navigation/goicon.cpp @@ -1,6 +1,6 @@ #include "goicon.h" -GoIcon::GoIcon(QWidget *parent) +GoIcon::GoIcon(QWidget* parent) : ClickableLabel(parent) { setObjectName("locationbar-goicon"); @@ -8,7 +8,7 @@ GoIcon::GoIcon(QWidget *parent) setHidden(true); } -void GoIcon::mousePressEvent(QMouseEvent *ev) +void GoIcon::mousePressEvent(QMouseEvent* ev) { ClickableLabel::mousePressEvent(ev); diff --git a/src/navigation/goicon.h b/src/navigation/goicon.h index 6ae5f3a60..a3d4e18d9 100644 --- a/src/navigation/goicon.h +++ b/src/navigation/goicon.h @@ -7,14 +7,14 @@ class GoIcon : public ClickableLabel { Q_OBJECT public: - explicit GoIcon(QWidget *parent = 0); + explicit GoIcon(QWidget* parent = 0); signals: public slots: private: - void mousePressEvent(QMouseEvent *ev); + void mousePressEvent(QMouseEvent* ev); }; diff --git a/src/network/qupzillaschemehandler.cpp b/src/network/qupzillaschemehandler.cpp index 5f9effc51..00793f153 100644 --- a/src/network/qupzillaschemehandler.cpp +++ b/src/network/qupzillaschemehandler.cpp @@ -216,7 +216,8 @@ QString QupZillaSchemeReply::aboutPage() authorString("Michał Szymanowski", "tylkobuba@gmail.com") + " (Polish)
" + authorString("Jérôme Giry", "baikalink@hotmail.fr") + " (French)
" + authorString("Nicolas Ourceau", "lamessen@hotmail.fr") + " (French)
" + - authorString("Vasilis Tsivikis", "vasitsiv.dev@gmail.com") + " (Greek)" + authorString("Vasilis Tsivikis", "vasitsiv.dev@gmail.com") + " (Greek)
" + + authorString("Alexander Maslov", "it@delta-z.ru") + " (Russian)
" ); return aPage; diff --git a/src/other/aboutdialog.cpp b/src/other/aboutdialog.cpp index 74aed4e68..d13c2ddd0 100644 --- a/src/other/aboutdialog.cpp +++ b/src/other/aboutdialog.cpp @@ -88,7 +88,8 @@ void AboutDialog::showAuthors() "Michał Szymanowski (Polish)
" "Jérôme Giry (French)
" "Nicolas Ourceau (French)
" - "Vasilis Tsivikis (Greek)" + "Vasilis Tsivikis (Greek)
" + "Alexander Maslov (Russian)" )); m_authorsHtml.append(""); } diff --git a/src/preferences/preferences.cpp b/src/preferences/preferences.cpp index efb1b0a2f..d0edcd9ad 100644 --- a/src/preferences/preferences.cpp +++ b/src/preferences/preferences.cpp @@ -144,7 +144,7 @@ Preferences::Preferences(QupZilla* mainClass, QWidget* parent) //PROFILES m_actProfileName = mApp->getActiveProfilPath(); - m_actProfileName = m_actProfileName.left(m_actProfileName.length()-1); + m_actProfileName = m_actProfileName.left(m_actProfileName.length() - 1); m_actProfileName = m_actProfileName.mid(m_actProfileName.lastIndexOf("/")); m_actProfileName.remove("/"); diff --git a/src/rss/rssicon.cpp b/src/rss/rssicon.cpp index 40eb31331..07eb51280 100644 --- a/src/rss/rssicon.cpp +++ b/src/rss/rssicon.cpp @@ -1,6 +1,6 @@ #include "rssicon.h" -RssIcon::RssIcon(QWidget *parent) +RssIcon::RssIcon(QWidget* parent) : ClickableLabel(parent) { setObjectName("locationbar-rss-icon"); @@ -9,7 +9,7 @@ RssIcon::RssIcon(QWidget *parent) setVisible(false); } -void RssIcon::mousePressEvent(QMouseEvent *ev) +void RssIcon::mousePressEvent(QMouseEvent* ev) { ClickableLabel::mousePressEvent(ev); diff --git a/src/rss/rssicon.h b/src/rss/rssicon.h index 3b595d441..da44da7c4 100644 --- a/src/rss/rssicon.h +++ b/src/rss/rssicon.h @@ -7,14 +7,14 @@ class RssIcon : public ClickableLabel { Q_OBJECT public: - explicit RssIcon(QWidget *parent = 0); + explicit RssIcon(QWidget* parent = 0); signals: public slots: private: - void mousePressEvent(QMouseEvent *ev); + void mousePressEvent(QMouseEvent* ev); }; #endif // RSSICON_H diff --git a/src/src.pro b/src/src.pro index 4d7181c20..fa283bb03 100644 --- a/src/src.pro +++ b/src/src.pro @@ -39,6 +39,7 @@ TRANSLATIONS +=../translations/cs_CZ.ts\ ../translations/es_ES.ts\ ../translations/fr_FR.ts\ ../translations/el_GR.ts\ + ../translations/ru_RU.ts\ ../translations/empty.ts\ diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index d2248c120..4e99294d9 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -1631,17 +1631,17 @@ LocationBar - + Add RSS from this page... Добавить RSS с этой страницы... - + Enter URL address or search on %1 Введите адрес или используйте поиск в %1 - + .co.uk Append domain name on ALT + Enter = Should be different for every country .ru @@ -1650,12 +1650,12 @@ MainApplication - + Last session crashed Последняя сессия завершилась с ошибками - + <b>QupZilla crashed :-(</b><br/>Oops, the last session of QupZilla was interrupted unexpectedly. We apologize for this. Would you like to try restoring the last saved state? <b>QupZilla упал :-(</b><br/>К сожалению, последняя сессия QupZilla была внезапно прервана. Мы извиняемся за это. Может быть, Вы желаете восстановить последнее сохраненное состояние? @@ -1974,11 +1974,11 @@ Delete - + Удалить - + Note: You cannot delete active profile. @@ -1988,494 +1988,499 @@ - + Themes - + Advanced options - + <b>Browser Window</b> <b>Окно браузера</b> - + Show StatusBar on start - + Show Bookmarks ToolBar on start - + Show Navigation ToolBar on start - + <b>Navigation ToolBar</b> <b>Панель навигации</b> - + Show Home button - + Show Back / Forward buttons - + Show Add Tab button - + <b>Background<b/> <b>Фон</b> - + Use transparent background - + <b>Tabs behavior</b> <b>Поведение вкладок</b> - + Make tabs movable - + Hide tabs when there is only one tab - + <b>Address Bar behaviour</b> <b>Поведение панели адреса</b> - + Select all text by double clicking in address bar - + Add .co.uk domain by pressing ALT key - + Activate last tab when closing active tab - + Ask when closing multiple tabs - + Select all text by clicking in address bar - + Web Configuration - + Load images - + Allow JAVA - + Allow JavaScript - - Allow Plugins (Flash plugin) - - - - - Block PopUp windows + + Active profile: + Allow Plugins (Flash plugin) + + + + + Block PopUp windows + + + + Allow DNS Prefetch - + JavaScript can access clipboard - + Send Do Not Track header to servers - + Zoom text only - + Print element background - + Include links in focus chain - + Enable XSS Auditing - + Mouse wheel scrolls - + lines on page - + Default zoom on pages: - + Ask when entering Private Browsing mode - + Local Storage - + Maximum pages in cache: - + 1 1 - + Allow storing network cache on disk - + Maximum - + 50 MB 50 Мб - + Allow storing web icons - + Allow saving history - + Delete history on close - + Proxy Configuration - + HTTP - + SOCKS5 - + Port: - + Username: - + Password: - + Don't use on: - + Manual configuration - + System proxy configuration - + Do not use proxy - + <b>Font Families</b> <b>Шрифты</b> - + Standard - + Fixed - + Serif - + Sans Serif - + Cursive - + Default Font - + Fixed Font - + Fantasy - + <b>Font Sizes</b> <b>Размеры шрифтов</b> - + <b>Download Location</b> <b>Директория загрузок</b> - + Ask everytime for download location - + Use defined location: - - + + ... ... - + <b>Download Options</b> <b>Опции загрузки</b> - + Use native system file dialog (may or may not cause problems with downloading SSL secured content) - + Close download manager when downloading finishes - + <b>AutoFill options</b> <b>Настройки автодополнения</b> - + Allow saving passwords from sites - + <b>Cookies</b> <b>Куки</b> - + Filter Tracking Cookies - + Allow storing of cookies - + Delete cookies on close - + Match domain exactly - + <b>Warning:</b> Match domain exactly and Filter Tracking Cookies options can lead to deny some cookies from sites. If you have problems with cookies, try to disable this options first! - + Cookies Manager - + SSL Manager - + <b>Notifications</b> <b>Уведомления</b> - + Use OSD Notifications - + Use Native System Notifications (Linux only) - + Do not use Notifications - + Expiration timeout: - + seconds - + <b>Note: </b>You can change position of OSD Notification by dragging it on the screen. <b>Примечание: </b> Вы можете изменить положение OSD уведомления перетягивая его по экрану. - + <b>Language</b> <b>Язык</b> - + Available translations: - + In order to change language, you must restart browser. - + <b>User CSS StyleSheet</b> <b>Пользовательский CSS</b> - + StyleSheet automatically loaded with all websites: - + Languages - + <b>Preferred language for web sites</b> <b>Предпочитаемый язык для веб сайтов</b> @@ -2535,58 +2540,58 @@ - + OSD Notification - + Drag it on the screen to place it where you want. - + Choose download location... - + Choose stylesheet location... - + New Profile - + Enter the new profile's name: - - + + Error! - + Ошибка! - + This profile already exists! - + Cannot create profile directory! - + Confirmation - + Подтверждение - + Are you sure to permanently delete "%1" profile? This action cannot be undone! @@ -2635,424 +2640,423 @@ QupZilla - - - + + + New tab - + Новая вкладка - + Private Browsing Enabled - + IP Address of current page - + &Tools - + &Help - + &Bookmarks - + Hi&story - + &File - + &New Window - + New Tab - + Новая вкладка - + Open Location - + Open &File - + Close Tab - + Close Window - + &Save Page As... - + Save Page Screen - + Send Link... - + &Print - + Import bookmarks... - + Quit - + &Edit - + &Undo - + &Redo - + &Cut - + C&opy - + &Paste - + &Delete - + &Удалить - + Select &All - + &Find - - + + Pr&eferences - + &View - + &Navigation Toolbar - + &Bookmarks Toolbar - + Sta&tus Bar - + &Menu Bar - + &Fullscreen - + &Stop - + &Reload - + Character &Encoding - + Bookmarks - + Закладки - + History - + Toolbars - + Sidebars - + Zoom &In - + Zoom &Out - + Reset - + &Page Source - + Closed Tabs - + Restore &Closed Tab - - + (Private Browsing) - + Bookmark &This Page - + Bookmark &All Tabs - + Добавить в закладки &все вкладки - + Organize &Bookmarks - - - + + + Empty - + Пусто - + &Back - + &Forward - + &Home - + Show &All History - + Restore All Closed Tabs - + Clear list - + About &Qt - + &About QupZilla - + Informations about application - + Report &Issue - + &Web Search - + Page &Info - + &Download Manager - + &Cookies Manager - + &AdBlock - + RSS &Reader - + Clear Recent &History - + &Private Browsing - + Other - + Default - + Open file... - + Are you sure you want to turn on private browsing? - + When private browsing is turned on, some actions concerning your privacy will be disabled: - + Webpages are not added to the history. - + Current cookies cannot be accessed. - + Your session is not stored. - + Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened. - + Start Private Browsing - + There are still %1 open tabs and your session won't be stored. Are you sure to quit QupZilla? @@ -3062,7 +3066,7 @@ No Error - + Без ошибок @@ -3125,7 +3129,7 @@ About QupZilla - + О QupZilla @@ -3175,7 +3179,7 @@ Settings - + Настройки @@ -3223,34 +3227,34 @@ - + Speed Dial - + Add New Page - + Apply - + Load title from page - + Edit - + Редактировать - + Remove - + Удалить @@ -3258,22 +3262,22 @@ - + Reload - - - Url - - - Title - + Url + Адрес - + + Title + Заголовок + + + New Page @@ -3289,7 +3293,7 @@ Empty - + Пусто @@ -3351,18 +3355,18 @@ Please add some with RSS icon in navigation bar on site which offers feeds. Open link in actual tab - + Открыть ссылку в текущей вкладке Open link in new tab - + Открыть ссылку в новой вкладке New Tab - + Новая вкладка @@ -3401,14 +3405,14 @@ Please add some with RSS icon in navigation bar on site which offers feeds. - + Untitled feed - + Add - + Добавить @@ -3456,7 +3460,7 @@ Please add some with RSS icon in navigation bar on site which offers feeds. Remove - + Удалить @@ -3466,12 +3470,12 @@ Please add some with RSS icon in navigation bar on site which offers feeds. Settings - + Настройки Add - + Добавить @@ -3515,27 +3519,27 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla Add... - + Добавить... Remove - + Удалить Edit - + Редактировать Up - + Вверх Down - + Вниз @@ -3583,7 +3587,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla Error - + Ошибка @@ -3609,7 +3613,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla Search... - + Поиск... @@ -3627,7 +3631,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla Bookmarks - + Закладки @@ -3723,7 +3727,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla <not set in certificate> - + <не указано в сертификате> @@ -3764,7 +3768,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla Error! - + Ошибка! @@ -3851,12 +3855,12 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla Close - + Закрыть Edit - + Редактировать @@ -3886,7 +3890,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla Delete - + Удалить @@ -3932,7 +3936,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla Error! - + Ошибка! @@ -3980,7 +3984,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla Search... - + Поиск... @@ -4036,7 +4040,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla Bookmark &All Tabs - + Добавить в закладки &все вкладки @@ -4067,7 +4071,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla New tab - + Новая вкладка @@ -4080,7 +4084,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla New Tab - + Новая вкладка @@ -4091,7 +4095,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla No Named Page - + Безымянная страница @@ -4103,7 +4107,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla New tab - + Новая вкладка @@ -4172,7 +4176,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla New tab - + Новая вкладка @@ -4222,7 +4226,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla Failed loading page - + Ошибка загрузки страницы @@ -4252,7 +4256,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla Choose file... - + Выбрать файл... @@ -4273,7 +4277,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla Failed loading page - + Ошибка загрузки страницы @@ -4285,7 +4289,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla New tab - + Новая вкладка @@ -4405,7 +4409,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla No Named Page - + Безымянная страница