[WEBLATE] fix merging issues

This commit is contained in:
RiotTranslate 2017-05-26 18:51:55 +00:00
commit e46b63dc5a
6 changed files with 133 additions and 28 deletions

View file

@ -180,7 +180,8 @@ function _setCallState(call, roomId, status) {
}
dis.dispatch({
action: 'call_state',
room_id: roomId
room_id: roomId,
state: status,
});
}

View file

@ -358,7 +358,7 @@
"%(senderName)s changed their profile picture": "%(senderName)s änderte das Profilbild",
"%(senderName)s changed the power level of %(powerLevelDiffText)s": "%(senderName)s änderte das Berechtigungslevel von %(powerLevelDiffText)s",
"%(senderDisplayName)s changed the room name to %(roomName)s": "%(senderDisplayName)s änderte den Raumnamen zu %(roomName)s",
"%(senderDisplayName)s changed the topic to %(topic)s": "%(senderDisplayName)s änderte das Thema zu %(topic)s",
"%(senderDisplayName)s changed the topic to \"%(topic)s\"": "%(senderDisplayName)s änderte das Thema zu \"%(topic)s\"",
"/ddg is not a command": "/ddg ist kein Kommando",
"%(senderName)s ended the call": "%(senderName)s beendete den Anruf",
"Failed to lookup current room": "Aktuellen Raum nachzuschlagen schlug fehl",

View file

