Merge remote-tracking branch 'origin/develop' into develop

2017-06-18 22:54:37 +00:00 · 2017-06-18 22:54:37 +00:00 · 9b1b5b3a4b
parent ffa24eac84 6b1ffaff7a
commit 9b1b5b3a4b
16 changed files with 16 additions and 16 deletions
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@ -205,7 +205,7 @@
    "This will allow you to return to your account after signing out, and sign in on other devices.": "Dies erlaubt dir, dich wieder an deinem Konto anzumelden, nachdem du dich abgemeldet hast.",
    "Dev chat for the Dendrite dev team": "Entwickler-Chat für das Dendrite-Entwickler-Team",
    "General discussion about Matrix and Riot": "Allgemeine Diskussion über Matrix und Riot",
-    " (HTTP status %(httpStatus))": "(HTTP-Status %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(HTTP-Status %(httpStatus)s)",
    "You have successfully set a password and an email address!": "Du hast erfolgreich ein Passwort und eine E-Mail-Adresse gesetzt!",
    "Remember, you can always set an email address in user settings if you change your mind.": "Denk daran, dass du in den Benutzereinstellungen jederzeit eine E-Mail-Adresse setzen kannst."
 }
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@ -156,7 +156,7 @@
    "powered by Matrix": "βασισμένο στο πρωτόκολλο Matrix",
    "Quote": "Παράθεση",
    "Fetching third party location failed": "Η λήψη τοποθεσίας απέτυχε",
-    " (HTTP status %(httpStatus))": "(Κατάσταση HTTP %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(Κατάσταση HTTP %(httpStatus)s)",
    "Login": "Σύνδεση",
    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Το Riot χρησιμοποιεί αρκετά προχωρημένα χαρακτηριστικά των περιηγητών Ιστού, ορισμένα από τα οποία δεν είναι διαθέσιμα ή είναι σε πειραματικό στάδιο στον περιηγητή σας.",
    "The Home Server may be too old to support third party networks": "Ο διακομιστής μπορεί να είναι αρκετά παλιός για να υποστηρίζει δίκτυα τρίτων",
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@ -62,7 +62,7 @@
  "Guests can join": "Guests can join",
  "Guest users can't invite users. Please register to invite.": "Guest users can't invite users. Please register to invite.",
  "Hide panel": "Hide panel",
-  " (HTTP status %(httpStatus))": "(HTTP status %(httpStatus))",
+  "(HTTP status %(httpStatus)s)": "(HTTP status %(httpStatus)s)",
  "I understand the risks and wish to continue": "I understand the risks and wish to continue",
  "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:",
  "Invite to this room": "Invite to this room",
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@ -164,7 +164,7 @@
    "Login": "Login",
    "Continue": "Continue",
    "Failed to change password. Is your password correct?": "Failed to change password. Is your password correct?",
-    " (HTTP status %(httpStatus))": "(HTTP status %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(HTTP status %(httpStatus)s)",
    "Welcome to Riot.im": "Welcome to Riot.im",
    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralised, encrypted chat &amp; collaboration powered by [matrix]",
    "Chat with Riot Bot": "Chat with Riot Bot",
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@ -81,7 +81,7 @@
    "Failed to set Direct Message status of room": "Malsukcesis agordi la staton de Rekta Mesaĝo de la ejo",
    "Forward Message": "Plusendi mesaĝon",
    "Hide panel": "Kaŝi panelon",
-    " (HTTP status %(httpStatus))": "(stato HTTP %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(stato HTTP %(httpStatus)s)",
    "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Por diagnozi problemojn, protokoloj el tiu ĉi kliento sendiĝos kune kun tiu ĉi raporto de eraro. Se vi preferas sendi nur la supran tekston, bonvolu malŝalti:",
    "Login": "Ensaluti",
    "Loading bug report module": "Ŝarĝante modulon pri eraroraporto",
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@ -123,7 +123,7 @@
    "Describe your problem here.": "Describa su problema aquí.",
    "Forward Message": "Reenviar mensaje",
    "Hide panel": "Ocultar panel",
-    " (HTTP status %(httpStatus))": "(estado HTTP %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(estado HTTP %(httpStatus)s)",
    "I understand the risks and wish to continue": "Entiendo los riesgos y deseo continuar",
    "Changelog": "Bitácora de cambios",
    "Collapse panel": "Colapsar panel",
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@ -169,7 +169,7 @@
    "You can now return to your account after signing out, and sign in on other devices.": "Vous pouvez maintenant revenir sur votre compte après vous être déconnecté, et vous identifier sur d'autres appareils.",
    "This will allow you to return to your account after signing out, and sign in on other devices.": "Cela vous permettra de retourner sur votre compte après vous être déconnecté, et de vous identifier sur d'autres appareils.",
    "Welcome to Riot.im": "Bienvenue sur Riot.im",
-    " (HTTP status %(httpStatus))": "(statut HTTP %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(statut HTTP %(httpStatus)s)",
    "Login": "S'identifier",
    "Chat with Riot Bot": "Discussion avec Riot Bot",
    "Search the room directory": "Rechercher dans le répertoire de salon",
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@ -196,7 +196,7 @@
    "Continue": "Folytatás",
    "Please set a password!": "Kérlek, állíts be egy jelszót!",
    "This will allow you to return to your account after signing out, and sign in on other devices.": "Ezzel visszatérhetsz kijelentkezés után a fiókodhoz és más eszközökkel is be tudsz jelentkezni.",
