Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
ereio committed Mar 23, 2022
2 parents 4087db2 + be96713 commit 3b461cc
Show file tree
Hide file tree
Showing 48 changed files with 676 additions and 330 deletions.
25 changes: 12 additions & 13 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@ analyzer:

linter:
rules:
# TODO: convert to true
prefer_const_constructors: false
lines_longer_than_80_chars: false
avoid_redundant_argument_values: false
prefer_typing_uninitialized_variables: false
empty_catches: false
avoid_dynamic_calls: false
# sort_constructors_first: true
# always_put_required_named_parameters_first: true
# always_specify_types: true

# Disabled
file_names: false
type_annotate_public_apis: false
Expand All @@ -18,21 +29,9 @@ linter:
prefer_conditional_assignment: false
sized_box_for_whitespace: false
always_use_package_imports: false
require_trailing_commas: false

use_build_context_synchronously: false # powers most of the navigation...

# Enabled
prefer_single_quotes: true

# sort_constructors_first: true
# prefer_double_quotes: true
# public_member_api_docs: true
# always_specify_types: true
# always_put_required_named_parameters_first: false

# TODO:
prefer_const_constructors: false
lines_longer_than_80_chars: false
avoid_redundant_argument_values: false
prefer_typing_uninitialized_variables: false
empty_catches: false
2 changes: 1 addition & 1 deletion assets/translations/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@
"title-dialog-draft-preview": "معاينة المسودة",
"label-color": "اللون",
"button-text-go-back": "الرجوع للخلف",
"list-item-user-details-confirm-start-chat": "الدردشة مع {}",
"list-item-user-details-start-chat": "الدردشة مع {}",
"label-search-unencrypted": "البحث غير مشفر",
"label-chat-settings": "إعدادات الدردشة",
"button-gallery": "المعرض",
Expand Down
2 changes: 1 addition & 1 deletion assets/translations/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@
"list-item-settings-proxy-password": "Proxy heslo",
"list-item-settings-sync-interval": "Interval synchronizace",
"list-item-user-details-invite-to-room": "Pozvat do místnosti",
"list-item-user-details-confirm-start-chat": "Psát si s {}",
"list-item-user-details-start-chat": "Psát si s {}",
"list-item-user-details-send-message": "Poslat správu",
"list-item-advanced-settings-start-background": "Spustit službu na pozadí",
"list-item-advanced-settings-test-sync-loop": "Test synchronizace na pozadí",
Expand Down
2 changes: 1 addition & 1 deletion assets/translations/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
"list-item-chat-detail-view-key": "Schlüssel anzeigen",
"list-item-settings-sync-toggle": "Synchronisation an/aus",
"list-item-user-details-invite-to-room": "In Raum einladen",
"list-item-user-details-confirm-start-chat": "Reden mit {}",
"list-item-user-details-start-chat": "Reden mit {}",
"list-item-user-details-unblock-user": "Benutzer entsperren",
"list-item-user-details-block-user": "Benutzer sperren",
"list-item-image-options-photo-select-method": "Fotoauswahlverfahren",
Expand Down
2 changes: 1 addition & 1 deletion assets/translations/en-Shaw.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
"list-item-settings-sync-interval": "𐑕𐑦𐑙𐑒 𐑦𐑯𐑑𐑼𐑝𐑩𐑤",
"list-item-settings-sync-toggle": "𐑑𐑪𐑜𐑩𐑤 𐑕𐑦𐑙𐑒𐑦𐑙",
"list-item-user-details-invite-to-room": "𐑦𐑯𐑝𐑲𐑑 𐑑 𐑮𐑵𐑥",
"list-item-user-details-confirm-start-chat": "𐑗𐑨𐑑 𐑢𐑦𐑞 {}",
"list-item-user-details-start-chat": "𐑗𐑨𐑑 𐑢𐑦𐑞 {}",
"list-item-user-details-send-message": "𐑕𐑧𐑯𐑛 𐑩 𐑥𐑧𐑕𐑦𐑡",
"list-item-user-details-view-profile": "𐑝𐑿 𐑐𐑮𐑴𐑓𐑲𐑤",
"list-item-user-details-unblock-user": "𐑳𐑯𐑚𐑤𐑪𐑒 𐑿𐑟𐑼",
Expand Down
4 changes: 2 additions & 2 deletions assets/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@
"list-item-settings-manual-sync": "Manual Sync",
"list-item-settings-force-full-sync": "Force Full Sync",
"list-item-user-details-invite-to-room": "Invite to Room",
"list-item-user-details-confirm-start-chat": "Chat with {}",
"list-item-user-details-start-chat": "Chat with {}",
"list-item-user-details-send-message": "Send A Message",
"list-item-user-details-view-profile": "View Profile",
"list-item-user-details-unblock-user": "Unblock User",
Expand All @@ -231,7 +231,7 @@
"list-item-received": "Received",
"list-item-via": "Platform",
"list-item-from": "From",
"list-item-read-by": "Read By",
"list-item-read-by": "Seen By",
"alert-restart-app-effect": "You'll need to close and restart the app for this to take effect",
"alert-invite-user-unknown": "This user doesn't appear to exist within matrix, but you can attempt to invite them anyway.\n\nMake sure you have the correct name before trying.",
"alert-feature-in-progress": "🛠 This feature is coming soon",
Expand Down
2 changes: 1 addition & 1 deletion assets/translations/eu.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
"list-item-settings-sync-interval": "Sinkronizazio denbora-tartea",
"list-item-settings-sync-toggle": "Piztu edo itzali sinkronizazioa",
"list-item-user-details-invite-to-room": "Gonbidatu gelara",
"list-item-user-details-confirm-start-chat": "Txateatu {}(r)ekin",
"list-item-user-details-start-chat": "Txateatu {}(r)ekin",
"list-item-user-details-send-message": "Bidali mezua",
"list-item-user-details-view-profile": "Ikusi profila",
"list-item-user-details-unblock-user": "Desblokeatu erabiltzailea",
Expand Down
1 change: 1 addition & 0 deletions assets/translations/fa.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
71 changes: 69 additions & 2 deletions assets/translations/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@
"list-item-settings-sync-interval": "Intervalle de synchronisation",
"list-item-settings-sync-toggle": "Activer/Désactiver la synchronisation",
"list-item-user-details-invite-to-room": "Inviter dans le groupe",
"list-item-user-details-confirm-start-chat": "Discuter avec {}",
"list-item-user-details-start-chat": "Discuter avec {}",
"list-item-user-details-view-profile": "Voir le profil",
"list-item-user-details-unblock-user": "Débloquer l'utilisateur",
"list-item-user-details-block-user": "Bloquer l'utilisateur",
Expand Down Expand Up @@ -269,5 +269,72 @@
"content-notification-style-type-latest": "Afficher une notification avec le message le plus récent",
"content-notification-style-type-itemized": "Une nouvelle notification apparaîtra pour chaque nouveau message",
"label-show-attachment-options": "Ouvrir les options de pièce jointe",
"content-support-dialog": "La communauté Syphon est là pour vous aider dans la mesure de ses possibilités.\n\nN'hésitez pas à rejoindre notre discussion d'assistance ou à nous envoyer un courriel. Veuillez noter que la réponse à un courriel peut prendre de 1 à 5 jours ouvrables !"
"content-support-dialog": "La communauté Syphon est là pour vous aider dans la mesure de ses possibilités.\n\nN'hésitez pas à rejoindre notre discussion d'assistance ou à nous envoyer un courriel. Veuillez noter que la réponse à un courriel peut prendre de 1 à 5 jours ouvrables !",
"header-ordering": "Classement",
"header-update-password": "Mettre à jour le mot de passe",
"title-dialog-sync-interval": "Modifier l'intervalle de synchronisation",
"title-dialog-attempt-chat-with-user": "Essayer de discuter avec {}",
"title-blocked-users": "Utilisateurs bloqués",
"title-export-session-keys": "Exporter les clés de session",
"title-dialog-confirm-deactivate-account": "Confirmer la désactivation du compte",
"title-dialog-confirm-deactivate-account-final": "Confirmer la désactivation finale du compte",
"title-dialog-remove-screen-lock": "Supprimer le verrouillage de l'écran",
"title-dialog-enter-screen-lock-pin": "Saisissez votre code de verrouillage actuel",
"title-dialog-verify-new-screen-lock-pin": "Entrez à nouveau votre code pour confirmer",
"subtitle-settings-show-membership-events": "Afficher les changements de membres dans la discussion",
"subtitle-settings-enter-sends": "En appuyant sur la touche Entrée, vous enverrez un message",
"subtitle-settings-dismiss-keyboard": "Désactiver le clavier après avoir envoyé un message",
"subtitle-settings-view-uploaded-media": "Voir toutes les données téléversées, même celles qui ne sont pas accessibles à partir des messages",
"subtitle-theme-settings": "Thème {}, police {}",
"subtitle-privacy-settings": "Verrouillage de l'écran {}, verrouillage de l'enregistrement {}",
"label-seconds": "secondes",
"label-new-password": "Nouveau mot de passe",
"button-text-remove": "Retirer",
"list-item-settings-show-membership-events": "Afficher les évènements d'adhésion",
"list-item-settings-enter-sends": "La touche Entrée envoie",
"list-item-settings-24h-format": "Format de l'heure en 24 heures",
"list-item-settings-dismiss-keyboard": "Désactiver le clavier",
"list-item-settings-group-by": "Regrouper par",
"list-item-settings-view-uploaded-media": "Voir tous les médias téléversés",
"list-item-settings-auto-download": "Téléchargement automatique",
"list-item-settings-when-using-wi-fi": "En Wi-Fi",
"list-item-settings-when-roaming": "En itinérance",
"list-item-settings-manual-sync": "Synchronisation manuelle",
"list-item-settings-force-full-sync": "Forcer la synchronisation complète",
"content-logout-confirm": "Voulez-vous vraiment vous déconnecter ?",
"content-logout-multiaccount-confirm": "\n\nComme vous avez d'autres comptes, la déconnexion vous fera passer à une autre session de compte.",
"content-remove-screen-lock": "Voulez-vous vraiment supprimer le verrouillage de l'écran ? Ceci supprimera également la protection par NIP du cache",
"title-dialog-logout": "Se déconnecter",
"header-media": "Média",
"subtitle-settings-24h-format": "Afficher l'horodatage des messages au format 24 heures",
"header-general": "Général",
"header-media-auto-download": "Téléchargement automatique des médias",
"title-dialog-chat-with-user": "Discuter avec {}",
"title-import-session-keys": "Importer les clés de session",
"title-dialog-backup-session-keys": "Clés de session de sauvegarde",
"title-dialog-enter-new-screen-lock-pin": "Saisissez votre nouveau code de verrouillage",
"label-timestamp": "Horodatage",
"label-current-password": "Mot de passe actuel",
"list-item-settings-language": "Langue",
"subtitle-images-audio-video-files": "Images, audio, vidéo, fichiers",
"subtitle-force-full-sync": "Effectuer une synchronisation complète forcée de toutes les données et de tous les messages de l'utilisateur",
"label-none": "Aucun",
"label-version": "Version",
"label-search-for-user": "Rechercher un utilisateur…",
"button-text-import": "importer",
"subtitle-manual-sync": "Effectuer une synchronisation forcée de Matrix en fonction de l'horodatage de la dernière synchronisation",
"label-stopped": "Arrêté",
"list-item-settings-sort-by": "Trier par",
"label-syncing": "Synchronisation",
"button-text-confirm-delete-keys": "Supprimer les clés",
"label-confirm-new-password": "Confirmer le nouveau mot de passe",
"list-item-settings-when-using-mobile-data": "En utilisant les données mobiles",
"alert-storage-access-required-for-keys": "Saisissez le mot de passe pour cette importation de clé de session.",
"alert-wait-for-full-sync-before-switching": "Attendez la fin de la synchronisation complète avant de changer de compte",
"content-export-session-keys": "Saisissez un mot de passe pour cette sauvegarde de clé de session.\n\nVeuillez noter que l'exportation peut prendre un certain temps.",
"alert-log-out-enable-multiaccount": "Vous devez vous déconnecter de votre\\nsession actuelle pour activer le multicompte",
"content-import-session-keys-enter-password": "Saisissez le mot de passe pour cette importation de clé de session.",
"content-export-session-keys-enter-password": "Saisissez un mot de passe pour crypter vos clés de session.",
"content-import-session-keys": "Saisissez le mot de passe pour cette importation de clé de session.\n\nVeuillez noter que l'importation peut prendre un certain temps.",
"semantics-image-password-update": "Utilisateur imaginant un mot de passe dans un tourbillon de vent"
}
2 changes: 1 addition & 1 deletion assets/translations/hu.json
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@
"list-item-chat-detail-notification-setting": "Értesítési beállítások",
"button-chat-details": "beszélgetés részletei",
"list-item-chat-detail-vibrate": "Rezgés",
"list-item-user-details-confirm-start-chat": "Beszélgetés {} felhasználóval",
"list-item-user-details-start-chat": "Beszélgetés {} felhasználóval",
"list-item-image-options-remove-photo": "Kép eltávolítása",
"list-item-advanced-settings-stop-background": "Összes Service megállítása",
"content-notification-style-type-itemized": "Új értesítés mutatása minden egyes új üzenethez",
Expand Down
71 changes: 69 additions & 2 deletions assets/translations/id.json
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
"list-item-settings-sync-interval": "Interval Sinkronisasi",
"list-item-settings-sync-toggle": "Alih Sinkronisasi",
"list-item-user-details-invite-to-room": "Undang ke Ruangan",
"list-item-user-details-confirm-start-chat": "Obrol dengan {}",
"list-item-user-details-start-chat": "Obrol dengan {}",
"list-item-user-details-send-message": "Kirim Sebuah Pesan",
"list-item-user-details-view-profile": "Tampilkan Profil",
"list-item-user-details-unblock-user": "Hilangkan Pemblokiran Pengguna",
Expand Down Expand Up @@ -269,5 +269,72 @@
"list-item-chat-detail-vibrate": "Getaran",
"content-notification-style-type-latest": "Tampilkan satu notifikasi dengan pesan terbaru",
"label-show-attachment-options": "Buka opsi lampiran",
"content-support-dialog": "Komunitas Syphon ada untuk membantu Anda sebanyak yang kami bisa.\n\nSilakan bergabung ke obrolan Dukungam kami atau kirim kami sebuah email. Diingat bahwa email dapat membutuhkan 1-5+ hari kerja untuk sebuah balasan!"
"content-support-dialog": "Komunitas Syphon ada untuk membantu Anda sebanyak yang kami bisa.\n\nSilakan bergabung ke obrolan Dukungam kami atau kirim kami sebuah email. Diingat bahwa email dapat membutuhkan 1-5+ hari kerja untuk sebuah balasan!",
"label-syncing": "Menyinkron",
"header-ordering": "Urutan",
"header-media-auto-download": "Pengunduhan media otomatis",
"title-dialog-sync-interval": "Atur Interval Penyinkronan",
"title-dialog-chat-with-user": "Obrol dengan {}",
"title-dialog-attempt-chat-with-user": "Coba mengobrol dengan {}",
"title-import-session-keys": "Impor Kunci Sesi",
"title-export-session-keys": "Ekspor Kunci Sesi",
"title-dialog-confirm-deactivate-account": "Konfirmasi Penonaktifan Akun",
"title-dialog-backup-session-keys": "Cadangkan Kunci Sesi",
"title-dialog-enter-screen-lock-pin": "Masukkan pin kunci layar Anda saat ini",
"subtitle-settings-enter-sends": "Menekan tombol enter akan mengirimkan sebuah pesan",
"subtitle-settings-dismiss-keyboard": "Abaikan keyboard setelah mengirimkan sebuah pesan",
"subtitle-settings-view-uploaded-media": "Lihat semua data yang terunggah, bahkan yang tidak dapat diakses dari pesan",
"subtitle-manual-sync": "Lakukan sebuah penyinkronan matrix secara paksa berdasarkan stempel waktu penyinkronan terakhir",
"subtitle-force-full-sync": "Lakukan penyinkronan penuh secara paksa untuk semua data dan pesan-pesan pengguna",
"label-timestamp": "Stempel Waktu",
"label-none": "Tidak Ada",
"label-stopped": "Diberhentikan",
"label-version": "Versi",
"label-search-for-user": "Cari pengguna...",
"label-new-password": "Kata Sandi Baru",
"label-confirm-new-password": "Konfirmasi Kata Sandi Baru",
"list-item-settings-dismiss-keyboard": "Abaikan Keyboard",
"list-item-settings-sort-by": "Urut Berdasarkan",
"list-item-settings-group-by": "Kelompok Berdasarkan",
"list-item-settings-view-uploaded-media": "Lihat semua Media yang terunggah",
"list-item-settings-auto-download": "Pengunduhan Otomatis",
"list-item-settings-when-using-mobile-data": "Ketika menggunakan jaringan seluler",
"list-item-settings-when-using-wi-fi": "Ketika menggunakan Wi-Fi",
"list-item-settings-when-roaming": "Ketika Roaming",
"list-item-settings-force-full-sync": "Paksa Sinkron Penuh",
"title-dialog-logout": "Keluar",
"header-general": "Umum",
"header-media": "Media",
"header-update-password": "Perbarui Kata Sandi",
"title-dialog-remove-screen-lock": "Hilangkan Kunci Layar",
"title-blocked-users": "Pengguna Yang Diblokir",
"title-dialog-confirm-deactivate-account-final": "Konfirmasi Terakhir Penonaktifan Akun",
"button-text-remove": "Hapus",
"title-dialog-verify-new-screen-lock-pin": "Masukkan ulang pin Anda untuk memverifikasi",
"button-text-import": "impor",
"alert-storage-access-required-for-keys": "Masukkan kata sandi untuk pengimporan kunci sesi ini.",
"title-dialog-enter-new-screen-lock-pin": "Masukkan pin kunci layar Anda yang baru",
"subtitle-images-audio-video-files": "Gambar, Audio, Video, File",
"label-current-password": "Kata Sandi Saat Ini",
"list-item-settings-language": "Bahasa",
"list-item-settings-24h-format": "Format Waktu 24 Jam",
"alert-wait-for-full-sync-before-switching": "Tunggu untuk penyinkronan untuk selesai sebelum beralih ke akun lain",
"subtitle-settings-show-membership-events": "Tampilkan perubahan keanggotaan dalam obrolan",
"subtitle-settings-24h-format": "Tampilkan stempel waktu pesan menggunakan format 24 jam",
"subtitle-theme-settings": "Tema {}, Font {}",
"subtitle-privacy-settings": "Layar Kunci {}, Kunci Pendaftaran {}",
"label-seconds": "detik",
"button-text-confirm-delete-keys": "Hapus Kunci",
"list-item-settings-show-membership-events": "Tampilkan Peristiwa Keanggotaan",
"list-item-settings-enter-sends": "Tombol Enter Mengirim",
"list-item-settings-manual-sync": "Penyinkronan Manual",
"content-logout-multiaccount-confirm": "\n\nAnda memiliki beberapa akun lain, mengeluarkan dari akun Anda saat ini akan mengalihkan Anda ke sesi akun yang lain.",
"alert-log-out-enable-multiaccount": "Anda harus mengeluarkan\\nsesi Anda saat ini untuk mengaktifkan multiakun",
"content-import-session-keys-enter-password": "Masukkan kata sandi untuk pengimporan kunci sesi ini.",
"content-export-session-keys": "Masukkan sebuah kata sandi untuk cadangan kunci sesi ini.\n\nDiingat bahwa pengeksporan mungkin membutuhkan beberapa waktu untuk selesai.",
"content-export-session-keys-enter-password": "Masukkan sebuah kata sandi untuk mengenkripsikan kunci sesi.",
"content-import-session-keys": "Masukkan sebuah kata sandi untuk pengimporan kunci sesi ini.\n\nDiingat bahwa pengimporan mungkin membutuhkan beberapa waktu untuk selesai.",
"content-logout-confirm": "Apakah Anda yakin untuk keluar dari akun Anda?",
"content-remove-screen-lock": "Apakah Anda yakin untuk menghapus kunci layar? Ini juga akan menghapus lindungan pin cache",
"semantics-image-password-update": "Pengguna memikirkan sebuah kata sandi dalam putaran angin"
}
Loading

0 comments on commit 3b461cc

Please sign in to comment.