From 30ebb702b9d650ce1a9bc80e93fa5cac59f03749 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Wed, 16 Dec 2015 19:09:55 +0100 Subject: [PATCH] Langs + some UI TT-RSS stuff. --- localization/rssguard-cs_CZ.ts | 20 +- localization/rssguard-da_DK.ts | 16 +- localization/rssguard-de_DE.ts | 16 +- localization/rssguard-en_GB.ts | 16 +- localization/rssguard-en_US.ts | 16 +- localization/rssguard-fr_FR.ts | 16 +- localization/rssguard-it_IT.ts | 16 +- localization/rssguard-nl_NL.ts | 108 +++++---- localization/rssguard-sv_SE.ts | 236 +++++++++++--------- src/services/tt-rss/gui/formeditaccount.cpp | 4 +- 10 files changed, 299 insertions(+), 165 deletions(-) diff --git a/localization/rssguard-cs_CZ.ts b/localization/rssguard-cs_CZ.ts index 432b7feff..24fb98c72 100644 --- a/localization/rssguard-cs_CZ.ts +++ b/localization/rssguard-cs_CZ.ts @@ -970,14 +970,18 @@ or this functionality is not implemented yet. URL cannot be empty. URL nemůže být prázdné. - - URL must end with "api/". - URL musí končit na "api/". - URL is okay. URL je v pořádku. + + Note that at least API level %1 is required. + + + + URL should end with "/api/". + + FormMain @@ -3091,6 +3095,14 @@ na tuto bublinu. Load initial set of feeds Načíst úvodní sadu kanálů + + This service offers integration with Tiny Tiny RSS. + +Tiny Tiny RSS is an open source web-based news feed (RSS/Atom) reader and aggregator, designed to allow you to read news from any location, while feeling as close to a real desktop application as possible. + +At least API level %1 is required. + + RecycleBin diff --git a/localization/rssguard-da_DK.ts b/localization/rssguard-da_DK.ts index 5f0c69ca3..b44743201 100644 --- a/localization/rssguard-da_DK.ts +++ b/localization/rssguard-da_DK.ts @@ -965,11 +965,15 @@ or this functionality is not implemented yet. - URL must end with "api/". + URL is okay. - URL is okay. + Note that at least API level %1 is required. + + + + URL should end with "/api/". @@ -3056,6 +3060,14 @@ version by clicking this popup notification. Load initial set of feeds + + This service offers integration with Tiny Tiny RSS. + +Tiny Tiny RSS is an open source web-based news feed (RSS/Atom) reader and aggregator, designed to allow you to read news from any location, while feeling as close to a real desktop application as possible. + +At least API level %1 is required. + + RecycleBin diff --git a/localization/rssguard-de_DE.ts b/localization/rssguard-de_DE.ts index 847f8aa95..8b3d8ae43 100644 --- a/localization/rssguard-de_DE.ts +++ b/localization/rssguard-de_DE.ts @@ -965,11 +965,15 @@ or this functionality is not implemented yet. - URL must end with "api/". + URL is okay. - URL is okay. + Note that at least API level %1 is required. + + + + URL should end with "/api/". @@ -3060,6 +3064,14 @@ version by clicking this popup notification. Load initial set of feeds + + This service offers integration with Tiny Tiny RSS. + +Tiny Tiny RSS is an open source web-based news feed (RSS/Atom) reader and aggregator, designed to allow you to read news from any location, while feeling as close to a real desktop application as possible. + +At least API level %1 is required. + + RecycleBin diff --git a/localization/rssguard-en_GB.ts b/localization/rssguard-en_GB.ts index fe764b293..0f74b636d 100644 --- a/localization/rssguard-en_GB.ts +++ b/localization/rssguard-en_GB.ts @@ -985,11 +985,15 @@ or this functionality is not implemented yet. - URL must end with "api/". + URL is okay. - URL is okay. + Note that at least API level %1 is required. + + + + URL should end with "/api/". @@ -3078,6 +3082,14 @@ version by clicking this popup notification. Load initial set of feeds + + This service offers integration with Tiny Tiny RSS. + +Tiny Tiny RSS is an open source web-based news feed (RSS/Atom) reader and aggregator, designed to allow you to read news from any location, while feeling as close to a real desktop application as possible. + +At least API level %1 is required. + + RecycleBin diff --git a/localization/rssguard-en_US.ts b/localization/rssguard-en_US.ts index 3845d118c..6b7eb6d01 100644 --- a/localization/rssguard-en_US.ts +++ b/localization/rssguard-en_US.ts @@ -965,11 +965,15 @@ or this functionality is not implemented yet. - URL must end with "api/". + URL is okay. - URL is okay. + Note that at least API level %1 is required. + + + + URL should end with "/api/". @@ -3055,6 +3059,14 @@ version by clicking this popup notification. Load initial set of feeds + + This service offers integration with Tiny Tiny RSS. + +Tiny Tiny RSS is an open source web-based news feed (RSS/Atom) reader and aggregator, designed to allow you to read news from any location, while feeling as close to a real desktop application as possible. + +At least API level %1 is required. + + RecycleBin diff --git a/localization/rssguard-fr_FR.ts b/localization/rssguard-fr_FR.ts index eb307789e..f5e6d5638 100644 --- a/localization/rssguard-fr_FR.ts +++ b/localization/rssguard-fr_FR.ts @@ -965,11 +965,15 @@ or this functionality is not implemented yet. - URL must end with "api/". + URL is okay. - URL is okay. + Note that at least API level %1 is required. + + + + URL should end with "/api/". @@ -3071,6 +3075,14 @@ version by clicking this popup notification. Load initial set of feeds + + This service offers integration with Tiny Tiny RSS. + +Tiny Tiny RSS is an open source web-based news feed (RSS/Atom) reader and aggregator, designed to allow you to read news from any location, while feeling as close to a real desktop application as possible. + +At least API level %1 is required. + + RecycleBin diff --git a/localization/rssguard-it_IT.ts b/localization/rssguard-it_IT.ts index 551cc7fc1..4c3307d2d 100644 --- a/localization/rssguard-it_IT.ts +++ b/localization/rssguard-it_IT.ts @@ -965,11 +965,15 @@ or this functionality is not implemented yet. - URL must end with "api/". + URL is okay. - URL is okay. + Note that at least API level %1 is required. + + + + URL should end with "/api/". @@ -3060,6 +3064,14 @@ version by clicking this popup notification. Load initial set of feeds + + This service offers integration with Tiny Tiny RSS. + +Tiny Tiny RSS is an open source web-based news feed (RSS/Atom) reader and aggregator, designed to allow you to read news from any location, while feeling as close to a real desktop application as possible. + +At least API level %1 is required. + + RecycleBin diff --git a/localization/rssguard-nl_NL.ts b/localization/rssguard-nl_NL.ts index 5542b7c22..b76ea2a66 100644 --- a/localization/rssguard-nl_NL.ts +++ b/localization/rssguard-nl_NL.ts @@ -861,83 +861,83 @@ of deze functie bestaat nog niet. Force execution of server-side update when updating feeds from RSS Guard - + Dwing het uitvoeren van server-side-update bij het bijwerken van RSS Guard feeds HTTP authentication username - + HTTP verificatie gebruikersnaam HTTP authentication password - + HTTP verificatie paswoord Password for your TT-RSS account - + Paswoord voor je TT-RSS account Username for your TT-RSS account - + Gebruikersnaam voor je TT-RSS account FULL URL of your TT-RSS instance WITH trailing "/api/" string - + VOLLEDIG URL van uw TT-RSS bijvoorbeeld met het slepen van de "/ api /" aanvraag No test done yet. - + Nog geen test uitgevoerd. Here, results of connection test are shown. - + Hier, worden resultaten van verbinding getoond. Add new Tiny Tiny RSS account - + Voeg nieuwe Tiny Tiny RSS account toe Edit existing Tiny Tiny RSS account - + Bewerk bestaande Tiny Tiny RSS account API access on selected server is not enabled. - + API toegang op geselecteerde server staat uit. Entered credentials are incorrect. - + Ingevoerde verificatiegegevens zijn onjuist. Other error occurred, contact developers. - + Andere fout opgetreden, contact ontwikkelaars. Selected Tiny Tiny RSS server is running unsupported version of API (%1). At least API level %2 is required. - + Geselecteerde Tiny Tiny RSS server draait een niet- ondersteunde versie van API (%1). Tenminste API level %2 is vereist. Selected Tiny Tiny RSS server is running unsupported version of API. - + Geselecteerde Tiny Tiny RSS-server draait een niet-ondersteunde versie van API. Tiny Tiny RSS server is okay, running with API level %1, while at least API level %2 is required. - + Tiny Tiny RSS server is ok, draait met API level %2, terwijl op z'n minst API level %2 vereist is. Tiny Tiny RSS server is okay. - + Tiny Tiny RSS server is ok. Network error: '%1'. - + Netwerk fout: '%1' Network error, have you entered correct Tiny Tiny RSS API endpoint and password? - + Netwerk fout, heb je de juiste Tiny Tiny RSS API eindpunt en paswoord? Username cannot be empty. - Gebruikersnaam mag niet leeg. + Gebruikersnaam kan niet leeg zijn. Username is okay. @@ -945,11 +945,11 @@ of deze functie bestaat nog niet. Password cannot be empty. - Paswoord mag niet leeg zijn. + Paswoord kan niet leeg zijn. Password is okay. - + Paswoord is ok. Username is ok or it is not needed. @@ -969,14 +969,18 @@ of deze functie bestaat nog niet. URL cannot be empty. - - - - URL must end with "api/". - + Url mag niet leeg zijn. URL is okay. + Url is goed. + + + Note that at least API level %1 is required. + + + + URL should end with "/api/". @@ -1352,23 +1356,23 @@ of deze functie bestaat nog niet. &Accounts - + &Accounts &Add new account - + &Voeg nieuw account toe Status bar - + Statusbalk &Edit selected account - + &Bewerk geselecteerde account &Delete selected account - + &Verwijder geselecteerde account @@ -2871,27 +2875,27 @@ Ga naar RRSguard website en download het handmatig. Loading of messages failed, maybe messages could not be downloaded. - + Laden van berichten mislukt, misschien konden berichten niet worden gedownload. Loading of messages from item '%1' failed. - + Laden van berichten voor item '%1' mislukt. Account ID - + Account ID Custom ID - + Handmatig ID Account ID of the message. - + Account ID van het bericht. Custom ID of the message - + Handmatig ID van het bericht @@ -3099,6 +3103,14 @@ door te clicken op deze popup melding. Load initial set of feeds Laad eerste set van de feeds + + This service offers integration with Tiny Tiny RSS. + +Tiny Tiny RSS is an open source web-based news feed (RSS/Atom) reader and aggregator, designed to allow you to read news from any location, while feeling as close to a real desktop application as possible. + +At least API level %1 is required. + + RecycleBin @@ -3118,7 +3130,9 @@ door te clicken op deze popup melding. Recycle bin %1 - + Prullenbak + +%1 @@ -3126,7 +3140,7 @@ door te clicken op deze popup melding. %n unread message(s). Tooltip for "unread" column of feed list. - + %n ongelezen bericht.%n ongelezen berichten. @@ -3247,7 +3261,9 @@ Auto-update status: %5 This is service account for standard RSS/RDF/ATOM feeds. Account ID: %1 - + Dit is een service account voor standaard RSS/RDF/ATOM feeds. + +Account ID: %1 @@ -3393,11 +3409,17 @@ Username: %1 Server: %2 Last error: %4 Last login on: %5 - + Tiny Tiny RSS + +Account ID: %3 +Gebruikersnaam: %1 +Server: %2 +Laatste fout: %4 +Laatste login: %5 Sync in - + Sync in diff --git a/localization/rssguard-sv_SE.ts b/localization/rssguard-sv_SE.ts index 8e1b8c7e6..fc3850576 100644 --- a/localization/rssguard-sv_SE.ts +++ b/localization/rssguard-sv_SE.ts @@ -492,11 +492,11 @@ Klicka här för att öppna målmappen. You can't transfer dragged item into different account, this is not supported. - + Du kan inte överföra objekt till annat konto med dra & släpp. Stöd saknas för detta. Cannot perform drag & drop operation - + Kan inte utföra dra & släpp-åtgärd @@ -534,36 +534,37 @@ Klicka här för att öppna målmappen. Selected item cannot be edited, this is not (yet?) supported. - + Det valda objektet kan inte redigeras. Stöd saknas (för närvarande?). Deleting "%1" - + Tar bort "%1" You are about to completely delete item "%1". - + Du är på väg att helt ta bort "%1". Are you sure? - + Är du säker? Cannot delete "%1" - + Kan inte ta bort "%1" This item cannot be deleted because something critically failed. Submit bug report. - + Objektet kan inte tas bort på grund av ett kritiskt fel. Skicka gärna en felrapport. This item cannot be deleted, because it does not support it or this functionality is not implemented yet. - + Objektet kan inte tas bort eftersom stöd saknas, eller för +att funktionen inte är implementerad än. Context menu for other items - + Kontextmeny för andra objekt @@ -643,18 +644,18 @@ or this functionality is not implemented yet. <body>%5 is a (very) tiny feed reader.<br><br>This software is distributed under the terms of GNU General Public License, version 3.<br><br>Contacts:<ul><li><a href="mailto://%1">%1</a> ~e-mail</li><li><a href="%2">%2</a> ~website</li></ul>You can obtain source code for %5 from its website.<br><br><br>Copyright (C) 2011-%3 %4</body> - + <body>%5 är en (mycket) liten flödesläsare.<br><br>Mjukvaran distribueras under GNU General Public License, version 3.<br><br>Kontakt:<ul><li><a href="mailto://%1">%1</a> ~e-post</li><li><a href="%2">%2</a> ~webbsida</li></ul>Du kan hämta källkod för %5 från webbsidan.<br><br><br>Copyright (C) 2011-%3 %4</body> FormAddAccount Add new account - + Lägg till nytt konto Details - + Detaljerat Name @@ -674,7 +675,7 @@ or this functionality is not implemented yet. This account can be added only once. - + Kontot kan endast läggas till en gång. @@ -823,7 +824,7 @@ or this functionality is not implemented yet. FormEditAccount Dialog - + Dialog Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported. @@ -831,7 +832,7 @@ or this functionality is not implemented yet. Authentication - + Autentisering Username @@ -843,11 +844,11 @@ or this functionality is not implemented yet. Show password - + Visa lösenord Requires HTTP authentication - + Kräver HTTP-autentisering URL @@ -855,99 +856,99 @@ or this functionality is not implemented yet. &Test setup - + &Testa inställning Force execution of server-side update when updating feeds from RSS Guard - + Utför tvingad körning av serveruppdatering när flöden uppdateras från RSS-Guard HTTP authentication username - + Användarnamn för HTTP-autentisering HTTP authentication password - + Lösenord för HTTP-autentisering Password for your TT-RSS account - + Lösenord för ditt TT RSS-konto Username for your TT-RSS account - + Användarnamn för ditt TT RSS-konto FULL URL of your TT-RSS instance WITH trailing "/api/" string - + FULLSTÄNDIG URL till din TT RSS-instans MED efterföljande API-sträng No test done yet. - + Inget test utfört ännu. Here, results of connection test are shown. - + Här visas resultat av anslutningstest. Add new Tiny Tiny RSS account - + Lägg till nytt Tiny Tiny RSS-konto Edit existing Tiny Tiny RSS account - + Redigera befintligt API access on selected server is not enabled. - + API-åtkomst är inte aktiverad på den valda servern. Entered credentials are incorrect. - + Inloggningsuppgifter är felaktiga. Other error occurred, contact developers. - + Annat fel uppstod! Kontakta utvecklaren. Selected Tiny Tiny RSS server is running unsupported version of API (%1). At least API level %2 is required. - + Den valda Tiny Tiny RSS-servern kör en API-version (%1) som inte stöds. Minst API-nivå %2 krävs. Selected Tiny Tiny RSS server is running unsupported version of API. - + Den valda Tiny Tiny RSS-servern kör en API-version som inte stöds. Tiny Tiny RSS server is okay, running with API level %1, while at least API level %2 is required. - + Tiny Tiny RSS-servern är okay. Den kör API-nivå %1 och minimikravet är nivå %2. Tiny Tiny RSS server is okay. - + Tiny Tiny RSS-servern är okay. Network error: '%1'. - + Nätverksfel: '%1'. Network error, have you entered correct Tiny Tiny RSS API endpoint and password? - + Nätverksfel! Har du angett korrekt Tiny Tiny RSS API-slutpunkt och lösenord? Username cannot be empty. - + Användarnamn saknas. Username is okay. - + Användarnamn okay. Password cannot be empty. - + Lösenord saknas. Password is okay. - + Lösenord okay. Username is ok or it is not needed. @@ -967,14 +968,18 @@ or this functionality is not implemented yet. URL cannot be empty. - - - - URL must end with "api/". - + URL saknas. URL is okay. + URL okay. + + + Note that at least API level %1 is required. + + + + URL should end with "/api/". @@ -1226,123 +1231,123 @@ or this functionality is not implemented yet. Add &new item - + Lägg till &nytt objekt Update &all items - + Uppdatera &alla objekt Update &selected items - + Uppdatera &markerade objekt &Edit selected item - + &Redigera markerade objekt &Delete selected item - + &Ta bort markerade objekt &Mark selected items as read - + &Märk markerade objekt som lästa Mark all messages (without message filters) from selected items as read. - + Märk alla meddelanden (utan meddelandefilter) från markerade objekt som lästa. &Mark selected items as unread - + &Märk markerade objekt som olästa Mark all messages (without message filters) from selected items as unread. - + Märk alla meddelanden (utan meddelandefilter) från markerade objekt som olästa. &Clean selected items - + &Rensa markerade objekt Deletes all messages from selected items. - + Tar bort alla meddelanden från markerade objekt. &Mark all items as &read - + &Märk alla objekt som &lästa Marks all messages in all items read. This does not take message filters into account. - + Märker all meddelanden i alla objekt som lästa. Tar inte hänsyn till meddelandefilter. View selected items in &newspaper mode - + Visa markerade objekt i &tidningsläge Displays all messages from selected item in a new "newspaper mode" tab. Note that messages are not set as read automatically. - + Visar alla meddelanden från markerade objekt i en ny "tidningsvy". Notera att meddelanden inte automatiskt märks som lästa. &Clean all items - + &Rensa alla objekt Deletes all messages from all items. - + Tar bort alla meddelanden från alla objekt Select &next item - + Gå till &nästa objekt Select &previous item - + Gå till &föregående objekt Show only unread items - + Visa endast olästa objekt &Expand/collapse selected item - + &Expandera/Komprimera markerade objekt &Restore selected messages - + &Återställ markerade meddelanden No possible actions - + Inga möjliga åtgärder &Recycle bin(s) - + &Papperskorg(ar) &Restore all recycle bins - + &Återställ alla pappereskorgar &Empty all recycle bins - + &Töm alla papperskorgar Select next &unread message - + Gå till nästa &olästa meddelande No recycle bin - + Ingen papperskorg Restore recycle bin - + Återställ papperskorgen Empty recycle bin - + Töm papperskorgen Feeds && categories @@ -1350,23 +1355,23 @@ or this functionality is not implemented yet. &Accounts - + &Konton &Add new account - + &Lägg till nytt konto Status bar - + Statusfält &Edit selected account - + &Redigera markerat konto &Delete selected account - + &Ta bort markerat konto @@ -2096,11 +2101,11 @@ File filter for external e-mail selection dialog. E-mail - + E-post Enable notifications - + Aktivera aviseringar @@ -2516,7 +2521,7 @@ File filter for external e-mail selection dialog. Requires HTTP authentication - + Kräver HTTP-autentisering @@ -2863,27 +2868,27 @@ Gå till programmets hemsida för att hämta den manuellt. Loading of messages failed, maybe messages could not be downloaded. - + Inläsning av meddelanden misslyckades. Meddelandena kanske inte kan laddas ner. Loading of messages from item '%1' failed. - + Inläsning av meddelanden från '%1' misslyckades. Account ID - + Konto-ID Custom ID - + Anpassat ID Account ID of the message. - + Konto-ID för meddelandet Custom ID of the message - + Anpassat ID för meddelandet @@ -3067,21 +3072,34 @@ Gå till programmets hemsida för att hämta den manuellt. + %n other feeds. - + + %n annat flöde. + ++ %n andra flöden. Welcome to %1. Please, check NEW stuff included in this version by clicking this popup notification. - + Välkommen till %1. + +Kolla in NYA grejer i den här versionen +genom att klicka på denna popup-avisering. Welcome to %1. - + Välkommen till %1. Load initial set of feeds + Läs in inledande flödesuppsättning + + + This service offers integration with Tiny Tiny RSS. + +Tiny Tiny RSS is an open source web-based news feed (RSS/Atom) reader and aggregator, designed to allow you to read news from any location, while feeling as close to a real desktop application as possible. + +At least API level %1 is required. @@ -3103,7 +3121,9 @@ version by clicking this popup notification. Recycle bin %1 - + Papperskorg + +%1 @@ -3111,7 +3131,7 @@ version by clicking this popup notification. %n unread message(s). Tooltip for "unread" column of feed list. - + %n oläst meddelande.%n olästa meddelanden. @@ -3151,7 +3171,7 @@ Denna kategori innehåller inga objekt. Metadata was not fetched because: %1. - + Metadata hämtades inte på grund av: %1 does not use auto-update @@ -3166,7 +3186,7 @@ Denna kategori innehåller inga objekt. uses specific settings (%n minute(s) to next auto-update) Describes feed auto-update status. - + använder specifika inställningar (%n minut till nästa autouppdatering)använder specifika inställningar (%n minuter till nästa autouppdatering) %1 (%2)%3 @@ -3186,7 +3206,7 @@ Uppdateringsstatus: %5 StandardServiceRoot This is obligatory service account for standard RSS/RDF/ATOM feeds. - + Detta är ett obligatoriskt tjänstkonto för standard RSS/RDF/ATOM-flöden. You started %1 for the first time, now you can load initial set of feeds. @@ -3232,7 +3252,9 @@ Uppdateringsstatus: %5 This is service account for standard RSS/RDF/ATOM feeds. Account ID: %1 - + Detta är ett tjänstkonto för standard RSS/RDF/ATOM-flöden. + +Konto-ID: %1 @@ -3258,7 +3280,7 @@ Account ID: %1 anonymous - + anonym @@ -3377,11 +3399,17 @@ Username: %1 Server: %2 Last error: %4 Last login on: %5 - + Tiny Tiny RSS + +Konto-ID: %3 +Användarnamn: %1 +Server: %2 +Senaste fel: %4 +Senast inloggad: %5 Sync in - + Synka i @@ -3461,7 +3489,7 @@ Last login on: %5 You cannot add this feed to %1 because standard RSS/ATOM account is not enabled. Enable it first. - + Detta flöde kan inte läggas till i %1 eftersom standard RSS/ATOM-kontot inte är aktiverat. Aktivera det först. diff --git a/src/services/tt-rss/gui/formeditaccount.cpp b/src/services/tt-rss/gui/formeditaccount.cpp index 9a2662749..9712e501d 100755 --- a/src/services/tt-rss/gui/formeditaccount.cpp +++ b/src/services/tt-rss/gui/formeditaccount.cpp @@ -248,8 +248,8 @@ void FormEditAccount::onUrlChanged() { if (url.isEmpty()) { m_ui->m_txtUrl->setStatus(WidgetWithStatus::Error, tr("URL cannot be empty.")); } - else if (!url.endsWith(QL1S("api/"))) { - m_ui->m_txtUrl->setStatus(WidgetWithStatus::Error, tr("URL must end with \"api/\".")); + else if (!url.endsWith(QL1S("/api/"))) { + m_ui->m_txtUrl->setStatus(WidgetWithStatus::Warning, tr("URL should end with \"/api/\".")); } else { m_ui->m_txtUrl->setStatus(WidgetWithStatus::Ok, tr("URL is okay."));