diff --git a/CMakeLists.txt b/CMakeLists.txt index 933f5238f..0e27f8fcb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,7 +106,7 @@ add_custom_target(AuxFiles SOURCES "resources/scripts/uncrustify/uncrustify.cfg" # Global compilation switches. option(BUILD_WITH_QT6 "Build application with Qt 6" OFF) option(USE_WEBENGINE "Use QtWebEngine for embedded web browser" ON) -option(UPDATE_TRANSLATIONS "Call lupdate to update translation files from source" OFF) +option(UPDATE_TRANSLATIONS "Call lupdate to update translation files from source (Qt 6 only)" OFF) option(FORCE_COLORED_OUTPUT "Always produce ANSI-colored output (GCC/Clang only)" OFF) option(REVISION_FROM_GIT "Get revision using `git rev-parse`" ON) @@ -229,6 +229,6 @@ elseif(APPLE) endif() # Generate localizations, build library and application. -add_subdirectory(localization) add_subdirectory(src/librssguard) +add_subdirectory(localization) add_subdirectory(src/rssguard) diff --git a/localization/CMakeLists.txt b/localization/CMakeLists.txt index e2d586afd..bf7fa8c70 100644 --- a/localization/CMakeLists.txt +++ b/localization/CMakeLists.txt @@ -1,4 +1,4 @@ -if(UPDATE_TRANSLATIONS) +if(UPDATE_TRANSLATIONS AND BUILD_WITH_QT6) # Regenerate "en" .ts file. # # "en" .ts file is only used as "source" language @@ -20,9 +20,18 @@ FILE(GLOB TS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.ts) set_source_files_properties(${TS_FILES} PROPERTIES OUTPUT_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}") -qt_add_translation(QM_FILES - ${TS_FILES} - OPTIONS "-compress" -) +if(BUILD_WITH_QT6) + qt_add_lrelease(rssguard + TS_FILES ${TS_FILES} + QM_FILES_OUTPUT_VARIABLE QM_FILES + OPTIONS "-compress" + ) +else() + qt_add_translation(QM_FILES + ${TS_FILES} + OPTIONS "-compress" + ) -add_custom_target(update_qm DEPENDS ${QM_FILES}) + add_custom_target(rssguard_lrelease DEPENDS ${QM_FILES}) + add_dependencies(rssguard rssguard_lrelease) +endif() diff --git a/localization/rssguard_en.ts b/localization/rssguard_en.ts index 0fb808e18..3140e4cd4 100644 --- a/localization/rssguard_en.ts +++ b/localization/rssguard_en.ts @@ -122,82 +122,67 @@ Error: %1 Application - + Application is already running. Application is already running - + Output directory is not writable. Output directory is not writable - + Settings file not copied to output directory successfully. Settings file not copied to output directory successfully. - + Database restoration was not initiated. Make sure that output directory is writable. Database restoration was not initiated. Make sure that output directory is writable. - + Settings restoration was not initiated. Make sure that output directory is writable. Settings restoration was not initiated. Make sure that output directory is writable. - + Cannot add feed Cannot add feed - + Feed cannot be added because there is no active account which can add feeds. - + Packages %1 were updated. - + Unread articles fetched - + Go to changelog - + AdBlock needs to be configured - - RSS Guard has Discord server! - - - - - You can visit it now! Click me! - - - - - Go to Discord! - - - - + Welcome - + Welcome to %1. Please, check NEW stuff included in this @@ -205,17 +190,17 @@ version by clicking this popup notification. - + AdBlock is not configured properly. Go to "Settings" -> "Node.js" and check if your Node.js is properly configured. - + Already running - + Packages %1 were NOT updated because of error: %2. @@ -933,7 +918,7 @@ Status: %3 Cannot delete item - + Context menu for empty space Context menu for empty space @@ -948,8 +933,8 @@ Status: %3 Selected item cannot be deleted because another critical operation is ongoing. - - + + Context menu for categories Context menu for categories @@ -974,25 +959,25 @@ Status: %3 Are you sure? - - + + Cannot delete "%1" Cannot delete "%1" - + This item cannot be deleted because something critically failed. Submit bug report. This item cannot be deleted because something critically failed. Submit bug report. - + This item cannot be deleted, because it does not support it or this functionality is not implemented yet. This item cannot be deleted, because it does not support it or this functionality is not implemented yet. - + Context menu for other items Context menu for other items @@ -1007,22 +992,22 @@ or this functionality is not implemented yet. Selected account does not support adding of new categories. - + Context menu for recycle bins - + Context menu for accounts - + Context menu for label - + Context menu for important articles @@ -1182,12 +1167,12 @@ or this functionality is not implemented yet. - + E-mail NOT sent - + Your e-mail message wasn't sent. @@ -1715,12 +1700,12 @@ or this functionality is not implemented yet. FormMain - + No possible actions No possible actions - + No recycle bin No recycle bin @@ -1775,509 +1760,539 @@ or this functionality is not implemented yet. - + + &Move + + + + Art&icles - + &Recycle bin(s) - + &Accounts - + &Web browser && tabs - + &Quit - + Quit the application. - + &Settings - + Display settings of the application. - + &About application - + Displays extra info about this application. - + &Fullscreen - + Switch fullscreen mode. - + &Fetch all - + Fetch all feeds - + Fetch &selected - + Fetch selected feeds - + &Edit selected item - + &Delete selected item - + Mark articles &read - + Mark selected articles read - + Mark articles &unread - + Mark selected articles unread - + Switch &importance - + Switch importance of selected articles - + Mark selected item &read - + Mark all messages (without message filters) from selected items as read. - + Mark selected item &unread - + Mark all messages (without message filters) from selected items as unread. - + &Delete articles - + &Clean selected item - + Deletes all messages from selected items. - + Open in &external browser - + Open selected articles in external browser - + Open in &internal browser - + Open selected articles in internal browser - + No actions available - + No actions are available right now. - + &Mark all read - + Marks all messages in all items read. This does not take message filters into account. - + View selected item in &newspaper mode - + Displays all messages from selected item in a new "newspaper mode" tab. Note that messages are not set as read automatically. - + Minimize (or hide) main window - + Hides main window if it is visible and shows it if it is hidden. - + &Feed list - + Hides or shows the list of feeds/categories. - + &Clean all - + Deletes all messages from all items. - + &Next item - + &Previous item - + &Next article - + &Previous article - + Check for &updates - + Check if new update for the application is available for download. - + &Main menu - + Hides or displays the main menu. - + Report a &bug... - + &Toolbars - + Switch visibility of main toolbars. - + &List headers - + &Donate... - + Display &documentation - + &Restart - + &Restore settings - + &Backup settings - + Switch layout - + &Downloads - + Send via e-mail - + Send selected articles via e-mail - + &Cleanup database - + Show unread items only - + &Expand/collapse selected item - + &Add account - + &Restore articles - + &Restore all recycle bins - + &Empty all recycle bins - + Next &unread article - + Status bar - + &Edit selected account - + &Delete selected account - - + + Add new category Add new category - + Stop ongoing fetching - + New browser tab - + Close all tabs - + Close all tabs except current - + Go to &next tab - + Go to &previous tab - + &Enable article preview - + &Copy URL of selected item - + Show &unread articles only - + Article &filters - + &Show tree expanders - + Fetch feeds with &custom auto-download policy - + Alternate row colors in lists - + Automatically &expand item when selected - + Message viewer toolbars - + Expand/collapse selected item &recursively - + Close &current tab - + &Copy URLs of selected articles - + Open in internal browser (no new tab) - - + + &Sort alphabetically + + + + + Move &up + + + + + Move to &top + + + + + Move &down + + + + + Move to &bottom + + + + + Add new feed Add new feed - + No actions possible No actions possible @@ -2292,22 +2307,22 @@ or this functionality is not implemented yet. Cannot cleanup database, because another critical action is running. - + Close opened modal dialogs first. Close opened modal dialogs first. - + Ta&bs - + Fetching common data - + Close dialogs @@ -3187,44 +3202,49 @@ You can install it now. GmailNetworkFactory - + Click this to login again. Error is: '%1' - + Click this to login again. - + No subject - + Gmail: authentication error + failed to download IDs of e-mail messages + + + + Gmail: authorization denied - - + + you are not logged in - + failed to get metadata - - + + Login @@ -3237,51 +3257,51 @@ You can install it now. - + Sent - + Drafts - + Spam - + + Reply to this e-mail message + + + + Authentication status: %1 Login tokens expiration: %2 - + logged-in - + NOT logged-in - + Select attachment destination file - + Write new e-mail message - - - Reply to this message - - GreaderAccountDetails @@ -3959,7 +3979,7 @@ Login tokens expiration: %2 - Custom ID of the article + Custom ID of the article. @@ -4672,7 +4692,7 @@ Login tokens expiration: %2 rotter.martinos@gmail.com - + + %n other feeds. @@ -4732,7 +4752,7 @@ Feedly is a secure space where you can privately organize and research the topic - + Cannot insert article filter, because current database cannot return last inserted row ID. @@ -4809,27 +4829,27 @@ List of supported readers: - + interesting stuff - + interesting stuff (highlighted) - + errored items - + errored items (highlighted) - + OK-ish color @@ -4852,38 +4872,38 @@ List of supported readers: Readability - + Packages for reader mode are installed - + You can now use reader mode! - + Packages for reader mode are NOT installed - + There is error: %1 - - + + Node.js libraries not installed - + %1 will now install some needed libraries, this will take only a few seconds. You will be notified when installation is complete. - + Node.js is not configured properly. Go to "Settings" -> "Node.js" and check if your Node.js is properly configured. @@ -5098,7 +5118,7 @@ Login tokens expiration: %2 RootItem - + %n unread article(s). Tooltip for "unread" column of feed list. @@ -5139,7 +5159,7 @@ Login tokens expiration: %2 SearchTextWidget - Seach text + Search text @@ -5169,14 +5189,14 @@ Login tokens expiration: %2 SettingsBrowserMail - + Select web browser executable Select web browser executable - - - + + + Executables (*) File filter for external browser selection dialog. ---------- @@ -5184,34 +5204,34 @@ File filter for external e-mail selection dialog. Executables (*) - - - + + + Executables (*.*) Executables (*.*) - + Select e-mail executable Select e-mail executable - + Opera 12 or older Opera 12 or older - + Mozilla Thunderbird Mozilla Thunderbird - + Enter (optional) parameters: - + Executable @@ -5227,7 +5247,7 @@ File filter for external e-mail selection dialog. - + <html><head/><body><p>If unchecked, then default system-wide web browser is used.</p></body></html> @@ -5248,26 +5268,26 @@ File filter for external e-mail selection dialog. - + &Browse - - + + Parameters - + Parameters passed to executable - + Use sample arguments for @@ -5277,74 +5297,74 @@ File filter for external e-mail selection dialog. - + Note that "%1" (without quotation marks) is placeholder for URL of selected message. - + External e-mail client - + Use custom external e-mail client - + E-mail client executable - + Executable file of e-mail client - + Select client - + Placeholders: • %1 - title of selected message, • %2 - body of selected message. - + External tools - + &Add tool - + &Edit selected tool - + &Delete selected tool - + On this page, you can setup a list of external tools which can open URLs. - + Select external tool - + Enter parameters @@ -5801,6 +5821,11 @@ Authors of this application are NOT responsible for lost data. Author Author + + + Forced skin colors + + Icon only @@ -5847,11 +5872,6 @@ Authors of this application are NOT responsible for lost data. Forced style - - - Forced UI colors - - You can override some colors defined by your skin here. Some colors are used dynamically throughout the application. @@ -5897,7 +5917,7 @@ Description: %3 - Force UI colors defined in skin + Use skin colors @@ -6218,13 +6238,13 @@ Also, there are some built-in sounds. Just start typing ":" and they w SkinFactory - - + + This page was blocked by AdBlock - + Blocked URL: "%1"<br/>Used filter: "%2" @@ -6273,27 +6293,27 @@ Also, there are some built-in sounds. Just start typing ":" and they w - + Cannot save data for feed: %1 - + JSON error '%1' - + XML is not well-formed, %1 - + XML feed file format unrecognized - + Cannot move feed, detailed information was logged via debug log. @@ -6305,12 +6325,12 @@ Type: %3 - + Cannot save feed data - + Cannot move feed diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml index b85f41edd..1bc84c5c0 100644 --- a/resources/desktop/com.github.rssguard.appdata.xml +++ b/resources/desktop/com.github.rssguard.appdata.xml @@ -26,7 +26,7 @@ https://github.com/sponsors/martinrotter - + none