Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 43e4b05

Browse files
committed
Merge remote-tracking branch 'origin/develop' into release-v0.14.5
2 parents 5dd1557 + 4ea1e4e commit 43e4b05

File tree

18 files changed

+2005
-112
lines changed

18 files changed

+2005
-112
lines changed

src/i18n/strings/bg.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1291,5 +1291,13 @@
12911291
"Clear cache and resync": "Изчисти кеша и ресинхронизирай",
12921292
"Please accept all of the policies": "Моля, приемете всички политики",
12931293
"Please review and accept the policies of this homeserver:": "Моля, прегледайте и приемете политиките на този сървър:",
1294-
"Add some now": "Добави сега"
1294+
"Add some now": "Добави сега",
1295+
"Pin unread rooms to the top of the room list": "Закачане на непрочетени стаи най-отгоре в списъка",
1296+
"Pin rooms I'm mentioned in to the top of the room list": "Закачане на споменаващи ме стаи най-отгоре в списъка",
1297+
"Joining room...": "Влизане в стая...",
1298+
"You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Вие сте администратор на тази общност. Няма да можете да се присъедините пак без покана от друг администратор.",
1299+
"Open Devtools": "Отвори инструментите за разработчици",
1300+
"Show developer tools": "Покажи инструментите за разработчици",
1301+
"If you would like to create a Matrix account you can <a>register</a> now.": "Ако искате да създадете Matrix акаунт, може да се <a>регистрирате</a> тук.",
1302+
"You are currently using Riot anonymously as a guest.": "В момента използвате Riot анонимно, като гост."
12951303
}

src/i18n/strings/de_DE.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1291,5 +1291,14 @@
12911291
"Incompatible local cache": "Inkompatibler lokaler Zwischenspeicher",
12921292
"Clear cache and resync": "Zwischenspeicher löschen und erneut synchronisieren",
12931293
"Please accept all of the policies": "Bitte akzeptiere alle Bedingungen",
1294-
"Please review and accept the policies of this homeserver:": "Bitte sieh dir alle Bedingungen dieses Heimservers an und akzeptiere sie:"
1294+
"Please review and accept the policies of this homeserver:": "Bitte sieh dir alle Bedingungen dieses Heimservers an und akzeptiere sie:",
1295+
"Pin unread rooms to the top of the room list": "Ungelesene Räume oben an der Raumliste anheften",
1296+
"Pin rooms I'm mentioned in to the top of the room list": "Räume mit Erwähnungen oben an der Raumliste anheften",
1297+
"Joining room...": "Trete Raum bei...",
1298+
"Add some now": "Füge jetzt hinzu",
1299+
"You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Du bist ein Administrator dieser Community. Du wirst nicht erneut hinzutreten können, wenn du nicht von einem anderen Administrator eingeladen wirst.",
1300+
"Open Devtools": "Öffne Entwickler-Werkzeuge",
1301+
"Show developer tools": "Zeige Entwickler-Werkzeuge",
1302+
"If you would like to create a Matrix account you can <a>register</a> now.": "Wenn du ein Matrix-Konto erstellen möchtest, kannst du dich jetzt <a>registrieren</a>.",
1303+
"You are currently using Riot anonymously as a guest.": "Du benutzt aktuell Riot anonym als Gast."
12951304
}

