Skip to content

Commit 9413b5c

Browse files
authored
Minor updates (#233)
2 parents 9dfffcc + 1cfb1e3 commit 9413b5c

32 files changed

+874
-589
lines changed

lib/api/api_helpers.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import 'dart:io';
2222
import 'package:bluecherry_client/api/api.dart';
2323
import 'package:bluecherry_client/models/server.dart';
2424
import 'package:bluecherry_client/providers/server_provider.dart';
25+
import 'package:bluecherry_client/providers/settings_provider.dart';
2526
import 'package:device_info_plus/device_info_plus.dart';
2627
import 'package:flutter/foundation.dart';
2728
import 'package:path_provider/path_provider.dart';
@@ -167,7 +168,7 @@ class DevHttpOverrides extends HttpOverrides {
167168
}
168169
}
169170

170-
return true;
171+
return SettingsProvider.instance.kAllowUntrustedCertificates.value;
171172
};
172173
}
173174
}

lib/l10n/app_en.arb

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,8 @@
425425
"automaticDownloadUpdates": "Automatic download updates",
426426
"automaticDownloadUpdatesDescription": "Be among the first to get the latest updates, fixes and improvements as they roll out.",
427427
"updateHistory": "Update history",
428+
"showReleaseNotes": "Show release notes",
429+
"showReleaseNotesDescription": "Display release notes when a new version is installed",
428430
"newVersionAvailable": "New version available",
429431
"installVersion": "Install",
430432
"downloadVersion": "Download",
@@ -456,15 +458,34 @@
456458
"taskDownloadingEvent": "Downloading event",
457459
"@@@SETTINGS": {},
458460
"defaultField": "Default",
459-
"@@GENERAL": {},
460461
"general": "General",
462+
"generalSettingsSuggestion": "Notifications, Data Usage, Wakelock, etc",
463+
"serverAndDevices": "Servers and Devices",
464+
"serverAndDevicesSettingsSuggestion": "Connect to servers, manage devices, etc",
465+
"eventsAndDownloads": "Events and Downloads",
466+
"eventsAndDownloadsSettingsSuggestion": "Events history, downloads, etc",
467+
"application": "Application",
468+
"applicationSettingsSuggestion": "Appearance, theme, date and time, etc",
469+
"privacyAndSecurity": "Privacy and Security",
470+
"privacyAndSecuritySettingsSuggestion": "Data collection, error reporting, etc",
471+
"updatesAndHelp": "Updates and Help",
472+
"updatesAndHelpSettingsSuggestion": "Check for updates, update history, etc",
473+
"advancedOptions": "Advanced Options",
474+
"advancedOptionsSettingsSuggestion": "Funcionalidades em Beta, Opções de Desenvolvedor, etc",
475+
"@@GENERAL": {},
461476
"cycleTogglePeriod": "Layout cycle toggle period",
462477
"cycleTogglePeriodDescription": "The interval between layout changes when the cycle mode is enabled.",
463478
"notifications": "Notifications",
464479
"notificationsEnabled": "Notifications enabled",
465480
"notificationClickBehavior": "Notification Click Behavior",
466481
"notificationClickBehaviorDescription": "Choose what happens when you click on a notification.",
467482
"showEventsScreen": "Show events history",
483+
"@@@DATA_USAGE": {},
484+
"dataUsage": "Data Usage",
485+
"streamsOnBackground": "Keep streams playing on background",
486+
"streamsOnBackgroundDescription": "When to keep streams playing when the app is in background",
487+
"automatic": "Automatic",
488+
"wifiOnly": "Wifi Only",
468489
"@@EVENTS_AND_DOWNLOADS": {},
469490
"chooseEveryDownloadsLocation": "Choose the location for every download",
470491
"chooseEveryDownloadsLocationDescription": "Whether to choose the location for each download or use the default location. When enabled, you will be prompted to choose the download directory for each download.",
@@ -494,7 +515,6 @@
494515
"convertToLocalTime": "Convert dates to the local timezone",
495516
"convertToLocalTimeDescription": "This will affect the date and time displayed in the app. This is useful when you are in a different timezone than the server. When disabled, the server timezone will be used.",
496517
"@@PRIVACY_AND_SECURITY": {},
497-
"privacyAndSecurity": "Privacy and Security",
498518
"allowDataCollection": "Allow Bluecherry to collect usage data",
499519
"allowDataCollectionDescription": "Allow Bluecherry to collect data to improve the app and provide better services. Data is collected anonymously and does not contain any personal information.",
500520
"automaticallyReportErrors": "Automatically report errors",
@@ -537,6 +557,12 @@
537557
}
538558
}
539559
},
560+
"@@SERVERS": {},
561+
"connectToServerAutomaticallyAtStartup": "Connect automatically at startup",
562+
"connectToServerAutomaticallyAtStartupDescription": "If enabled, the server will be automatically connected when the app starts. This only applies to the new servers you add.",
563+
"allowUntrustedCertificates": "Allow untrusted certificates",
564+
"allowUntrustedCertificatesDescription": "Allow connecting to servers with untrusted certificates. This is useful when you are using self-signed certificates or certificates from unknown authorities.",
565+
"certificateNotPassed": "Certificate not passed",
540566
"@@STREAMING": {},
541567
"streamingSettings": "Streaming settings",
542568
"streamingType": "Streaming type",
@@ -603,5 +629,8 @@
603629
"rackNameExample": "Lab 1",
604630
"openServer": "Open server",
605631
"@SEARCH": {},
606-
"disableSearch": "Disable search"
632+
"disableSearch": "Disable search",
633+
"@@@Updates and Help": {},
634+
"help": "Help",
635+
"licenses": "Licenses"
607636
}