@ -120,27 +120,27 @@
"zh-tw": "Chinese (Taiwan)",
"zu": "Zulu",
"anyone.": "anyone",
"Direct Chat": "Chat direct",
"Direct chats": "Direct chats",
"Disable inline URL previews by default": "Disable inline URL previews by default",
"Disinvite": "Disinvite",
"Display name": "Display name",
"Displays action": "Displays action",
"Don't send typing notifications": "Don't send typing notifications",
"Download %(text)s": "Download %(text)s",
"Drop here %(toAction)s": "Drop here %(toAction)s",
"Drop here to tag %(section)s": "Drop here to tag %(section)s",
"Ed25519 fingerprint": "Ed25519 fingerprint",
"Email Address": "Email Address",
"Email, name or matrix ID": "Email, name or matrix ID",
"Emoji": "Emoji",
"Enable encryption": "Enable encryption",
"Encrypted messages will not be visible on clients that do not yet implement encryption": "Encrypted messages will not be visible on clients that do not yet implement encryption",
"Encrypted room": "Encrypted room",
"%(senderName)s ended the call": "%(senderName)s ended the call",
"End-to-end encryption information": "End-to-end encryption information",
"End-to-end encryption is in beta and may not be reliable": "End-to-end encryption is in beta and may not be reliable",
"Enter Code": "Enter Code",
"Direct Chat": "Conversation Directe",
"Direct chats": "Conversations directes",
"Disable inline URL previews by default": "Désactiver laperçu des URLs",
"Disinvite": "Désinviter",
"Display name": "Nom d'affichage",
"Displays action": "Affiche l'action",
"Don't send typing notifications": "Ne pas envoyer les notifications de saisie",
"Download %(text)s": "Télécharger %(text)s",
"Drop here %(toAction)s": "Déposer ici %(toAction)s",
"Drop here to tag %(section)s": "Déposer ici pour marque comme %(section)s",
"Ed25519 fingerprint": "Empreinte Ed25519",
"Email Address": "Adresse e-mail",
"Email, name or matrix ID": "E-mail, nom or identifiant Matrix",
"Emoji": "Emoticône",
"Enable encryption": "Activer l'encryption",
"Encrypted messages will not be visible on clients that do not yet implement encryption": "Les messages encryptés ne seront pas visibles dans les clients qui nimplémentent pas encore lencryption",
"Encrypted room": "Salon encrypté",
"%(senderName)s ended the call": "%(senderName)s a terminé lappel",
"End-to-end encryption information": "Information sur l'encryption bout-en-bout",
"End-to-end encryption is in beta and may not be reliable": "Lencryption bout-en-bout est en béta et risque de ne pas être fiable",
"Enter Code": "Entrer le code",
"Error": "Erreur",
"Event information": "Event information",
"Existing Call": "Existing Call",
@ -167,6 +167,111 @@
"italic": "italique",
"strike": "barré",
"underline": "souligné",
"A registered account is required for this action": "Il est nécessaire davoir un compte enregistré pour cette action",
"A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Un message a été envoyé à +%(msisdn)s. Merci dentrer le code de vérification quil contient"
"Favourite": "Favoris",
"Notifications": "Notifications",
"Settings": "Paramètres",
"Failed to join the room": "Échec de l'adhésion au salon",
"A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Un message texte a été envoyé à +%(msisdn)s. Merci d'entrer le code de vérification qu'il contient",
"accept": "Accepter",
"%(targetName)s accepted an invitation": "%(targetName)s a accepté une invitation",
"%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s a accepté une invitation de %(displayName)s",
"Account": "Compte",
"Add email address": "Ajouter une adresse e-mail",
"Add phone number": "Ajouter un numéro de téléphone",
"Admin": "Admin",
"Advanced": "Avancé",
"Algorithm": "Algorithme",
"all room members": "tous les membres du salon",
"all room members, from the point they are invited": "tous les membres du salon, depuis le moment où ils ont été invités",
"all room members, from the point they joined": "tous les membres du salon, depuis le moment où ils ont joint",
"an address": "une adresse",
"and": "et",
"%(items)s and %(remaining)s others": "%(items)s et %(remaining)s autres",
"%(items)s and one other": "%(items)s et un autre",
"%(items)s and %(lastItem)s": "%(items)s et %(lastItem)s",
"and %(overflowCount)s others...": "et %(overflowCount)s autres...",
"and one other...": "et un autre...",
"%(names)s and %(lastPerson)s are typing": "%(names)s et %(lastPerson)s sont en train de taper",
"%(names)s and one other are typing": "%(names)s et un autre sont en train de taper",
"%(names)s and %(count)s others are typing": "%(names)s et %(count)s d'autres sont en train de taper",
"An email has been sent to": "Un e-mail a été envoyé à",
"A new password must be entered.": "Un nouveau mot de passe doit être entré.",
"%(senderName)s answered the call": "%(senderName)s a répondu à lappel",
"Anyone who knows the room's link, apart from guests": "Tout ceux qui connaissent le lien du salon, à part les invités",
"Anyone who knows the room's link, including guests": "Tout ceux qui connaissent le lien du salon, y compris les invités",
"Are you sure?": "Êtes-vous sûr ?",
"Are you sure you want to reject the invitation?": "Êtes-vous sûr de vouloir rejeter l'invitation ?",
"Are you sure you want upload the following files?": "Êtes-vous sûr de vouloir télécharger les fichiers suivants ?",
"Attachment": "Pièce jointe",
"Autoplay GIFs and videos": "Jouer automatiquement les GIFs et vidéos",
"%(senderName)s banned %(targetName)s": "%(senderName)s a banni %(targetName)s",
"Ban": "Bannir",
"Banned users": "Utilisateurs bannis",
"Bans user with given id": "Utilisateurs bannis avec un identifiant donné",
"Blacklisted": "Sur liste noire",
"Bug Report": "Rapport d'erreur",
"Call Timeout": "Délai dappel expiré",
"Can't connect to homeserver - please check your connectivity and ensure your %(urlStart)s homeserver's SSL certificate %(urlEnd)s is trusted": "Connexion au Home Server impossible - merci de vérifier votre connectivité et que le %(urlStart)s certificat SSL de votre Home Server %(urlEnd)s est de confiance",
"Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or %(urlStart)s enable unsafe scripts %(urlEnd)s": "Impossible de se connecter au homeserver en HTTP si l'URL dans la barre de votre explorateur est en HTTPS. Utilisez HTTPS ou %(urlStart)s activez le support des scripts non-vérifiés %(urlEnd)s",
"Can't load user settings": "Impossible de charger les paramètres utilisateur",
"Change Password": "Changer le mot de passe",
"%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s": "%(senderName)s a changé son nom daffichage de %(oldDisplayName)s en %(displayName)s",
"%(senderName)s changed their profile picture": "%(senderName)s a changé sa photo de profil",
"%(senderName)s changed the power level of %(powerLevelDiffText)s": "%(senderName)s a changé le niveau de pouvoir de %(powerLevelDiffText)s",
"%(senderDisplayName)s changed the room name to %(roomName)s": "%(senderDisplayName)s a changé le nom du salon en %(roomName)s",
"%(senderDisplayName)s changed the topic to \"%(topic)s\"": "%(senderDisplayName)s a changé le sujet du salon en \"%(topic)s\"",
"Changes to who can read history will only apply to future messages in this room": "Les changements de visibilité de lhistorique de ce salon ne sappliquent quaux messages futurs",
"Changes your display nickname": "Change votre nom d'affichage",
"Claimed Ed25519 fingerprint key": "Clé empreinte Ed25519 revendiquée",
"Clear Cache and Reload": "Vider le cache et recharger",
"Clear Cache": "Vider le cache",
"Click here": "Cliquer ici",
"Click here to fix": "Cliquer ici pour réparer",
"Click to mute audio": "Cliquer pour couper le son",
"Click to mute video": "Cliquer ici pour couper la vidéo",
"click to reveal": "cliquer pour dévoiler",
"Click to unmute video": "Cliquer pour rétablir la vidéo",
"Click to unmute audio": "Cliquer pour rétablir le son",
"Command error": "Erreur de commande",
"Commands": "Commandes",
"Conference call failed": "Échec de la conférence",
"Conference calling is in development and may not be reliable": "Les appels en conférence sont encore en développement et sont potentiellement peu fiables",
"Conference calls are not supported in encrypted rooms": "Les appels en conférence ne sont pas supportés dans les salons encryptés",
"Conference calls are not supported in this client": "Les appels en conférence ne sont pas supportés avec ce client",
"Confirm password": "Confirmer le mot de passe",
"Confirm your new password": "Confirmer votre nouveau mot de passe",
"Continue": "Continuer",
"Could not connect to the integration server": "Impossible de se connecter au serveur d'intégration",
"Create an account": "Créer un compte",
"Create Room": "Créer un salon",
"Cryptography": "Encryption",
"Current password": "Mot de passe actuel",
"Curve25519 identity key": "Clé didentité Curve25519",
"/ddg is not a command": "/ddg n'est pas une commande",
"Deactivate Account": "Désactiver le compte",
"Deactivate my account": "Désactiver mon compte",
"decline": "décliner",
"Decrypt %(text)s": "Décrypter %(text)s",
"Decryption error": "Erreur de décryptage",
"Delete": "Supprimer",
"demote": "rétrograder",
"Deops user with given id": "Retire les privilèges dopérateur dun utilisateur avec un ID donné",
"Device ID": "ID de l'appareil",
"Devices": "Appareils",
"Devices will not yet be able to decrypt history from before they joined the room": "Les appareils ne seront pas capables de décrypter lhistorique précédant leur adhésion au salon",
"ml": "Malayalam",
"Failed to join room": "Échec lors de ladhésion au salon",
"Failed to kick": "Échec lors de l'expulsion",
"Failed to leave room": "Échec du départ",
"Failed to load timeline position": "Erreur lors du chargement de la position dans la chronologie",
"Failed to lookup current room": "Échec lors de la recherche du salon actuel",
"Failed to mute user": "Échec lors de l'interruption de l'utilisateur",
"Failed to reject invite": "Échec lors du rejet de l'invitation",
"Failed to reject invitation": "Échec lors du rejet de l'invitation",
"Failed to save settings": "Échec lors de la sauvegarde des paramètres",
"Failed to send email": "Échec lors de lenvoi de le-mail",
"Failed to send request": "Échec lors de lenvoi de la requête",
"Failed to set display name": "Échec lors de l'enregistrement du nom d'affichage",
"Failed to set up conference call": "Échec lors de létablissement de lappel",
"Failed to toggle moderator status": "Échec lors de létablissement du statut de modérateur"
}