src/i18n/strings/en_US.json

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -840,5 +840,45 @@
840840
"Your homeserver's URL": "Your homeserver's URL",
841841
"Your identity server's URL": "Your identity server's URL",
842842
"e.g. %(exampleValue)s": "e.g. %(exampleValue)s",
843-
"Every page you use in the app": "Every page you use in the app"
843+
"Every page you use in the app": "Every page you use in the app",
844+
"e.g. <CurrentPageURL>": "e.g. <CurrentPageURL>",
845+
"Your User Agent": "Your User Agent",
846+
"Your device resolution": "Your device resolution",
847+
"The information being sent to us to help make Riot.im better includes:": "The information being sent to us to help make Riot.im better includes:",
848+
"Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.",
849+
"Call Failed": "Call Failed",
850+
"There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.",
851+
"Review Devices": "Review Devices",
852+
"Call Anyway": "Call Anyway",
853+
"Answer Anyway": "Answer Anyway",
854+
"Call": "Call",
855+
"Answer": "Answer",
856+
"A conference call could not be started because the intgrations server is not available": "A conference call could not be started because the integrations server is not available",
857+
"Call in Progress": "Call in Progress",
858+
"A call is currently being placed!": "A call is currently being placed!",
859+
"A call is already in progress!": "A call is already in progress!",
860+
"Permission Required": "Permission Required",
861+
"You do not have permission to start a conference call in this room": "You do not have permission to start a conference call in this room",
862+
"%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
863+
"Who would you like to add to this community?": "Who would you like to add to this community?",
864+
"Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID",
865+
"Invite new community members": "Invite new community members",
866+
"Name or matrix ID": "Name or matrix ID",
867+
"Invite to Community": "Invite to Community",
868+
"Which rooms would you like to add to this community?": "Which rooms would you like to add to this community?",
869+
"Show these rooms to non-members on the community page and room list?": "Show these rooms to non-members on the community page and room list?",
870+
"Add rooms to the community": "Add rooms to the community",
871+
"Room name or alias": "Room name or alias",
872+
"Add to community": "Add to community",
873+
"Failed to invite the following users to %(groupId)s:": "Failed to invite the following users to %(groupId)s:",
874+
"Failed to invite users to community": "Failed to invite users to community",
875+
"Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
876+
"Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
877+
"Registration Required": "Registration Required",
878+
"You need to register to do this. Would you like to register now?": "You need to register to do this. Would you like to register now?",
879+
"Restricted": "Restricted",
880+
"Missing roomId.": "Missing roomId.",
881+
"Opens the Developer Tools dialog": "Opens the Developer Tools dialog",
882+
"Forces the current outbound group session in an encrypted room to be discarded": "Forces the current outbound group session in an encrypted room to be discarded",
883+
"%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s changed their display name to %(displayName)s."
844884
}

src/i18n/strings/eo.json

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1110,5 +1110,19 @@
11101110
"<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Redemandi ĉifroŝlosilojn</requestLink> el viaj aliaj aparatoj.",
11111111
"Encrypting": "Ĉifranta",
11121112
"Encrypted, not sent": "Ĉifrita, ne sendita",
1113-
"If your other devices do not have the key for this message you will not be able to decrypt them.": "Se viaj aliaj aparatoj ne havas la ŝlosilon por ĉi tiu mesaĝo, vi ne povos malĉifri ĝin."
1113+
"If your other devices do not have the key for this message you will not be able to decrypt them.": "Se viaj aliaj aparatoj ne havas la ŝlosilon por ĉi tiu mesaĝo, vi ne povos malĉifri ĝin.",
1114+
"Permission Required": "Necesas permeso",
1115+
"Registration Required": "Necesas registriĝo",
1116+
"You need to register to do this. Would you like to register now?": "Por fari ĉi tion, vi bezonas registriĝi. Ĉu vi volas registriĝi nun?",
1117+
"Missing roomId.": "Mankas identigilo de la ĉambro.",
1118+
"%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s aldonis %(addedAddresses)s kiel adresojn por la ĉambro.",
1119+
"%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s aldonis %(addedAddresses)s kiel adreson por la ĉambro.",
1120+
"%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s forigis %(removedAddresses)s kiel adresojn por la ĉambro.",
1121+
"%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s forigis %(removedAddresses)s kiel adreson por la ĉambro.",
1122+
"%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s aldonis %(addedAddresses)s kaj forigis %(removedAddresses)s kiel adresojn por la ĉambro.",
1123+
"%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s agordis la ĉefan adreson por la ĉambro al %(address)s.",
1124+
"%(senderName)s removed the main address for this room.": "%(senderName)s forigis la ĉefan adreson de la ĉambro.",
1125+
"Please <a>contact your service administrator</a> to continue using the service.": "Bonvolu <a>kontakti administranton de la servo</a> por daŭre uzadi la servon.",
1126+
"Pin unread rooms to the top of the room list": "Fiksi nelegitajn ĉambrojn supre de la listo",
1127+
"Pin rooms I'm mentioned in to the top of the room list": "Fiksi ĉambrojn kun mencioj de mia nomo supre de la listo"
11141128
}

