fix: translation conflict

This commit is contained in:
Raatty 2022-02-19 21:02:56 +00:00 committed by Krille Fear
parent c416b5366f
commit f46c6fc8e3
11 changed files with 164 additions and 16 deletions

View File

@ -2708,12 +2708,19 @@
"iUnderstand": "I understand", "iUnderstand": "I understand",
"@iUnderstand": {}, "@iUnderstand": {},
"openChat": "Open Chat", "openChat": "Open Chat",
"@openChat": {},
"markAsRead": "Mark as read", "markAsRead": "Mark as read",
"@markAsRead": {},
"reportUser": "Report user", "reportUser": "Report user",
"@reportUser": {},
"dismiss": "Dismiss", "dismiss": "Dismiss",
"@dismiss": {},
"matrixWidgets": "Matrix Widgets", "matrixWidgets": "Matrix Widgets",
"@matrixWidgets": {},
"integrationsNotImplemented": "Editing widgets and integrations is not possible yet.", "integrationsNotImplemented": "Editing widgets and integrations is not possible yet.",
"@integrationsNotImplemented": {},
"editIntegrations": "Edit widgets and integrations", "editIntegrations": "Edit widgets and integrations",
"@editIntegrations": {},
"reactedWith": "{sender} reacted with {reaction}", "reactedWith": "{sender} reacted with {reaction}",
"@reactedWith": { "@reactedWith": {
"type": "text", "type": "text",
@ -2723,14 +2730,23 @@
} }
}, },
"pinMessage": "Pin to room", "pinMessage": "Pin to room",
"@pinMessage": {},
"pinnedEventsError": "Error loading pinned messages", "pinnedEventsError": "Error loading pinned messages",
"@pinnedEventsError": {},
"confirmEventUnpin": "Are you sure to permanently unpin the event?", "confirmEventUnpin": "Are you sure to permanently unpin the event?",
"@confirmEventUnpin": {},
"emojis": "Emojis", "emojis": "Emojis",
"@emojis": {},
"placeCall": "Place call", "placeCall": "Place call",
"@placeCall": {},
"voiceCall": "Voice call", "voiceCall": "Voice call",
"@voiceCall": {},
"unsupportedAndroidVersion": "Unsupported Android version", "unsupportedAndroidVersion": "Unsupported Android version",
"@unsupportedAndroidVersion": {},
"unsupportedAndroidVersionLong": "This feature required a never Android version. Please check for updates or Lineage OS support.", "unsupportedAndroidVersionLong": "This feature required a never Android version. Please check for updates or Lineage OS support.",
"@unsupportedAndroidVersionLong": {},
"videoCallsBetaWarning": "Please note that video calls are currently in beta. They might not work as expected or work at all on all platforms.", "videoCallsBetaWarning": "Please note that video calls are currently in beta. They might not work as expected or work at all on all platforms.",
"@videoCallsBetaWarning": {},
"experimentalVideoCalls": "Experimental video calls", "experimentalVideoCalls": "Experimental video calls",
"emailOrUsername": "Email or username" "emailOrUsername": "Email or username"
} }

View File

@ -2726,5 +2726,7 @@
"pinnedEventsError": "Viga klammerdatud sõnumite laadimisel", "pinnedEventsError": "Viga klammerdatud sõnumite laadimisel",
"@pinnedEventsError": {}, "@pinnedEventsError": {},
"pinMessage": "Klammerda sõnum jututuppa", "pinMessage": "Klammerda sõnum jututuppa",
"@pinMessage": {} "@pinMessage": {},
"videoCallsBetaWarning": "Palun arvesta, et videokõned on veel beetajärgus. Nad ei pruugi veel toimida kõikidel platvormidel korrektselt.",
"@videoCallsBetaWarning": {}
} }

View File

@ -2708,5 +2708,41 @@
"@bubbleSize": { "@bubbleSize": {
"type": "text", "type": "text",
"placeholders": {} "placeholders": {}
},
"emojis": "Hymiöt",
"@emojis": {},
"unsupportedAndroidVersionLong": "Tämä ominaisuus vaatii uudemman Android-version. Tarkista päivitykset tai LineageOS-tuki.",
"@unsupportedAndroidVersionLong": {},
"unsupportedAndroidVersion": "Ei tuettu Android-versio",
"@unsupportedAndroidVersion": {},
"reportUser": "Ilmianna käyttäjä",
"@reportUser": {},
"voiceCall": "Äänipuhelu",
"@voiceCall": {},
"videoCallsBetaWarning": "Huomaathan videopuheluiden ovan beta-asteella. Ne eivät ehkä toimi odotetusti tai toimi ollenkaan kaikilla alustoilla.",
"@videoCallsBetaWarning": {},
"placeCall": "Soita",
"@placeCall": {},
"matrixWidgets": "Matrix-pienoisohjelmat",
"@matrixWidgets": {},
"integrationsNotImplemented": "Pienoisohjelmien ja integraatioiden muokkaus ei ole vielä mahdollista.",
"@integrationsNotImplemented": {},
"editIntegrations": "Muokkaa pienoisohjelmia ja integraatioita",
"@editIntegrations": {},
"reactedWith": "{sender} reagoi {reaction}",
"@reactedWith": {
"type": "text",
"placeholders": {
"sender": {},
"reaction": {}
} }
},
"openChat": "Avaa Keskustelu",
"@openChat": {},
"pinMessage": "Kiinnitä huoneeseen",
"@pinMessage": {},
"pinnedEventsError": "Virhe ladattaessa kiinnitettyjä viestejä",
"@pinnedEventsError": {},
"confirmEventUnpin": "Haluatko varmasti irrottaa tapahtuman pysyvästi?",
"@confirmEventUnpin": {}
} }

View File

@ -2761,5 +2761,7 @@
"pinnedEventsError": "Erreur lors du chargement des messages épinglés", "pinnedEventsError": "Erreur lors du chargement des messages épinglés",
"@pinnedEventsError": {}, "@pinnedEventsError": {},
"confirmEventUnpin": "Voulez-vous vraiment désépingler définitivement l'événement ?", "confirmEventUnpin": "Voulez-vous vraiment désépingler définitivement l'événement ?",
"@confirmEventUnpin": {} "@confirmEventUnpin": {},
"videoCallsBetaWarning": "Veuillez noter que les appels vidéo sont actuellement en version bêta. Ils peuvent ne pas fonctionner comme prévu ou ne oas fonctionner du tout sur toutes les plateformes.",
"@videoCallsBetaWarning": {}
} }

View File