lib/l10n/app_fr.arb

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,8 @@
401401
"automaticDownloadUpdates": "Téléchargement automatique des mises à jour",
402402
"automaticDownloadUpdatesDescription": "Faites parti des premiers à recevoir les dernières mises à jour, correctifs et améliorations quand elles sortent.",
403403
"updateHistory": "Historique de mises à jour",
404+
"showReleaseNotes": "Show release notes",
405+
"showReleaseNotesDescription": "Display release notes when a new version is installed",
404406
"newVersionAvailable": "Nouvelle version disponible",
405407
"installVersion": "Installer",
406408
"downloadVersion": "Télécharger",
@@ -432,15 +434,34 @@
432434
"taskDownloadingEvent": "Téléchargement de l'évènement",
433435
"@@@SETTINGS": {},
434436
"defaultField": "Par défaut",
435-
"@@GENERAL": {},
436437
"general": "Général",
438+
"generalSettingsSuggestion": "Notifications, Data Usage, Wakelock, etc",
439+
"serverAndDevices": "Servers and Devices",
440+
"serverAndDevicesSettingsSuggestion": "Connect to servers, manage devices, etc",
441+
"eventsAndDownloads": "Events and Downloads",
442+
"eventsAndDownloadsSettingsSuggestion": "Events history, downloads, etc",
443+
"application": "Application",
444+
"applicationSettingsSuggestion": "Appearance, theme, date and time, etc",
445+
"privacyAndSecurity": "Sécurité et vie Privée",
446+
"privacyAndSecuritySettingsSuggestion": "Data collection, error reporting, etc",
447+
"updatesAndHelp": "Updates and Help",
448+
"updatesAndHelpSettingsSuggestion": "Check for updates, update history, etc",
449+
"advancedOptions": "Advanced Options",
450+
"advancedOptionsSettingsSuggestion": "Funcionalidades em Beta, Opções de Desenvolvedor, etc",
451+
"@@GENERAL": {},
437452
"cycleTogglePeriod": "Durée du cycle de basculement",
438453
"cycleTogglePeriodDescription": "Intervalle de temps entre les changements de disposition quand le mode cycle est activé.",
439454
"notifications": "Notifications",
440455
"notificationsEnabled": "Notifications activées",
441456
"notificationClickBehavior": "Action de clic sur les notifications",
442457
"notificationClickBehaviorDescription": "Choisir ce qui se passe lorsque vous cliquez sur une notification.",
443458
"showEventsScreen": "Montrer le navigateur d'événements",
459+
"@@@DATA_USAGE": {},
460+
"dataUsage": "Data Usage",
461+
"streamsOnBackground": "Keep streams playing on background",
462+
"streamsOnBackgroundDescription": "When to keep streams playing when the app is in background",
463+
"automatic": "Automatic",
464+
"wifiOnly": "Wifi Only",
444465
"@@EVENTS_AND_DOWNLOADS": {},
445466
"chooseEveryDownloadsLocation": "Choisir l'emplacement pour chaque téléchargements",
446467
"chooseEveryDownloadsLocationDescription": "Choisir l'emplacement de chaque téléchargements ou utiliser l'emplacement par défaut. Lorsque activé vous devrez choisir l'emplacement pour chaque téléchargements.",
@@ -470,7 +491,6 @@
470491
"convertToLocalTime": "Convertir le temps à l'heure locale",
471492
"convertToLocalTimeDescription": "Convertir les temps affichés à l'heure locale. Cette option affecte l'heure et la date affichée dans l'application. Cette option est utile si le serveur est situé dans un autre fuseau horaire.",
472493
"@@PRIVACY_AND_SECURITY": {},
473-
"privacyAndSecurity": "Sécurité et vie Privée",
474494
"allowDataCollection": "Permettre à Bluecherry de collecter des données d'utilisation",
475495
"allowDataCollectionDescription": "Permettre à Bluecherry de collecter des données améliore l'application et fournit un meilleur service. Les données collectées ne contiennent aucune information personnelle.",
476496
"automaticallyReportErrors": "Signaler automatiquement les erreurs",
@@ -511,6 +531,12 @@
511531
"time": {}
512532
}
513533
},
534+
"@@SERVERS": {},
535+
"connectToServerAutomaticallyAtStartup": "Connect automatically at startup",
536+
"connectToServerAutomaticallyAtStartupDescription": "If enabled, the server will be automatically connected when the app starts. This only applies to the new servers you add.",
537+
"allowUntrustedCertificates": "Allow untrusted certificates",
538+
"allowUntrustedCertificatesDescription": "Allow connecting to servers with untrusted certificates. This is useful when you are using self-signed certificates or certificates from unknown authorities.",
539+
"certificateNotPassed": "Certificate not passed",
514540
"@@STREAMING": {},
515541
"streamingSettings": "Paramètre de diffusion",
516542
"streamingType": "Type de diffusion",
@@ -577,5 +603,8 @@
577603
"rackNameExample": "Labo 1",
578604
"openServer": "Serveur libre",
579605
"@SEARCH": {},
580-
"disableSearch": "Désactiver la recherche"
581-
}
606+
"disableSearch": "Désactiver la recherche",
607+
"@@@Updates and Help": {},
608+
"help": "Help",
609+
"licenses": "Licenças"
610+
}

