diff --git a/localization/rssguard-cs_CZ.ts b/localization/rssguard-cs_CZ.ts index 9f22ca8b0..7abc8dbb2 100644 --- a/localization/rssguard-cs_CZ.ts +++ b/localization/rssguard-cs_CZ.ts @@ -1,6 +1,6 @@ - + Application @@ -9,23 +9,23 @@ Output directory is not writable. - + Cílový adresář není zapisovatelný. Settings file not copied to output directory successfully. - + Soubor nastavení nebyl zkopírován do cílového adresáře. Database file not copied to output directory successfully. - + Soubor databáze nebyl zkopírován do cílového adresáře. Database restoration was not initiated. Make sure that output directory is writable. - + Obnovení databáze nebylo spuštěno. Ujistěte se, že cílový adresář je zapisovatelný. Settings restoration was not initiated. Make sure that output directory is writable. - + Obnovení nastavení nebylo spuštěno. Ujistěte se, že cílový adresář je zapisovatelný. @@ -50,7 +50,7 @@ Selected database does not exist (yet). - + Zvolená databáze (zatím) neexistuje. @@ -128,23 +128,23 @@ Tato stránka obsahuje %n kanálů. Open &directory - + &Otevřít adresář Cannot open file - + Soubor nelze otevřít Cannot open output file. Open it manually. - + Výstupní soubor nelze otevří, otevřete jej ručně. Cannot open directory - + Adresář nelze otevřít Cannot open output directory. Open it manually. - + Výstupní adresář nelze otevří, otevřete jej ručně. @@ -240,7 +240,7 @@ Tato stránka obsahuje %n kanálů. Error when loading initial feeds - + Chyba při načítání úvodních kanálů @@ -255,7 +255,7 @@ Tato stránka obsahuje %n kanálů. Category - + Kategorie @@ -267,10 +267,12 @@ Tato stránka obsahuje %n kanálů. Titles of feeds/categories. + Feed list header "titles" column tooltip. Názvy kanálů/kategorií. Counts of unread/all meesages. + Feed list header "counts" column tooltip. Počty nepřečtených/všech zpráviček. @@ -462,27 +464,27 @@ Automatický update: %5 You cannot update all items because another another critical operation is ongoing. - + Nelze aktualizovat všechny položky, protože už běží jiná kritická operace. You cannot update selected items because another critical operation is ongoing. - + Nelze aktualizovat vybrané položky, protože už běží jiná kritická operace. You cannot add new standard category now because another critical operation is ongoing. - + Nelze přidat novou kategorii, protože už běží jiná kritická operace. You cannot add new standard feed now because another critical operation is ongoing. - + Nelze přidat nový kanál, protože už běží jiná kritická operace. Selected item cannot be edited because another critical operation is ongoing. - + Nelze editovat vybranou položku, protože už běží jiná kritická operace. Selected item cannot be deleted because another critical operation is ongoing. - + Nelze smazat vybranou položku, protože už běží jiná kritická operace. @@ -617,27 +619,27 @@ Automatický update: %5 Backup failed. - + Zálohování selhalo. Output directory - + Výstupní adresář &Select directory - &Zvolit adresář + &Zvolit adresář Backup was created successfully and stored in target directory. - + Záloha byla vytvořena a uložena ve výstupním adresáři. Select destination directory - + Zvolit výstupní adresář Good destination directory is specified. - + Je zvolen vhodný výstupní adresář. @@ -1037,23 +1039,23 @@ Automatický update: %5 Icon fetched successfully. - + Ikona úspěšně stažena. Icon metadata fetched. - + Metadata ikony načtena. Icon metatada not fetched. - + Metadata ikony nenačtena. No icon fetched. - + Ikona nestažena. Fetch icon from feed - + Stáhnout ikonu online z kanálu @@ -1618,7 +1620,9 @@ Automatický update: %5 Language - Language settings section. + Language settings section. +---------- +Language column of language list. Lokalizace @@ -1676,10 +1680,12 @@ Automatický update: %5 Code + Lang. code column of language list. Kód Version + Version column of skin list. Verze @@ -1753,6 +1759,7 @@ Automatický update: %5 Name + Skin list name column. Název @@ -2184,7 +2191,7 @@ MySQL backend will automatically use database with name "rssguard". Do Working database - + Mouse gestures work with middle mouse button. Possible gestures are: • previous web page (drag mouse left), • next web page (drag mouse right), @@ -2216,7 +2223,7 @@ MySQL backend will automatically use database with name "rssguard". Do Select client - + Placeholders: • %1 - title of selected message, • %2 - body of selected message. @@ -2379,8 +2386,8 @@ Přejít na web aplikace a stáhnout jej ručně. IOFactory - Cannot open file '%s' for reading. - + Cannot open file '%1' for reading. + Soubor '%1' nelze otevřít pro čtení. @@ -2394,42 +2401,52 @@ Přejít na web aplikace a stáhnout jej ručně. MessagesModel Id + Tooltip for ID of message. Read + Tooltip for "read" column in msg list. Přečteno Deleted + Tooltip for "deleted" column in msg list. Smazáno Important + Tooltip for "important" column in msg list. Důležité Feed + Tooltip for name of feed for message. Kanál Title + Tooltip for title of message. Nadpis Url + Tooltip for url of message. Author + Tooltip for author of message. Autor Created on + Tooltip for creation date of message. Vytvořeno Contents + Tooltip for contents of message. Obsah @@ -2474,6 +2491,7 @@ Přejít na web aplikace a stáhnout jej ručně. Permanently deleted + Tooltip for "pdeleted" column in msg list. Permanentně smazáno @@ -2482,6 +2500,7 @@ Přejít na web aplikace a stáhnout jej ručně. Attachments + Tooltip for attachments of message. Přílohy @@ -2655,19 +2674,19 @@ Přejít na web aplikace a stáhnout jej ručně. Load initial feeds - - - - Your started %1 for the first time, now you can load initial set of feeds. - + Načíst úvodní kanály Do you want to load initial set of feeds? - + Chcete načíst úvodní set kanálů? LANG_NAME Name of language, e.g. English. + Čeština + + + You started %1 for the first time, now you can load initial set of feeds. @@ -3022,7 +3041,7 @@ Nepřečtené zprávy: %2 Search "%1" via Google... - + Hledat "%1" přes Google... diff --git a/localization/rssguard-de_DE.ts b/localization/rssguard-de_DE.ts index 3e0355184..b91c51109 100644 --- a/localization/rssguard-de_DE.ts +++ b/localization/rssguard-de_DE.ts @@ -1,6 +1,6 @@ - + Application @@ -260,10 +260,12 @@ This website contains %n feed(s). Titles of feeds/categories. + Feed list header "titles" column tooltip. Titel der Feeds/Kategorien. Counts of unread/all meesages. + Feed list header "counts" column tooltip. Anzahl ungelesener/aller Nachrichten. @@ -1601,7 +1603,9 @@ Auto-update status: %5 Language - Language settings section. + Language settings section. +---------- +Language column of language list. Sprache @@ -1659,10 +1663,12 @@ Auto-update status: %5 Code + Lang. code column of language list. Code Version + Version column of skin list. Version @@ -1736,6 +1742,7 @@ Auto-update status: %5 Name + Skin list name column. Name @@ -2155,7 +2162,7 @@ MySQL backend will automatically use database with name "rssguard". Do Working database - + Mouse gestures work with middle mouse button. Possible gestures are: • previous web page (drag mouse left), • next web page (drag mouse right), @@ -2187,7 +2194,7 @@ MySQL backend will automatically use database with name "rssguard". Do Select client - + Placeholders: • %1 - title of selected message, • %2 - body of selected message. @@ -2352,7 +2359,7 @@ Go to application website to obtain it manually. IOFactory - Cannot open file '%s' for reading. + Cannot open file '%1' for reading. @@ -2367,42 +2374,52 @@ Go to application website to obtain it manually. MessagesModel Id + Tooltip for ID of message. ID Read + Tooltip for "read" column in msg list. Lesen Deleted + Tooltip for "deleted" column in msg list. Gelöscht Important + Tooltip for "important" column in msg list. Wichtig Feed + Tooltip for name of feed for message. Feed Title + Tooltip for title of message. Titel Url + Tooltip for url of message. Url Author + Tooltip for author of message. Author Created on + Tooltip for creation date of message. Erstellt am Contents + Tooltip for contents of message. Inhalt @@ -2447,6 +2464,7 @@ Go to application website to obtain it manually. Permanently deleted + Tooltip for "pdeleted" column in msg list. @@ -2455,6 +2473,7 @@ Go to application website to obtain it manually. Attachments + Tooltip for attachments of message. @@ -2630,10 +2649,6 @@ Go to application website to obtain it manually. Load initial feeds - - Your started %1 for the first time, now you can load initial set of feeds. - - Do you want to load initial set of feeds? @@ -2643,6 +2658,10 @@ Go to application website to obtain it manually. Name of language, e.g. English. + + You started %1 for the first time, now you can load initial set of feeds. + + ShortcutCatcher diff --git a/localization/rssguard-en_GB.ts b/localization/rssguard-en_GB.ts index b33f894b0..03ecc6a72 100644 --- a/localization/rssguard-en_GB.ts +++ b/localization/rssguard-en_GB.ts @@ -1,6 +1,6 @@ - + Application @@ -260,10 +260,12 @@ This website contains %n feed(s). Titles of feeds/categories. + Feed list header "titles" column tooltip. Counts of unread/all meesages. + Feed list header "counts" column tooltip. @@ -1601,7 +1603,9 @@ Auto-update status: %5 Language - Language settings section. + Language settings section. +---------- +Language column of language list. @@ -1659,10 +1663,12 @@ Auto-update status: %5 Code + Lang. code column of language list. Version + Version column of skin list. @@ -1736,6 +1742,7 @@ Auto-update status: %5 Name + Skin list name column. @@ -2153,7 +2160,7 @@ MySQL backend will automatically use database with name "rssguard". Do Working database - + Mouse gestures work with middle mouse button. Possible gestures are: • previous web page (drag mouse left), • next web page (drag mouse right), @@ -2185,7 +2192,7 @@ MySQL backend will automatically use database with name "rssguard". Do Select client - + Placeholders: • %1 - title of selected message, • %2 - body of selected message. @@ -2347,7 +2354,7 @@ Go to application website to obtain it manually. IOFactory - Cannot open file '%s' for reading. + Cannot open file '%1' for reading. @@ -2362,42 +2369,52 @@ Go to application website to obtain it manually. MessagesModel Id + Tooltip for ID of message. Read + Tooltip for "read" column in msg list. Deleted + Tooltip for "deleted" column in msg list. Important + Tooltip for "important" column in msg list. Feed + Tooltip for name of feed for message. Title + Tooltip for title of message. Url + Tooltip for url of message. Author + Tooltip for author of message. Created on + Tooltip for creation date of message. Contents + Tooltip for contents of message. @@ -2442,6 +2459,7 @@ Go to application website to obtain it manually. Permanently deleted + Tooltip for "pdeleted" column in msg list. @@ -2450,6 +2468,7 @@ Go to application website to obtain it manually. Attachments + Tooltip for attachments of message. @@ -2625,10 +2644,6 @@ Go to application website to obtain it manually. Load initial feeds - - Your started %1 for the first time, now you can load initial set of feeds. - - Do you want to load initial set of feeds? @@ -2638,6 +2653,10 @@ Go to application website to obtain it manually. Name of language, e.g. English. + + You started %1 for the first time, now you can load initial set of feeds. + + ShortcutCatcher diff --git a/localization/rssguard-en_US.ts b/localization/rssguard-en_US.ts index a653d0169..cb8b87588 100644 --- a/localization/rssguard-en_US.ts +++ b/localization/rssguard-en_US.ts @@ -1,6 +1,6 @@ - + Application @@ -323,11 +323,13 @@ This website contains %n feed(s). Titles of feeds/categories. + Feed list header "titles" column tooltip. Counts of unread/all meesages. + Feed list header "counts" column tooltip. @@ -1995,7 +1997,9 @@ Auto-update status: %5 Language - Language settings section. + Language settings section. +---------- +Language column of language list. @@ -2305,7 +2309,7 @@ Authors of this application are NOT responsible for lost data. Select client - + Placeholders: • %1 - title of selected message, @@ -2467,7 +2471,7 @@ MySQL backend will automatically use database with name "rssguard". Do &Show password - + Mouse gestures work with middle mouse button. Possible gestures are: • previous web page (drag mouse left), @@ -2489,12 +2493,14 @@ MySQL backend will automatically use database with name "rssguard". Do Code + Lang. code column of language list. Version + Version column of skin list. @@ -2511,6 +2517,7 @@ MySQL backend will automatically use database with name "rssguard". Do Name + Skin list name column. @@ -2934,7 +2941,7 @@ currently installed one. IOFactory - Cannot open file '%s' for reading. + Cannot open file '%1' for reading. @@ -2951,61 +2958,73 @@ currently installed one. Id + Tooltip for ID of message. Read + Tooltip for "read" column in msg list. Deleted + Tooltip for "deleted" column in msg list. Important + Tooltip for "important" column in msg list. Feed + Tooltip for name of feed for message. Title + Tooltip for title of message. Url + Tooltip for url of message. Author + Tooltip for author of message. Created on + Tooltip for creation date of message. Contents + Tooltip for contents of message. Permanently deleted + Tooltip for "pdeleted" column in msg list. Attachments + Tooltip for attachments of message. @@ -3279,7 +3298,7 @@ currently installed one. - Your started %1 for the first time, now you can load initial set of feeds. + You started %1 for the first time, now you can load initial set of feeds. diff --git a/localization/rssguard-fr_FR.ts b/localization/rssguard-fr_FR.ts index 89927c996..126827619 100644 --- a/localization/rssguard-fr_FR.ts +++ b/localization/rssguard-fr_FR.ts @@ -1,6 +1,6 @@ - + Application @@ -260,10 +260,12 @@ This website contains %n feed(s). Titles of feeds/categories. + Feed list header "titles" column tooltip. Titres des flux/catégories. Counts of unread/all meesages. + Feed list header "counts" column tooltip. Nombre des messages lus/non-lus. @@ -1602,7 +1604,9 @@ Auto-update status: %5 Language - Language settings section. + Language settings section. +---------- +Language column of language list. Langage @@ -1660,10 +1664,12 @@ Auto-update status: %5 Code + Lang. code column of language list. Code Version + Version column of skin list. Version @@ -1737,6 +1743,7 @@ Auto-update status: %5 Name + Skin list name column. Nom @@ -2166,7 +2173,7 @@ MySQL backend will automatically use database with name "rssguard". Do Working database - + Mouse gestures work with middle mouse button. Possible gestures are: • previous web page (drag mouse left), • next web page (drag mouse right), @@ -2198,7 +2205,7 @@ MySQL backend will automatically use database with name "rssguard". Do Select client - + Placeholders: • %1 - title of selected message, • %2 - body of selected message. @@ -2364,7 +2371,7 @@ Aller sur le site de l'application pour les obtenir manuellement. IOFactory - Cannot open file '%s' for reading. + Cannot open file '%1' for reading. @@ -2379,42 +2386,52 @@ Aller sur le site de l'application pour les obtenir manuellement.MessagesModel Id + Tooltip for ID of message. Id Read + Tooltip for "read" column in msg list. Lire Deleted + Tooltip for "deleted" column in msg list. Supprimé Important + Tooltip for "important" column in msg list. Important Feed + Tooltip for name of feed for message. Flux Title + Tooltip for title of message. Titre Url + Tooltip for url of message. Url Author + Tooltip for author of message. Auteur Created on + Tooltip for creation date of message. Crée sur Contents + Tooltip for contents of message. Contenus @@ -2459,6 +2476,7 @@ Aller sur le site de l'application pour les obtenir manuellement. Permanently deleted + Tooltip for "pdeleted" column in msg list. @@ -2467,6 +2485,7 @@ Aller sur le site de l'application pour les obtenir manuellement. Attachments + Tooltip for attachments of message. @@ -2642,10 +2661,6 @@ Aller sur le site de l'application pour les obtenir manuellement.Load initial feeds - - Your started %1 for the first time, now you can load initial set of feeds. - - Do you want to load initial set of feeds? @@ -2655,6 +2670,10 @@ Aller sur le site de l'application pour les obtenir manuellement.Name of language, e.g. English. + + You started %1 for the first time, now you can load initial set of feeds. + + ShortcutCatcher diff --git a/localization/rssguard-it_IT.ts b/localization/rssguard-it_IT.ts index cdd8155ac..16d3ddfe1 100644 --- a/localization/rssguard-it_IT.ts +++ b/localization/rssguard-it_IT.ts @@ -1,6 +1,6 @@ - + Application @@ -260,10 +260,12 @@ This website contains %n feed(s). Titles of feeds/categories. + Feed list header "titles" column tooltip. Titoli dei feed/categorie. Counts of unread/all meesages. + Feed list header "counts" column tooltip. Conteggio dei messaggi non letti/tutti. @@ -1601,7 +1603,9 @@ Auto-update status: %5 Language - Language settings section. + Language settings section. +---------- +Language column of language list. Lingua @@ -1659,10 +1663,12 @@ Auto-update status: %5 Code + Lang. code column of language list. Codice Version + Version column of skin list. Versione @@ -1736,6 +1742,7 @@ Auto-update status: %5 Name + Skin list name column. Nome @@ -2155,7 +2162,7 @@ MySQL backend will automatically use database with name "rssguard". Do Working database - + Mouse gestures work with middle mouse button. Possible gestures are: • previous web page (drag mouse left), • next web page (drag mouse right), @@ -2187,7 +2194,7 @@ MySQL backend will automatically use database with name "rssguard". Do Select client - + Placeholders: • %1 - title of selected message, • %2 - body of selected message. @@ -2352,7 +2359,7 @@ Go to application website to obtain it manually. IOFactory - Cannot open file '%s' for reading. + Cannot open file '%1' for reading. @@ -2367,42 +2374,52 @@ Go to application website to obtain it manually. MessagesModel Id + Tooltip for ID of message. Id Read + Tooltip for "read" column in msg list. Leggi Deleted + Tooltip for "deleted" column in msg list. Eliminato Important + Tooltip for "important" column in msg list. Importante Feed + Tooltip for name of feed for message. Feed Title + Tooltip for title of message. Titolo Url + Tooltip for url of message. Url Author + Tooltip for author of message. Autore Created on + Tooltip for creation date of message. Creato il Contents + Tooltip for contents of message. Contenuti @@ -2447,6 +2464,7 @@ Go to application website to obtain it manually. Permanently deleted + Tooltip for "pdeleted" column in msg list. @@ -2455,6 +2473,7 @@ Go to application website to obtain it manually. Attachments + Tooltip for attachments of message. @@ -2630,10 +2649,6 @@ Go to application website to obtain it manually. Load initial feeds - - Your started %1 for the first time, now you can load initial set of feeds. - - Do you want to load initial set of feeds? @@ -2643,6 +2658,10 @@ Go to application website to obtain it manually. Name of language, e.g. English. + + You started %1 for the first time, now you can load initial set of feeds. + + ShortcutCatcher diff --git a/localization/rssguard-nl_NL.ts b/localization/rssguard-nl_NL.ts index 9eb200f6f..0cec818fd 100644 --- a/localization/rssguard-nl_NL.ts +++ b/localization/rssguard-nl_NL.ts @@ -1,6 +1,6 @@ - + Application @@ -262,10 +262,12 @@ Deze website bevat % n feed(s). Titles of feeds/categories. + Feed list header "titles" column tooltip. Naam van feeds/categorieën. Counts of unread/all meesages. + Feed list header "counts" column tooltip. Aantal van alle ongelezen berichten. @@ -1611,7 +1613,9 @@ Exporteer feeds die je wilt van het geselecteerde bestand. Language - Language settings section. + Language settings section. +---------- +Language column of language list. Taal @@ -1669,10 +1673,12 @@ Exporteer feeds die je wilt van het geselecteerde bestand. Code + Lang. code column of language list. Code Version + Version column of skin list. Versie @@ -1746,6 +1752,7 @@ Exporteer feeds die je wilt van het geselecteerde bestand. Name + Skin list name column. Naam @@ -2181,7 +2188,7 @@ MySQL backend maakt automatisch gebruik van databank met de naam "rssguard& Working database - + Mouse gestures work with middle mouse button. Possible gestures are: • previous web page (drag mouse left), • next web page (drag mouse right), @@ -2213,7 +2220,7 @@ MySQL backend maakt automatisch gebruik van databank met de naam "rssguard& Select client - + Placeholders: • %1 - title of selected message, • %2 - body of selected message. @@ -2379,7 +2386,7 @@ Ga naar RRSguard website en download het handmatig. IOFactory - Cannot open file '%s' for reading. + Cannot open file '%1' for reading. @@ -2394,42 +2401,52 @@ Ga naar RRSguard website en download het handmatig. MessagesModel Id + Tooltip for ID of message. ld Read + Tooltip for "read" column in msg list. Lees Deleted + Tooltip for "deleted" column in msg list. verwijder Important + Tooltip for "important" column in msg list. Belangrijk Feed + Tooltip for name of feed for message. Feed Title + Tooltip for title of message. Titel Url + Tooltip for url of message. Url Author + Tooltip for author of message. Auteur Created on + Tooltip for creation date of message. Gemaakt op Contents + Tooltip for contents of message. Inhoud @@ -2474,6 +2491,7 @@ Ga naar RRSguard website en download het handmatig. Permanently deleted + Tooltip for "pdeleted" column in msg list. Definitief verwijderd @@ -2482,6 +2500,7 @@ Ga naar RRSguard website en download het handmatig. Attachments + Tooltip for attachments of message. Bijlagen @@ -2657,10 +2676,6 @@ Ga naar RRSguard website en download het handmatig. Load initial feeds - - Your started %1 for the first time, now you can load initial set of feeds. - - Do you want to load initial set of feeds? @@ -2670,6 +2685,10 @@ Ga naar RRSguard website en download het handmatig. Name of language, e.g. English. + + You started %1 for the first time, now you can load initial set of feeds. + + ShortcutCatcher diff --git a/localization/rssguard-sv_SE.ts b/localization/rssguard-sv_SE.ts index 3ed032737..a0e40ba21 100644 --- a/localization/rssguard-sv_SE.ts +++ b/localization/rssguard-sv_SE.ts @@ -1,6 +1,6 @@ - + Application @@ -262,10 +262,12 @@ Denna webbsida innehåller %1 flöden. Titles of feeds/categories. + Feed list header "titles" column tooltip. Namn på kategorier/flöden. Counts of unread/all meesages. + Feed list header "counts" column tooltip. Antal meddelanden. @@ -1609,7 +1611,9 @@ Uppdateringsstatus: %5 Language - Language settings section. + Language settings section. +---------- +Language column of language list. Språk @@ -1667,10 +1671,12 @@ Uppdateringsstatus: %5 Code + Lang. code column of language list. Språkkod Version + Version column of skin list. Version @@ -1744,6 +1750,7 @@ Uppdateringsstatus: %5 Name + Skin list name column. Namn @@ -2178,7 +2185,7 @@ MySQL-gränssnittet använder automatiskt en datbas med namnet "rssguard&qu Working database Arbetsdatabas - + Mouse gestures work with middle mouse button. Possible gestures are: • previous web page (drag mouse left), • next web page (drag mouse right), @@ -2214,7 +2221,7 @@ MySQL-gränssnittet använder automatiskt en datbas med namnet "rssguard&qu Select client Välj klient - + Placeholders: • %1 - title of selected message, • %2 - body of selected message. @@ -2381,7 +2388,7 @@ Gå till programmets hemsida för att hämta den manuellt. IOFactory - Cannot open file '%s' for reading. + Cannot open file '%1' for reading. @@ -2396,42 +2403,52 @@ Gå till programmets hemsida för att hämta den manuellt. MessagesModel Id + Tooltip for ID of message. ID Read + Tooltip for "read" column in msg list. Läst Deleted + Tooltip for "deleted" column in msg list. Borttaget Important + Tooltip for "important" column in msg list. Viktigt Feed + Tooltip for name of feed for message. Flöde Title + Tooltip for title of message. Titel Url + Tooltip for url of message. URL Author + Tooltip for author of message. Författare Created on + Tooltip for creation date of message. Skapad Contents + Tooltip for contents of message. Innehåll @@ -2476,6 +2493,7 @@ Gå till programmets hemsida för att hämta den manuellt. Permanently deleted + Tooltip for "pdeleted" column in msg list. Permanent borttagna @@ -2484,6 +2502,7 @@ Gå till programmets hemsida för att hämta den manuellt. Attachments + Tooltip for attachments of message. Bilagor @@ -2659,10 +2678,6 @@ Gå till programmets hemsida för att hämta den manuellt. Load initial feeds - - Your started %1 for the first time, now you can load initial set of feeds. - - Do you want to load initial set of feeds? @@ -2672,6 +2687,10 @@ Gå till programmets hemsida för att hämta den manuellt. Name of language, e.g. English. + + You started %1 for the first time, now you can load initial set of feeds. + + ShortcutCatcher diff --git a/src/main.cpp b/src/main.cpp index b595be4db..10658a987 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -113,7 +113,7 @@ int main(int argc, char *argv[]) { qApp->settings()->setValue(GROUP(General), General::FirstRun, false); if (MessageBox::show(&main_window, QMessageBox::Question, QObject::tr("Load initial feeds"), - QObject::tr("Your started %1 for the first time, now you can load initial set of feeds.").arg(APP_NAME), + QObject::tr("You started %1 for the first time, now you can load initial set of feeds.").arg(APP_NAME), QObject::tr("Do you want to load initial set of feeds?"), QString(), QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) { qApp->mainForm()->tabWidget()->feedMessageViewer()->loadInitialFeeds(); diff --git a/src/miscellaneous/iofactory.cpp b/src/miscellaneous/iofactory.cpp index 1ebea3225..8beaeb902 100755 --- a/src/miscellaneous/iofactory.cpp +++ b/src/miscellaneous/iofactory.cpp @@ -46,7 +46,7 @@ QByteArray IOFactory::readTextFile(const QString &file_path) { return input_data; } else { - throw IOException(tr("Cannot open file '%s' for reading.").arg(QDir::toNativeSeparators(file_path))); + throw IOException(tr("Cannot open file '%1' for reading.").arg(QDir::toNativeSeparators(file_path))); } } diff --git a/src/network-web/basenetworkaccessmanager.cpp b/src/network-web/basenetworkaccessmanager.cpp index 5d5c54d30..c2bd27dc9 100755 --- a/src/network-web/basenetworkaccessmanager.cpp +++ b/src/network-web/basenetworkaccessmanager.cpp @@ -27,7 +27,6 @@ BaseNetworkAccessManager::BaseNetworkAccessManager(QObject *parent) : QNetworkAccessManager(parent) { connect(this, SIGNAL(sslErrors(QNetworkReply*,QList)), this, SLOT(onSslErrors(QNetworkReply*,QList))); - loadSettings(); } @@ -42,28 +41,28 @@ void BaseNetworkAccessManager::loadSettings() { if (selected_proxy_type == QNetworkProxy::NoProxy) { // No extra setting is needed, set new proxy and exit this method. setProxy(QNetworkProxy::NoProxy); - return; } else if (selected_proxy_type == QNetworkProxy::DefaultProxy) { setProxy(QNetworkProxy::applicationProxy()); - return; } + else { - Settings *settings = qApp->settings(); + Settings *settings = qApp->settings(); - // Custom proxy is selected, set it up. - new_proxy.setType(selected_proxy_type); - new_proxy.setHostName(settings->value(GROUP(Proxy), SETTING(Proxy::Host)).toString()); - new_proxy.setPort(settings->value(GROUP(Proxy), SETTING(Proxy::Port)).toInt()); - new_proxy.setUser(settings->value(GROUP(Proxy), SETTING(Proxy::Username)).toString()); - new_proxy.setPassword(settings->value(GROUP(Proxy), SETTING(Proxy::Password)).toString()); - setProxy(new_proxy); + // Custom proxy is selected, set it up. + new_proxy.setType(selected_proxy_type); + new_proxy.setHostName(settings->value(GROUP(Proxy), SETTING(Proxy::Host)).toString()); + new_proxy.setPort(settings->value(GROUP(Proxy), SETTING(Proxy::Port)).toInt()); + new_proxy.setUser(settings->value(GROUP(Proxy), SETTING(Proxy::Username)).toString()); + new_proxy.setPassword(settings->value(GROUP(Proxy), SETTING(Proxy::Password)).toString()); + setProxy(new_proxy); + } qDebug("Settings of BaseNetworkAccessManager loaded."); } void BaseNetworkAccessManager::onSslErrors(QNetworkReply *reply, const QList &error) { - qDebug("SSL errors for '%s': '%s' (code %d).", qPrintable(reply->url().toString()), qPrintable(reply->errorString()), (int) reply->error()); + qWarning("SSL errors for '%s': '%s' (code %d).", qPrintable(reply->url().toString()), qPrintable(reply->errorString()), (int) reply->error()); reply->ignoreSslErrors(error); } diff --git a/src/network-web/basenetworkaccessmanager.h b/src/network-web/basenetworkaccessmanager.h index 2b170092b..21ab4846f 100755 --- a/src/network-web/basenetworkaccessmanager.h +++ b/src/network-web/basenetworkaccessmanager.h @@ -36,6 +36,7 @@ class BaseNetworkAccessManager : public QNetworkAccessManager { virtual void loadSettings(); protected slots: + // Called when some SSL-related errors are detected. void onSslErrors(QNetworkReply *reply, const QList &error); protected: diff --git a/src/network-web/discoverfeedsbutton.cpp b/src/network-web/discoverfeedsbutton.cpp index 263fb3c69..6b344925b 100644 --- a/src/network-web/discoverfeedsbutton.cpp +++ b/src/network-web/discoverfeedsbutton.cpp @@ -41,6 +41,7 @@ void DiscoverFeedsButton::setFeedAddresses(const QStringList &addresses) { tr("Click me to add feeds from this website.\nThis website contains %n feed(s).", 0, addresses.size())); if (menu() == NULL) { + // Initialize the menu. setMenu(new QMenu(this)); connect(menu(), SIGNAL(triggered(QAction*)), this, SLOT(linkTriggered(QAction*))); } diff --git a/src/network-web/discoverfeedsbutton.h b/src/network-web/discoverfeedsbutton.h index a1acadf4d..eb15cd7b1 100644 --- a/src/network-web/discoverfeedsbutton.h +++ b/src/network-web/discoverfeedsbutton.h @@ -25,16 +25,20 @@ class DiscoverFeedsButton : public QToolButton { Q_OBJECT public: + // Constructors. explicit DiscoverFeedsButton(QWidget *parent = 0); virtual ~DiscoverFeedsButton(); + // Feed addresses manipulators. void clearFeedAddresses(); void setFeedAddresses(const QStringList &addresses); private slots: + // User chose any of addresses. void linkTriggered(QAction *action); signals: + // User requests addition of selected address. void addingOfFeedRequested(const QString &feed_link); }; diff --git a/src/network-web/downloader.cpp b/src/network-web/downloader.cpp index 05b23bb79..ad0154946 100755 --- a/src/network-web/downloader.cpp +++ b/src/network-web/downloader.cpp @@ -68,7 +68,7 @@ void Downloader::downloadFile(const QString &url, int timeout, bool protected_co } void Downloader::finished() { - QNetworkReply *reply = static_cast(sender()); + QNetworkReply *reply = qobject_cast(sender()); m_timer->stop(); diff --git a/src/network-web/downloader.h b/src/network-web/downloader.h index 84f9f7388..8cbdf0366 100755 --- a/src/network-web/downloader.h +++ b/src/network-web/downloader.h @@ -73,6 +73,7 @@ class Downloader : public QObject { QTimer *m_timer; QHash m_customHeaders; + // Response data. QByteArray m_lastOutputData; QNetworkReply::NetworkError m_lastOutputError; QVariant m_lastContentType; diff --git a/src/network-web/downloadmanager.h b/src/network-web/downloadmanager.h index 699280b73..e8af5f5af 100644 --- a/src/network-web/downloadmanager.h +++ b/src/network-web/downloadmanager.h @@ -36,10 +36,12 @@ class QMimeData; class DownloadItem : public QWidget { Q_OBJECT + // Friends of this class. friend class DownloadManager; friend class DownloadModel; public: + // Constructors. explicit DownloadItem(QNetworkReply *reply = 0, QWidget *parent = 0); virtual ~DownloadItem(); @@ -65,7 +67,7 @@ class DownloadItem : public QWidget { signals: void statusChanged(); - void progress(qint64 bytesReceived, qint64 bytesTotal); + void progress(qint64 bytes_received, qint64 bytes_total); void downloadFinished(); private: