From 25ee8a1496734622f5d43e039ff3b027d9862c61 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 25 Sep 2014 10:47:27 +1000 Subject: [PATCH] Revert "Revert "Update Mojang translations to 1.8"" This reverts commit dd1a28ea1ef86650d012f790540ac7340a609c08. --- .../mojang-translations/en_US.properties | 223 +++++++++--------- 1 file changed, 115 insertions(+), 108 deletions(-) diff --git a/proxy/src/main/resources/mojang-translations/en_US.properties b/proxy/src/main/resources/mojang-translations/en_US.properties index 4feb71f73..628a2a6ca 100644 --- a/proxy/src/main/resources/mojang-translations/en_US.properties +++ b/proxy/src/main/resources/mojang-translations/en_US.properties @@ -20,6 +20,7 @@ translation.test.invalid2=hi % s translation.test.args=%s %s translation.test.world=world +menu.game=Game menu menu.singleplayer=Singleplayer menu.multiplayer=Multiplayer menu.online=Minecraft Realms @@ -109,7 +110,7 @@ selectWorld.bonusItems=Bonus Chest: generator.default=Default generator.flat=Superflat generator.largeBiomes=Large Biomes -generator.amplified=AMPLIFIED +generator.amplified=Amplified generator.amplified.info=Notice: Just for fun, requires beefy computer @@ -131,6 +132,10 @@ addServer.enterName=Server Name addServer.enterIp=Server Address addServer.add=Done addServer.hideAddress=Hide Address +addServer.resourcePack=Server Resource Packs +addServer.resourcePack.enabled=Enabled +addServer.resourcePack.disabled=Disabled +addServer.resourcePack.prompt=Prompt lanServer.title=LAN World lanServer.scanning=Scanning for games on your local network lanServer.start=Start LAN World @@ -148,6 +153,7 @@ multiplayer.downloadingTerrain=Downloading terrain multiplayer.downloadingStats=Downloading statistics & achievements... multiplayer.stopSleeping=Leave Bed multiplayer.player.joined=%s joined the game +multiplayer.player.joined.renamed=%s (formerly known as %s) joined the game multiplayer.player.left=%s left the game chat.cannotSend=Cannot send chat message @@ -162,7 +168,10 @@ chat.copy=Copy to Clipboard chat.link.confirmTrusted=Do you want to open this link or copy it to your clipboard? chat.link.open=Open in browser -$o=Play Demo World +chat.stream.text=(%s) <%s> %s +chat.stream.emote=(%s) * %s %s + +menu.playdemo=Play Demo World menu.resetdemo=Reset Demo World demo.day.1=This demo will last five game days, do your best! @@ -214,6 +223,8 @@ soundCategory.player=Players soundCategory.block=Blocks soundCategory.ambient=Ambient/Environment +record.nowPlaying=Now playing: %s + options.off=OFF options.on=ON options.visible=Shown @@ -222,6 +233,7 @@ options.title=Options options.controls=Controls... options.video=Video Settings... options.language=Language... +options.stream=Broadcast Settings... options.sounds=Music & Sounds... options.sounds.title=Music & Sound Options options.languageWarning=Language translations may not be 100%% accurate @@ -319,7 +331,6 @@ options.chat.width=Width options.chat.height.focused=Focused Height options.chat.height.unfocused=Unfocused Height options.showCape=Show Cape -options.serverTextures=Server Textures options.snooper=Allow Snooper options.snooper.view=Snooper Settings... options.snooper.title=Machine Specs Collection @@ -328,10 +339,43 @@ options.resourcepack=Resource Packs... options.fullscreen=Fullscreen options.vsync=Use VSync options.touchscreen=Touchscreen Mode + options.mipmapLevels=Mipmap Levels options.anisotropicFiltering=Anisotropic Filtering options.forceUnicodeFont=Force Unicode Font +options.stream.title=Twitch Broadcast Settings +options.stream.bytesPerPixel=Quality +options.stream.micVolumne=Mic Volume +options.stream.micToggleBehavior=Push To +options.stream.mic_toggle.mute=Mute +options.stream.mic_toggle.talk=Talk +options.stream.systemVolume=System Volume +options.stream.kbps=Bandwidth +options.stream.fps=Framerate +options.stream.sendMetadata=Send Metadata +options.stream.compression=Compression +options.stream.compression.low=Low +options.stream.compression.medium=Medium +options.stream.compression.high=High +options.stream.estimation=Estimated resolution: %dx%d +options.stream.changes=You may need to restart your stream for these changes to take place. +options.stream.ingestSelection=Broadcast Server List +options.stream.ingest.title=Twitch Broadcast Servers +options.stream.ingest.reset=Reset Preference +options.stream.chat.title=Twitch Chat Settings +options.stream.chat.enabled=Enable +options.stream.chat.enabled.streaming=Whilst Streaming +options.stream.chat.enabled.always=Always +options.stream.chat.enabled.never=Never +options.stream.chat.userFilter=User Filter +options.stream.chat.userFilter.all=All Viewers +options.stream.chat.userFilter.subs=Subscribers +options.stream.chat.userFilter.mods=Moderators + +title.oldgl1=Old graphics card detected; this may prevent you from +title.oldgl2=playing in the future as OpenGL 2.0 will be required. + controls.title=Controls controls.reset=Reset controls.resetAll=Reset Keys @@ -355,6 +399,7 @@ key.command=Open Command key.screenshot=Take Screenshot key.togglePerspective=Toggle Perspective key.smoothCamera=Toggle Cinematic Camera +key.fullscreen=Toggle Fullscreen key.hotbar.1=Hotbar Slot 1 key.hotbar.2=Hotbar Slot 2 key.hotbar.3=Hotbar Slot 3 @@ -364,6 +409,10 @@ key.hotbar.6=Hotbar Slot 6 key.hotbar.7=Hotbar Slot 7 key.hotbar.8=Hotbar Slot 8 key.hotbar.9=Hotbar Slot 9 +key.streamStartStop=Start/Stop Stream +key.streamPauseUnpause=Pause/Unpause Stream +key.streamCommercial=Show Stream Commercials +key.streamToggleMic=Push To Talk/Mute key.categories.movement=Movement key.categories.misc=Miscellaneous @@ -371,6 +420,7 @@ key.categories.multiplayer=Multiplayer key.categories.gameplay=Gameplay key.categories.ui=Game Interface key.categories.inventory=Inventory +key.categories.stream=Streaming resourcePack.openFolder=Open resource pack folder resourcePack.title=Select Resource Packs @@ -378,6 +428,8 @@ resourcePack.available.title=Available Resource Packs resourcePack.selected.title=Selected Resource Packs resourcePack.folderInfo=(Place resource pack files here) +sign.edit=Edit sign message + book.pageIndicator=Page %1$s of %2$s book.byAuthor=by %1$s book.signButton=Sign @@ -1376,13 +1428,17 @@ commands.kick.success=Kicked %s from the game commands.kick.success.reason=Kicked %s from the game: '%s' commands.kick.usage=/kick [reason ...] commands.op.success=Opped %s +commands.op.failed=Could not op %s commands.op.usage=/op commands.deop.success=De-opped %s +commands.deop.failed=Could not de-op %s commands.deop.usage=/deop commands.say.usage=/say commands.ban.success=Banned player %s +commands.ban.failed=Could not ban player %s commands.ban.usage=/ban [reason ...] commands.unban.success=Unbanned player %s +commands.unban.failed=Could not unban player %s commands.unban.usage=/pardon commands.banip.invalid=You have entered an invalid IP address or a player that is not online commands.banip.success=Banned IP address %s @@ -1412,8 +1468,10 @@ commands.whitelist.enabled=Turned on the whitelist commands.whitelist.disabled=Turned off the whitelist commands.whitelist.reloaded=Reloaded the whitelist commands.whitelist.add.success=Added %s to the whitelist +commands.whitelist.add.failed=Could not add %s to the whitelist commands.whitelist.add.usage=/whitelist add commands.whitelist.remove.success=Removed %s from the whitelist +commands.whitelist.remove.failed=Could not remove %s from the whitelist commands.whitelist.remove.usage=/whitelist remove commands.whitelist.usage=/whitelist commands.scoreboard.usage=/scoreboard @@ -1557,113 +1615,8 @@ advMode.previousOutput=Previous Output advMode.notEnabled=Command blocks are not enabled on this server advMode.notAllowed=Must be an opped player in creative mode -mco.title=Minecraft Realms mount.onboard=Press %1$s to dismount -mco.terms.buttons.agree=Agree -mco.terms.buttons.disagree=Don't Agree -mco.terms.title=Realms Terms of Service -mco.terms.sentence.1=I agree to Minecraft Realms -mco.terms.sentence.2=Terms of Service - -mco.buy.realms.title=Buy a Realm -mco.buy.realms.buy=I want one! - -mco.selectServer.play=Play -mco.selectServer.configure=Configure -mco.selectServer.leave=Leave Realm -mco.selectServer.create=Create Realm -mco.selectServer.buy=Buy Realm -mco.selectServer.moreinfo=More Info - -mco.selectServer.expired=Expired Server -mco.selectServer.open=Open Server -mco.selectServer.closed=Closed Server -mco.selectServer.locked=Locked Server - -mco.selectServer.expires.days=Expires in %s days -mco.selectServer.expires.day=Expires in a day -mco.selectServer.expires.soon=Expires soon - -mco.configure.world.edit.title=Edit Realm - -mco.configure.world.title=Configure Realm -mco.configure.world.name=Name -mco.configure.world.description=Description -mco.configure.world.location=Location -mco.configure.world.invited=Invited -mco.configure.world.buttons.edit=Edit -mco.configure.world.buttons.reset=Reset Realm -mco.configure.world.buttons.done=Done -mco.configure.world.buttons.delete=Delete -mco.configure.world.buttons.open=Open Realm -mco.configure.world.buttons.close=Close Realm -mco.configure.world.buttons.invite=Invite -mco.configure.world.buttons.uninvite=Uninvite -mco.configure.world.buttons.backup=Backups -mco.configure.world.buttons.subscription=Subscription -mco.configure.world.invite.profile.name=Name -mco.configure.world.uninvite.question=Are you sure that you want to uninvite -mco.configure.world.status=Status - -mco.configure.world.subscription.title=Subscription Info -mco.configure.world.subscription.daysleft=Days Left -mco.configure.world.subscription.start=Start Date -mco.configure.world.subscription.extend=Extend Subscription - -mco.create.world.location.title=Locations -mco.create.world.location.warning=You may not get the exact location you select -mco.create.world.wait=Creating the realm... -mco.create.world.seed=Seed (Optional) - -mco.reset.world.title=Reset Realm -mco.reset.world.warning=This will permanently delete your realm! -mco.reset.world.seed=Seed (Optional) -mco.reset.world.resetting.screen.title=Resetting Realm... - -mco.configure.world.close.question.line1=Your realm will become unavailable. -mco.configure.world.close.question.line2=Are you sure you want to do that? - -mco.configure.world.leave.question.line1=If you leave this realm you won't see it unless invited again -mco.configure.world.leave.question.line2=Are you sure you want to do that? - -mco.configure.world.reset.question.line1=Your realm will be regenerated and your current realm will be lost -mco.configure.world.reset.question.line2=Are you sure you want to do that? - -mco.configure.world.restore.question.line1=Your realm will be restored to date -mco.configure.world.restore.question.line2=Are you sure you want to do that? - -mco.configure.world.restore.download.question.line1=You will be redirected to your default browser to download your world map. -mco.configure.world.restore.download.question.line2=Do you want to continue? - -mco.more.info.question.line1=You will be redirected to your default browser to see the page. -mco.more.info.question.line2=Do you want to continue? - -mco.connect.connecting=Connecting to the online server... -mco.connect.authorizing=Logging in... -mco.connect.failed=Failed to connect to the online server - -mco.create.world=Create - -mco.client.outdated.title=Client Outdated! -mco.client.outdated.msg=Your client is outdated, please consider updating it to use Realms - -mco.backup.title=Backups -mco.backup.button.restore=Restore -mco.backup.restoring=Restoring your realm -mco.backup.button.download=Download Latest - -mco.template.title=Realm Templates -mco.template.button.select=Select -mco.template.default.name=Select Template (Optional) -mco.template.name=Template - -mco.invites.button.accept=Accept -mco.invites.button.reject=Reject -mco.invites.title=Pending Invitations -mco.invites.pending=New invitations! -mco.invites.nopending=No pending invitations! - build.tooHigh=Height limit for building is %s blocks attribute.modifier.plus.0=+%d %s @@ -1683,3 +1636,57 @@ attribute.name.generic.attackDamage=Attack Damage screenshot.success=Saved screenshot as %s screenshot.failure=Couldn't save screenshot: %s + +stream.user.mode.moderator=Moderator +stream.user.mode.moderator.self=Moderator on your channel +stream.user.mode.moderator.other=Moderator on %s's channel +stream.user.mode.broadcaster=Broadcaster +stream.user.mode.broadcaster.self=Broadcaster (You!) +stream.user.mode.broadcaster.other=Broadcaster +stream.user.mode.administrator=Twitch Administrator +stream.user.mode.staff=Twitch Staff +stream.user.mode.banned=Banned +stream.user.mode.banned.self=Banned on your channel +stream.user.mode.banned.other=Banned on %s's channel +stream.user.subscription.subscriber=Subscriber +stream.user.subscription.subscriber.self=Subscriber to your channel +stream.user.subscription.subscriber.other=Subscriber to %s's channel +stream.user.subscription.turbo=Twitch Turbo + +stream.unavailable.title=Twitch Broadcasting Unavailable +stream.unavailable.report_to_mojang=Report to Mojang + +stream.confirm_start=Are you sure you want to start broadcasting? + +stream.unavailable.account_not_bound=Before you can broadcast Minecraft through Twitch, you will need to link your Twitch account on mojang.com. Would you like to do that now? +stream.unavailable.account_not_bound.okay=Link Accounts +stream.unavailable.account_not_migrated=Before you can broadcast Minecraft through Twitch, you will need to migrate your Minecraft account to a Mojang account. Would you like to do that now? +stream.unavailable.account_not_migrated.okay=Migrate Account +stream.unavailable.failed_auth=Authentication to Twitch failed. Please go to mojang.com and rebind your Twitch account. +stream.unavailable.failed_auth.okay=Rebind Accounts +stream.unavailable.failed_auth_error=Unable to authenticate to Twitch. Please try again later. +stream.unavailable.initialization_failure=Unable to initialize the Twitch SDK. +stream.unavailable.initialization_failure.extra=(Reason: %s) +stream.unavailable.library_arch_mismatch=The custom java version used to launch Minecraft has a different architecture than the one used to run the launcher. Please make sure these are the same, either 32-bit or 64-bit for both. +stream.unavailable.library_failure=Unable to load the libraries needed for the integrated Twitch broadcasting service. +stream.unavailable.no_fbo=Your video card needs to support at least OpenGL version 3.0 or support Framebuffer Objects via an extension to use the integrated Twitch broadcasting. +stream.unavailable.no_fbo.version=You are currently using: %s +stream.unavailable.no_fbo.blend=Separate blending support via EXT is: %s +stream.unavailable.no_fbo.arb=Framebuffer object support via ARB is: %s +stream.unavailable.no_fbo.ext=Framebuffer object support via EXT is: %s +stream.unavailable.not_supported.windows=Unfortunately the integrated Twitch broadcasting requires a newer version of Windows than you are on. You must have at least Windows Vista or newer. +stream.unavailable.not_supported.mac=Unfortunately the integrated Twitch broadcasting on Mac requires a version of OSX newer than the one you are on. You must use 10.7 (Mac OS X Lion) or newer to be able to use this service. Would you like to visit apple.com to learn about upgrading? +stream.unavailable.not_supported.mac.okay=Upgrade +stream.unavailable.not_supported.other=Unfortunately the integrated Twitch broadcasting service requires Windows (Vista or newer) or Mac OS X (10.7/Lion or newer) +stream.unavailable.unknown=Unfortunately you cannot broadcast to Twitch at this time. And we don't know why :'( +stream.unavailable.unknown.chat=Could not start stream: %s + +stream.unavailable.soundflower.chat=Soundflower is required to be able to stream on Mac. %s +stream.unavailable.soundflower.chat.link=Please click here to install it. + +stream.userinfo.chatTooltip=Click to manage user +stream.userinfo.timeout=Timeout +stream.userinfo.ban=Ban +stream.userinfo.unban=Unban +stream.userinfo.mod=Promote to Moderator +stream.userinfo.unmod=Demote from Moderator