@ -112,7 +112,7 @@
"type": "text", "type": "text",
"placeholders": {} "placeholders": {}
}, },
"areYouSureYouWantToLogout": "Tes a certeza de querer desconectar?", "areYouSureYouWantToLogout": "Tes a certeza de querer saír?",
"@areYouSureYouWantToLogout": { "@areYouSureYouWantToLogout": {
"type": "text", "type": "text",
"placeholders": {} "placeholders": {}
@ -1270,12 +1270,12 @@
"type": "text", "type": "text",
"placeholders": {} "placeholders": {}
}, },
"login": "Conectar", "login": "Acceder",
"@login": { "@login": {
"type": "text", "type": "text",
"placeholders": {} "placeholders": {}
}, },
"logInTo": "Conectar con {homeserver}", "logInTo": "Entrar en {homeserver}",
"@logInTo": { "@logInTo": {
"type": "text", "type": "text",
"placeholders": { "placeholders": {
@ -1289,7 +1289,7 @@
"brand": {} "brand": {}
} }
}, },
"logout": "Desconectar", "logout": "Saír",
"@logout": { "@logout": {
"type": "text", "type": "text",
"placeholders": {} "placeholders": {}
@ -2544,7 +2544,7 @@
"type": "text", "type": "text",
"placeholders": {} "placeholders": {}
}, },
"youWillBeConnectedTo": "Vaste conectar a {homeserver}", "youWillBeConnectedTo": "Vas acceder a {homeserver}",
"@youWillBeConnectedTo": { "@youWillBeConnectedTo": {
"type": "text", "type": "text",
"placeholders": { "placeholders": {
@ -2723,5 +2723,37 @@
"reportUser": "Denunciar usuaria", "reportUser": "Denunciar usuaria",
"@reportUser": {}, "@reportUser": {},
"openChat": "Abrir Chat", "openChat": "Abrir Chat",
"@openChat": {} "@openChat": {},
"voiceCall": "Chamada de voz",
"@voiceCall": {},
"emojis": "Emojis",
"@emojis": {},
"placeCall": "Chamar",
"@placeCall": {},
"unsupportedAndroidVersionLong": "Esta característica require unha vesión máis recente de Android. Mira se hai actualizacións ou soporte de LineageOS.",
"@unsupportedAndroidVersionLong": {},
"videoCallsBetaWarning": "Ten en conta que as chamadas de vídeo están en fase beta. Poderían non funcionar correctamente ou non funcionar nalgunhas plataformas.",
"@videoCallsBetaWarning": {},
"unsupportedAndroidVersion": "Version de Android non soportada",
"@unsupportedAndroidVersion": {},
"matrixWidgets": "Widgets de Matrix",
"@matrixWidgets": {},
"integrationsNotImplemented": "Por agora non se poden editar os widgets e integracións.",
"@integrationsNotImplemented": {},
"editIntegrations": "Editar widgets e integracións",
"@editIntegrations": {},
"reactedWith": "{sender} reaccionou con {reaction}",
"@reactedWith": {
"type": "text",
"placeholders": {
"sender": {},
"reaction": {}
}
},
"pinMessage": "Fixar na sala",
"@pinMessage": {},
"pinnedEventsError": "Erro ao cargar mensaxes fixadas",
"@pinnedEventsError": {},
"confirmEventUnpin": "Tes a certeza de querer desafixar o evento?",
"@confirmEventUnpin": {}
} }

View File

@ -2755,5 +2755,7 @@
"placeCall": "Lakukan panggilan", "placeCall": "Lakukan panggilan",
"@placeCall": {}, "@placeCall": {},
"voiceCall": "Panggilan suara", "voiceCall": "Panggilan suara",
"@voiceCall": {} "@voiceCall": {},
"videoCallsBetaWarning": "Dicatat bahwa panggilan video sedang dalam beta. Fitur ini mungkin tidak berkerja dengan benar atau tidak berkerja sama sekali pada semua platform.",
"@videoCallsBetaWarning": {}
} }

View File

@ -2746,5 +2746,21 @@
} }
}, },
"pinMessage": "Maak vast aan kamer", "pinMessage": "Maak vast aan kamer",
"@pinMessage": {} "@pinMessage": {},
"emojis": "Emoji's",
"@emojis": {},
"placeCall": "Bellen",
"@placeCall": {},
"unsupportedAndroidVersion": "Niet-ondersteunde Android-versie",
"@unsupportedAndroidVersion": {},
"unsupportedAndroidVersionLong": "Voor deze functie is een nieuwere Android-versie vereist. Controleer op updates of Lineage OS-ondersteuning.",
"@unsupportedAndroidVersionLong": {},
"videoCallsBetaWarning": "Houd er rekening mee dat videogesprekken momenteel in bèta zijn. Ze werken misschien niet zoals je verwacht of werken niet op alle platformen.",
"@videoCallsBetaWarning": {},
"voiceCall": "Spraakoproep",
"@voiceCall": {},
"pinnedEventsError": "Fout bij laden van vastgemaakte berichten",
"@pinnedEventsError": {},
"confirmEventUnpin": "Weet je zeker dat je de gebeurtenis definitief wilt losmaken?",
"@confirmEventUnpin": {}
} }

View File

