From 6746abacd72d7663aa4ff9007579ebabb72a9915 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Mon, 5 Dec 2022 12:26:17 -0800 Subject: [PATCH] fix translations for new feature, use icon --- lib/l10n/intl_cy.arb | 6 +++++- lib/l10n/intl_da.arb | 6 +++++- lib/l10n/intl_de.arb | 22 +++++++++++++--------- lib/l10n/intl_el.arb | 6 +++++- lib/l10n/intl_en.arb | 6 +++++- lib/l10n/intl_es.arb | 6 +++++- lib/l10n/intl_fr.arb | 20 ++++++++++++-------- lib/l10n/intl_it.arb | 6 +++++- lib/l10n/intl_lb.arb | 6 +++++- lib/l10n/intl_nl.arb | 8 ++++++-- lib/l10n/intl_no.arb | 6 +++++- lib/l10n/intl_pl.arb | 6 +++++- lib/l10n/intl_pt.arb | 6 +++++- lib/l10n/intl_pt_BR.arb | 14 +++++++++----- lib/l10n/intl_ro.arb | 6 +++++- lib/l10n/intl_ru.arb | 6 +++++- lib/l10n/intl_tr.arb | 8 ++++++-- lib/views/addeditprofileview.dart | 9 +++++---- lib/widgets/profileimage.dart | 6 +++--- 19 files changed, 114 insertions(+), 45 deletions(-) diff --git a/lib/l10n/intl_cy.arb b/lib/l10n/intl_cy.arb index b2c37d2f..12db6f32 100644 --- a/lib/l10n/intl_cy.arb +++ b/lib/l10n/intl_cy.arb @@ -1,6 +1,10 @@ { "@@locale": "cy", - "@@last_modified": "2022-11-18T15:19:11+01:00", + "@@last_modified": "2022-12-05T21:06:07+01:00", + "profileEnabledDescription": "Start or stop the profile", + "profileAutostartDescription": "Controls if the profile will be automatically launched on startup", + "profileEnabled": "Enable", + "profileAutostartLabel": "Autostart", "localePtBr": "Brazilian Portuguese \/ Português do Brasil", "localeNl": "Dutch \/ Dutch", "experimentQRCodeDescription": "QR Code support allows sharing data (such as profile identity) by QR Codes", diff --git a/lib/l10n/intl_da.arb b/lib/l10n/intl_da.arb index 3aafcac1..820fae1c 100644 --- a/lib/l10n/intl_da.arb +++ b/lib/l10n/intl_da.arb @@ -1,6 +1,10 @@ { "@@locale": "da", - "@@last_modified": "2022-11-18T15:19:11+01:00", + "@@last_modified": "2022-12-05T21:06:07+01:00", + "profileEnabledDescription": "Start or stop the profile", + "profileAutostartDescription": "Controls if the profile will be automatically launched on startup", + "profileEnabled": "Enable", + "profileAutostartLabel": "Autostart", "localePtBr": "Brazilian Portuguese \/ Português do Brasil", "localeNl": "Dutch \/ Dutch", "experimentQRCodeDescription": "QR Code support allows sharing data (such as profile identity) by QR Codes", diff --git a/lib/l10n/intl_de.arb b/lib/l10n/intl_de.arb index 4327f170..78b46269 100644 --- a/lib/l10n/intl_de.arb +++ b/lib/l10n/intl_de.arb @@ -1,14 +1,18 @@ { "@@locale": "de", - "@@last_modified": "2022-11-18T15:19:11+01:00", - "localePtBr": "Brazilian Portuguese \/ Português do Brasil", - "localeNl": "Dutch \/ Dutch", - "experimentQRCodeDescription": "QR Code support allows sharing data (such as profile identity) by QR Codes", - "enableExperimentQRCode": "QR Codes", - "shareMenuQRCode": "Show QR Code", - "shareProfileMenuTooltop": "Share profile via...", - "acquiredTicketsFromServer": "Antispam Challenge Complete", - "acquiringTicketsFromServer": "Performing Antispam Challenge", + "@@last_modified": "2022-12-05T21:06:07+01:00", + "profileEnabledDescription": "Start or stop the profile", + "profileAutostartDescription": "Controls if the profile will be automatically launched on startup", + "profileEnabled": "Enable", + "profileAutostartLabel": "Autostart", + "acquiringTicketsFromServer": "Antispam-Herausforderung meistern", + "acquiredTicketsFromServer": "Antispam-Herausforderung abgeschlossen", + "shareProfileMenuTooltop": "Profil teilen über...", + "localeNl": "Niederländisch \/ Nederlands", + "localePtBr": "Brasilianisches Portugiesisch \/ Português do Brasil", + "shareMenuQRCode": "QR-Code anzeigen", + "enableExperimentQRCode": "QR-Codes", + "experimentQRCodeDescription": "QR-Code-Unterstützung ermöglicht den Austausch von Daten (z. B. Profilidentität) über QR-Codes", "localeIt": "Italienisch \/ Italiano", "errorDownloadDirectoryDoesNotExist": "Die Dateifreigabe kann nicht aktiviert werden, da der Download-Ordner nicht festgelegt wurde oder auf einen nicht vorhandenen Ordner festgelegt ist.", "localeTr": "Türkisch \/ Türk", diff --git a/lib/l10n/intl_el.arb b/lib/l10n/intl_el.arb index 20bcde04..e8b5bd9e 100644 --- a/lib/l10n/intl_el.arb +++ b/lib/l10n/intl_el.arb @@ -1,6 +1,10 @@ { "@@locale": "el", - "@@last_modified": "2022-11-18T15:19:11+01:00", + "@@last_modified": "2022-12-05T21:06:07+01:00", + "profileEnabledDescription": "Start or stop the profile", + "profileAutostartDescription": "Controls if the profile will be automatically launched on startup", + "profileEnabled": "Enable", + "profileAutostartLabel": "Autostart", "localePtBr": "Brazilian Portuguese \/ Português do Brasil", "localeNl": "Dutch \/ Dutch", "experimentQRCodeDescription": "QR Code support allows sharing data (such as profile identity) by QR Codes", diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 73fc8ea1..a1cb0793 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -1,6 +1,10 @@ { "@@locale": "en", - "@@last_modified": "2022-11-18T15:19:11+01:00", + "@@last_modified": "2022-12-05T21:06:07+01:00", + "profileEnabledDescription": "Start or stop the profile", + "profileAutostartDescription": "Controls if the profile will be automatically launched on startup", + "profileEnabled": "Enable", + "profileAutostartLabel": "Autostart", "localePtBr": "Brazilian Portuguese \/ Português do Brasil", "localeNl": "Dutch \/ Dutch", "experimentQRCodeDescription": "QR Code support allows sharing data (such as profile identity) by QR Codes", diff --git a/lib/l10n/intl_es.arb b/lib/l10n/intl_es.arb index 17ac828e..7acf83de 100644 --- a/lib/l10n/intl_es.arb +++ b/lib/l10n/intl_es.arb @@ -1,6 +1,10 @@ { "@@locale": "es", - "@@last_modified": "2022-11-18T15:19:11+01:00", + "@@last_modified": "2022-12-05T21:06:07+01:00", + "profileEnabledDescription": "Start or stop the profile", + "profileAutostartDescription": "Controls if the profile will be automatically launched on startup", + "profileEnabled": "Enable", + "profileAutostartLabel": "Autostart", "localePtBr": "Brazilian Portuguese \/ Português do Brasil", "localeNl": "Dutch \/ Dutch", "experimentQRCodeDescription": "QR Code support allows sharing data (such as profile identity) by QR Codes", diff --git a/lib/l10n/intl_fr.arb b/lib/l10n/intl_fr.arb index 08d6fe7d..73557354 100644 --- a/lib/l10n/intl_fr.arb +++ b/lib/l10n/intl_fr.arb @@ -1,14 +1,18 @@ { "@@locale": "fr", - "@@last_modified": "2022-11-18T15:19:11+01:00", - "localePtBr": "Brazilian Portuguese \/ Português do Brasil", - "localeNl": "Dutch \/ Dutch", - "experimentQRCodeDescription": "QR Code support allows sharing data (such as profile identity) by QR Codes", + "@@last_modified": "2022-12-05T21:06:07+01:00", + "profileEnabledDescription": "Start or stop the profile", + "profileAutostartDescription": "Controls if the profile will be automatically launched on startup", + "profileEnabled": "Enable", + "profileAutostartLabel": "Autostart", + "shareProfileMenuTooltop": "Partager le profil via...", + "shareMenuQRCode": "Afficher le QR code", + "localePtBr": "Portugais du Brésil \/ Português do Brasil", + "localeNl": "néerlandais \/ néerlandais", + "experimentQRCodeDescription": "La prise en charge des QR codes permet de partager des données (telles que l'identité du profil) par des QR codes \n", "enableExperimentQRCode": "QR Codes", - "shareMenuQRCode": "Show QR Code", - "shareProfileMenuTooltop": "Share profile via...", - "acquiredTicketsFromServer": "Antispam Challenge Complete", - "acquiringTicketsFromServer": "Performing Antispam Challenge", + "acquiringTicketsFromServer": "Réaliser un défi anti-spam", + "acquiredTicketsFromServer": "Défi anti-spam terminé", "errorDownloadDirectoryDoesNotExist": "Le partage de fichiers ne peut pas être activé car le dossier de téléchargement n'a pas été défini ou est défini sur un dossier qui n'existe pas.", "localeIt": "italien \/ italien", "localeTr": "Turc \/ Türk", diff --git a/lib/l10n/intl_it.arb b/lib/l10n/intl_it.arb index 9cc30f24..ca39b32d 100644 --- a/lib/l10n/intl_it.arb +++ b/lib/l10n/intl_it.arb @@ -1,6 +1,10 @@ { "@@locale": "it", - "@@last_modified": "2022-11-18T15:19:11+01:00", + "@@last_modified": "2022-12-05T21:06:07+01:00", + "profileEnabledDescription": "Start or stop the profile", + "profileAutostartDescription": "Controls if the profile will be automatically launched on startup", + "profileEnabled": "Enable", + "profileAutostartLabel": "Autostart", "localePtBr": "Brazilian Portuguese \/ Português do Brasil", "localeNl": "Dutch \/ Dutch", "tooltipPinConversation": "Aggiungi la conversazione in cima alla lista \"Conversazioni\"", diff --git a/lib/l10n/intl_lb.arb b/lib/l10n/intl_lb.arb index 90b03f29..3d54cab8 100644 --- a/lib/l10n/intl_lb.arb +++ b/lib/l10n/intl_lb.arb @@ -1,6 +1,10 @@ { "@@locale": "lb", - "@@last_modified": "2022-11-18T15:19:11+01:00", + "@@last_modified": "2022-12-05T21:06:07+01:00", + "profileEnabledDescription": "Start or stop the profile", + "profileAutostartDescription": "Controls if the profile will be automatically launched on startup", + "profileEnabled": "Enable", + "profileAutostartLabel": "Autostart", "localePtBr": "Brazilian Portuguese \/ Português do Brasil", "localeNl": "Dutch \/ Dutch", "experimentQRCodeDescription": "QR Code support allows sharing data (such as profile identity) by QR Codes", diff --git a/lib/l10n/intl_nl.arb b/lib/l10n/intl_nl.arb index 5d30ba5f..c5084d54 100644 --- a/lib/l10n/intl_nl.arb +++ b/lib/l10n/intl_nl.arb @@ -1,7 +1,11 @@ { "@@locale": "nl", - "@@last_modified": "2022-11-18T15:19:11+01:00", - "localePtBr": "Brazilian Portuguese \/ Português do Brasil", + "@@last_modified": "2022-12-05T21:06:07+01:00", + "profileEnabledDescription": "Start or stop the profile", + "profileAutostartDescription": "Controls if the profile will be automatically launched on startup", + "profileEnabled": "Enable", + "profileAutostartLabel": "Autostart", + "localePtBr": "Braziliaans Portugees \/ Português do Brasil", "acquiredTicketsFromServer": "Anti-spam uitdaging voltooid", "acquiringTicketsFromServer": "Anti-spam uitdaging uitvoeren", "acknowledgedLabel": "Erkend", diff --git a/lib/l10n/intl_no.arb b/lib/l10n/intl_no.arb index 396bc5bd..f0711b25 100644 --- a/lib/l10n/intl_no.arb +++ b/lib/l10n/intl_no.arb @@ -1,6 +1,10 @@ { "@@locale": "no", - "@@last_modified": "2022-11-18T15:19:11+01:00", + "@@last_modified": "2022-12-05T21:06:07+01:00", + "profileEnabledDescription": "Start or stop the profile", + "profileAutostartDescription": "Controls if the profile will be automatically launched on startup", + "profileEnabled": "Enable", + "profileAutostartLabel": "Autostart", "localePtBr": "Brazilian Portuguese \/ Português do Brasil", "localeNl": "Dutch \/ Dutch", "experimentQRCodeDescription": "QR Code support allows sharing data (such as profile identity) by QR Codes", diff --git a/lib/l10n/intl_pl.arb b/lib/l10n/intl_pl.arb index 7014169a..485f9977 100644 --- a/lib/l10n/intl_pl.arb +++ b/lib/l10n/intl_pl.arb @@ -1,6 +1,10 @@ { "@@locale": "pl", - "@@last_modified": "2022-11-18T15:19:11+01:00", + "@@last_modified": "2022-12-05T21:06:07+01:00", + "profileEnabledDescription": "Start or stop the profile", + "profileAutostartDescription": "Controls if the profile will be automatically launched on startup", + "profileEnabled": "Enable", + "profileAutostartLabel": "Autostart", "localePtBr": "Brazilian Portuguese \/ Português do Brasil", "localeNl": "Dutch \/ Dutch", "experimentQRCodeDescription": "QR Code support allows sharing data (such as profile identity) by QR Codes", diff --git a/lib/l10n/intl_pt.arb b/lib/l10n/intl_pt.arb index 6c350817..4ba9acd7 100644 --- a/lib/l10n/intl_pt.arb +++ b/lib/l10n/intl_pt.arb @@ -1,6 +1,10 @@ { "@@locale": "pt", - "@@last_modified": "2022-11-18T15:19:11+01:00", + "@@last_modified": "2022-12-05T21:06:07+01:00", + "profileEnabledDescription": "Start or stop the profile", + "profileAutostartDescription": "Controls if the profile will be automatically launched on startup", + "profileEnabled": "Enable", + "profileAutostartLabel": "Autostart", "localePtBr": "Brazilian Portuguese \/ Português do Brasil", "localeNl": "Dutch \/ Dutch", "experimentQRCodeDescription": "QR Code support allows sharing data (such as profile identity) by QR Codes", diff --git a/lib/l10n/intl_pt_BR.arb b/lib/l10n/intl_pt_BR.arb index 02f20ed0..1ecfa75d 100644 --- a/lib/l10n/intl_pt_BR.arb +++ b/lib/l10n/intl_pt_BR.arb @@ -1,6 +1,10 @@ { "@@locale": "pt_BR", - "@@last_modified": "2022-11-18T15:19:11+01:00", + "@@last_modified": "2022-12-05T21:06:07+01:00", + "profileEnabledDescription": "Start or stop the profile", + "profileAutostartDescription": "Controls if the profile will be automatically launched on startup", + "profileEnabled": "Enable", + "profileAutostartLabel": "Autostart", "localePtBr": "Português do Brasil \/ Português do Brasil", "localeNl": "Dutch \/ Dutch", "experimentQRCodeDescription": "O suporte a QR Code permite o compartilhamento de dados (como identidade de perfil) através dos QR Codes", @@ -289,7 +293,7 @@ "password1Label": "Senha", "currentPasswordLabel": "Senha Atual", "yourDisplayName": "Seu nome de exibição", - "profileOnionLabel": "Envie este endereço para contatos que você deseja se conectar", + "profileOnionLabel": "Send this address to contacts you want to connect with", "noPasswordWarning": "Não usar uma senha nesta conta significa que todos os dados armazenados localmente não serão criptografados", "radioNoPassword": "Descriptografado (Sem senha)", "radioUsePassword": "Senha", @@ -299,13 +303,13 @@ "profileName": "Nome de exibição", "editProfileTitle": "Editar perfil", "addProfileTitle": "Adicionar novo perfil", - "deleteBtn": "Deletar", + "deleteBtn": "Delete", "unblockBtn": "Desbloquear Contato", "dontSavePeerHistory": "Deletar histórico", "savePeerHistoryDescription": "Determina se deve excluir algum histórico associado com o contato.", "savePeerHistory": "Salvar histórico", "blockBtn": "Bloquear Contato", - "saveBtn": "Salvar", + "saveBtn": "Save", "displayNameLabel": "Nome de Exibição", "copiedToClipboardNotification": "Copiado", "addressLabel": "Endereço", @@ -339,7 +343,7 @@ "serverConnectivityConnected": "Servidor Conectado", "serverInfo": "Informação do Servidor", "invitationLabel": "Convite", - "serverLabel": "Servidor", + "serverLabel": "Server", "search": "Pesquisar...", "blocked": "Bloqueado", "pasteAddressToAddContact": "… cole um endereço aqui para adicionar um contato…", diff --git a/lib/l10n/intl_ro.arb b/lib/l10n/intl_ro.arb index 349951aa..023dff44 100644 --- a/lib/l10n/intl_ro.arb +++ b/lib/l10n/intl_ro.arb @@ -1,6 +1,10 @@ { "@@locale": "ro", - "@@last_modified": "2022-11-18T15:19:11+01:00", + "@@last_modified": "2022-12-05T21:06:07+01:00", + "profileEnabledDescription": "Start or stop the profile", + "profileAutostartDescription": "Controls if the profile will be automatically launched on startup", + "profileEnabled": "Enable", + "profileAutostartLabel": "Autostart", "localePtBr": "Brazilian Portuguese \/ Português do Brasil", "localeNl": "Dutch \/ Dutch", "experimentQRCodeDescription": "QR Code support allows sharing data (such as profile identity) by QR Codes", diff --git a/lib/l10n/intl_ru.arb b/lib/l10n/intl_ru.arb index 511c2b55..f80f2328 100644 --- a/lib/l10n/intl_ru.arb +++ b/lib/l10n/intl_ru.arb @@ -1,6 +1,10 @@ { "@@locale": "ru", - "@@last_modified": "2022-11-18T15:19:11+01:00", + "@@last_modified": "2022-12-05T21:06:07+01:00", + "profileEnabledDescription": "Start or stop the profile", + "profileAutostartDescription": "Controls if the profile will be automatically launched on startup", + "profileEnabled": "Enable", + "profileAutostartLabel": "Autostart", "localePtBr": "Brazilian Portuguese \/ Português do Brasil", "localeNl": "Dutch \/ Dutch", "experimentQRCodeDescription": "QR Code support allows sharing data (such as profile identity) by QR Codes", diff --git a/lib/l10n/intl_tr.arb b/lib/l10n/intl_tr.arb index 83f70361..d69332b4 100644 --- a/lib/l10n/intl_tr.arb +++ b/lib/l10n/intl_tr.arb @@ -1,7 +1,11 @@ { "@@locale": "tr", - "@@last_modified": "2022-11-18T15:19:11+01:00", - "localePtBr": "Brazilian Portuguese \/ Português do Brasil", + "@@last_modified": "2022-12-05T21:06:07+01:00", + "profileEnabledDescription": "Start or stop the profile", + "profileAutostartDescription": "Controls if the profile will be automatically launched on startup", + "profileEnabled": "Enable", + "profileAutostartLabel": "Autostart", + "localePtBr": "Brezilya Portekizcesi \/ Português do Brasil", "experimentQRCodeDescription": "QR Kod desteği profil kimliği gibi verilerin QR Kodla paylaşılmasına olanak tanır", "acquiringTicketsFromServer": "Spame Karşı Sınama", "acquiredTicketsFromServer": "Spame Karşı Sınama Tamamlandı", diff --git a/lib/views/addeditprofileview.dart b/lib/views/addeditprofileview.dart index f6ab0f01..b172a1af 100644 --- a/lib/views/addeditprofileview.dart +++ b/lib/views/addeditprofileview.dart @@ -174,8 +174,8 @@ class _AddEditProfileViewState extends State { Visibility( visible: Provider.of(context).onion.isNotEmpty, child: SwitchListTile( - title: Text(AppLocalizations.of(context)!.serverEnabled, style: TextStyle(color: Provider.of(context).current().mainTextColor)), - subtitle: Text(AppLocalizations.of(context)!.serverEnabledDescription), + title: Text(AppLocalizations.of(context)!.profileEnabled, style: TextStyle(color: Provider.of(context).current().mainTextColor)), + subtitle: Text(AppLocalizations.of(context)!.profileEnabledDescription), value: Provider.of(context).enabled, onChanged: (bool value) { Provider.of(context).enabled = value; @@ -192,8 +192,8 @@ class _AddEditProfileViewState extends State { // Auto start SwitchListTile( - title: Text(AppLocalizations.of(context)!.serverAutostartLabel, style: TextStyle(color: Provider.of(context).current().mainTextColor)), - subtitle: Text(AppLocalizations.of(context)!.serverAutostartDescription), + title: Text(AppLocalizations.of(context)!.profileAutostartLabel, style: TextStyle(color: Provider.of(context).current().mainTextColor)), + subtitle: Text(AppLocalizations.of(context)!.profileAutostartDescription), value: Provider.of(context).autostart, onChanged: (bool value) { Provider.of(context).autostart = value; @@ -397,6 +397,7 @@ class _AddEditProfileViewState extends State { // match (and are provided if the user has requested an encrypted profile). if (_formKey.currentState!.validate()) { if (Provider.of(context, listen: false).onion.isEmpty) { + // TODO: save autostart in create flow if (usePassword == true) { Provider.of(context, listen: false).cwtch.CreateProfile(ctrlrNick.value.text, ctrlrPass.value.text); Navigator.of(context).pop(); diff --git a/lib/widgets/profileimage.dart b/lib/widgets/profileimage.dart index 15a55934..cc6a2c54 100644 --- a/lib/widgets/profileimage.dart +++ b/lib/widgets/profileimage.dart @@ -116,9 +116,9 @@ class _ProfileImageState extends State { Center( - child: ImageIcon( - AssetImage("assets/core/negative_heart_512px.png"), - size: widget.diameter / 1.25, + child: Icon( + CwtchIcons.negative_heart_24px, + size: widget.diameter / 1.5, color: Provider.of(context).theme.portraitOfflineBorderColor, )