View file

@ -319,7 +319,7 @@
"%(senderName)s changed their profile picture": "%(senderName)s alterou sua imagem de perfil",
"%(senderName)s changed the power level of %(powerLevelDiffText)s": "%(senderName)s alterou o nível de permissões de %(powerLevelDiffText)s",
"%(senderDisplayName)s changed the room name to %(roomName)s": "%(senderDisplayName)s alterou o nome da sala para %(roomName)s",
"%(senderDisplayName)s changed the topic to %(topic)s": "%(senderDisplayName)s alterou o tópico para %(topic)s",
"%(senderDisplayName)s changed the topic to \"%(topic)s\"": "%(senderDisplayName)s alterou o tópico para \"%(topic)s\"",
"click to reveal": "clique para ver",
"Conference call failed": "Chamada de conferência falhou",
"Conference calling is in development and may not be reliable": "Chamadas de conferência estão em desenvolvimento e portanto podem não funcionar",

View file

@ -324,7 +324,6 @@
"%(senderName)s changed their profile picture": "%(senderName)s alterou sua imagem de perfil",
"%(senderName)s changed the power level of %(powerLevelDiffText)s": "%(senderName)s alterou o nível de permissões de %(powerLevelDiffText)s",
"%(senderDisplayName)s changed the room name to %(roomName)s": "%(senderDisplayName)s alterou o nome da sala para %(roomName)s",
"%(senderDisplayName)s changed the topic to %(topic)s": "%(senderDisplayName)s alterou o tópico para %(topic)s",
"click to reveal": "clique para ver",
"Conference call failed": "Chamada de conferência falhou",
"Conference calling is in development and may not be reliable": "Chamadas de conferência estão em desenvolvimento e portanto podem não funcionar",

View file

@ -231,7 +231,7 @@
"%(senderName)s changed their profile picture": "%(senderName)s измененное ихнее фото профиля",
"%(senderName)s changed the power level of %(powerLevelDiffText)s": "%(senderName)s уровень мощности изменен на %(powerLevelDiffText)s",
"%(senderDisplayName)s changed the room name to %(roomName)s": "%(senderDisplayName)s имя комнаты измененно на %(roomName)s",
"%(senderDisplayName)s changed the topic to %(topic)s": "%(senderDisplayName)s измененная тема на %(topic)s",
"%(senderDisplayName)s changed the topic to \"%(topic)s\"": "%(senderDisplayName)s измененная тема на %(topic)s",
"Conference call failed": "Конференц-вызов прервался",
"Conference calling is in development and may not be reliable": "Конференц-вызов находится в процессе и может не быть надежным",
"Conference calls are not supported in encrypted rooms": "Конференц-вызовы не поддерживаются в зашифрованных комнатах",