lib/l10n/app_pl.arb

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,8 @@
425425
"automaticDownloadUpdates": "Pobieraj aktualizacje automatycznie",
426426
"automaticDownloadUpdatesDescription": "Bądź jedną z pierwszych osób, które otrzymają najnowsze aktualizacje, poprawki i ulepszenia w miarę ich wdrażania.",
427427
"updateHistory": "Historia aktualizacji",
428+
"showReleaseNotes": "Show release notes",
429+
"showReleaseNotesDescription": "Display release notes when a new version is installed",
428430
"newVersionAvailable": "Dostępna nowa wersja",
429431
"installVersion": "Instaluj",
430432
"downloadVersion": "Pobierz",
@@ -456,15 +458,34 @@
456458
"taskDownloadingEvent": "Pobieranie zdarzenia",
457459
"@@@SETTINGS": {},
458460
"defaultField": "Default",
459-
"@@GENERAL": {},
460461
"general": "General",
462+
"generalSettingsSuggestion": "Notifications, Data Usage, Wakelock, etc",
463+
"serverAndDevices": "Servers and Devices",
464+
"serverAndDevicesSettingsSuggestion": "Connect to servers, manage devices, etc",
465+
"eventsAndDownloads": "Events and Downloads",
466+
"eventsAndDownloadsSettingsSuggestion": "Events history, downloads, etc",
467+
"application": "Application",
468+
"applicationSettingsSuggestion": "Appearance, theme, date and time, etc",
469+
"privacyAndSecurity": "Privacy and Security",
470+
"privacyAndSecuritySettingsSuggestion": "Data collection, error reporting, etc",
471+
"updatesAndHelp": "Updates and Help",
472+
"updatesAndHelpSettingsSuggestion": "Check for updates, update history, etc",
473+
"advancedOptions": "Advanced Options",
474+
"advancedOptionsSettingsSuggestion": "Funcionalidades em Beta, Opções de Desenvolvedor, etc",
475+
"@@GENERAL": {},
461476
"cycleTogglePeriod": "Okres cyklicznego przełączania układu",
462477
"cycleTogglePeriodDescription": "The interval between layout changes when the cycle mode is enabled.",
463478
"notifications": "Notifications",
464479
"notificationsEnabled": "Notifications enabled",
465480
"notificationClickBehavior": "Zachowanie po kliknięciu na powiadomienie",
466481
"notificationClickBehaviorDescription": "Choose what happens when you click on a notification.",
467482
"showEventsScreen": "Pokaż historię zdarzeń",
483+
"@@@DATA_USAGE": {},
484+
"dataUsage": "Data Usage",
485+
"streamsOnBackground": "Keep streams playing on background",
486+
"streamsOnBackgroundDescription": "When to keep streams playing when the app is in background",
487+
"automatic": "Automatic",
488+
"wifiOnly": "Wifi Only",
468489
"@@EVENTS_AND_DOWNLOADS": {},
469490
"chooseEveryDownloadsLocation": "Choose the location for every download",
470491
"chooseEveryDownloadsLocationDescription": "Whether to choose the location for each download or use the default location. When enabled, you will be prompted to choose the download directory for each download.",
@@ -494,7 +515,6 @@
494515
"convertToLocalTime": "Convert dates to the local timezone",
495516
"convertToLocalTimeDescription": "This will affect the date and time displayed in the app. This is useful when you are in a different timezone than the server. When disabled, the server timezone will be used.",
496517
"@@PRIVACY_AND_SECURITY": {},
497-
"privacyAndSecurity": "Privacy and Security",
498518
"allowDataCollection": "Allow Bluecherry to collect usage data",
499519
"allowDataCollectionDescription": "Allow Bluecherry to collect data to improve the app and provide better services. Data is collected anonymously and does not contain any personal information.",
500520
"automaticallyReportErrors": "Automatically report errors",
@@ -537,6 +557,12 @@
537557
}
538558
}
539559
},
560+
"@@SERVERS": {},
561+
"connectToServerAutomaticallyAtStartup": "Connect automatically at startup",
562+
"connectToServerAutomaticallyAtStartupDescription": "If enabled, the server will be automatically connected when the app starts. This only applies to the new servers you add.",
563+
"allowUntrustedCertificates": "Allow untrusted certificates",
564+
"allowUntrustedCertificatesDescription": "Allow connecting to servers with untrusted certificates. This is useful when you are using self-signed certificates or certificates from unknown authorities.",
565+
"certificateNotPassed": "Certificate not passed",
540566
"@@STREAMING": {},
541567
"streamingSettings": "Streaming settings",
542568
"streamingType": "Streaming type",
@@ -603,5 +629,8 @@
603629
"rackNameExample": "Lab 1",
604630
"openServer": "Open server",
605631
"@SEARCH": {},
606-
"disableSearch": "Disable search"
632+
"disableSearch": "Disable search",
633+
"@@@Updates and Help": {},
634+
"help": "Help",
635+
"licenses": "Licenças"
607636
}