src/i18n/strings/eu.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1292,5 +1292,13 @@
12921292
"If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Rioten beste bertsioa oraindik beste fitxat batean irekita badago, itxi ezazu zerbitzari bera aldi berean karga alferra gaituta eta desgaituta erabiltzeak arazoak sor ditzakeelako.",
12931293
"Incompatible local cache": "Katxe lokal bateraezina",
12941294
"Clear cache and resync": "Garbitu katxea eta sinkronizatu berriro",
1295-
"Add some now": "Gehitu batzuk orain"
1295+
"Add some now": "Gehitu batzuk orain",
1296+
"Joining room...": "Gelara elkartzen...",
1297+
"You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Komunitate honen administratzailea zara. Ezin izango duzu berriro elkartu ez bazaitu beste administratzaile batek gonbidatzen.",
1298+
"Open Devtools": "Ireki garapen tresnak",
1299+
"Show developer tools": "Erakutsi garapen tresnak",
1300+
"Pin unread rooms to the top of the room list": "Finkatu irakurri gabeko gelak gelen zerrendaren goialdean",
1301+
"Pin rooms I'm mentioned in to the top of the room list": "Finkatu aipatu nauten gelak gelen zerrendaren goialdean",
1302+
"If you would like to create a Matrix account you can <a>register</a> now.": "Matrix kontu bat sortu nahi baduzu, <a>izena eman</a> dezakezu.",
1303+
"You are currently using Riot anonymously as a guest.": "Riot anonimoki gonbidatu gisa erabiltzen ari zara."
12961304
}