-    " (HTTP status %(httpStatus))": "(HTTP állapot %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(HTTP állapot %(httpStatus)s)",
    "You have successfully set a password and an email address!": "Sikeresen beállítottad a jelszavad és e-mail címed!",
    "Remember, you can always set an email address in user settings if you change your mind.": "Ha meggondolod magad, bármikor beállíthatod az e-mail címed a felhasználói beállításoknál."
 }
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@ -131,7 +131,7 @@
    "Forward Message": "메시지 전달",
    " from room": " 방에서",
    "Guests can join": "손님이 들어올 수 있어요",
-    " (HTTP status %(httpStatus))": "(HTTP 상태 %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(HTTP 상태 %(httpStatus)s)",
    "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "문제를 진단하기 위해서, 이 클라이언트의 로그를 오류 보고서와 같이 보낼 거에요. 위 내용만 보내시려면, 체크를 해제하세요:",
    "Keywords": "키워드",
    "Mentions only": "답만 하기",
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@ -132,7 +132,7 @@
    "Failed to send report: ": "Rapport verzenden mislukt: ",
    "Forward Message": "Bericht doorsturen",
    "Hide panel": "Paneel verbergen",
-    " (HTTP status %(httpStatus))": "(HTTP-status %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(HTTP-status %(httpStatus)s)",
    "I understand the risks and wish to continue": "Ik begrijp de risico's en wil graag verder gaan",
    "Login": "Aanmelden",
    "Loading bug report module": "Bugrapporteermodule laden",
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@ -77,7 +77,7 @@
    "more": "więcej",
    "Enable desktop notifications": "Włącz powiadomienia",
    "Guest users can't invite users. Please register to invite.": "Gość nie ma uprawnień dow wysyłania zaproszeń. Proszę się zarejestrować.",
-    " (HTTP status %(httpStatus))": "(status HTTP %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(status HTTP %(httpStatus)s)",
    "Leave": "Opuść",
    "Login": "Logowanie",
    "Members": "Członkowie",
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@ -198,6 +198,6 @@
    "Continue": "Continuar",
    "Please set a password!": "Por favor, defina uma senha!",
    "This will allow you to return to your account after signing out, and sign in on other devices.": "Isso permitirá que você possa retornar à sua conta após fazer logout, e também fazer login em outros dispositivos.",
-    " (HTTP status %(httpStatus))": "(Status HTTP %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(Status HTTP %(httpStatus)s)",
    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Chat descentralizado, criptografado e colaborativo impulsionado por [matrix]"
 }
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@ -183,7 +183,7 @@
    "Admin support for Dendrite": "Админ. помощь для Dendrite",
    "Building services on Matrix": "Построить услуги для Matrix",
    "Implementing VoIP services with Matrix": "Внедрение услуги VoIP с Matrix",
-    " (HTTP status %(httpStatus))": "(HTTP-Состояние %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(HTTP-Состояние %(httpStatus)s)",
    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot-iOS &amp; \"matrix-ios-sdk\"-Чат",
    "Riot/Android &amp; matrix-android-sdk chat": "Riot-Android &amp; matrix-android-sdk-Чат",
    "Announcements about Synapse releases": "Объявления релизов Synapse",
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@ -197,7 +197,7 @@
    "Discussion of the Identity Service API": "พูดคุยเกี่ยวกับ Identity Service API",
    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "ระบบแชทและประสานงาน ไร้ศูนย์กลางและเข้ารหัสได้ โดยใช้เทคโนโลยีจาก [matrix]",
    "General discussion about Matrix and Riot": "พูดคุยเรื่องทั่วไป ทั้ง Matrix และ Riot",
-    " (HTTP status %(httpStatus))": "(สถานะ HTTP %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(สถานะ HTTP %(httpStatus)s)",
    "Remember, you can always set an email address in user settings if you change your mind.": "อย่าลืม คุณสามารถตั้งที่อยู่อีเมลในการตั้งค่าผู้ใช้ได้ทุกเมื่อหากคุณเปลี่ยนใจ",
    "You have successfully set a password and an email address!": "ตั้งรหัสผ่านและที่อยู่อีเมลสำเร็จแล้ว!"
 }
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@ -62,7 +62,7 @@
    "Guests can join": "Misafirler katılabilirler",
    "Guest users can't invite users. Please register to invite.": "Misafir kullanıcılar kullanıcıları davet edemezler . Davet etmek için lütfen kayıt olun.",
    "Hide panel": "Paneli gizle",
-    " (HTTP status %(httpStatus))": "(HTTP durumu &(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(HTTP durumu &(httpStatus))",
    "I understand the risks and wish to continue": "Riskleri anlıyorum ve devam etmek istiyorum",
    "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Sorunları teşhis etmek için , bu istemciden kayıtlar hata raporu ile beraber gönderilecek . Yalnızca yukarıdaki metni göndermek isterseniz , lütfen işareti kaldırın:",
    "Invite to this room": "Bu odaya davet et",
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@ -59,7 +59,7 @@
    "Guests can join": "Гості можуть приєднуватися",
    "Guest users can't invite users. Please register to invite.": "Гості не можуть запрошувати користувачів. Зареєструйтесь, будь ласка, для видачі запрошень.",
    "Hide panel": "Сховати панель",
-    " (HTTP status %(httpStatus))": "(статус HTTP %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(статус HTTP %(httpStatus)s)",
    "I understand the risks and wish to continue": "Я ознайомлений з ризиками і хочу продовжити",
    "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "З метою діагностики проблем журнали з цього застосунку будуть надіслані разом зі звітом про вади. Якщо ви бажаєте надіслати лише вищенаведений текст, відозначте, будь ласка:",
    "Invite to this room": "Запросити до цієї кімнати",