lib/l10n/app_pt.arb

Lines changed: 39 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@
263263
"downloaded": "Baixado",
264264
"downloading": "Baixando",
265265
"seeInDownloads": "Ver nos Downloads",
266-
"downloadPath": "Diretório de Download",
266+
"downloadPath": "Local de Download",
267267
"delete": "Deletar",
268268
"showInFiles": "Ver no Explorador de Arquivos",
269269
"noDownloads": "Você ainda não baixou nenhum evento :/",
@@ -425,6 +425,8 @@
425425
"automaticDownloadUpdates": "Baixar atualizações automaticamente",
426426
"automaticDownloadUpdatesDescription": "Seja um dos primeiros a receber as atualizações, correções e melhorias mais recentes assim que lançadas.",
427427
"updateHistory": "Histórico de atualizações",
428+
"showReleaseNotes": "Mostrar notas de atualização",
429+
"showReleaseNotesDescription": "Mostrar as notas de atualização quando uma versão for instalada.",
428430
"newVersionAvailable": "Nova versão disponível!",
429431
"installVersion": "Instalar",
430432
"downloadVersion": "Baixar",
@@ -456,18 +458,37 @@
456458
"taskDownloadingEvent": "Baixando evento",
457459
"@@@SETTINGS": {},
458460
"defaultField": "Padrão",
459-
"@@GENERAL": {},
460461
"general": "Geral",
462+
"generalSettingsSuggestion": "Notificações, Layouts, Wakelock, etc",
463+
"serverAndDevices": "Servidores e Dispositivos",
464+
"serverAndDevicesSettingsSuggestion": "Servidores, Dispositivos, Streaming, etc",
465+
"eventsAndDownloads": "Eventos e Downloads",
466+
"eventsAndDownloadsSettingsSuggestion": "Eventos, Histórico de Eventos, Downloads, etc",
467+
"application": "Aplicação",
468+
"applicationSettingsSuggestion": "Aparência, idioma, etc",
469+
"privacyAndSecurity": "Privacidade e Segurança",
470+
"privacyAndSecuritySettingsSuggestion": "Coleta de dados, relatórios de erros, etc",
471+
"updatesAndHelp": "Atualizações e Ajuda",
472+
"updatesAndHelpSettingsSuggestion": "Verificar atualizações, histórico de atualizações, etc",
473+
"advancedOptions": "Opções Avançadas",
474+
"advancedOptionsSettingsSuggestion": "Funcionalidades em Beta, Opções de Desenvolvedor, etc",
475+
"@@GENERAL": {},
461476
"cycleTogglePeriod": "Duração da alternância de layouts",
462477
"cycleTogglePeriodDescription": "O intervalo entre alterações de layout quando a alternância está ativada.",
463-
"notifications": "Notifications",
464-
"notificationsEnabled": "Notifications enabled",
478+
"notifications": "Notificações",
479+
"notificationsEnabled": "Notificações ativadas",
465480
"notificationClickBehavior": "Ação ao clicar na notificação",
466481
"notificationClickBehaviorDescription": "Escolha o que acontece quando você clica em uma notificação.",
467482
"showEventsScreen": "Mostar histórico de eventos",
483+
"@@@DATA_USAGE": {},
484+
"dataUsage": "Uso de Dados",
485+
"streamsOnBackground": "Manter transmissões em segundo plano",
486+
"streamsOnBackgroundDescription": "Quando manter as transmissões em segundo plano quando o aplicativo estiver em segundo plano",
487+
"automatic": "Automatico",
488+
"wifiOnly": "Somente Wi-Fi",
468489
"@@EVENTS_AND_DOWNLOADS": {},
469490
"chooseEveryDownloadsLocation": "Escolher a localização de cada download",
470-
"chooseEveryDownloadsLocationDescription": "Se você deseja escolher a localização de cada download ou usar a localização padrão. Quando ativado, você será solicitado a escolher o diretório de download para cada download.",
491+
"chooseEveryDownloadsLocationDescription": "Se você deseja escolher a localização de cada download ou usar a localização padrão. Quando ativado, você será solicitado a escolher a localização de cada download.",
471492
"allowCloseWhenDownloading": "Permitir fechar o aplicativo quando houver downloads em andamento",
472493
"events": "Eventos",
473494
"initialEventSpeed": "Velocidade inicial",
@@ -480,7 +501,7 @@
480501
"firstEventInitialPoint": "Primeiro evento",
481502
"hourAgoInitialPoint": "1 hora atrás",
482503
"@@APPLICATION": {},
483-
"appearance": "Appearance",
504+
"appearance": "Visualização",
484505
"theme": "Aparência",
485506
"themeDescription": "Mude a aparência do aplicativo",
486507
"system": "Padrão do Sistema",
@@ -491,10 +512,9 @@
491512
"dateFormatDescription": "Qual formato usar para exibir datas",
492513
"timeFormat": "Formato de Hora",
493514
"timeFormatDescription": "Qual formato usar para exibir horas",
494-
"convertToLocalTime": "Convert dates to the local timezone",
495-
"convertToLocalTimeDescription": "This will affect the date and time displayed in the app. This is useful when you are in a different timezone than the server. When disabled, the server timezone will be used.",
515+
"convertToLocalTime": "Converter datas para o fuso-horário local",
516+
"convertToLocalTimeDescription": "Isso afetará a data e a hora exibidas no aplicativo. É útil quando você está em um fuso horário diferente do servidor. Quando desativado, o fuso horário do servidor será usado.",
496517
"@@PRIVACY_AND_SECURITY": {},
497-
"privacyAndSecurity": "Privacidade e Segurança",
498518
"allowDataCollection": "Permitir que Bluecherry colete dados de uso",
499519
"allowDataCollectionDescription": "Permitir que Bluecherry colete dados para melhorar o aplicativo e fornecer serviços melhores. Os dados são coletados anonimamente e não contêm informações pessoais.",
500520
"automaticallyReportErrors": "Relatar erros automaticamente",
@@ -537,6 +557,12 @@
537557
}
538558
}
539559
},
560+
"@@SERVERS": {},
561+
"connectToServerAutomaticallyAtStartup": "Conectar automaticamente ao iniciar",
562+
"connectToServerAutomaticallyAtStartupDescription": "Se ativado, o servidor será conectado automaticamente quando o aplicativo for iniciado. Isso só se aplica aos novos servidores que você adicionar.",
563+
"allowUntrustedCertificates": "Permitir certificados não confiáveis",
564+
"allowUntrustedCertificatesDescription": "Permitir a conexão a servidores com certificados não confiáveis. Isso é útil quando você está usando certificados autoassinados ou certificados de autoridades desconhecidas.",
565+
"certificateNotPassed": "Certificado não autorizado",
540566
"@@STREAMING": {},
541567
"streamingSettings": "Configurações de streaming",
542568
"streamingType": "Tipo de streaming",
@@ -603,5 +629,8 @@
603629
"rackNameExample": "Lab 1",
604630
"openServer": "Abrir servidor",
605631
"@SEARCH": {},
606-
"disableSearch": "Desativar pesquisa"
632+
"disableSearch": "Desativar pesquisa",
633+
"@@@Updates and Help": {},
634+
"help": "Ajuda",
635+
"licenses": "Licenças"
607636
}

0 commit comments

Comments
 (0)