@ -2728,5 +2728,39 @@
"thisUserHasNotPostedAnythingYet": "Den här användaren har inte lagt till något till deras berättelse än", "thisUserHasNotPostedAnythingYet": "Den här användaren har inte lagt till något till deras berättelse än",
"@thisUserHasNotPostedAnythingYet": {}, "@thisUserHasNotPostedAnythingYet": {},
"storyPrivacyWarning": "Notera att användare kan se och kontakta varandra i din berättelse. Din berättelse är synlig i 24 timmar, men det finns ingen garanti för att berättelser raderas från alla enheter och servrar.", "storyPrivacyWarning": "Notera att användare kan se och kontakta varandra i din berättelse. Din berättelse är synlig i 24 timmar, men det finns ingen garanti för att berättelser raderas från alla enheter och servrar.",
"@storyPrivacyWarning": {} "@storyPrivacyWarning": {},
"emojis": "Emojis",
"@emojis": {},
"placeCall": "Ring",
"@placeCall": {},
"voiceCall": "Röstsamtal",
"@voiceCall": {},
"unsupportedAndroidVersion": "Inget stöd för dena version av Android",
"@unsupportedAndroidVersion": {},
"videoCallsBetaWarning": "Videosamtal är för närvarande under testning. De kanske inte fungerar som det är tänkt eller på alla plattformar.",
"@videoCallsBetaWarning": {},
"unsupportedAndroidVersionLong": "Denna funktion kräver en senare version av Android.",
"@unsupportedAndroidVersionLong": {},
"dismiss": "Avfärda",
"@dismiss": {},
"matrixWidgets": "Matrix widgetar",
"@matrixWidgets": {},
"integrationsNotImplemented": "Det går inte att redigera widgetar och integrationer ännu.",
"@integrationsNotImplemented": {},
"editIntegrations": "Redigera widgetar och integrationer",
"@editIntegrations": {},
"reactedWith": "{sender} reagerade med {reaction}",
"@reactedWith": {
"type": "text",
"placeholders": {
"sender": {},
"reaction": {}
}
},
"pinMessage": "Fäst i rum",
"@pinMessage": {},
"pinnedEventsError": "Ett fel uppstod när fastnålade meddelanden skulle hämtas",
"@pinnedEventsError": {},
"confirmEventUnpin": "Är du säker på att händelsen inte längre skall vara fastnålad?",
"@confirmEventUnpin": {}
} }

View File

@ -2408,7 +2408,7 @@
"type": "text", "type": "text",
"placeholders": {} "placeholders": {}
}, },
"videoCall": "Video arama", "videoCall": "Görüntülü arama",
"@videoCall": { "@videoCall": {
"type": "text", "type": "text",
"placeholders": {} "placeholders": {}
@ -2761,5 +2761,7 @@
"pinnedEventsError": "Sabitlenmiş mesajlar yüklenirken hata oluştu", "pinnedEventsError": "Sabitlenmiş mesajlar yüklenirken hata oluştu",
"@pinnedEventsError": {}, "@pinnedEventsError": {},
"confirmEventUnpin": "Etkinliğin sabitlemesini kalıcı olarak kaldırmak istediğinizden emin misiniz?", "confirmEventUnpin": "Etkinliğin sabitlemesini kalıcı olarak kaldırmak istediğinizden emin misiniz?",
"@confirmEventUnpin": {} "@confirmEventUnpin": {},
"videoCallsBetaWarning": "Görüntülü aramaların şu anda beta aşamasında olduğunu lütfen unutmayın. Tüm platformlarda beklendiği gibi veya hiç çalışmayabilirler.",
"@videoCallsBetaWarning": {}
} }

View File

@ -2756,5 +2756,7 @@
"voiceCall": "Голосовий виклик", "voiceCall": "Голосовий виклик",
"@voiceCall": {}, "@voiceCall": {},
"unsupportedAndroidVersionLong": "Для цієї функції потрібна новіша версія Android. Перевірте наявність оновлень або підтримку Lineage OS.", "unsupportedAndroidVersionLong": "Для цієї функції потрібна новіша версія Android. Перевірте наявність оновлень або підтримку Lineage OS.",
"@unsupportedAndroidVersionLong": {} "@unsupportedAndroidVersionLong": {},
"videoCallsBetaWarning": "Зауважте, що відеовиклики на ранньому етапі розробки. Вони можуть працювати не так, як очікувалося, або взагалі не працювати на всіх платформах.",
"@videoCallsBetaWarning": {}
} }

View File

@ -2759,5 +2759,9 @@
"unsupportedAndroidVersion": "不受支持的 Android 版本", "unsupportedAndroidVersion": "不受支持的 Android 版本",
"@unsupportedAndroidVersion": {}, "@unsupportedAndroidVersion": {},
"voiceCall": "语音通话", "voiceCall": "语音通话",
"@voiceCall": {} "@voiceCall": {},
"placeCall": "打电话",
"@placeCall": {},
"videoCallsBetaWarning": "请注意,视频通话目前处于测试阶段。它们可能不能像预期的那样工作,或者在所有平台上都不能工作。",
"@videoCallsBetaWarning": {}
} }