From 622477db4934016053eedb892e1768b1fc2fa2a3 Mon Sep 17 00:00:00 2001 From: Chris Garrity Date: Wed, 17 Jun 2020 09:52:44 -0400 Subject: [PATCH] rebase and update translations The merge failed because we removed a string from the general l10n.json `registration.receiveEmails` (so the previous mn.json had more strings that the source and failed validation). --- www/scratch-website.download-l10njson/hu.json | 6 +++--- www/scratch-website.download-l10njson/uk.json | 4 ++-- www/scratch-website.general-l10njson/ja.json | 2 +- www/scratch-website.general-l10njson/mn.json | 3 +-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/www/scratch-website.download-l10njson/hu.json b/www/scratch-website.download-l10njson/hu.json index 2fb4a0e8..ffbbc5d3 100644 --- a/www/scratch-website.download-l10njson/hu.json +++ b/www/scratch-website.download-l10njson/hu.json @@ -1,6 +1,6 @@ { - "download.appTitle": "Download the Scratch App", - "download.appIntro": "Would you like to create and save Scratch projects without an internet connection? Download the free Scratch app.", + "download.appTitle": "A Scratch Applikáció letöltése", + "download.appIntro": "Szeretnél készíteni és elmenteni Scratch projekteket az internet nélkül? Töltsd le az ingyenes Scratch applikációt!", "download.requirements": "Követelmények", "download.imgAltDownloadIllustration": "Scratch 3.0 Desktop képernyőkép", "download.troubleshootingTitle": "GYIK", @@ -20,7 +20,7 @@ "download.cannotAccessWindowsStore": "Mi van, ha nem érem el a Microsoft Áruházat?", "download.macMoveToApplications": "Nyisd meg a .dmg fájlt. Vidd a Scratch Desktopot az Alkalmazások mappába.", "download.winMoveToApplications": "Futtasd az .exe fájlt.", - "download.doIHaveToDownload": "Do I have to download an app to use Scratch?", + "download.doIHaveToDownload": "Le kell töltenem egy applikációt, hogy használhassam a Scratch-et?", "download.doIHaveToDownloadAnswer": "No. You can also use the Scratch project editor in most web browsers on most devices by going to scratch.mit.edu and clicking \"Create\".", "download.canIUseScratchLink": "Használhatom a Scratch Linket, hogy a bővítményekhez kapcsolódjak?", "download.canIUseScratchLinkAnswer": "Igen. Viszont internetkapcsolatra lesz szükséged a Scratch Link használatához.", diff --git a/www/scratch-website.download-l10njson/uk.json b/www/scratch-website.download-l10njson/uk.json index 3d8f1e9e..0c3d9d31 100644 --- a/www/scratch-website.download-l10njson/uk.json +++ b/www/scratch-website.download-l10njson/uk.json @@ -21,11 +21,11 @@ "download.macMoveToApplications": "Відкрийте .dmg файл. Перемістити Scratch Desktop у Applications.", "download.winMoveToApplications": "Запустіть .exe файл.", "download.doIHaveToDownload": "Чи обов'язково завантажувати редактор, щоб використовувати Скретч?", - "download.doIHaveToDownloadAnswer": "No. You can also use the Scratch project editor in most web browsers on most devices by going to scratch.mit.edu and clicking \"Create\".", + "download.doIHaveToDownloadAnswer": "Ні. Ви також можете скористатися редактором проєктів Скретч у будь-якому веб-переглядачі на будь-якому пристрої, перейшовши на scratch.mit.edu і натиснувши 'Створити'.", "download.canIUseScratchLink": "Чи можу я використовувати Scratch Link для підключення до розширень?", "download.canIUseScratchLinkAnswer": "Так. Однак вам знадобиться підключення до Інтернету, щоб використовувати Scratch Link.", "download.canIUseExtensions": " Чи можу я підключитися до розширень обладнання?", - "download.canIUseExtensionsAnswer": "Yes. With the Scratch app you can connect to extensions, and you do not need Scratch Link.", + "download.canIUseExtensionsAnswer": "Так. З застосунком Скретчу ви можете підключатися до розширень без використання Scratch Link.", "download.howConnectHardwareDevices": "How do I connect the Scratch app to hardware devices?", "download.howConnectHardwareDevicesAnswerLink": "You will need to install and run Scratch Link in order to connect to hardware devices when using Scratch app for {operatingsystem}. You will also need an internet connection to use Scratch Link.", "download.howConnectHardwareDevicesAnswerApp": "With the Scratch app you can connect to hardware devices like the micro:bit or LEGO Boost. When using the Scratch app for {operatingsystem} you do not need Scratch Link.", diff --git a/www/scratch-website.general-l10njson/ja.json b/www/scratch-website.general-l10njson/ja.json index 2e96b462..34c5d3e0 100644 --- a/www/scratch-website.general-l10njson/ja.json +++ b/www/scratch-website.general-l10njson/ja.json @@ -170,7 +170,7 @@ "registration.genderOptionAnother": "その他の性別:", "registration.genderOptionPreferNotToSay": "選択しない", "registration.emailStepTitle": "メールアドレスを入力してください。", - "registration.emailStepInfo": "This will help if you forget your password. This information will not be made public on your account.", + "registration.emailStepInfo": "これはパスワードを忘れた時に使います。この情報は公開されません。", "registration.goToClass": "クラスへ行く", "registration.invitedBy": "次の人に招待されました。", "registration.lastStepTitle": "Scratch教師用アカウントのご申請、ありがとうございます。", diff --git a/www/scratch-website.general-l10njson/mn.json b/www/scratch-website.general-l10njson/mn.json index 0206706e..777b7de1 100644 --- a/www/scratch-website.general-l10njson/mn.json +++ b/www/scratch-website.general-l10njson/mn.json @@ -170,7 +170,7 @@ "registration.genderOptionAnother": "Another gender:", "registration.genderOptionPreferNotToSay": "Prefer not to say", "registration.emailStepTitle": "What's your email?", - "registration.emailStepInfo": "This will help if you forget your password, or if you want to receive email updates. This information will not be made public on your account.", + "registration.emailStepInfo": "This will help if you forget your password. This information will not be made public on your account.", "registration.goToClass": "Go to Class", "registration.invitedBy": "invited by", "registration.lastStepTitle": "Thank you for requesting a Scratch Teacher Account", @@ -187,7 +187,6 @@ "registration.personalStepDescription": "Your individual responses will not be displayed publicly, and will be kept confidential and secure", "registration.private": "We will keep this information private.", "registration.problemsAre": "The problems are:", - "registration.receiveEmails": "I'd like to receive emails from the Scratch Team about project ideas, events, and more.", "registration.selectCountry": "Select country", "registration.startOverInstruction": "Click \"Start over.\"", "registration.studentPersonalStepDescription": "This information will not appear on the Scratch website.",