mirror of
https://github.com/git-learning-game/oh-my-git.git
synced 2024-12-22 20:32:38 +01:00
splited .po files for cards, levels and some one
This commit is contained in:
Luca Canali
parent
e80596219a
commit
c2e0eaffb6
10 changed files with 583 additions and 165 deletions
|
|
@ -3,7 +3,7 @@ cards = checkout commit-auto
|
||||||
|
|
||||||
[description]
|
[description]
|
||||||
|
|
||||||
The yellow boxes are frozen points in time, we call them "commits"! You can travel between them using the "checkout" card! (Try it!)
|
The yellow boxes are frozen points in time, we call them 'commits'! You can travel between them using the "checkout" card! (Try it!)
|
||||||
|
|
||||||
Can you find out what happened here? Then, while on the last commit, edit the files to fix the problem, and make a new commit!
|
Can you find out what happened here? Then, while on the last commit, edit the files to fix the problem, and make a new commit!
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ cards = init
|
||||||
|
|
||||||
You've been accepted to time travel school! Yay! It's your first day! Your teacher explains:
|
You've been accepted to time travel school! Yay! It's your first day! Your teacher explains:
|
||||||
|
|
||||||
"To do anything with a time machine, you first need to initialize it!"
|
'To do anything with a time machine, you first need to initialize it!'
|
||||||
|
|
||||||
Drag that blue card up to play it!
|
Drag that blue card up to play it!
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ cards =
|
||||||
|
|
||||||
[description]
|
[description]
|
||||||
|
|
||||||
So you have decided to apply for time travel school, to learn how to use this time machine called "Git"!
|
So you have decided to apply for time travel school, to learn how to use this time machine called 'Git'!
|
||||||
|
|
||||||
How exciting!
|
How exciting!
|
||||||
|
|
||||||
|
|
|
||||||
150
locale/it.po
150
locale/it.po
|
|
@ -266,153 +266,3 @@ msgstr "Il testo qui"
|
||||||
#: oh-my-git/scenes/title.tscn:74
|
#: oh-my-git/scenes/title.tscn:74
|
||||||
msgid "Language"
|
msgid "Language"
|
||||||
msgstr "Linguaggio"
|
msgstr "Linguaggio"
|
||||||
|
|
||||||
#: CARDS DESCRIPTION
|
|
||||||
#: oh-my-git/resources/cards.json:6
|
|
||||||
msgid "Drag this card into the empty space above to initialize the time machine!"
|
|
||||||
msgstr "Trascina questa carta nell'area vuota sopra per inizializzare la macchina del tempo"
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:14
|
|
||||||
msgid "Create your own copy of someone else's repo."
|
|
||||||
msgstr "Crea la tua copia personale del Repo di qualcun'altro."
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:22
|
|
||||||
msgid "Set your name.\n\n(Will not change anything outside of this game.)"
|
|
||||||
msgstr "Imposta il tuo nome.\n\n(Non cambierà nulla all'infuori del gioco.)"
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:30
|
|
||||||
msgid "Set your email address."
|
|
||||||
msgstr "Imposta la tua e-mail."
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:38
|
|
||||||
msgid "Drag this card to a commit or to a branch to travel to it!"
|
|
||||||
msgstr "Trascina questa carta su un commit o su un branch per spostarti su di esso."
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:46
|
|
||||||
msgid "Reset changes in a local file."
|
|
||||||
msgstr "Resetta i cambiamenti in un file locale"
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:54
|
|
||||||
msgid "Get the file contents from the specified commits, and reset both the working directory, as well as the index, to it."
|
|
||||||
msgstr "Ottieni il contenuto dei file dai commit specificati e resetta sia la directory di lavoro sia l'indice."
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:62
|
|
||||||
msgid "Make a new commit, after automatically adding all changes to the index.\nYou'll be asked to enter a short description of what you changed."
|
|
||||||
msgstr "Crea un nuovo commit, dopo aver aggiunto automaticamente tutti i cambiamenti all'indice.\nDovrai inserire una breve descrizione di cosa hai cambiato."
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:70
|
|
||||||
msgid "Make a new commit containing your current environment! Type in a description of what changed!"
|
|
||||||
msgstr "Crea un commit contenente il tuo ambiente attuale! Scrivi una descrizione di cosa è cambiato!"
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:78
|
|
||||||
msgid "Merge the specified timeline into yours. If necessary, will create a merge commit."
|
|
||||||
msgstr "Unisce la linea temporale specificata con la tua. Se necessario, creerà un commit di merge."
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:86
|
|
||||||
msgid "Abort the current merge attempt, and reconstruct the previous state."
|
|
||||||
msgstr "Interrompe il corrente tentativo di unione e ricostruisce lo stato precedente."
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:94
|
|
||||||
msgid "Put the events in your current timeline on top of the specified one."
|
|
||||||
msgstr "Mette gli eventi della tua linea temporale corrente sulla linea temporale specificata."
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:102
|
|
||||||
msgid "Get someone else's version of the current timeline, and try to merge it into yours."
|
|
||||||
msgstr "Prende la versione di qualcun'altro della temporale corrente e prova ad unirla alla tua."
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:110
|
|
||||||
msgid "Get a someone else's version of the current timeline."
|
|
||||||
msgstr "Prende la versione di qualcun'altro della temporale corrente"
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:118
|
|
||||||
msgid "Give the current timeline to someone else."
|
|
||||||
msgstr "Invia la linea temporale corrente a qualcun'altro"
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:126
|
|
||||||
msgid "Make changes to the events in your current timeline, back to the commit you drag this to."
|
|
||||||
msgstr "Cambia gli eventi della linea temporale fino al commit su cui hai trascinato questa scheda."
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:134
|
|
||||||
msgid "Continue the current rebasing process."
|
|
||||||
msgstr "Continua il processo di rebasing"
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:142
|
|
||||||
msgid "Move the branch you're on to the specified commit."
|
|
||||||
msgstr "Sposta il branch su cui ti trovi al commit specificato."
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:150
|
|
||||||
msgid "Jump to the commit, and update the index. Keep the current environment."
|
|
||||||
msgstr "Salta al commit e aggiorna l'indice. Mantieni l'ambiente attuale."
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:158
|
|
||||||
msgid "Reset the index version of a file to the version in the commit you're on."
|
|
||||||
msgstr "Resetta la versione dell'indice di un file alla versione del commit in cui sei"
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:166
|
|
||||||
msgid "Repeat the specified action on top of your current timeline."
|
|
||||||
msgstr "Ripete l'azione specificata, in cima alla linea temporale corrente"
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:174
|
|
||||||
msgid "Make a new commit that reverts the changes of the speicified commit."
|
|
||||||
msgstr "Crea un nuovo commit che annulla le modifiche del commit specificato."
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:182
|
|
||||||
msgid "Start looking for the commit where things got bad."
|
|
||||||
msgstr "Inizia a cercare il commit dove le cose sono andate storte"
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:190
|
|
||||||
msgid "State that the current commit is good! When you're automatically transferred, keep playing the `good` and `bad` cards!"
|
|
||||||
msgstr "Dichiara che l'attuale commit è buono! Continua a giocare con le carte `buono` e `cattivo`!"
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:198
|
|
||||||
msgid "State that the current commit is bad! When you're automatically transferred, keep playing the `good` and `bad` cards!"
|
|
||||||
msgstr "Dichiara che l'attuale commit non è valido! Continua a giocare con le carte `buone` e `cattive`!"
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:206
|
|
||||||
msgid "Update the index version of the file to its current real content."
|
|
||||||
msgstr "Aggiorna la versione in indice del file con il contenuto attuale."
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:214
|
|
||||||
msgid "Delete a file both in the working directory, as well as the index."
|
|
||||||
msgstr "Cancella un file sia dalla cartella di lavoro corrente che dall'indice."
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:222
|
|
||||||
msgid "Make a commit from the current index."
|
|
||||||
msgstr "Crea un commit dall'indice corrente."
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:230
|
|
||||||
msgid "Show what changed in the commit."
|
|
||||||
msgstr "Mostra cosa è cambiato nel commit."
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:238
|
|
||||||
msgid "Create a new branch at your current location."
|
|
||||||
msgstr "Crea un nuovo branch alla posizione corrente."
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:246
|
|
||||||
msgid "Delete a branch."
|
|
||||||
msgstr "Cancella un branch."
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:254
|
|
||||||
msgid "Display a log of where the ref pointed to in the past."
|
|
||||||
msgstr "Mostra un log di dove il riferimento (ref) ha puntato in passato."
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:262
|
|
||||||
msgid "Create a new file."
|
|
||||||
msgstr "Crea un nuovo file."
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:270
|
|
||||||
msgid "Delete a file."
|
|
||||||
msgstr "Cancella un file."
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:278
|
|
||||||
msgid "Rename a file."
|
|
||||||
msgstr "Rinomina un file."
|
|
||||||
|
|
||||||
#: oh-my-git/resources/cards.json:286
|
|
||||||
msgid "Make a copy of a file."
|
|
||||||
msgstr "Crea una copia di un file."
|
|
||||||
|
|
||||||
#: LEVELS
|
|
||||||
#: oh-my-git/levels/
|
|
||||||
msgid "Amici"
|
|
||||||
msgstr "Friend"
|
|
||||||
|
|
|
||||||
164
locale/it_cards.po
Normal file
164
locale/it_cards.po
Normal file
|
|
@ -0,0 +1,164 @@
|
||||||
|
# Translations template for PROJECT.
|
||||||
|
# Copyright (C) 2022 ORGANIZATION
|
||||||
|
# This file is distributed under the same license as the PROJECT project.
|
||||||
|
# Automatically generated, 2022.
|
||||||
|
#
|
||||||
|
msgid ""
|
||||||
|
msgstr ""
|
||||||
|
"Project-Id-Version: PROJECT VERSION\n"
|
||||||
|
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
|
||||||
|
"POT-Creation-Date: 2022-08-18 10:39+0200\n"
|
||||||
|
"PO-Revision-Date: 2022-08-18 10:39+0200\n"
|
||||||
|
"Last-Translator: Automatically generated\n"
|
||||||
|
"Language-Team: none\n"
|
||||||
|
"MIME-Version: 1.0\n"
|
||||||
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
|
"Generated-By: Babel 2.10.3\n"
|
||||||
|
"Language: it\n"
|
||||||
|
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||||
|
|
||||||
|
#: CARDS DESCRIPTION
|
||||||
|
#: oh-my-git/resources/cards.json:6
|
||||||
|
msgid "Drag this card into the empty space above to initialize the time machine!"
|
||||||
|
msgstr "Trascina questa carta nell'area vuota sopra per inizializzare la macchina del tempo"
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:14
|
||||||
|
msgid "Create your own copy of someone else's repo."
|
||||||
|
msgstr "Crea la tua copia personale del Repo di qualcun'altro."
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:22
|
||||||
|
msgid "Set your name.\n\n(Will not change anything outside of this game.)"
|
||||||
|
msgstr "Imposta il tuo nome.\n\n(Non cambierà nulla all'infuori del gioco.)"
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:30
|
||||||
|
msgid "Set your email address."
|
||||||
|
msgstr "Imposta la tua e-mail."
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:38
|
||||||
|
msgid "Drag this card to a commit or to a branch to travel to it!"
|
||||||
|
msgstr "Trascina questa carta su un commit o su un branch per spostarti su di esso."
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:46
|
||||||
|
msgid "Reset changes in a local file."
|
||||||
|
msgstr "Resetta i cambiamenti in un file locale"
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:54
|
||||||
|
msgid "Get the file contents from the specified commits, and reset both the working directory, as well as the index, to it."
|
||||||
|
msgstr "Ottieni il contenuto dei file dai commit specificati e resetta sia la directory di lavoro sia l'indice."
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:62
|
||||||
|
msgid "Make a new commit, after automatically adding all changes to the index.\nYou'll be asked to enter a short description of what you changed."
|
||||||
|
msgstr "Crea un nuovo commit, dopo aver aggiunto automaticamente tutti i cambiamenti all'indice.\nDovrai inserire una breve descrizione di cosa hai cambiato."
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:70
|
||||||
|
msgid "Make a new commit containing your current environment! Type in a description of what changed!"
|
||||||
|
msgstr "Crea un commit contenente il tuo ambiente attuale! Scrivi una descrizione di cosa è cambiato!"
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:78
|
||||||
|
msgid "Merge the specified timeline into yours. If necessary, will create a merge commit."
|
||||||
|
msgstr "Unisce la linea temporale specificata con la tua. Se necessario, creerà un commit di merge."
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:86
|
||||||
|
msgid "Abort the current merge attempt, and reconstruct the previous state."
|
||||||
|
msgstr "Interrompe il corrente tentativo di unione e ricostruisce lo stato precedente."
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:94
|
||||||
|
msgid "Put the events in your current timeline on top of the specified one."
|
||||||
|
msgstr "Mette gli eventi della tua linea temporale corrente sulla linea temporale specificata."
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:102
|
||||||
|
msgid "Get someone else's version of the current timeline, and try to merge it into yours."
|
||||||
|
msgstr "Prende la versione di qualcun'altro della temporale corrente e prova ad unirla alla tua."
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:110
|
||||||
|
msgid "Get a someone else's version of the current timeline."
|
||||||
|
msgstr "Prende la versione di qualcun'altro della temporale corrente"
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:118
|
||||||
|
msgid "Give the current timeline to someone else."
|
||||||
|
msgstr "Invia la linea temporale corrente a qualcun'altro"
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:126
|
||||||
|
msgid "Make changes to the events in your current timeline, back to the commit you drag this to."
|
||||||
|
msgstr "Cambia gli eventi della linea temporale fino al commit su cui hai trascinato questa scheda."
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:134
|
||||||
|
msgid "Continue the current rebasing process."
|
||||||
|
msgstr "Continua il processo di rebasing"
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:142
|
||||||
|
msgid "Move the branch you're on to the specified commit."
|
||||||
|
msgstr "Sposta il branch su cui ti trovi al commit specificato."
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:150
|
||||||
|
msgid "Jump to the commit, and update the index. Keep the current environment."
|
||||||
|
msgstr "Salta al commit e aggiorna l'indice. Mantieni l'ambiente attuale."
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:158
|
||||||
|
msgid "Reset the index version of a file to the version in the commit you're on."
|
||||||
|
msgstr "Resetta la versione dell'indice di un file alla versione del commit in cui sei"
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:166
|
||||||
|
msgid "Repeat the specified action on top of your current timeline."
|
||||||
|
msgstr "Ripete l'azione specificata, in cima alla linea temporale corrente"
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:174
|
||||||
|
msgid "Make a new commit that reverts the changes of the speicified commit."
|
||||||
|
msgstr "Crea un nuovo commit che annulla le modifiche del commit specificato."
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:182
|
||||||
|
msgid "Start looking for the commit where things got bad."
|
||||||
|
msgstr "Inizia a cercare il commit dove le cose sono andate storte"
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:190
|
||||||
|
msgid "State that the current commit is good! When you're automatically transferred, keep playing the `good` and `bad` cards!"
|
||||||
|
msgstr "Dichiara che l'attuale commit è buono! Continua a giocare con le carte `buono` e `cattivo`!"
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:198
|
||||||
|
msgid "State that the current commit is bad! When you're automatically transferred, keep playing the `good` and `bad` cards!"
|
||||||
|
msgstr "Dichiara che l'attuale commit non è valido! Continua a giocare con le carte `buone` e `cattive`!"
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:206
|
||||||
|
msgid "Update the index version of the file to its current real content."
|
||||||
|
msgstr "Aggiorna la versione in indice del file con il contenuto attuale."
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:214
|
||||||
|
msgid "Delete a file both in the working directory, as well as the index."
|
||||||
|
msgstr "Cancella un file sia dalla cartella di lavoro corrente che dall'indice."
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:222
|
||||||
|
msgid "Make a commit from the current index."
|
||||||
|
msgstr "Crea un commit dall'indice corrente."
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:230
|
||||||
|
msgid "Show what changed in the commit."
|
||||||
|
msgstr "Mostra cosa è cambiato nel commit."
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:238
|
||||||
|
msgid "Create a new branch at your current location."
|
||||||
|
msgstr "Crea un nuovo branch alla posizione corrente."
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:246
|
||||||
|
msgid "Delete a branch."
|
||||||
|
msgstr "Cancella un branch."
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:254
|
||||||
|
msgid "Display a log of where the ref pointed to in the past."
|
||||||
|
msgstr "Mostra un log di dove il riferimento (ref) ha puntato in passato."
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:262
|
||||||
|
msgid "Create a new file."
|
||||||
|
msgstr "Crea un nuovo file."
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:270
|
||||||
|
msgid "Delete a file."
|
||||||
|
msgstr "Cancella un file."
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:278
|
||||||
|
msgid "Rename a file."
|
||||||
|
msgstr "Rinomina un file."
|
||||||
|
|
||||||
|
#: oh-my-git/resources/cards.json:286
|
||||||
|
msgid "Make a copy of a file."
|
||||||
|
msgstr "Crea una copia di un file."
|
||||||
401
locale/it_levels.po
Normal file
401
locale/it_levels.po
Normal file
|
|
@ -0,0 +1,401 @@
|
||||||
|
# Translations template for PROJECT.
|
||||||
|
# Copyright (C) 2022 ORGANIZATION
|
||||||
|
# This file is distributed under the same license as the PROJECT project.
|
||||||
|
# Automatically generated, 2022.
|
||||||
|
#
|
||||||
|
msgid ""
|
||||||
|
msgstr ""
|
||||||
|
"Project-Id-Version: PROJECT VERSION\n"
|
||||||
|
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
|
||||||
|
"POT-Creation-Date: 2022-08-18 10:39+0200\n"
|
||||||
|
"PO-Revision-Date: 2022-08-18 10:39+0200\n"
|
||||||
|
"Last-Translator: Automatically generated\n"
|
||||||
|
"Language-Team: none\n"
|
||||||
|
"MIME-Version: 1.0\n"
|
||||||
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
|
"Generated-By: Babel 2.10.3\n"
|
||||||
|
"Language: it\n"
|
||||||
|
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||||
|
|
||||||
|
#: TITLE
|
||||||
|
#: oh-my-git/levels/
|
||||||
|
msgid "Friend"
|
||||||
|
msgstr "Amici"
|
||||||
|
|
||||||
|
msgid "friend"
|
||||||
|
msgstr "amici"
|
||||||
|
|
||||||
|
|
||||||
|
#: DESCRIPTION
|
||||||
|
msgid "So you have decided to apply for time travel school, to learn how to use this time machine called 'Git'!\n\nHow exciting!\n\nYou're almost done with the paperwork! You just need to fill in one more reason why you want to learn Git."
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "This time, you're making a lot of backup copies - you can look at them by clicking on them!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "You've been accepted to time travel school! Yay! It's your first day! Your teacher explains:\n\n'To do anything with a time machine, you first need to initialize it!'\n\nDrag that blue card up to play it!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "These playing cards are designed to be easy to use and to remember! We'd suggest sticking to them if you don't have a lot of experience with Git!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "You can use your time machine to make snapshots of objects around you! Here, let's practice this!\n\n(Your teacher pours some water into a glass.)"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Let's add your name to our list of students!\n\nI already have a second commit of it in my time machine - let's work together!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "The first day at Time Travel School comes to an end and you receive the key to your room.\nFull of excitement you open the door just to find... spider webs! Spider webs everywhere!\n\nRemove all the spider webs you can find with the remove card!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Now that your room looks tidy, you can start to unpack your stuff. You brought two new pieces of furniture with you and with a bright smile,\nyou see that their colors match the color of your bed!\n\nBuild up your two pieces of furniture by playing the touch card.\nThen name your furniture - you can choose whatever you like.\n\nMake sure the colors match! You can find the bed's color in its description.\nDon't forget to add a color and description to your new furnitures, too!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "The yellow boxes are frozen points in time, we call them 'commits'! You can travel between them using the 'checkout' card! (Try it!)\n\nCan you find out what happened here? Then, while on the last commit, edit the files to fix the problem, and make a new commit!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Did you know that creating parallel timelines is perfectly legal and safe? It's true!\n\nCan you find out when things went wrong in this zoo? Then, go back to the last good commit and create a parallel universe where everyone is happy!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "You were invited to two parties! At one of them, your favorite band is playing - and the other one is your best friend's birthday party. Where should you go? No worries - as a time travel agent in training, you can go to both parties!\n\nTo make it easier to tell which timeline is which, you can create time portals! (We call these 'branches'.)"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Note that there are two options to 'travel to the end of a timeline':\n\nFirst, you can directly travel to the commit, like we've done it before.\n\nAnd second, you can travel to the branch label. In this case, when you make a new commit, the branch will grow with you, and still point at the end of the timeline!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Life is full of dangers, right? Even when walking to school, it seems like there's a lot of risks!\n\nThis Monday is especially bad. You made it to school, but there's some timelines you definitely don't want to keep around."
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "One of your colleagues messed up here, and put the branches in the wrong timelines!\n\nYou could delete and re-create these branches - but you can also directly move them to different commits, by using\n\n git checkout\n\non the branch names, and then using\n\n git reset --hard\n\non the commit where you want the branch to be.\n\nThe donut branch is in the right place, but the timeline is still incomplete - make you actually *eat* the donut in that branch!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Here's a trick so that you can sleep a bit longer: just do all your morning activities in parallel universes, and then at the end, merge them together!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Sometimes, timelines will contradict each other.\n\nFor example, in this case, one of our clients wants these timelines merged, but they ate different things for breakfast in both timelines.\n\nTry to merge them together! You'll notice that there will be a conflict! The time machine will leave it up to you how to proceed: you can edit the problematic item, it will show you the conflicting sections. You can keep either of the two versions - or create a combination of them! Remove the >>>, <<<, and === markers, and make a new commit to finalize the merge!\n\nLet your finalized timeline be the 'main' one."
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Welcome to today's lesson! We're going to learn how to make commits with more precision!\n\nHave a look at these two timelines. They have exactly the same outcome. But one of them makes it much easier to figure out what happened."
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "So far, when we made a commit, we've always recorded the current status of all objects, right?\n\nBut Git allows you to pick which changes you want to put in a commit!\n\nTo learn how that works, we need to learn about the 'index'! In the index, we can prepare what will be in the next commit. In this game, the index is represented by a blue aura around icons in the file browser!\n\nInitially, the index is empty. To make a commit that contains a new file, we need to add it!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "When we change files, the index won't change on its own. We have to use `git add` to update the index to the changed version of the file.\n\nLet's try that!\n\nThe icons in the file browser show you when the actual file (white) and the version in the index (blue) are different, and when they are the same!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "See the dark shadow behind the icons? That's the version of the file in the last commit!\n\nFor example, these candles have been blown out, and that change has been added.\n\nBut you decide that this was a mistake! You only want to blow out the red candle in the next commit!\n\nIf you already have updated the index to a changed file, but want to reset it, you can use `git reset`!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "The index is really useful, because it allows us to be precise about which changes we want to include in each commit!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Your friend added another line to your essay! Get it, add a third one and send it to them!\n\nTake turns until you have five lines!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Both you and your friend have been working on the file, and want to sync up!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Okay - turns out that saving time in the morning by utilizing parallel universes is against the regulations of the International Time Travel Association. You'll have to do your tasks in sequence after all.\n\nSee the 'rebase' card? When you drag it to a commit, it will copy the events in your current timeline after the specified one! This way, make a clean, linear timeline where you visit all three shops.\n\nAgain, we want to make that our base reality - the 'main' branch should point to that timeline!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Oops, looks like there's something messed up here. Can you put the events back into their correct order?\n\nThere are two ways to do this: You can drag the 'interactive rebase' card to the commit before the one you want to change, then reorder the lines in the file that opens, and save it.\n\nOr you can reset the main tag to the very first commit, and then cherry-pick single commits in the order you want. You have cards for both approaches!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Oops - you deleted the 'essay' file, which you worked on all night!\n\nLuckily, Git is here to help! You can use `git checkout` to restore the file!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Here's a similar problem: you really liked the essay from the very first commit, and want to have it back! Well, checkout can also restore things from older commits, Here's how:\n\n git checkout [commit] [file]"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Oh no, we made a bad commit! How can we undo making the commit, and go back to a point where we can try again?\n\nThe answer is using `git reset [commit]`, which does two things:\n\n- It resets the current branch ref to the commit you specify.\n- And it resets the index to that commit.\n\nIt does not change your working directory in any way, which means that after that, you can try making the commit you want again."
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "We were talking about how to undo a commit, and fix it. This only helps when you haven't already pushed it to a remote. When that has happened, and you want to undo the effects of the commit completely, your best option is `git revert`"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Say you were looking at something in the past, and then switched back to the main branch.\n\nBut then, you got reaaally distracted, and after your lunch break, you can't remember on which commit in the past you were before. How can you find out?\n\nThere's a convenient command that shows you all the places your HEAD did point to in the past:\n\n git reflog"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Your friend has a problem! Clone the repo, create a branch called 'solution', and fix the problem in this branch. When you're ready, make a 'Pull Request' by using `git tag pr`."
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "(Please zoom out a bit using your mouse wheel! :D)\n\nOh no! You have lost your key at some point during the day!\n\nSure, you could look at every single commit in an attempt to find it - but there's a better way: your time machine has a built-in way to find the point in time where things went wrong quickly!\n\nFirst, play the 'bisect start' card. Then, go to a commit where you don't have the key, and play the 'bisect bad' card. Likewise, go to a commit early on where you have the key *in your pocket*, and play the 'bisect good card'.\n\nAfter you've found the last good commit, reset the main branch to it. What happened to the key after you lost it?"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "You will encounter situations in which you are working on your project but you need to\nput your current changes aside temporarily. To do so, you can use the stash function. Use\n git stash push \nto add your current changes to the stash stack.\n\n---\ntipp1\n---\ntipp2\n---\ntipp3"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "When you stashed your changes and you want to apply them back to your current working directory, you can use\n git stash pop\nThis will remove the changes from the stash stack. If you also want to keep the changes on the stash stack, use\n git stash apply\n\n---\ntipp1\n---\ntipp2\n---\ntipp3"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "If you want to inspect your stash stack, use the command\n git stash list\n \nOh, you don't want to keep your stashed changes? There are way too many? Then go ahead and clear the stack with\n git stash clear\nIf you only want to discard a certain stash entry, you can use\n git stash drop <stash>\n \nClear your stash stack!\n\n---\ntipp1\n---\ntipp2\n---\ntipp3"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "If you want to keep your changes but they don't belong to the main branch, you can easily\ncreate a new branch from your stashed changes. Just use\n git stash branch <branchname> <stash>\nIf you just want to use the latest stash entry, you can leave the <stash> option empty.\n\nCreate a new branch from the stashed changes!\n\n---\ntipp1\n---\ntipp2\n---\ntipp3"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "When you want to reapply your changes but you already continued working on your file, you might get\na merge conflict! Let's practise this situation.\nPop the changes from the stash with\n git stash pop\nand resolve the merge conflict. Commit the resolved changes and clear the stash stack afterwards.\n\n---\ntipp1\n---\ntipp2\n---\ntipp3"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Some of your commits may be special commits. Maybe you reached a milestone or a new version number.\n\nYou can mark these commits with a special flag called 'tag'.\n\nWrite \n\n git tag <tag-name> \n \nto tag your commit.\n\n---\ntipp1\n---\ntipp2\n---\ntipp3"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "You added way too many tags? No prob! Delete them with\n\n git tag -d <tag-name>\n \nRemove all tags in this repo!\n\n---\ntipp1\n---\ntipp2\n---\ntipp3"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "But what happens if you forgot to tag your current commit?\nNo Prob! You can also tag older commits via\n\n git tag <tag-name> <commit-hash>\n \nTag the commit 'Adding feature 2' with the name 'v1'!\n\n---\ntipp1\n---\ntipp2\n---\ntipp3"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "When you work with remote repositories, tags are not pushed or pulled automatically.\n\nYou can push a tag with\n git push <remote> <tag-name>\nOr all tags with:\n git push <remote> --tags\n \nDeleting tags on your remote works with: \n git push <remote> --delete <tag-name>\n \nYou can also sync \n git fetch <remote> --prune --prune-tags\n\n\nAdd a tag named 'v2' to the last commit and push it to the remote. Also pull the v1 tag to your local repository."
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "This is an empty sandbox you can play around in."
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Here's a sandbox with a remote! Try pulling, fetching, or pushing!\n\nHow can you push tags and branches on a remote? How can you delete them again?"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Here's a sandbox you can play around in.\n\nYou can use both the playing cards, as well as the terminal. This is a real Git terminal! Fun things to try:\n\n- Make a commit that merges three timelines together at once!\n- Create and delete some tags!\n- Make a timeline that's completely independent of the rest!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "So you have decided to apply for time travel school, to learn how to use this time machine called 'Git'!\n\nHow exciting!\n\nYou're almost done with the paperwork! You just need to fill in one more reason why you want to learn Git."
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "This time, you're making a lot of backup copies - you can look at them by clicking on them!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "You've been accepted to time travel school! Yay! It's your first day! Your teacher explains:\n\n'To do anything with a time machine, you first need to initialize it!'\n\nDrag that blue card up to play it!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "These playing cards are designed to be easy to use and to remember! We'd suggest sticking to them if you don't have a lot of experience with Git!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "You can use your time machine to make snapshots of objects around you! Here, let's practice this!\n\n(Your teacher pours some water into a glass.)"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Let's add your name to our list of students!\n\nI already have a second commit of it in my time machine - let's work together!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "The first day at Time Travel School comes to an end and you receive the key to your room.\nFull of excitement you open the door just to find... spider webs! Spider webs everywhere!\n\nRemove all the spider webs you can find with the remove card!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Now that your room looks tidy, you can start to unpack your stuff. You brought two new pieces of furniture with you and with a bright smile,\nyou see that their colors match the color of your bed!\n\nBuild up your two pieces of furniture by playing the touch card.\nThen name your furniture - you can choose whatever you like.\n\nMake sure the colors match! You can find the bed's color in its description.\nDon't forget to add a color and description to your new furnitures, too!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "The yellow boxes are frozen points in time, we call them 'commits'! You can travel between them using the 'checkout' card! (Try it!)\n\nCan you find out what happened here? Then, while on the last commit, edit the files to fix the problem, and make a new commit!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Did you know that creating parallel timelines is perfectly legal and safe? It's true!\n\nCan you find out when things went wrong in this zoo? Then, go back to the last good commit and create a parallel universe where everyone is happy!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "You were invited to two parties! At one of them, your favorite band is playing - and the other one is your best friend's birthday party. Where should you go? No worries - as a time travel agent in training, you can go to both parties!\n\nTo make it easier to tell which timeline is which, you can create time portals! (We call these 'branches'.)"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Note that there are two options to 'travel to the end of a timeline':\n\nFirst, you can directly travel to the commit, like we've done it before.\n\nAnd second, you can travel to the branch label. In this case, when you make a new commit, the branch will grow with you, and still point at the end of the timeline!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Life is full of dangers, right? Even when walking to school, it seems like there's a lot of risks!\n\nThis Monday is especially bad. You made it to school, but there's some timelines you definitely don't want to keep around."
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "One of your colleagues messed up here, and put the branches in the wrong timelines!\n\nYou could delete and re-create these branches - but you can also directly move them to different commits, by using\n\n git checkout\n\non the branch names, and then using\n\n git reset --hard\n\non the commit where you want the branch to be.\n\nThe donut branch is in the right place, but the timeline is still incomplete - make you actually *eat* the donut in that branch!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Here's a trick so that you can sleep a bit longer: just do all your morning activities in parallel universes, and then at the end, merge them together!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Sometimes, timelines will contradict each other.\n\nFor example, in this case, one of our clients wants these timelines merged, but they ate different things for breakfast in both timelines.\n\nTry to merge them together! You'll notice that there will be a conflict! The time machine will leave it up to you how to proceed: you can edit the problematic item, it will show you the conflicting sections. You can keep either of the two versions - or create a combination of them! Remove the >>>, <<<, and === markers, and make a new commit to finalize the merge!\n\nLet your finalized timeline be the 'main' one."
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Welcome to today's lesson! We're going to learn how to make commits with more precision!\n\nHave a look at these two timelines. They have exactly the same outcome. But one of them makes it much easier to figure out what happened."
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "So far, when we made a commit, we've always recorded the current status of all objects, right?\n\nBut Git allows you to pick which changes you want to put in a commit!\n\nTo learn how that works, we need to learn about the 'index'! In the index, we can prepare what will be in the next commit. In this game, the index is represented by a blue aura around icons in the file browser!\n\nInitially, the index is empty. To make a commit that contains a new file, we need to add it!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "When we change files, the index won't change on its own. We have to use `git add` to update the index to the changed version of the file.\n\nLet's try that!\n\nThe icons in the file browser show you when the actual file (white) and the version in the index (blue) are different, and when they are the same!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "See the dark shadow behind the icons? That's the version of the file in the last commit!\n\nFor example, these candles have been blown out, and that change has been added.\n\nBut you decide that this was a mistake! You only want to blow out the red candle in the next commit!\n\nIf you already have updated the index to a changed file, but want to reset it, you can use `git reset`!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "The index is really useful, because it allows us to be precise about which changes we want to include in each commit!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Your friend added another line to your essay! Get it, add a third one and send it to them!\n\nTake turns until you have five lines!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Both you and your friend have been working on the file, and want to sync up!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Okay - turns out that saving time in the morning by utilizing parallel universes is against the regulations of the International Time Travel Association. You'll have to do your tasks in sequence after all.\n\nSee the 'rebase' card? When you drag it to a commit, it will copy the events in your current timeline after the specified one! This way, make a clean, linear timeline where you visit all three shops.\n\nAgain, we want to make that our base reality - the 'main' branch should point to that timeline!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Oops, looks like there's something messed up here. Can you put the events back into their correct order?\n\nThere are two ways to do this: You can drag the 'interactive rebase' card to the commit before the one you want to change, then reorder the lines in the file that opens, and save it.\n\nOr you can reset the main tag to the very first commit, and then cherry-pick single commits in the order you want. You have cards for both approaches!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Oops - you deleted the 'essay' file, which you worked on all night!\n\nLuckily, Git is here to help! You can use `git checkout` to restore the file!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Here's a similar problem: you really liked the essay from the very first commit, and want to have it back! Well, checkout can also restore things from older commits, Here's how:\n\n git checkout [commit] [file]"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Oh no, we made a bad commit! How can we undo making the commit, and go back to a point where we can try again?\n\nThe answer is using `git reset [commit]`, which does two things:\n\n- It resets the current branch ref to the commit you specify.\n- And it resets the index to that commit.\n\nIt does not change your working directory in any way, which means that after that, you can try making the commit you want again."
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "We were talking about how to undo a commit, and fix it. This only helps when you haven't already pushed it to a remote. When that has happened, and you want to undo the effects of the commit completely, your best option is `git revert`"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Say you were looking at something in the past, and then switched back to the main branch.\n\nBut then, you got reaaally distracted, and after your lunch break, you can't remember on which commit in the past you were before. How can you find out?\n\nThere's a convenient command that shows you all the places your HEAD did point to in the past:\n\n git reflog"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Your friend has a problem! Clone the repo, create a branch called 'solution', and fix the problem in this branch. When you're ready, make a 'Pull Request' by using `git tag pr`."
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "(Please zoom out a bit using your mouse wheel! :D)\n\nOh no! You have lost your key at some point during the day!\n\nSure, you could look at every single commit in an attempt to find it - but there's a better way: your time machine has a built-in way to find the point in time where things went wrong quickly!\n\nFirst, play the 'bisect start' card. Then, go to a commit where you don't have the key, and play the 'bisect bad' card. Likewise, go to a commit early on where you have the key *in your pocket*, and play the 'bisect good card'.\n\nAfter you've found the last good commit, reset the main branch to it. What happened to the key after you lost it?"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "You will encounter situations in which you are working on your project but you need to\nput your current changes aside temporarily. To do so, you can use the stash function. Use\n git stash push \nto add your current changes to the stash stack.\n\n---\ntipp1\n---\ntipp2\n---\ntipp3"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "When you stashed your changes and you want to apply them back to your current working directory, you can use\n git stash pop\nThis will remove the changes from the stash stack. If you also want to keep the changes on the stash stack, use\n git stash apply\n\n---\ntipp1\n---\ntipp2\n---\ntipp3"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "If you want to inspect your stash stack, use the command\n git stash list\n \nOh, you don't want to keep your stashed changes? There are way too many? Then go ahead and clear the stack with\n git stash clear\nIf you only want to discard a certain stash entry, you can use\n git stash drop <stash>\n \nClear your stash stack!\n\n---\ntipp1\n---\ntipp2\n---\ntipp3"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "If you want to keep your changes but they don't belong to the main branch, you can easily\ncreate a new branch from your stashed changes. Just use\n git stash branch <branchname> <stash>\nIf you just want to use the latest stash entry, you can leave the <stash> option empty.\n\nCreate a new branch from the stashed changes!\n\n---\ntipp1\n---\ntipp2\n---\ntipp3"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "When you want to reapply your changes but you already continued working on your file, you might get\na merge conflict! Let's practise this situation.\nPop the changes from the stash with\n git stash pop\nand resolve the merge conflict. Commit the resolved changes and clear the stash stack afterwards.\n\n---\ntipp1\n---\ntipp2\n---\ntipp3"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Some of your commits may be special commits. Maybe you reached a milestone or a new version number.\n\nYou can mark these commits with a special flag called 'tag'.\n\nWrite \n\n git tag <tag-name> \n \nto tag your commit.\n\n---\ntipp1\n---\ntipp2\n---\ntipp3"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "You added way too many tags? No prob! Delete them with\n\n git tag -d <tag-name>\n \nRemove all tags in this repo!\n\n---\ntipp1\n---\ntipp2\n---\ntipp3"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "But what happens if you forgot to tag your current commit?\nNo Prob! You can also tag older commits via\n\n git tag <tag-name> <commit-hash>\n \nTag the commit 'Adding feature 2' with the name 'v1'!\n\n---\ntipp1\n---\ntipp2\n---\ntipp3"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "When you work with remote repositories, tags are not pushed or pulled automatically.\n\nYou can push a tag with\n git push <remote> <tag-name>\nOr all tags with:\n git push <remote> --tags\n \nDeleting tags on your remote works with: \n git push <remote> --delete <tag-name>\n \nYou can also sync \n git fetch <remote> --prune --prune-tags\n\n\nAdd a tag named 'v2' to the last commit and push it to the remote. Also pull the v1 tag to your local repository."
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "This is an empty sandbox you can play around in."
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Here's a sandbox with a remote! Try pulling, fetching, or pushing!\n\nHow can you push tags and branches on a remote? How can you delete them again?"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Here's a sandbox you can play around in.\n\nYou can use both the playing cards, as well as the terminal. This is a real Git terminal! Fun things to try:\n\n- Make a commit that merges three timelines together at once!\n- Create and delete some tags!\n- Make a timeline that's completely independent of the rest!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
#: HITS
|
||||||
|
msgid "But there's another way to interact with Git:\n\nTry typing `git init` into the black terminal below, and pressing the enter key!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Again, instead of using the card, you can also type the commands which are printed on it into the black terminal below!\n\nThis is totally optional! But this will be a super useful skill in the real world - and it will give you a sparkling golden badge! :)"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "To go back to old commands, you can press arrow up and down. That way, you don't have to type in long commands twice."
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "On the command line, you can easily delete all files ending in -web using this command:\n\n rm *web"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "To checkout a specific commit, type `git checkout`, then a space, and then right click on the commit you want!\n\nThis will insert the commit's unique identifier!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "The blue animal represents a concept known as the 'HEAD pointer' in Git: It shows you which commit is the current one.\n\nHere's a cool trick to go to the previous commit: \n\n git checkout HEAD^\n\nYou can also go back two commits by typing, for example: \n\n git checkout HEAD~2"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Branches also make it really easy to travel between different places using the command line! As soon as you have a branch called 'birthday', you can type `git checkout birthday` to travel to it!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "To travel to a branch, type `git checkout name_of_the_branch`.\n\nAnd to travel to the last commit, type `git checkout --detach name_of_the_branch`."
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "You can use tab completion in the terminal! Start typing a filename, then press the tab key to complete its name. This will often save you some time!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "But there's another way to interact with Git:\n\nTry typing `git init` into the black terminal below, and pressing the enter key!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Again, instead of using the card, you can also type the commands which are printed on it into the black terminal below!\n\nThis is totally optional! But this will be a super useful skill in the real world - and it will give you a sparkling golden badge! :)"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "To go back to old commands, you can press arrow up and down. That way, you don't have to type in long commands twice."
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "On the command line, you can easily delete all files ending in -web using this command:\n\n rm *web"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "To checkout a specific commit, type `git checkout`, then a space, and then right click on the commit you want!\n\nThis will insert the commit's unique identifier!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "The blue animal represents a concept known as the 'HEAD pointer' in Git: It shows you which commit is the current one.\n\nHere's a cool trick to go to the previous commit: \n\n git checkout HEAD^\n\nYou can also go back two commits by typing, for example: \n\n git checkout HEAD~2"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "Branches also make it really easy to travel between different places using the command line! As soon as you have a branch called 'birthday', you can type `git checkout birthday` to travel to it!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "To travel to a branch, type `git checkout name_of_the_branch`.\n\nAnd to travel to the last commit, type `git checkout --detach name_of_the_branch`."
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
msgid "You can use tab completion in the terminal! Start typing a filename, then press the tab key to complete its name. This will often save you some time!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
||||||
|
|
||||||
|
#############################################
|
||||||
|
|
||||||
|
#: CONGRAT
|
||||||
|
msgid "Good job, you solved the level!\n\nFeel free to try a few more things or click 'Next level'."
|
||||||
|
msgstr "PIPPO"
|
||||||
|
msgid "Suddenly, your cat jumps on the table, snatches away the form, and runs away! Oh no. All your hard work, gone!\n\nYou clearly need a better solution.\n\n(Click 'Next Level' as soon as you're ready!)"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
msgid "Okay, this kind of works.\n\nBut you're a bit worried that you'll end up with hundreds of copies of this form, and it will be hard to keep track of all of them.\n\nAnd especially when working with other people, sending copies back and forth doesn't seem ideal.\n\nYou can't wait to try these time machines!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
msgid "Nice! See that little owl squirrel that appeared? It will be your companion, and always show you where you are in time!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
msgid "Cool! Instead of using the playing cards, you can also do everything via the command line!\n\nThe command line is pretty powerful! Often, you can use it to solve tasks faster compared to using a graphical interface."
|
||||||
|
msgstr "PIPPO"
|
||||||
|
msgid "Nice! You can try making some additional commits. When you feel comfortable, click on 'Next Level'."
|
||||||
|
msgstr "PIPPO"
|
||||||
|
msgid "Welcome to time travel school! :) I'll see you for your first class tomorrow!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
msgid "Your room looks now very tidy and cozy! Time to unpack your stuff!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
msgid "Don't you immediately feel more at home?"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
msgid "Wonderful! Now that you're getting familiar with the time machine, let's look at some more complicated situations..."
|
||||||
|
msgstr "PIPPO"
|
||||||
|
msgid "Whew, good job! This seems like a *much* better outcome.\n\nFeel free to add more parallel timelines, or make them longer.\n\nIf you're ready, our next mission is already waiting..."
|
||||||
|
msgstr "PIPPO"
|
||||||
|
msgid "Now you can travel between those branches easily (using `git checkout`) - try it!\n\nYour friend is happy that you made it to the birthday party and you also got your concert ticket signed. Yay!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
msgid "On second thought, maybe you even prefer the ice cream timeline to the main one? :)"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
msgid "I wonder if you're more relaxed when you *sleep* in parallel timelines..."
|
||||||
|
msgstr "PIPPO"
|
||||||
|
msgid "Yum, that sounds like a good breakfast!"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
msgid "Notice how the other timelines and commits are still there - if anything goes wrong, you can also travel back to them.\n\nIt's really hard to actually *destroy* stuff with your time machine."
|
||||||
|
msgstr "PIPPO"
|
||||||
|
msgid "Feel free to reset the level and try the other strategy! Which one do you like better?"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
msgid "Well done! :) The only problem is that you now have to walk all the way back home, again..."
|
||||||
|
msgstr "PIPPO"
|
||||||
|
msgid "Nice stash you got there! :)"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
msgid "Yay, you got your changes back! :)"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
msgid "All clear! :)"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
msgid "Stashed changes are in a new branch! :)"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
msgid "Nice! You tagged your first commit :)"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
msgid "Well done :)"
|
||||||
|
msgstr "PIPPO"
|
||||||
|
|
@ -151,7 +151,7 @@ mute={
|
||||||
|
|
||||||
[locale]
|
[locale]
|
||||||
|
|
||||||
translations=PoolStringArray( "res://locale/it.po" )
|
translations=PoolStringArray( "res://locale/it.po", "res://locale/it_levels.po", "res://locale/it_cards.po" )
|
||||||
locale_filter=[ 0, [ ] ]
|
locale_filter=[ 0, [ ] ]
|
||||||
|
|
||||||
[network]
|
[network]
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ func load(path):
|
||||||
|
|
||||||
var level_names = []
|
var level_names = []
|
||||||
var dir = Directory.new()
|
var dir = Directory.new()
|
||||||
dir.open("res://levels/" + game.os_lang + "/%s" % slug)
|
dir.open("res://levels/%s" % slug)
|
||||||
dir.list_dir_begin()
|
dir.list_dir_begin()
|
||||||
|
|
||||||
while true:
|
while true:
|
||||||
|
|
@ -28,7 +28,7 @@ func load(path):
|
||||||
|
|
||||||
var final_level_sequence = []
|
var final_level_sequence = []
|
||||||
|
|
||||||
var level_sequence = Array(helpers.read_file("res://levels/" + game.os_lang + "/%s/sequence" % slug, "").split("\n"))
|
var level_sequence = Array(helpers.read_file("res://levels/%s/sequence" % slug, "").split("\n"))
|
||||||
|
|
||||||
for level in level_sequence:
|
for level in level_sequence:
|
||||||
if level == "":
|
if level == "":
|
||||||
|
|
@ -42,7 +42,7 @@ func load(path):
|
||||||
|
|
||||||
for l in final_level_sequence:
|
for l in final_level_sequence:
|
||||||
var level = Level.new()
|
var level = Level.new()
|
||||||
level.load("res://levels/" + game.os_lang + "/%s/%s" % [slug, l])
|
level.load("res://levels/%s/%s" % [slug, l])
|
||||||
levels.push_back(level)
|
levels.push_back(level)
|
||||||
|
|
||||||
func _to_string():
|
func _to_string():
|
||||||
|
|
|
||||||
|
|
@ -20,9 +20,9 @@ func load(path):
|
||||||
# This is a new-style level.
|
# This is a new-style level.
|
||||||
var config = helpers.parse(path)
|
var config = helpers.parse(path)
|
||||||
|
|
||||||
title = config.get("title", slug)
|
title = tr(config.get("title", slug))
|
||||||
print(tr(title))
|
|
||||||
description = config.get("description", "(no description)")
|
description = config.get("description", "(no description)")
|
||||||
|
description = tr(description.replace("\"", "\'"))
|
||||||
|
|
||||||
# Surround all lines indented with four spaces with [code] tags.
|
# Surround all lines indented with four spaces with [code] tags.
|
||||||
var monospace_regex = RegEx.new()
|
var monospace_regex = RegEx.new()
|
||||||
|
|
@ -31,9 +31,11 @@ func load(path):
|
||||||
description = description.split("---")
|
description = description.split("---")
|
||||||
|
|
||||||
var cli_hints = config.get("cli", "")
|
var cli_hints = config.get("cli", "")
|
||||||
|
cli_hints = tr(cli_hints.replace("\"", "\'"))
|
||||||
# Also do this substitution in the CLI hints.
|
# Also do this substitution in the CLI hints.
|
||||||
cli_hints = monospace_regex.sub(cli_hints, "\n [code][color=#bbbb5d]$1[/color][/code]", true)
|
cli_hints = monospace_regex.sub(cli_hints, "\n [code][color=#bbbb5d]$1[/color][/code]", true)
|
||||||
|
|
||||||
|
|
||||||
# Also replace `code` with [code] tags.
|
# Also replace `code` with [code] tags.
|
||||||
var monospace_inline_regex = RegEx.new()
|
var monospace_inline_regex = RegEx.new()
|
||||||
monospace_inline_regex.compile("`([^`]+)`")
|
monospace_inline_regex.compile("`([^`]+)`")
|
||||||
|
|
@ -43,7 +45,9 @@ func load(path):
|
||||||
if cli_hints != "":
|
if cli_hints != "":
|
||||||
description[0] = description[0] + "\n\n[color=#787878]"+cli_hints+"[/color]"
|
description[0] = description[0] + "\n\n[color=#787878]"+cli_hints+"[/color]"
|
||||||
|
|
||||||
congrats = config.get("congrats", tr("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, you solved the level!\n\nFeel free to try a few more things or click 'Next level'.")
|
||||||
|
congrats = congrats.replace("\"", "\'")
|
||||||
|
congrats = tr(congrats)
|
||||||
cards = Array(config.get("cards", "").split(" "))
|
cards = Array(config.get("cards", "").split(" "))
|
||||||
if cards == [""]:
|
if cards == [""]:
|
||||||
cards = []
|
cards = []
|
||||||
|
|
|
||||||
|
|
@ -3,14 +3,13 @@ extends Node
|
||||||
var chapters
|
var chapters
|
||||||
|
|
||||||
func _ready():
|
func _ready():
|
||||||
var lang = game.os_lang
|
|
||||||
reload()
|
reload()
|
||||||
|
|
||||||
func reload():
|
func reload():
|
||||||
chapters = []
|
chapters = []
|
||||||
|
|
||||||
var dir = Directory.new()
|
var dir = Directory.new()
|
||||||
dir.open("res://levels/" + game.os_lang)
|
dir.open("res://levels/")
|
||||||
dir.list_dir_begin()
|
dir.list_dir_begin()
|
||||||
|
|
||||||
var chapter_names = []
|
var chapter_names = []
|
||||||
|
|
@ -27,7 +26,7 @@ func reload():
|
||||||
|
|
||||||
var final_chapter_sequence = []
|
var final_chapter_sequence = []
|
||||||
|
|
||||||
var chapter_sequence = Array(helpers.read_file("res://levels/" + game.os_lang + "/sequence", "").split("\n"))
|
var chapter_sequence = Array(helpers.read_file("res://levels/sequence", "").split("\n"))
|
||||||
|
|
||||||
for chapter in chapter_sequence:
|
for chapter in chapter_sequence:
|
||||||
if chapter == "":
|
if chapter == "":
|
||||||
|
|
@ -41,5 +40,5 @@ func reload():
|
||||||
|
|
||||||
for c in final_chapter_sequence:
|
for c in final_chapter_sequence:
|
||||||
var chapter = Chapter.new()
|
var chapter = Chapter.new()
|
||||||
chapter.load("res://levels/" + game.os_lang + "/%s" % c)
|
chapter.load("res://levels/%s" % c)
|
||||||
chapters.push_back(chapter)
|
chapters.push_back(chapter)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue