diff --git a/levels/it_IT/branches/branch-create b/levels/it_IT/branches/branch-create index 428c4a5..2544ead 100644 --- a/levels/it_IT/branches/branch-create +++ b/levels/it_IT/branches/branch-create @@ -31,11 +31,11 @@ git branch -D main [win] -# Crea un ramo chiamato 'birthday questo punta alla linea temporale del compleanno -git show birthday | grep 'al compleanno' +# Crea un ramo chiamato 'birthday' questo punta alla linea temporale del compleanno +git show birthday | grep 'birthday' -# Create a branch called 'concert' that points to the concert timeline. -git show concert | grep 'al concerto' +# Crea un ramo chiamato 'concert' questo punta alla linea temporale del compleanno +git show concert | grep 'concert' [congrats] diff --git a/levels/it_IT/branches/branch-remove b/levels/it_IT/branches/branch-remove index 07f8583..00a2d4c 100644 --- a/levels/it_IT/branches/branch-remove +++ b/levels/it_IT/branches/branch-remove @@ -20,7 +20,7 @@ echo Salti in un tombino nel marciapiede e arrivi in orario a scuola. >> you git commit -am "Salto" git checkout HEAD^ -b friend -echo All'improvviso cadi in una pozzanghera puzzolente e vieni mangiato da degli alligatori. >> you +echo "All'improvviso cadi in una pozzanghera puzzolente e vieni mangiato da degli alligatori." >> you git commit -am "Un nuovo amico" git checkout HEAD~2 -b music diff --git a/levels/it_IT/intro/risky b/levels/it_IT/intro/risky index 0203433..57a52d1 100644 --- a/levels/it_IT/intro/risky +++ b/levels/it_IT/intro/risky @@ -15,7 +15,7 @@ All'improvviso, il tuo gatto salta sul tavolo, strappa via il modulo, e scappa v Devi trovare una buona soluzione. -(Premi "Next Level" appena sei pronto!) +(Premi "Prossimo livello" appena sei pronto!) [setup] diff --git a/resources/localizations.csv b/resources/localizations.csv index 8716ff6..e64522b 100644 --- a/resources/localizations.csv +++ b/resources/localizations.csv @@ -28,4 +28,11 @@ WHATEVER,"Whatever...","Ad ogni costo..." OKAY,"Okay!","Ok!" YAY,"Yay!","Yay!" AWESOME,"Awesome!","Eccezionale!" -YOUR_TERMINAL,"This is your terminal! All commands are executed here, and you can see their output. You can also type your own commands here!","Questo è il tuo terminale! Tutti i comandi sono eseguiti qui e puoi vedere il loro output. Puoi anche digitare i tuoi comndi qui!" \ No newline at end of file +YOUR_TERMINAL,"This is your terminal! All commands are executed here, and you can see their output. You can also type your own commands here!","Questo è il tuo terminale! Tutti i comandi sono eseguiti qui e puoi vedere il loro output. Puoi anche digitare i tuoi comandi qui!" +INTERACT,"This is the time machine of another person! To interact with it, you need special commands!","Questa è la macchina del tempo di u'altra persona! Per interagirci hai bisogno di comandi speciali!" +GOLDEN_BADGE,"You get a golden badge for each level you solve without using the playing cards! Can you solve them all using the command line?","Ti aggiudicherai un badge d'oro per ogni livello che risolverai senza usare le cards! Puoi risolverli usando solo la linea di comando?" +GOOD_JOB,"Good job, you solved the level!\n\nFeel free to try a few more things or click 'Next level'.","Ottimo lavoro hai risolto il livello!\n\nSentiti libero di provare altro o clicca su 'Prossimo livello'" +COMPLETE_GOAL,"Complete the goal of this level","Completa l'obbiettivo di questo ivello!" +DRAG_AROUND,"You can drag these around with your mouse!","Puoi trascinarli in giro con il mouse!" +EDIT_FILE,"Click on these files to edit them!","Clicca su questi files per modificarli!" +YOUR_CARDS,"These are your cards! Drag them to highlighted areas to play them!","Queste sono le tue carte! Spostale nell'area evidenziata per usarle!" \ No newline at end of file diff --git a/resources/localizations.en.translation b/resources/localizations.en.translation index 29648f6..8809d36 100644 Binary files a/resources/localizations.en.translation and b/resources/localizations.en.translation differ diff --git a/resources/localizations.it.translation b/resources/localizations.it.translation index 882761e..0a5f06a 100644 Binary files a/resources/localizations.it.translation and b/resources/localizations.it.translation differ diff --git a/scenes/cards.gd b/scenes/cards.gd index aed300e..095ee96 100644 --- a/scenes/cards.gd +++ b/scenes/cards.gd @@ -55,7 +55,7 @@ func draw(ids): arrange_cards() if ids.size() > 0: - game.notify("These are your cards! Drag them to highlighted areas to play them!", self, "cards") + game.notify(tr("YOUR_CARDS"), self, "cards") func arrange_cards(): var t = Timer.new() diff --git a/scenes/file_browser.gd b/scenes/file_browser.gd index 1af3fa2..b2d45f0 100644 --- a/scenes/file_browser.gd +++ b/scenes/file_browser.gd @@ -82,7 +82,7 @@ func update(): grid.add_child(item) if files.size() > 0: - game.notify("Click on these files to edit them!", self, "file-browser") + game.notify("EDIT_FILE", self, "file-browser") if false: match mode: diff --git a/scenes/game.gd b/scenes/game.gd index 9cd9f92..66695b3 100644 --- a/scenes/game.gd +++ b/scenes/game.gd @@ -126,7 +126,7 @@ func notify(text, target=null, hint_slug=null): return var notification = preload("res://scenes/notification.tscn").instance() - notification.text = text + notification.text = tr(text) if not target: target = get_tree().root target.call_deferred("add_child", notification) diff --git a/scenes/level.gd b/scenes/level.gd index 97c1746..06b8740 100644 --- a/scenes/level.gd +++ b/scenes/level.gd @@ -42,7 +42,7 @@ func load(path): if cli_hints != "": description[0] = description[0] + "\n\n[color=#787878]"+cli_hints+"[/color]" - congrats = config.get("congrats", "Good job, you solved the level!\n\nFeel free to try a few more things or click 'Next level'.") + congrats = config.get("congrats", "GOOD_JOB") cards = Array(config.get("cards", "").split(" ")) if cards == [""]: cards = [] @@ -78,7 +78,7 @@ func load(path): else: repo = "yours" - var desc = "Complete the goal of this level" + var desc = tr("COMPLETE_GOAL") for line in Array(config[k].split("\n")): if line.length() > 0 and line[0] == "#": desc = line.substr(1).strip_edges(true, true) diff --git a/scenes/level_select.gd b/scenes/level_select.gd index 42bff1b..cdcaaf9 100644 --- a/scenes/level_select.gd +++ b/scenes/level_select.gd @@ -57,7 +57,7 @@ func reload(): level_list.add_child(hb) if badge.active: - game.notify("You get a golden badge for each level you solve without using the playing cards! Can you solve them all using the command line?", badge, "cli-badge") + game.notify("GOLDEN_BADGE", badge, "cli-badge") level_id += 1 chapter_id += 1 diff --git a/scenes/node.gd b/scenes/node.gd index f19e66a..f810a81 100644 --- a/scenes/node.gd +++ b/scenes/node.gd @@ -80,7 +80,7 @@ func type_set(new_type): $Sprite.texture = preload("res://nodes/tree.svg") "commit": $Sprite.texture = preload("res://nodes/commit.svg") - game.notify("You can drag these around with your mouse!", self, "drag-nodes") + game.notify("DRAG_AROUND", self, "drag-nodes") "tag": $Sprite.texture = preload("res://nodes/blob.svg") "ref": diff --git a/scenes/repository.gd b/scenes/repository.gd index 916bb03..c2f1524 100644 --- a/scenes/repository.gd +++ b/scenes/repository.gd @@ -89,7 +89,7 @@ func set_label(new_label): $Rows/RepoVis/SeparatorLine/DropArea.queue_free() $Rows/RepoVis/SeparatorLine.hide() else: - game.notify("This is the time machine of another person! To interact with it, you need special commands!", self, "remote") + game.notify("INTERACT", self, "remote") label_node.text = new_label func random_position(): diff --git a/scenes/repository.tscn b/scenes/repository.tscn index 566b5e8..35264e9 100644 --- a/scenes/repository.tscn +++ b/scenes/repository.tscn @@ -113,6 +113,7 @@ margin_bottom = 61.0 __meta__ = { "_edit_use_anchors_": false } + [connection signal="mouse_entered" from="." to="." method="_on_mouse_entered"] [connection signal="mouse_exited" from="." to="." method="_on_mouse_exited"] [connection signal="pressed" from="Rows/RepoVis/Button" to="." method="update_everything"]