src/i18n/strings/fr.json

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
"Devices": "Appareils",
103103
"Devices will not yet be able to decrypt history from before they joined the room": "Les appareils ne pourront pas encore déchiffrer l'historique de messages d'avant leur arrivée sur le salon",
104104
"Failed to join room": "Échec de l’inscription au salon",
105-
"Failed to kick": "Échec de l'exclusion",
105+
"Failed to kick": "Échec de l'expulsion",
106106
"Failed to leave room": "Échec du départ du salon",
107107
"Failed to load timeline position": "Échec du chargement de la position dans l'historique",
108108
"Failed to mute user": "Échec de la mise en sourdine de l'utilisateur",
@@ -157,9 +157,9 @@
157157
"Join Room": "Rejoindre le salon",
158158
"%(targetName)s joined the room.": "%(targetName)s a rejoint le salon.",
159159
"Joins room with given alias": "Rejoint le salon avec l'alias renseigné",
160-
"%(senderName)s kicked %(targetName)s.": "%(senderName)s a exclu %(targetName)s.",
161-
"Kick": "Exclure",
162-
"Kicks user with given id": "Exclut l'utilisateur à partir de son identifiant",
160+
"%(senderName)s kicked %(targetName)s.": "%(senderName)s a expulsé %(targetName)s.",
161+
"Kick": "Expulser",
162+
"Kicks user with given id": "Expulse l'utilisateur à partir de son identifiant",
163163
"Labs": "Laboratoire",
164164
"Leave room": "Quitter le salon",
165165
"%(targetName)s left the room.": "%(targetName)s a quitté le salon.",
@@ -592,7 +592,7 @@
592592
"Verified": "Vérifié",
593593
"Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Souhaitez-vous <acceptText>accepter</acceptText> ou <declineText>refuser</declineText> cette invitation ?",
594594
"You have been banned from %(roomName)s by %(userName)s.": "Vous avez été banni(e) de %(roomName)s par %(userName)s.",
595-
"You have been kicked from %(roomName)s by %(userName)s.": "Vous avez été exclu de %(roomName)s par %(userName)s.",
595+
"You have been kicked from %(roomName)s by %(userName)s.": "%(userName)s vous a expulsé de %(roomName)s.",
596596
"You may wish to login with a different account, or add this email to this account.": "Vous souhaiteriez peut-être vous identifier avec un autre compte, ou ajouter cette e-mail à votre compte.",
597597
"Your home server does not support device management.": "Votre serveur d'accueil ne prend pas en charge la gestion d'appareils.",
598598
"(~%(count)s results)|one": "(~%(count)s résultat)",
@@ -637,7 +637,7 @@
637637
"Define the power level of a user": "Définir le rang d'un utilisateur",
638638
"Edit": "Modifier",
639639
"Enable automatic language detection for syntax highlighting": "Activer la détection automatique de la langue pour la correction orthographique",
640-
"Hide join/leave messages (invites/kicks/bans unaffected)": "Masquer les messages d'arrivée/départ (n'affecte pas les invitations/exclusions/bannissements)",
640+
"Hide join/leave messages (invites/kicks/bans unaffected)": "Masquer les messages d'arrivée/départ (n'affecte pas les invitations/expulsions/bannissements)",
641641
"Revoke widget access": "Révoquer les accès du widget",
642642
"Sets the room topic": "Défini le sujet du salon",
643643
"To get started, please pick a username!": "Pour commencer, choisissez un nom d'utilisateur !",
@@ -719,7 +719,7 @@
719719
"Guests can join": "Les invités peuvent rejoindre le salon",
720720
"To invite users into the room, you must be a": "Pour inviter des utilisateurs dans le salon, vous devez être un(e)",
721721
"To configure the room, you must be a": "Pour configurer le salon, vous devez être un(e)",
722-
"To kick users, you must be a": "Pour exclure des utilisateurs, vous devez être un(e)",
722+
"To kick users, you must be a": "Pour expulser des utilisateurs, vous devez être",
723723
"To ban users, you must be a": "Pour bannir des utilisateurs, vous devez être un(e)",
724724
"To remove other users' messages, you must be a": "Pour supprimer les messages d'autres utilisateurs, vous devez être un(e)",
725725
"To send events of type <eventType/>, you must be a": "Pour envoyer des évènements du type <eventType/>, vous devez être un",
@@ -730,14 +730,14 @@
730730
"%(senderName)s sent a video": "%(senderName)s a envoyé une vidéo",
731731
"%(senderName)s uploaded a file": "%(senderName)s a transféré un fichier",
732732
"Disinvite this user?": "Désinviter l'utilisateur ?",
733-
"Kick this user?": "Exclure cet utilisateur ?",
733+
"Kick this user?": "Expulser cet utilisateur ?",
734734
"Unban this user?": "Révoquer le bannissement de cet utilisateur ?",
735735
"Ban this user?": "Bannir cet utilisateur ?",
736736
"Drop here to favourite": "Déposer ici pour mettre en favori",
737737
"Drop here to tag direct chat": "Déposer ici pour marquer comme conversation directe",
738738
"Drop here to restore": "Déposer ici pour restaurer",
739739
"Drop here to demote": "Déposer ici pour rétrograder",
740-
"You have been kicked from this room by %(userName)s.": "Vous avez été exclu de ce salon par %(userName)s.",
740+
"You have been kicked from this room by %(userName)s.": "%(userName)s vous a expulsé de ce salon.",
741741
"You have been banned from this room by %(userName)s.": "Vous avez été banni de ce salon par %(userName)s.",
742742
"You are trying to access a room.": "Vous essayez d'accéder à un salon.",
743743
"Members only (since the point in time of selecting this option)": "Seulement les membres (depuis la sélection de cette option)",
@@ -798,10 +798,10 @@
798798
"were unbanned %(count)s times|one": "ont vu leur bannissement révoqué",
799799
"was unbanned %(count)s times|other": "a vu son bannissement révoqué %(count)s fois",
800800
"was unbanned %(count)s times|one": "a vu son bannissement révoqué",
801-
"were kicked %(count)s times|other": "ont été exclus %(count)s fois",
802-
"were kicked %(count)s times|one": "ont été exclus",
803-
"was kicked %(count)s times|other": "a été exclu %(count)s fois",
804-
"was kicked %(count)s times|one": "a été exclu",
801+
"were kicked %(count)s times|other": "ont été expulsés %(count)s fois",
802+
"were kicked %(count)s times|one": "ont été expulsés",
803+
"was kicked %(count)s times|other": "a été expulsé %(count)s fois",
804+
"was kicked %(count)s times|one": "a été expulsé",
805805
"%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s ont changé de nom %(count)s fois",
806806
"%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s ont changé de nom",
807807
"%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s a changé de nom %(count)s fois",
@@ -1294,5 +1294,13 @@
12941294
"Clear cache and resync": "Vider le cache et resynchroniser",
12951295
"Please accept all of the policies": "Veuillez accepter toutes les politiques",
12961296
"Please review and accept the policies of this homeserver:": "Veuillez lire et accepter les politiques de ce serveur d'accueil :",
1297-
"Add some now": "En ajouter maintenant"
1297+
"Add some now": "En ajouter maintenant",
1298+
"Joining room...": "Adhésion au salon…",
1299+
"You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Vous êtes administrateur de cette communauté. Vous ne pourrez pas revenir sans une invitation d'un autre administrateur.",
1300+
"Open Devtools": "Ouvrir les outils développeur",
1301+
"Show developer tools": "Afficher les outils de développeur",
1302+
"Pin unread rooms to the top of the room list": "Épingler les salons non lus en haut de la liste des salons",
1303+
"Pin rooms I'm mentioned in to the top of the room list": "Épingler les salons où l'on me mentionne en haut de la liste des salons",
1304+
"If you would like to create a Matrix account you can <a>register</a> now.": "Si vous souhaitez créer un compte Matrix, vous pouvez <a>vous inscrire</a> maintenant.",
1305+
"You are currently using Riot anonymously as a guest.": "Vous utilisez Riot de façon anonyme en tant qu'invité."
12981306
}

0 commit comments

Comments
 (0)