From 20595b50dadf9a380a010e8199e355a81bbb224b Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Tue, 21 Oct 2014 14:27:37 -0700 Subject: [PATCH 01/13] Fixes 1647. Somehow had been under the impression the segmented sprite containers weren't handling clicks correctly and that segments needed to handle them. --- app/lib/surface/SegmentedSprite.coffee | 8 -------- test/app/lib/surface/SegmentedSprite.spec.coffee | 14 -------------- 2 files changed, 22 deletions(-) diff --git a/app/lib/surface/SegmentedSprite.coffee b/app/lib/surface/SegmentedSprite.coffee index d34b15b82..45f03e133 100644 --- a/app/lib/surface/SegmentedSprite.coffee +++ b/app/lib/surface/SegmentedSprite.coffee @@ -89,7 +89,6 @@ module.exports = class SegmentedSprite extends createjs.SpriteContainer containerName = @spriteSheetPrefix + action.container sprite = new createjs.Sprite(@spriteSheet) sprite.gotoAndStop(containerName) - @listenToEventsFor(sprite) if sprite.currentFrame is 0 or @usePlaceholders sprite.gotoAndStop(0) @notifyActionNeedsRender(action) @@ -173,7 +172,6 @@ module.exports = class SegmentedSprite extends createjs.SpriteContainer outerContainer = new createjs.SpriteContainer(@spriteSheet) innerContainer = new createjs.Sprite(@spriteSheet) innerContainer.gotoAndStop(@spriteSheetPrefix + localContainer.gn) - @listenToEventsFor(innerContainer) if innerContainer.currentFrame is 0 or @usePlaceholders innerContainer.gotoAndStop(0) @actionNotSupported = true @@ -191,12 +189,6 @@ module.exports = class SegmentedSprite extends createjs.SpriteContainer map[localContainer.bn] = outerContainer return map - listenToEventsFor: (displayObject) -> - for event in ['mousedown', 'click', 'dblclick', 'pressmove', 'pressup'] - displayObject.on event, @onMouseEvent, @ - - onMouseEvent: (e) -> @dispatchEvent(e) - buildMovieClipAnimations: (localAnimations) -> map = {} for localAnimation in localAnimations diff --git a/test/app/lib/surface/SegmentedSprite.spec.coffee b/test/app/lib/surface/SegmentedSprite.spec.coffee index d7c6832f4..7d4fc8175 100644 --- a/test/app/lib/surface/SegmentedSprite.spec.coffee +++ b/test/app/lib/surface/SegmentedSprite.spec.coffee @@ -81,13 +81,6 @@ describe 'SegmentedSprite', -> expect(hitRate).toBeGreaterThan(0.73) $('canvas').remove() - it 'propagates events from the single segment through the segmented sprite', -> - fired = {} - segmentedSprite.on('click', -> fired.didIt = true) - segmentedSprite.gotoAndStop('idle') - segmentedSprite.children[0].dispatchEvent('click') - expect(fired.didIt).toBe(true) - describe 'with Ogre Munchkin ThangType', -> beforeEach -> layer = new LayerAdapter({webGL:true, name:'Default'}) @@ -182,13 +175,6 @@ describe 'SegmentedSprite', -> expect(hitRate).toBeGreaterThan(0.96) $('canvas').remove() - it 'propagates events from the segments through the segmented sprite', -> - fired = {} - segmentedSprite.on('click', -> fired.didIt = true) - segmentedSprite.gotoAndStop('idle') - segmentedSprite.children[0].children[0].dispatchEvent('click') - expect(fired.didIt).toBe(true) - describe 'with Ogre Fangrider ThangType', -> beforeEach -> layer = new LayerAdapter({webGL:true}) From 1f7d098b2ed491ae2d2c570bfb71f189f636f21f Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Tue, 21 Oct 2014 15:19:12 -0700 Subject: [PATCH 02/13] Added rotation buttons in the context menu and shortcuts to the level editor. --- app/locale/en.coffee | 1 + app/styles/editor/level/thangs-tab-view.sass | 3 +++ .../editor/level/thangs-tab-view.jade | 11 ++++++++ .../editor/level/thangs/ThangsTabView.coffee | 25 ++++++++++++++++++- 4 files changed, 39 insertions(+), 1 deletion(-) diff --git a/app/locale/en.coffee b/app/locale/en.coffee index ad2a61431..0f5735679 100644 --- a/app/locale/en.coffee +++ b/app/locale/en.coffee @@ -494,6 +494,7 @@ level_tab_thangs_add: "Add Thangs" delete: "Delete" duplicate: "Duplicate" + rotate: "Rotate" level_settings_title: "Settings" level_component_tab_title: "Current Components" level_component_btn_new: "Create New Component" diff --git a/app/styles/editor/level/thangs-tab-view.sass b/app/styles/editor/level/thangs-tab-view.sass index c7a39f8df..84dd8b2c2 100644 --- a/app/styles/editor/level/thangs-tab-view.sass +++ b/app/styles/editor/level/thangs-tab-view.sass @@ -122,3 +122,6 @@ left: 0 top: 0 pointer-events: none + + #contextmenu + text-align: left diff --git a/app/templates/editor/level/thangs-tab-view.jade b/app/templates/editor/level/thangs-tab-view.jade index 99a3ee070..b9fbe46f9 100644 --- a/app/templates/editor/level/thangs-tab-view.jade +++ b/app/templates/editor/level/thangs-tab-view.jade @@ -14,6 +14,17 @@ button.btn#thangs-palette-toggle a(data-i18n="editor.delete") Delete li#duplicate a(data-i18n="editor.duplicate") Duplicate + li.divider + li.dropdown-header#rotation-menu-item + span(data-i18n="editor.rotate").spr Rotate + button.btn.btn-xs.spr(data-rotation='-0.5') + span.glyphicon.glyphicon-arrow-up + button.btn.btn-xs.spr(data-rotation='1') + span.glyphicon.glyphicon-arrow-left + button.btn.btn-xs.spr(data-rotation='0') + span.glyphicon.glyphicon-arrow-right + button.btn.btn-xs(data-rotation='0.5') + span.glyphicon.glyphicon-arrow-down canvas(width=924, height=589)#webgl-surface canvas(width=924, height=589)#normal-surface #canvas-left-gradient.gradient diff --git a/app/views/editor/level/thangs/ThangsTabView.coffee b/app/views/editor/level/thangs/ThangsTabView.coffee index d6542fca7..efbf0cdf6 100644 --- a/app/views/editor/level/thangs/ThangsTabView.coffee +++ b/app/views/editor/level/thangs/ThangsTabView.coffee @@ -51,7 +51,8 @@ module.exports = class ThangsTabView extends CocoView 'click #thangs-container-toggle': 'toggleThangsContainer' 'click #thangs-palette-toggle': 'toggleThangsPalette' # 'click .add-thang-palette-icon': 'toggleThangsPalette' - + 'click #rotation-menu-item button': 'onClickRotationButton' + shortcuts: 'esc': 'selectAddThang' 'delete, del, backspace': 'deleteSelectedExtantThang' @@ -59,6 +60,10 @@ module.exports = class ThangsTabView extends CocoView 'right': -> @moveAddThangSelection 1 'ctrl+z, ⌘+z': 'undo' 'ctrl+shift+z, ⌘+shift+z': 'redo' + 'alt+left': -> @rotateSelectedThangBy(Math.PI) + 'alt+right': -> @rotateSelectedThangBy(0) + 'alt+up': -> @rotateSelectedThangBy(-Math.PI/2) + 'alt+down': -> @rotateSelectedThangBy(Math.PI/2) constructor: (options) -> super options @@ -615,6 +620,8 @@ module.exports = class ThangsTabView extends CocoView $('#contextmenu').css { position: 'fixed', left: clientX, top: clientY } $('#contextmenu').show() + #- Context menu callbacks + onDeleteClicked: (e) -> $('#contextmenu').hide() @deleteSelectedExtantThang e @@ -623,6 +630,22 @@ module.exports = class ThangsTabView extends CocoView $('#contextmenu').hide() @selectAddThangType @selectedExtantThang.spriteName, @selectedExtantThang + onClickRotationButton: (e) -> + $('#contextmenu').hide() + rotation = parseFloat($(e.target).closest('button').data('rotation')) + @rotateSelectedThangBy rotation * Math.PI + + rotateSelectedThangBy: (radians) -> + return unless @selectedExtantThang + @hush = true + thangData = @getThangByID(@selectedExtantThang.id) + thangData = $.extend(true, {}, thangData) + component = _.find thangData.components, {original: LevelComponent.PhysicalID} + component.config.rotation = radians + @thangsTreema.set(@pathForThang(thangData), thangData) + @hush = false + @onThangsChanged() + toggleThangsContainer: (e) -> $('#all-thangs').toggleClass('hide') From e38f26a8d0676687ace81cf32bdd143995fe23c0 Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Tue, 21 Oct 2014 15:25:40 -0700 Subject: [PATCH 03/13] Fixed a little bit of spritesheet rebuilding cleanup. --- app/lib/surface/Mark.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/app/lib/surface/Mark.coffee b/app/lib/surface/Mark.coffee index 16283a41d..110c6a357 100644 --- a/app/lib/surface/Mark.coffee +++ b/app/lib/surface/Mark.coffee @@ -35,6 +35,7 @@ module.exports = class Mark extends CocoClass onLayerMadeSpriteSheet: -> return unless @sprite # rebuild sprite for new sprite sheet + @layer.removeChild @sprite @sprite = null @build() @layer.addChild @sprite From 49c85bce5fcd12bf69c6d0bd7f838b6293a4ead3 Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Tue, 21 Oct 2014 16:40:00 -0700 Subject: [PATCH 04/13] Fixed an issue with thang type marks not handling sprite sheet build completion correctly. --- app/lib/surface/Mark.coffee | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/lib/surface/Mark.coffee b/app/lib/surface/Mark.coffee index 110c6a357..0b52976af 100644 --- a/app/lib/surface/Mark.coffee +++ b/app/lib/surface/Mark.coffee @@ -34,6 +34,7 @@ module.exports = class Mark extends CocoClass onLayerMadeSpriteSheet: -> return unless @sprite + return @update() if @markLank # rebuild sprite for new sprite sheet @layer.removeChild @sprite @sprite = null @@ -236,12 +237,14 @@ module.exports = class Mark extends CocoClass @sprite.scaleY = h / (@layer.resolutionFactor * DEBUG_SIZE) buildSprite: -> + console.log 'build sprite?' if _.isString @thangType thangType = markThangTypes[@thangType] return @loadThangType() if not thangType @thangType = thangType return @listenToOnce(@thangType, 'sync', @onLoadedThangType) if not @thangType.loaded + console.log 'loaded, so go ahead!' Lank = require './Lank' # don't bother with making these render async for now, but maybe later for fun and more complexity of code markLank = new Lank @thangType @@ -249,6 +252,7 @@ module.exports = class Mark extends CocoClass @sprite = markLank.sprite @markLank = markLank @listenTo @markLank, 'new-sprite', (@sprite) -> + console.log 'oh yes, all done', markLank, @markLank loadThangType: -> name = @thangType @@ -259,7 +263,9 @@ module.exports = class Mark extends CocoClass markThangTypes[name] = @thangType onLoadedThangType: -> + console.log 'on loaded thang type...', @name @build() + @update() if @markLank @toggle(@toggleTo) if @toggleTo? Backbone.Mediator.publish 'sprite:loaded', {sprite: @} From 4371873d417747e39c777b364d010acdafaae05e Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Wed, 22 Oct 2014 07:53:28 -0700 Subject: [PATCH 05/13] Set up thang types to use their raster property as an icon. --- app/models/ThangType.coffee | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/models/ThangType.coffee b/app/models/ThangType.coffee index 37c9ac648..add003f56 100644 --- a/app/models/ThangType.coffee +++ b/app/models/ThangType.coffee @@ -219,7 +219,7 @@ module.exports = class ThangType extends CocoModel $('').attr('src', src) getPortraitSource: (spriteOptionsOrKey, size=100) -> - return @getPortraitURL() if @get 'rasterIcon' + return @getPortraitURL() if @get('rasterIcon') or @get('raster') stage = @getPortraitStage(spriteOptionsOrKey, size) stage?.toDataURL() @@ -259,7 +259,7 @@ module.exports = class ThangType extends CocoModel uploadGenericPortrait: (callback, src) -> src ?= @getPortraitSource() - return callback?() unless src + return callback?() unless src and src.startsWith 'data:' src = src.replace('data:image/png;base64,', '').replace(/\ /g, '+') body = filename: 'portrait.png' @@ -284,6 +284,8 @@ module.exports = class ThangType extends CocoModel getPortraitURL: -> if iconURL = @get('rasterIcon') return "/file/#{iconURL}" + if rasterURL = @get('raster') + return "/file/#{rasterURL}" "/file/db/thang.type/#{@get('original')}/portrait.png" # Item functions From 9392100d3bf31201cfe4b56622136331dc7d6602 Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Wed, 22 Oct 2014 08:17:30 -0700 Subject: [PATCH 06/13] Removed some logs. --- app/lib/surface/Mark.coffee | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/lib/surface/Mark.coffee b/app/lib/surface/Mark.coffee index 0b52976af..84362689c 100644 --- a/app/lib/surface/Mark.coffee +++ b/app/lib/surface/Mark.coffee @@ -237,14 +237,12 @@ module.exports = class Mark extends CocoClass @sprite.scaleY = h / (@layer.resolutionFactor * DEBUG_SIZE) buildSprite: -> - console.log 'build sprite?' if _.isString @thangType thangType = markThangTypes[@thangType] return @loadThangType() if not thangType @thangType = thangType return @listenToOnce(@thangType, 'sync', @onLoadedThangType) if not @thangType.loaded - console.log 'loaded, so go ahead!' Lank = require './Lank' # don't bother with making these render async for now, but maybe later for fun and more complexity of code markLank = new Lank @thangType @@ -252,8 +250,7 @@ module.exports = class Mark extends CocoClass @sprite = markLank.sprite @markLank = markLank @listenTo @markLank, 'new-sprite', (@sprite) -> - console.log 'oh yes, all done', markLank, @markLank - + loadThangType: -> name = @thangType @thangType = new ThangType() @@ -263,7 +260,6 @@ module.exports = class Mark extends CocoClass markThangTypes[name] = @thangType onLoadedThangType: -> - console.log 'on loaded thang type...', @name @build() @update() if @markLank @toggle(@toggleTo) if @toggleTo? From afc6558edc4b0792f839812649ccf58f26667d97 Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Wed, 22 Oct 2014 10:46:34 -0700 Subject: [PATCH 07/13] Spell Saved -> Code Saved. Re-enabled level locking, with a fallback for when victory modals are hanging. --- app/locale/en.coffee | 2 +- app/templates/play/level/tome/spell.jade | 2 +- app/views/play/WorldMapView.coffee | 4 ++-- app/views/play/level/modal/HeroVictoryModal.coffee | 9 ++++++++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/locale/en.coffee b/app/locale/en.coffee index 0f5735679..ce8992a56 100644 --- a/app/locale/en.coffee +++ b/app/locale/en.coffee @@ -227,7 +227,7 @@ tome_available_spells: "Available Spells" tome_your_skills: "Your Skills" hud_continue: "Continue (shift+space)" - spell_saved: "Spell Saved" + code_saved: "Code Saved" skip_tutorial: "Skip (esc)" keyboard_shortcuts: "Key Shortcuts" loading_ready: "Ready!" diff --git a/app/templates/play/level/tome/spell.jade b/app/templates/play/level/tome/spell.jade index 32a97806d..b8e361e77 100644 --- a/app/templates/play/level/tome/spell.jade +++ b/app/templates/play/level/tome/spell.jade @@ -3,4 +3,4 @@ span.code-background div.ace -.save-status(data-i18n="play_level.spell_saved") Spell Saved +.save-status(data-i18n="play_level.code_saved") Code Saved diff --git a/app/views/play/WorldMapView.coffee b/app/views/play/WorldMapView.coffee index 7e6c3bac6..e689107fb 100644 --- a/app/views/play/WorldMapView.coffee +++ b/app/views/play/WorldMapView.coffee @@ -82,8 +82,8 @@ module.exports = class WorldMapView extends RootView for level, index in campaign.levels level.x ?= 10 + 80 * Math.random() level.y ?= 10 + 80 * Math.random() - #level.locked = index > 0 and not me.earnedLevel level.original - level.locked = false # Until we can solve the bug. + level.locked = index > 0 and not me.earnedLevel level.original + level.locked = false if window.levelUnlocksNotWorking context.levelStatusMap = @levelStatusMap context.levelPlayCountMap = @levelPlayCountMap context.isIPadApp = application.isIPadApp diff --git a/app/views/play/level/modal/HeroVictoryModal.coffee b/app/views/play/level/modal/HeroVictoryModal.coffee index 448f67562..ab92b7db1 100644 --- a/app/views/play/level/modal/HeroVictoryModal.coffee +++ b/app/views/play/level/modal/HeroVictoryModal.coffee @@ -30,6 +30,7 @@ module.exports = class HeroVictoryModal extends ModalView @achievements = @supermodel.loadCollection(achievements, 'achievements').model @listenToOnce @achievements, 'sync', @onAchievementsLoaded @readyToContinue = false + @waitingToContinueSince = new Date() Backbone.Mediator.publish 'audio-player:play-sound', trigger: 'victory' onAchievementsLoaded: -> @@ -59,7 +60,13 @@ module.exports = class HeroVictoryModal extends ModalView res = @supermodel.loadCollection(earnedAchievements, 'earned_achievements') @earnedAchievements = res.model @listenTo @earnedAchievements, 'sync', -> - if @earnedAchievements.models.length < @earnedAchievements.sizeShouldBe + if (new Date() - @waitingToContinueSince) > 15 * 1000 + # In case there is some network problem, like we saw with CloudFlare + school proxies, we'll let them keep playing. + application.tracker?.trackEvent 'Unlocking Failed', level: @level.get('slug'), label: @level.get('slug') + window.levelUnlocksNotWorking = true + @readyToContinue = true + @updateSavingProgressStatus() + else if @earnedAchievements.models.length < @earnedAchievements.sizeShouldBe @earnedAchievements.fetch() else @listenToOnce me, 'sync', -> From f2fdd761dfb268e70185de66c04d6e7ef9ff0234 Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Wed, 22 Oct 2014 10:47:03 -0700 Subject: [PATCH 08/13] Propagated i18n. --- app/locale/ar.coffee | 3 ++- app/locale/bg.coffee | 3 ++- app/locale/ca.coffee | 3 ++- app/locale/cs.coffee | 3 ++- app/locale/da.coffee | 3 ++- app/locale/de-AT.coffee | 3 ++- app/locale/de-CH.coffee | 3 ++- app/locale/de-DE.coffee | 3 ++- app/locale/el.coffee | 3 ++- app/locale/en-AU.coffee | 3 ++- app/locale/en-GB.coffee | 3 ++- app/locale/en-US.coffee | 3 ++- app/locale/es-419.coffee | 3 ++- app/locale/es-ES.coffee | 3 ++- app/locale/fa.coffee | 3 ++- app/locale/fi.coffee | 3 ++- app/locale/fr.coffee | 3 ++- app/locale/he.coffee | 3 ++- app/locale/hi.coffee | 3 ++- app/locale/hu.coffee | 3 ++- app/locale/id.coffee | 3 ++- app/locale/it.coffee | 3 ++- app/locale/ja.coffee | 3 ++- app/locale/ko.coffee | 3 ++- app/locale/lt.coffee | 3 ++- app/locale/ms.coffee | 3 ++- app/locale/nb.coffee | 3 ++- app/locale/nl-BE.coffee | 3 ++- app/locale/nl-NL.coffee | 3 ++- app/locale/nn.coffee | 3 ++- app/locale/no.coffee | 3 ++- app/locale/pl.coffee | 3 ++- app/locale/pt-BR.coffee | 3 ++- app/locale/pt-PT.coffee | 3 ++- app/locale/ro.coffee | 3 ++- app/locale/ru.coffee | 3 ++- app/locale/sk.coffee | 3 ++- app/locale/sl.coffee | 3 ++- app/locale/sr.coffee | 3 ++- app/locale/sv.coffee | 3 ++- app/locale/th.coffee | 3 ++- app/locale/tr.coffee | 3 ++- app/locale/uk.coffee | 3 ++- app/locale/ur.coffee | 3 ++- app/locale/vi.coffee | 3 ++- app/locale/zh-HANS.coffee | 3 ++- app/locale/zh-HANT.coffee | 3 ++- app/locale/zh-WUU-HANS.coffee | 3 ++- app/locale/zh-WUU-HANT.coffee | 3 ++- 49 files changed, 98 insertions(+), 49 deletions(-) diff --git a/app/locale/ar.coffee b/app/locale/ar.coffee index 91e87b156..0feec171d 100644 --- a/app/locale/ar.coffee +++ b/app/locale/ar.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi # tome_available_spells: "Available Spells" # tome_your_skills: "Your Skills" # hud_continue: "Continue (shift+space)" -# spell_saved: "Spell Saved" +# code_saved: "Code Saved" # skip_tutorial: "Skip (esc)" # keyboard_shortcuts: "Key Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi # level_tab_thangs_add: "Add Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" # level_settings_title: "Settings" # level_component_tab_title: "Current Components" # level_component_btn_new: "Create New Component" diff --git a/app/locale/bg.coffee b/app/locale/bg.coffee index 2ee7384a4..c8e35ac2a 100644 --- a/app/locale/bg.coffee +++ b/app/locale/bg.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "български език", englishDescri # tome_available_spells: "Available Spells" # tome_your_skills: "Your Skills" # hud_continue: "Continue (shift+space)" -# spell_saved: "Spell Saved" +# code_saved: "Code Saved" # skip_tutorial: "Skip (esc)" # keyboard_shortcuts: "Key Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "български език", englishDescri # level_tab_thangs_add: "Add Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" # level_settings_title: "Settings" # level_component_tab_title: "Current Components" # level_component_btn_new: "Create New Component" diff --git a/app/locale/ca.coffee b/app/locale/ca.coffee index de79233fd..018b8e05f 100644 --- a/app/locale/ca.coffee +++ b/app/locale/ca.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # tome_available_spells: "Available Spells" # tome_your_skills: "Your Skills" hud_continue: "Continuar (shift+espai)" -# spell_saved: "Spell Saved" +# code_saved: "Code Saved" # skip_tutorial: "Skip (esc)" keyboard_shortcuts: "Dreceres del teclat" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # level_tab_thangs_add: "Add Thangs" delete: "Esborrar" duplicate: "Duplicar" +# rotate: "Rotate" level_settings_title: "Configuració" level_component_tab_title: "Components actuals" # level_component_btn_new: "Create New Component" diff --git a/app/locale/cs.coffee b/app/locale/cs.coffee index 5c6a23be7..e0e30f095 100644 --- a/app/locale/cs.coffee +++ b/app/locale/cs.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr tome_available_spells: "Dostupná kouzla" # tome_your_skills: "Your Skills" hud_continue: "Pokračovat (stiskněte shift-mezera)" - spell_saved: "Kouzlo uloženo" +# code_saved: "Code Saved" # skip_tutorial: "Skip (esc)" # keyboard_shortcuts: "Key Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr level_tab_thangs_add: "Přidat Thangy" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" level_settings_title: "Nastavení" level_component_tab_title: "Současné komponenty" level_component_btn_new: "Vytvořit novou komponentu" diff --git a/app/locale/da.coffee b/app/locale/da.coffee index 302712571..c221e9b31 100644 --- a/app/locale/da.coffee +++ b/app/locale/da.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans tome_available_spells: "Tilgængelige trylleformularer" # tome_your_skills: "Your Skills" hud_continue: "Fortsæt (tryk skift-mellemrum)" - spell_saved: "Trylleformularen er gemt" +# code_saved: "Code Saved" skip_tutorial: "Spring over (esc)" # keyboard_shortcuts: "Key Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans # level_tab_thangs_add: "Add Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" level_settings_title: "Instillinger" level_component_tab_title: "Nuværende komponenter" level_component_btn_new: "Opret ny komponent" diff --git a/app/locale/de-AT.coffee b/app/locale/de-AT.coffee index e0020b744..9c14f5781 100644 --- a/app/locale/de-AT.coffee +++ b/app/locale/de-AT.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription: tome_available_spells: "Verfügbare Zauber" # tome_your_skills: "Your Skills" hud_continue: "Weiter (drücke Shift + Leertaste)" - spell_saved: "Zauber gespeichert" +# code_saved: "Code Saved" skip_tutorial: "Überspringen (Esc)" keyboard_shortcuts: "Tastenkürzel" loading_ready: "Bereit!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription: level_tab_thangs_add: "Thangs hinzufügen" delete: "Löschen" duplicate: "Duplizieren" +# rotate: "Rotate" level_settings_title: "Einstellungen" level_component_tab_title: "Aktuelle Komponenten" level_component_btn_new: "neue Komponente erstellen" diff --git a/app/locale/de-CH.coffee b/app/locale/de-CH.coffee index 3c1b41dec..6cccb042c 100644 --- a/app/locale/de-CH.coffee +++ b/app/locale/de-CH.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge tome_available_spells: "Verfüegbari Zaubersprüch" # tome_your_skills: "Your Skills" hud_continue: "Wiiter (shift+space)" - spell_saved: "Zauberspruch gspeicheret" +# code_saved: "Code Saved" skip_tutorial: "Überspringe (esc)" keyboard_shortcuts: "Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge # level_tab_thangs_add: "Add Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" # level_settings_title: "Settings" # level_component_tab_title: "Current Components" # level_component_btn_new: "Create New Component" diff --git a/app/locale/de-DE.coffee b/app/locale/de-DE.coffee index 9eed5d516..e7127461f 100644 --- a/app/locale/de-DE.coffee +++ b/app/locale/de-DE.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: tome_available_spells: "Verfügbare Zauber" # tome_your_skills: "Your Skills" hud_continue: "Weiter (drücke Shift + Leertaste)" - spell_saved: "Zauber gespeichert" +# code_saved: "Code Saved" skip_tutorial: "Überspringen (Esc)" keyboard_shortcuts: "Tastenkürzel" loading_ready: "Bereit!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: level_tab_thangs_add: "Thangs hinzufügen" delete: "Löschen" duplicate: "Duplizieren" +# rotate: "Rotate" level_settings_title: "Einstellungen" level_component_tab_title: "Aktuelle Komponenten" level_component_btn_new: "neue Komponente erstellen" diff --git a/app/locale/el.coffee b/app/locale/el.coffee index 98c51dcf1..2e4fe6604 100644 --- a/app/locale/el.coffee +++ b/app/locale/el.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre # tome_available_spells: "Available Spells" # tome_your_skills: "Your Skills" # hud_continue: "Continue (shift+space)" -# spell_saved: "Spell Saved" +# code_saved: "Code Saved" # skip_tutorial: "Skip (esc)" # keyboard_shortcuts: "Key Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre # level_tab_thangs_add: "Add Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" # level_settings_title: "Settings" # level_component_tab_title: "Current Components" # level_component_btn_new: "Create New Component" diff --git a/app/locale/en-AU.coffee b/app/locale/en-AU.coffee index c6dc7371d..767d5bb34 100644 --- a/app/locale/en-AU.coffee +++ b/app/locale/en-AU.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English # tome_available_spells: "Available Spells" # tome_your_skills: "Your Skills" # hud_continue: "Continue (shift+space)" -# spell_saved: "Spell Saved" +# code_saved: "Code Saved" # skip_tutorial: "Skip (esc)" # keyboard_shortcuts: "Key Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English # level_tab_thangs_add: "Add Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" # level_settings_title: "Settings" # level_component_tab_title: "Current Components" # level_component_btn_new: "Create New Component" diff --git a/app/locale/en-GB.coffee b/app/locale/en-GB.coffee index 9520b5200..50e61fb93 100644 --- a/app/locale/en-GB.coffee +++ b/app/locale/en-GB.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English # tome_available_spells: "Available Spells" # tome_your_skills: "Your Skills" # hud_continue: "Continue (shift+space)" -# spell_saved: "Spell Saved" +# code_saved: "Code Saved" # skip_tutorial: "Skip (esc)" # keyboard_shortcuts: "Key Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English # level_tab_thangs_add: "Add Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" # level_settings_title: "Settings" # level_component_tab_title: "Current Components" # level_component_btn_new: "Create New Component" diff --git a/app/locale/en-US.coffee b/app/locale/en-US.coffee index 3b3fe7a47..42e13e02b 100644 --- a/app/locale/en-US.coffee +++ b/app/locale/en-US.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English # tome_available_spells: "Available Spells" # tome_your_skills: "Your Skills" # hud_continue: "Continue (shift+space)" -# spell_saved: "Spell Saved" +# code_saved: "Code Saved" # skip_tutorial: "Skip (esc)" # keyboard_shortcuts: "Key Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English # level_tab_thangs_add: "Add Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" # level_settings_title: "Settings" # level_component_tab_title: "Current Components" # level_component_btn_new: "Create New Component" diff --git a/app/locale/es-419.coffee b/app/locale/es-419.coffee index 861f38017..4304c454b 100644 --- a/app/locale/es-419.coffee +++ b/app/locale/es-419.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip tome_available_spells: "Hechizos Disponibles" tome_your_skills: "Tus habilidades" hud_continue: "Continuar (presionar shift+space)" - spell_saved: "Hechizo Guardado" +# code_saved: "Code Saved" skip_tutorial: "Saltar (esc)" keyboard_shortcuts: "Atajos de teclado" loading_ready: "¡Listo!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip # level_tab_thangs_add: "Add Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" # level_settings_title: "Settings" # level_component_tab_title: "Current Components" # level_component_btn_new: "Create New Component" diff --git a/app/locale/es-ES.coffee b/app/locale/es-ES.coffee index e70fe83c1..c9163f2db 100644 --- a/app/locale/es-ES.coffee +++ b/app/locale/es-ES.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis tome_available_spells: "Hechizos disponibles" tome_your_skills: "Tus Habilidades" hud_continue: "Continuar (pulsa Shift+Space)" - spell_saved: "Hechizo guardado" +# code_saved: "Code Saved" skip_tutorial: "Saltar (esc)" keyboard_shortcuts: "Atajos de teclado" loading_ready: "¡Listo!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis level_tab_thangs_add: "Añadir Objetos" delete: "Borrar" duplicate: "Duplicar" +# rotate: "Rotate" level_settings_title: "Ajustes" level_component_tab_title: "Componentes Actuales" level_component_btn_new: "Crear Nuevo Componente" diff --git a/app/locale/fa.coffee b/app/locale/fa.coffee index 8682128a4..de0db783a 100644 --- a/app/locale/fa.coffee +++ b/app/locale/fa.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian", # tome_available_spells: "Available Spells" # tome_your_skills: "Your Skills" # hud_continue: "Continue (shift+space)" -# spell_saved: "Spell Saved" +# code_saved: "Code Saved" # skip_tutorial: "Skip (esc)" # keyboard_shortcuts: "Key Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian", # level_tab_thangs_add: "Add Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" # level_settings_title: "Settings" # level_component_tab_title: "Current Components" # level_component_btn_new: "Create New Component" diff --git a/app/locale/fi.coffee b/app/locale/fi.coffee index 6ea8016e0..6ca7421a9 100644 --- a/app/locale/fi.coffee +++ b/app/locale/fi.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran # tome_available_spells: "Available Spells" # tome_your_skills: "Your Skills" # hud_continue: "Continue (shift+space)" -# spell_saved: "Spell Saved" +# code_saved: "Code Saved" # skip_tutorial: "Skip (esc)" # keyboard_shortcuts: "Key Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran # level_tab_thangs_add: "Add Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" # level_settings_title: "Settings" # level_component_tab_title: "Current Components" # level_component_btn_new: "Create New Component" diff --git a/app/locale/fr.coffee b/app/locale/fr.coffee index b3ba5175d..c6f6505b3 100644 --- a/app/locale/fr.coffee +++ b/app/locale/fr.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t tome_available_spells: "Sorts diponibles" # tome_your_skills: "Your Skills" hud_continue: "Continuer (appuie sur shift ou espace)" - spell_saved: "Sort enregistré" +# code_saved: "Code Saved" skip_tutorial: "Passer (esc)" keyboard_shortcuts: "Raccourcis Clavier" loading_ready: "Pret!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t level_tab_thangs_add: "ajouter des Thangs" delete: "Supprimer" duplicate: "Dupliquer" +# rotate: "Rotate" level_settings_title: "Paramètres" level_component_tab_title: "Composants actuels" level_component_btn_new: "Créer un nouveau composant" diff --git a/app/locale/he.coffee b/app/locale/he.coffee index 946e6f80f..6715b319e 100644 --- a/app/locale/he.coffee +++ b/app/locale/he.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew", # tome_available_spells: "Available Spells" # tome_your_skills: "Your Skills" # hud_continue: "Continue (shift+space)" -# spell_saved: "Spell Saved" +# code_saved: "Code Saved" # skip_tutorial: "Skip (esc)" # keyboard_shortcuts: "Key Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew", # level_tab_thangs_add: "Add Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" # level_settings_title: "Settings" # level_component_tab_title: "Current Components" # level_component_btn_new: "Create New Component" diff --git a/app/locale/hi.coffee b/app/locale/hi.coffee index c77631423..7583b57a7 100644 --- a/app/locale/hi.coffee +++ b/app/locale/hi.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe # tome_available_spells: "Available Spells" # tome_your_skills: "Your Skills" # hud_continue: "Continue (shift+space)" -# spell_saved: "Spell Saved" +# code_saved: "Code Saved" # skip_tutorial: "Skip (esc)" # keyboard_shortcuts: "Key Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe # level_tab_thangs_add: "Add Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" # level_settings_title: "Settings" # level_component_tab_title: "Current Components" # level_component_btn_new: "Create New Component" diff --git a/app/locale/hu.coffee b/app/locale/hu.coffee index 299106b2f..01e438010 100644 --- a/app/locale/hu.coffee +++ b/app/locale/hu.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t tome_available_spells: "Elérhető varázslatok" # tome_your_skills: "Your Skills" hud_continue: "Folytatás (shift+space)" - spell_saved: "Varázslat elmentve." +# code_saved: "Code Saved" # skip_tutorial: "Skip (esc)" # keyboard_shortcuts: "Key Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t # level_tab_thangs_add: "Add Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" # level_settings_title: "Settings" # level_component_tab_title: "Current Components" # level_component_btn_new: "Create New Component" diff --git a/app/locale/id.coffee b/app/locale/id.coffee index c7c399d0b..9e8151f5d 100644 --- a/app/locale/id.coffee +++ b/app/locale/id.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind # tome_available_spells: "Available Spells" # tome_your_skills: "Your Skills" # hud_continue: "Continue (shift+space)" -# spell_saved: "Spell Saved" +# code_saved: "Code Saved" # skip_tutorial: "Skip (esc)" # keyboard_shortcuts: "Key Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind # level_tab_thangs_add: "Add Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" # level_settings_title: "Settings" # level_component_tab_title: "Current Components" # level_component_btn_new: "Create New Component" diff --git a/app/locale/it.coffee b/app/locale/it.coffee index 2cf126cfd..59cc4c190 100644 --- a/app/locale/it.coffee +++ b/app/locale/it.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t tome_available_spells: "Incantesimi disponibili" # tome_your_skills: "Your Skills" hud_continue: "Continua (premi Maiusc-Spazio)" - spell_saved: "Magia Salvata" +# code_saved: "Code Saved" skip_tutorial: "Salta (esc)" # keyboard_shortcuts: "Key Shortcuts" loading_ready: "Pronto!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t level_tab_thangs_add: "Aggiungi thang" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" level_settings_title: "Impostazioni" level_component_tab_title: "Componenti esistenti" level_component_btn_new: "Crea nuovo componente" diff --git a/app/locale/ja.coffee b/app/locale/ja.coffee index 88fa14564..df806a301 100644 --- a/app/locale/ja.coffee +++ b/app/locale/ja.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese", tome_available_spells: "利用できる呪文" # tome_your_skills: "Your Skills" hud_continue: "続く　（Shift+Spaceキー）" - spell_saved: "呪文を保存しました" +# code_saved: "Code Saved" skip_tutorial: "スキップ (esc)" # keyboard_shortcuts: "Key Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese", # level_tab_thangs_add: "Add Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" # level_settings_title: "Settings" # level_component_tab_title: "Current Components" # level_component_btn_new: "Create New Component" diff --git a/app/locale/ko.coffee b/app/locale/ko.coffee index 1f65c4454..2f7c267ae 100644 --- a/app/locale/ko.coffee +++ b/app/locale/ko.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t tome_available_spells: "사용 가능한 마법" # tome_your_skills: "Your Skills" hud_continue: "계속진행 (shift+space)" - spell_saved: "마법 저장 완료" +# code_saved: "Code Saved" skip_tutorial: "넘기기 (esc)" keyboard_shortcuts: "단축키" loading_ready: "준비!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t level_tab_thangs_add: "Thangs 추가" delete: "삭제" # duplicate: "Duplicate" +# rotate: "Rotate" level_settings_title: "설정" level_component_tab_title: "현재 요소들" level_component_btn_new: "새로운 요소들 생성" diff --git a/app/locale/lt.coffee b/app/locale/lt.coffee index 185c802d8..22ad1a355 100644 --- a/app/locale/lt.coffee +++ b/app/locale/lt.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith # tome_available_spells: "Available Spells" # tome_your_skills: "Your Skills" # hud_continue: "Continue (shift+space)" -# spell_saved: "Spell Saved" +# code_saved: "Code Saved" # skip_tutorial: "Skip (esc)" # keyboard_shortcuts: "Key Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith # level_tab_thangs_add: "Add Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" # level_settings_title: "Settings" # level_component_tab_title: "Current Components" # level_component_btn_new: "Create New Component" diff --git a/app/locale/ms.coffee b/app/locale/ms.coffee index 7d0797d6e..8ef3c7121 100644 --- a/app/locale/ms.coffee +++ b/app/locale/ms.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa # tome_available_spells: "Available Spells" # tome_your_skills: "Your Skills" # hud_continue: "Continue (shift+space)" -# spell_saved: "Spell Saved" +# code_saved: "Code Saved" # skip_tutorial: "Skip (esc)" # keyboard_shortcuts: "Key Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa # level_tab_thangs_add: "Add Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" # level_settings_title: "Settings" # level_component_tab_title: "Current Components" # level_component_btn_new: "Create New Component" diff --git a/app/locale/nb.coffee b/app/locale/nb.coffee index 0d6e09675..38521a0a2 100644 --- a/app/locale/nb.coffee +++ b/app/locale/nb.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg tome_available_spells: "Tilgjenglige Trylleformularer" # tome_your_skills: "Your Skills" hud_continue: "Fortsett (trykk shift-mellomrom)" -# spell_saved: "Spell Saved" +# code_saved: "Code Saved" # skip_tutorial: "Skip (esc)" # keyboard_shortcuts: "Key Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg # level_tab_thangs_add: "Add Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" # level_settings_title: "Settings" # level_component_tab_title: "Current Components" # level_component_btn_new: "Create New Component" diff --git a/app/locale/nl-BE.coffee b/app/locale/nl-BE.coffee index 356244785..41668a27a 100644 --- a/app/locale/nl-BE.coffee +++ b/app/locale/nl-BE.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription: tome_available_spells: "Beschikbare spreuken" # tome_your_skills: "Your Skills" hud_continue: "Ga verder (druk shift-space)" - spell_saved: "Spreuk Opgeslagen" +# code_saved: "Code Saved" skip_tutorial: "Overslaan (esc)" # keyboard_shortcuts: "Key Shortcuts" loading_ready: "Klaar!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription: level_tab_thangs_add: "Voeg element toe" delete: "Verwijder" duplicate: "Dupliceer" +# rotate: "Rotate" level_settings_title: "Instellingen" level_component_tab_title: "Huidige Componenten" level_component_btn_new: "Maak een nieuwe component aan" diff --git a/app/locale/nl-NL.coffee b/app/locale/nl-NL.coffee index c541c1424..dc5bb51df 100644 --- a/app/locale/nl-NL.coffee +++ b/app/locale/nl-NL.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription tome_available_spells: "Beschikbare spreuken" # tome_your_skills: "Your Skills" hud_continue: "Ga verder (druk shift-spatie)" - spell_saved: "Spreuk Opgeslagen" +# code_saved: "Code Saved" skip_tutorial: "Overslaan (esc)" # keyboard_shortcuts: "Key Shortcuts" loading_ready: "Klaar!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription level_tab_thangs_add: "Voeg element toe" delete: "Verwijder" duplicate: "Dupliceer" +# rotate: "Rotate" level_settings_title: "Instellingen" level_component_tab_title: "Huidige Componenten" level_component_btn_new: "Maak een nieuwe component aan" diff --git a/app/locale/nn.coffee b/app/locale/nn.coffee index 4c40d8a1b..fc5ca9745 100644 --- a/app/locale/nn.coffee +++ b/app/locale/nn.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No # tome_available_spells: "Available Spells" # tome_your_skills: "Your Skills" # hud_continue: "Continue (shift+space)" -# spell_saved: "Spell Saved" +# code_saved: "Code Saved" # skip_tutorial: "Skip (esc)" # keyboard_shortcuts: "Key Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No # level_tab_thangs_add: "Add Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" # level_settings_title: "Settings" # level_component_tab_title: "Current Components" # level_component_btn_new: "Create New Component" diff --git a/app/locale/no.coffee b/app/locale/no.coffee index 93ed924cc..b4f1d8730 100644 --- a/app/locale/no.coffee +++ b/app/locale/no.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr tome_available_spells: "Tilgjenglige trylleformularer" # tome_your_skills: "Your Skills" hud_continue: "Fortsett (trykk shift+mellomrom)" -# spell_saved: "Spell Saved" +# code_saved: "Code Saved" # skip_tutorial: "Skip (esc)" # keyboard_shortcuts: "Key Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr # level_tab_thangs_add: "Add Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" # level_settings_title: "Settings" # level_component_tab_title: "Current Components" # level_component_btn_new: "Create New Component" diff --git a/app/locale/pl.coffee b/app/locale/pl.coffee index ee27aaf04..9fa14fe65 100644 --- a/app/locale/pl.coffee +++ b/app/locale/pl.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish tome_available_spells: "Dostępne czary" # tome_your_skills: "Your Skills" hud_continue: "Kontynuuj (Shift + spacja)" - spell_saved: "Czar zapisany" +# code_saved: "Code Saved" skip_tutorial: "Pomiń (esc)" keyboard_shortcuts: "Skróty klawiszowe" loading_ready: "Gotowy!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish level_tab_thangs_add: "Dodaj obiekty" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" level_settings_title: "Ustawienia" level_component_tab_title: "Aktualne komponenty" level_component_btn_new: "Stwórz nowy komponent" diff --git a/app/locale/pt-BR.coffee b/app/locale/pt-BR.coffee index dc020e36d..b04616347 100644 --- a/app/locale/pt-BR.coffee +++ b/app/locale/pt-BR.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: tome_available_spells: "Feitiços Disponíveis" tome_your_skills: "Suas habilidades" hud_continue: "Continue (tecle Shift+Space)" - spell_saved: "Feitiço Salvo" +# code_saved: "Code Saved" skip_tutorial: "Pular (esc)" keyboard_shortcuts: "Teclas de atalho" loading_ready: "Pronto!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: level_tab_thangs_add: "Adicionar Thangs" delete: "Excluir" duplicate: "Duplicar" +# rotate: "Rotate" level_settings_title: "Configurações" level_component_tab_title: "Componentess Atuais" level_component_btn_new: "Criar Novo Componente" diff --git a/app/locale/pt-PT.coffee b/app/locale/pt-PT.coffee index 961cc1b38..225b8bc6c 100644 --- a/app/locale/pt-PT.coffee +++ b/app/locale/pt-PT.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: tome_available_spells: "Feitiços Disponíveis" tome_your_skills: "As Tuas Habilidades" hud_continue: "Continuar (shift-espaço)" - spell_saved: "Feitiço Guardado" +# code_saved: "Code Saved" skip_tutorial: "Saltar (esc)" keyboard_shortcuts: "Atalhos do Teclado" loading_ready: "Pronto!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: level_tab_thangs_add: "Adicionar Thangs" delete: "Eliminar" duplicate: "Duplicar" +# rotate: "Rotate" level_settings_title: "Configurações" level_component_tab_title: "Componentes Atuais" level_component_btn_new: "Criar Novo Componente" diff --git a/app/locale/ro.coffee b/app/locale/ro.coffee index e5f4d64ec..49dc182d7 100644 --- a/app/locale/ro.coffee +++ b/app/locale/ro.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman tome_available_spells: "Vrăjile disponibile" # tome_your_skills: "Your Skills" hud_continue: "Continuă (apasă shift-space)" - spell_saved: "Vrajă salvată" +# code_saved: "Code Saved" skip_tutorial: "Sari peste (esc)" keyboard_shortcuts: "Scurtături Keyboard" loading_ready: "Gata!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman level_tab_thangs_add: "Adaugă Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" level_settings_title: "Setări" level_component_tab_title: "Componente actuale" level_component_btn_new: "Crează componentă nouă" diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee index 002f0952d..124eb4f92 100644 --- a/app/locale/ru.coffee +++ b/app/locale/ru.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi tome_available_spells: "Доступные заклинания" tome_your_skills: "Ваши навыки" hud_continue: "Продолжить (Shift+Пробел)" - spell_saved: "Заклинание сохранено" +# code_saved: "Code Saved" skip_tutorial: "Пропуск (Esc)" keyboard_shortcuts: "Горячие клавиши" loading_ready: "Готово!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi level_tab_thangs_add: "Добавить объект" delete: "Удалить" duplicate: "Дублировать" +# rotate: "Rotate" level_settings_title: "Настройки" level_component_tab_title: "Текущие компоненты" level_component_btn_new: "Создать новый компонент" diff --git a/app/locale/sk.coffee b/app/locale/sk.coffee index a1d761310..1e5707ca3 100644 --- a/app/locale/sk.coffee +++ b/app/locale/sk.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak", # tome_available_spells: "Available Spells" # tome_your_skills: "Your Skills" # hud_continue: "Continue (shift+space)" -# spell_saved: "Spell Saved" +# code_saved: "Code Saved" # skip_tutorial: "Skip (esc)" # keyboard_shortcuts: "Key Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak", # level_tab_thangs_add: "Add Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" # level_settings_title: "Settings" # level_component_tab_title: "Current Components" # level_component_btn_new: "Create New Component" diff --git a/app/locale/sl.coffee b/app/locale/sl.coffee index 8d58ccce4..9dcdaefe0 100644 --- a/app/locale/sl.coffee +++ b/app/locale/sl.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven # tome_available_spells: "Available Spells" # tome_your_skills: "Your Skills" # hud_continue: "Continue (shift+space)" -# spell_saved: "Spell Saved" +# code_saved: "Code Saved" # skip_tutorial: "Skip (esc)" # keyboard_shortcuts: "Key Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven # level_tab_thangs_add: "Add Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" # level_settings_title: "Settings" # level_component_tab_title: "Current Components" # level_component_btn_new: "Create New Component" diff --git a/app/locale/sr.coffee b/app/locale/sr.coffee index e05088c3e..3b4c54695 100644 --- a/app/locale/sr.coffee +++ b/app/locale/sr.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian tome_available_spells: "Доступне чини" # tome_your_skills: "Your Skills" hud_continue: "Настави (притисни ентер)" -# spell_saved: "Spell Saved" +# code_saved: "Code Saved" # skip_tutorial: "Skip (esc)" # keyboard_shortcuts: "Key Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian # level_tab_thangs_add: "Add Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" # level_settings_title: "Settings" # level_component_tab_title: "Current Components" # level_component_btn_new: "Create New Component" diff --git a/app/locale/sv.coffee b/app/locale/sv.coffee index a725e344d..14550f643 100644 --- a/app/locale/sv.coffee +++ b/app/locale/sv.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr tome_available_spells: "Tillgängliga förmågor" # tome_your_skills: "Your Skills" hud_continue: "Fortsätt (skift+mellanslag)" - spell_saved: "Besvärjelse sparad" +# code_saved: "Code Saved" skip_tutorial: "Hoppa över (esc)" # keyboard_shortcuts: "Key Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr level_tab_thangs_add: "Lägg till enheter" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" level_settings_title: "Inställningar" level_component_tab_title: "Nuvarande komponenter" level_component_btn_new: "Skapa ny komponent" diff --git a/app/locale/th.coffee b/app/locale/th.coffee index f06b7a39e..8795db607 100644 --- a/app/locale/th.coffee +++ b/app/locale/th.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra # tome_available_spells: "Available Spells" # tome_your_skills: "Your Skills" # hud_continue: "Continue (shift+space)" -# spell_saved: "Spell Saved" +# code_saved: "Code Saved" # skip_tutorial: "Skip (esc)" # keyboard_shortcuts: "Key Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra # level_tab_thangs_add: "Add Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" # level_settings_title: "Settings" # level_component_tab_title: "Current Components" # level_component_btn_new: "Create New Component" diff --git a/app/locale/tr.coffee b/app/locale/tr.coffee index 0ed4ce9fd..abfd5a5b4 100644 --- a/app/locale/tr.coffee +++ b/app/locale/tr.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t tome_available_spells: "Kullanılabilir Büyüler" tome_your_skills: "Yetenekleriniz" hud_continue: "Devam (ÜstKarakter+Boşluk)" - spell_saved: "Büyü Kaydedildi" +# code_saved: "Code Saved" skip_tutorial: "Atla (esc)" keyboard_shortcuts: "Klavye Kısayolları" loading_ready: "Hazır!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t level_tab_thangs_add: "Nesne Ekle" delete: "Sil" duplicate: "Kopyala" +# rotate: "Rotate" level_settings_title: "Ayarlar" level_component_tab_title: "Geçerli Bileşenler" level_component_btn_new: "Yeni Bileşen Oluştur" diff --git a/app/locale/uk.coffee b/app/locale/uk.coffee index a19f6dccd..eb8fa44e8 100644 --- a/app/locale/uk.coffee +++ b/app/locale/uk.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "українська мова", englishDesc tome_available_spells: "Доступні закляття" # tome_your_skills: "Your Skills" hud_continue: "Продовжити (натисніть shift-space)" - spell_saved: "Закляття збережено" +# code_saved: "Code Saved" skip_tutorial: "Пропустити (esc)" # keyboard_shortcuts: "Key Shortcuts" loading_ready: "Готово!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "українська мова", englishDesc level_tab_thangs_add: "Додати об'єкти" delete: "Видалити" duplicate: "Копіювати" +# rotate: "Rotate" level_settings_title: "Налаштування" level_component_tab_title: "Поточні компоненти" level_component_btn_new: "Створити новий компонент" diff --git a/app/locale/ur.coffee b/app/locale/ur.coffee index 67f2749e5..6bd4b44df 100644 --- a/app/locale/ur.coffee +++ b/app/locale/ur.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu", # tome_available_spells: "Available Spells" # tome_your_skills: "Your Skills" # hud_continue: "Continue (shift+space)" -# spell_saved: "Spell Saved" +# code_saved: "Code Saved" # skip_tutorial: "Skip (esc)" # keyboard_shortcuts: "Key Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu", # level_tab_thangs_add: "Add Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" # level_settings_title: "Settings" # level_component_tab_title: "Current Components" # level_component_btn_new: "Create New Component" diff --git a/app/locale/vi.coffee b/app/locale/vi.coffee index 17d5c0e86..31076b174 100644 --- a/app/locale/vi.coffee +++ b/app/locale/vi.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn # tome_available_spells: "Available Spells" # tome_your_skills: "Your Skills" # hud_continue: "Continue (shift+space)" -# spell_saved: "Spell Saved" +# code_saved: "Code Saved" # skip_tutorial: "Skip (esc)" # keyboard_shortcuts: "Key Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn # level_tab_thangs_add: "Add Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" # level_settings_title: "Settings" # level_component_tab_title: "Current Components" # level_component_btn_new: "Create New Component" diff --git a/app/locale/zh-HANS.coffee b/app/locale/zh-HANS.coffee index c03974f5a..cb7cf01e2 100644 --- a/app/locale/zh-HANS.coffee +++ b/app/locale/zh-HANS.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese tome_available_spells: "可用的法术" # tome_your_skills: "Your Skills" hud_continue: "继续（按 Shift-空格）" - spell_saved: "咒语已保存" +# code_saved: "Code Saved" skip_tutorial: "跳过（esc）" # keyboard_shortcuts: "Key Shortcuts" loading_ready: "载入完成!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese level_tab_thangs_add: "增加物体" delete: "删除" duplicate: "复制" +# rotate: "Rotate" level_settings_title: "设置" level_component_tab_title: "目前所有组件" level_component_btn_new: "创建新的组件" diff --git a/app/locale/zh-HANT.coffee b/app/locale/zh-HANT.coffee index 5204e1cdd..e6aa70c32 100644 --- a/app/locale/zh-HANT.coffee +++ b/app/locale/zh-HANT.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese tome_available_spells: "可用的法術" # tome_your_skills: "Your Skills" hud_continue: "繼續 (按 shift-空格)" - spell_saved: "咒語已儲存" +# code_saved: "Code Saved" # skip_tutorial: "Skip (esc)" # keyboard_shortcuts: "Key Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese # level_tab_thangs_add: "Add Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" # level_settings_title: "Settings" # level_component_tab_title: "Current Components" # level_component_btn_new: "Create New Component" diff --git a/app/locale/zh-WUU-HANS.coffee b/app/locale/zh-WUU-HANS.coffee index 9b5dc793a..cd418bafa 100644 --- a/app/locale/zh-WUU-HANS.coffee +++ b/app/locale/zh-WUU-HANS.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi # tome_available_spells: "Available Spells" # tome_your_skills: "Your Skills" # hud_continue: "Continue (shift+space)" -# spell_saved: "Spell Saved" +# code_saved: "Code Saved" # skip_tutorial: "Skip (esc)" # keyboard_shortcuts: "Key Shortcuts" # loading_ready: "Ready!" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi # level_tab_thangs_add: "Add Thangs" # delete: "Delete" # duplicate: "Duplicate" +# rotate: "Rotate" # level_settings_title: "Settings" # level_component_tab_title: "Current Components" # level_component_btn_new: "Create New Component" diff --git a/app/locale/zh-WUU-HANT.coffee b/app/locale/zh-WUU-HANT.coffee index 685337b5e..059c5f9c7 100644 --- a/app/locale/zh-WUU-HANT.coffee +++ b/app/locale/zh-WUU-HANT.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio tome_available_spells: "好用個法術" # tome_your_skills: "Your Skills" hud_continue: "接落去（捺 Shift-空格）" - spell_saved: "咒語存起爻" +# code_saved: "Code Saved" skip_tutorial: "跳過去（Esc）" # keyboard_shortcuts: "Key Shortcuts" loading_ready: "讀取下落！" @@ -494,6 +494,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio level_tab_thangs_add: "加物事" delete: "刪除" duplicate: "翻做" +# rotate: "Rotate" level_settings_title: "設定" level_component_tab_title: "能界所有組件" level_component_btn_new: "造新個組件" From 918e940edd6ff2473b570ae4aaeb7990856a7e06 Mon Sep 17 00:00:00 2001 From: Imperadeiro98 Date: Wed, 22 Oct 2014 19:21:57 +0100 Subject: [PATCH 09/13] Update pt-PT.coffee --- app/locale/pt-PT.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/locale/pt-PT.coffee b/app/locale/pt-PT.coffee index 225b8bc6c..0487dd3a8 100644 --- a/app/locale/pt-PT.coffee +++ b/app/locale/pt-PT.coffee @@ -227,7 +227,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: tome_available_spells: "Feitiços Disponíveis" tome_your_skills: "As Tuas Habilidades" hud_continue: "Continuar (shift-espaço)" -# code_saved: "Code Saved" + code_saved: "Código Guardado" skip_tutorial: "Saltar (esc)" keyboard_shortcuts: "Atalhos do Teclado" loading_ready: "Pronto!" @@ -494,7 +494,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: level_tab_thangs_add: "Adicionar Thangs" delete: "Eliminar" duplicate: "Duplicar" -# rotate: "Rotate" + rotate: "Rodar" level_settings_title: "Configurações" level_component_tab_title: "Componentes Atuais" level_component_btn_new: "Criar Novo Componente" From 625a34b2e6f4c31690a41f09428bbb71f19e186c Mon Sep 17 00:00:00 2001 From: Matt Lott Date: Wed, 22 Oct 2014 12:24:28 -0700 Subject: [PATCH 10/13] Add autocomplete right-justified help text --- app/views/play/level/tome/SpellView.coffee | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/views/play/level/tome/SpellView.coffee b/app/views/play/level/tome/SpellView.coffee index e77f689ab..16d90e69d 100644 --- a/app/views/play/level/tome/SpellView.coffee +++ b/app/views/play/level/tome/SpellView.coffee @@ -209,6 +209,11 @@ module.exports = class SpellView extends CocoView @zatanna?.set 'snippets', @autocomplete addZatannaSnippets: (e) -> + # Snippet entry format: + # content: code inserted into document + # meta: displayed right-justfied in popup + # name: displayed left-justified in popup, and what's being matched + # tabTrigger: fallback for name field return unless @zatanna and @autocomplete snippetEntries = [] for group, props of e.propGroups @@ -224,6 +229,7 @@ module.exports = class SpellView extends CocoView if doc?.snippets?[e.language] entry = content: doc.snippets[e.language].code + meta: 'press enter' name: doc.name tabTrigger: doc.snippets[e.language].tab snippetEntries.push entry From 5d4a6b603bdbae4f5e6f1b05714f26feec9e86cc Mon Sep 17 00:00:00 2001 From: Christelle Date: Wed, 22 Oct 2014 16:12:41 -0400 Subject: [PATCH 11/13] Update fr.coffee --- app/locale/fr.coffee | 52 ++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/app/locale/fr.coffee b/app/locale/fr.coffee index c6f6505b3..1d337e474 100644 --- a/app/locale/fr.coffee +++ b/app/locale/fr.coffee @@ -24,7 +24,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t blog: "Blog" forum: "Forum" account: "Compte" -# profile: "Profile" + profile: "Profil" # stats: "Stats" # code: "Code" admin: "Admin" # Only shows up when you are an admin @@ -34,7 +34,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t about: "À propos" contact: "Contact" twitter_follow: "Suivre" -# teachers: "Teachers" + teachers: "Enseignants" modal: close: "Fermer" @@ -181,7 +181,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t play_level: done: "Fait" home: "Accueil" -# skip: "Skip" + skip: "Passer" # game_menu: "Game Menu" guide: "Guide" restart: "Relancer" @@ -219,13 +219,13 @@ module.exports = nativeDescription: "français", englishDescription: "French", t # tome_cast_button_run: "Run" # tome_cast_button_running: "Running" # tome_cast_button_ran: "Ran" -# tome_submit_button: "Submit" + tome_submit_button: "Envoyer" # tome_reload_method: "Reload original code for this method" # Title text for individual method reload button. # tome_select_method: "Select a Method" # tome_see_all_methods: "See all methods you can edit" # Title text for method list selector (shown when there are multiple programmable methdos). tome_select_a_thang: "Sélectionnez une unité pour" tome_available_spells: "Sorts diponibles" -# tome_your_skills: "Your Skills" + tome_your_skills: "Vos compétences" hud_continue: "Continuer (appuie sur shift ou espace)" # code_saved: "Code Saved" skip_tutorial: "Passer (esc)" @@ -270,7 +270,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t customize_wizard: "Personnaliser le magicien" game_menu: -# inventory_tab: "Inventory" + inventory_tab: "Inventaire" # choose_hero_tab: "Restart Level" # save_load_tab: "Save/Load" # options_tab: "Options" @@ -287,11 +287,11 @@ module.exports = nativeDescription: "français", englishDescription: "French", t # choose_inventory: "Equip Items" # choose_hero: -# choose_hero: "Choose Your Hero" + choose_hero: "Choisir votre héro" # programming_language: "Programming Language" # programming_language_description: "Which programming language do you want to use?" # status: "Status" -# weapons: "Weapons" + weapons: "Armes" # health: "Health" # speed: "Speed" @@ -473,7 +473,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t revert: "Annuler" revert_models: "Annuler les modèles" # pick_a_terrain: "Pick A Terrain" -# small: "Small" + small: "Petit" # grassy: "Grassy" fork_title: "Fork une nouvelle version" fork_creating: "Créer un Fork..." @@ -668,8 +668,8 @@ module.exports = nativeDescription: "français", englishDescription: "French", t # tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details" # tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details" tournament_blurb_blog: "Sur notre blog" -# rules: "Rules" -# winners: "Winners" + rules: "Règles" + winners: "Gagnants" # user: # stats: "Stats" @@ -683,7 +683,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t # no_singleplayer: "No Singleplayer games played yet." # no_multiplayer: "No Multiplayer games played yet." # no_achievements: "No Achievements earned yet." -# favorite_prefix: "Favorite language is " + favorite_prefix: "Le langage favori est " # favorite_postfix: "." # achievements: @@ -736,9 +736,9 @@ module.exports = nativeDescription: "français", englishDescription: "French", t # patched_model: "Source Document" # model: "Model" system: "Système" -# systems: "Systems" -# component: "Component" -# components: "Components" + systems: "Systèmes" + component: "Composant" + components: "Composants" # thang: "Thang" # thangs: "Thangs" # level_session: "Your Session" @@ -752,14 +752,14 @@ module.exports = nativeDescription: "français", englishDescription: "French", t document: "Document" # sprite_sheet: "Sprite Sheet" # employers: "Employers" -# candidates: "Candidates" + candidates: "Candidats" # candidate_sessions: "Candidate Sessions" # user_remark: "User Remark" # user_remarks: "User Remarks" # versions: "Versions" -# items: "Items" -# heroes: "Heroes" -# wizard: "Wizard" + items: "Objets" + heroes: "Héros" + wizard: "Magicien" # achievement: "Achievement" # clas: "CLAs" # play_counts: "Play Counts" @@ -1000,7 +1000,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t # filter_visa_yes: "US Authorized" # filter_visa_no: "Not Authorized" # filter_education_top: "Top School" -# filter_education_other: "Other" + filter_education_other: "Autre" # filter_role_web_developer: "Web Developer" # filter_role_software_developer: "Software Developer" # filter_role_mobile_developer: "Mobile Developer" @@ -1009,7 +1009,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t # filter_experience_junior: "Junior" # filter_experience_recent_grad: "Recent Grad" # filter_experience_student: "College Student" -# filter_results: "results" + filter_results: "Résultat" # start_hiring: "Start hiring." # reasons: "Three reasons you should hire through us:" # everyone_looking: "Everyone here is looking for their next opportunity." @@ -1032,21 +1032,21 @@ module.exports = nativeDescription: "français", englishDescription: "French", t candidate_last_updated: "Dernière mise à jour" # candidate_who: "Who" # featured_developers: "Featured Developers" -# other_developers: "Other Developers" + other_developers: "Autres développeur" # inactive_developers: "Inactive Developers" admin: # av_espionage: "Espionage" # Really not important to translate /admin controls. -# av_espionage_placeholder: "Email or username" -# av_usersearch: "User Search" + av_espionage_placeholder: "Email ou nom d'utilisateur" + av_usersearch: "Recherche d'utilisateurs" # av_usersearch_placeholder: "Email, username, name, whatever" -# av_usersearch_search: "Search" + av_usersearch_search: "Recherche" av_title: "Vues d'administrateurs" av_entities_sub_title: "Entités" av_entities_users_url: "Utilisateurs" av_entities_active_instances_url: "Instances actives" av_entities_employer_list_url: "Liste des employés" -# av_entities_candidates_list_url: "Candidate List" + av_entities_candidates_list_url: "Liste des candidats" av_other_sub_title: "Autre" av_other_debug_base_url: "Base (pour debugger base.jade)" u_title: "Liste des utilisateurs" From 32a230548fc68c543a5fe40fde4d7670a75b39dc Mon Sep 17 00:00:00 2001 From: Christelle Date: Wed, 22 Oct 2014 16:17:48 -0400 Subject: [PATCH 12/13] Update fr.coffee --- app/locale/fr.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/locale/fr.coffee b/app/locale/fr.coffee index 1d337e474..ddba6268d 100644 --- a/app/locale/fr.coffee +++ b/app/locale/fr.coffee @@ -1009,7 +1009,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t # filter_experience_junior: "Junior" # filter_experience_recent_grad: "Recent Grad" # filter_experience_student: "College Student" - filter_results: "Résultat" + filter_results: "Résultats" # start_hiring: "Start hiring." # reasons: "Three reasons you should hire through us:" # everyone_looking: "Everyone here is looking for their next opportunity." @@ -1032,7 +1032,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t candidate_last_updated: "Dernière mise à jour" # candidate_who: "Who" # featured_developers: "Featured Developers" - other_developers: "Autres développeur" + other_developers: "Autres développeurs" # inactive_developers: "Inactive Developers" admin: From 039dd4f2645ba84d4615fea7aa6f52eb96f42cf5 Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Wed, 22 Oct 2014 13:52:37 -0700 Subject: [PATCH 13/13] Fixed issue with HeroVictoryModal assuming achievements all have rewards. --- app/views/play/level/modal/HeroVictoryModal.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/play/level/modal/HeroVictoryModal.coffee b/app/views/play/level/modal/HeroVictoryModal.coffee index ab92b7db1..0c5a52cf0 100644 --- a/app/views/play/level/modal/HeroVictoryModal.coffee +++ b/app/views/play/level/modal/HeroVictoryModal.coffee @@ -37,7 +37,7 @@ module.exports = class HeroVictoryModal extends ModalView thangTypeOriginals = [] achievementIDs = [] for achievement in @achievements.models - rewards = achievement.get('rewards') + rewards = achievement.get('rewards') or {} thangTypeOriginals.push rewards.heroes or [] thangTypeOriginals.push rewards.items or [] achievement.completed = LocalMongo.matchesQuery(@session.attributes, achievement.get('query')) @@ -95,7 +95,7 @@ module.exports = class HeroVictoryModal extends ModalView # achievement.completed = true # achievement.completedAWhileAgo = false # achievement.attributes.worth = (index + 1) * achievement.get('worth', true) - # rewards = achievement.get('rewards') + # rewards = achievement.get('rewards') or {} # rewards.gems *= (index + 1) c.thangTypes = @thangTypes