Merge branch 'master' into development

Conflicts: horizons/constants.py horizons/main.py
mesutcank · Apr 20, 2012 · f5963fc · f5963fc
2 parents 1ad08aa + 1d66526
commit f5963fc
Show file tree

Hide file tree

Showing 16 changed files with 664 additions and 588 deletions.
diff --git a/content/gui/xml/mainmenu/call_for_support.xml b/content/gui/xml/mainmenu/call_for_support.xml
@@ -14,8 +14,8 @@
 		<Label name="text" text="• Python developers" />
 		<Label name="text" text="Visit our IRC channel #unknown-horizons on FreeNode to get in touch with the developers and we will be happy to answer all your questions!"
 			   wrap_text="1"  max_size="280,80" />
-		<Label name="text" text="You find information on how to get started at" />
-		<Label name="text" text="http://tinyurl.com/UH-get-started" />
+		<Label name="text" text="You find information on how to get started at:" />
+		<Label name="text" text="    http://tinyurl.com/uh-get-involved" />
 		<Label name="text" text="Most developers are from Europe, so make sure to show a little patience. We read our channel logs and will always come back to you."
 			   wrap_text="1"  max_size="280,80" />
 	</VBox>
@@ -46,9 +46,9 @@
 		<HBox  size="280,80" padding="15">
 		<VBox>
 			<Label name="text" text="  ~ buildings ~ " />
-			<Label name="text" text="• animated herbs field" />
-			<Label name="text" text="• boar forest field" />
-			<Label name="text" text="• a doctor (hospital)" />
+			<Label name="text" text="• mainsquare upgrades" />
+			<Label name="text" text="• warehouse upgrades" />
+			<Label name="text" text="• settler variants (lvl 2/3/4)" />
 		</VBox>
 		<VBox>
 			<Label name="text" text="  ~ units ~ " />

diff --git a/content/gui/xml/mainmenu/credits/credits0.xml b/content/gui/xml/mainmenu/credits/credits0.xml
@@ -31,6 +31,8 @@
 			<Label text="mihaibivol (Mihai Bivol)" />
 			<Label text="Court-Jus (Ghislain Lévêque)" />
 			<Label text="squiddy (Reiner Gerecke)" />
+			<Label text="mesutcan (Mesutcan Kurt)" />
+			<Label text="Kiryx (Krzysztof Nowak)" />
 		</VBox>
 	</VBox> <Spacer />
 </VBox>

diff --git a/content/gui/xml/mainmenu/credits/credits2.xml b/content/gui/xml/mainmenu/credits/credits2.xml
@@ -40,6 +40,9 @@
 			<Label text="Kristian Hynek (Kris_CZ)" />
 			<Label text="Petr Palička (peca)" />
 			<Label text="Vilem Soulak (Turmaleus)" />
+			<Label text="naked.in.rain" />
+			<Label text="Spek" />
+			<Label text="VMa" />
 		</VBox>
 	</VBox>
 	<VBox> <Label text="Danish"  name="headline" />
@@ -51,6 +54,7 @@
 		<VBox  name="box">
 			<Label text="Michael Skiba" />
 			<Label text="djot" />
+			<Label text="Kikody" />
 		</VBox>
 	</VBox>
 	<VBox> <Label text="Spanish"  name="headline" />
@@ -60,11 +64,15 @@
 			<Label text="Álex Plaza" />
 			<Label text="Fabio Fernández (Catharsius)" />
 			<Label text="MicMic" />
+			<Label text="stefania_m" />
+			<Label text="Andrés José Fernandez (ariktaurendil)" />
+			<Label text="Sergio Lorenzo (Juarrox)" />
 		</VBox>
 	</VBox>
 	<VBox> <Label text="Estonian"  name="headline" />
 		<VBox  name="box">
 			<Label text="Mihkel Rämmel (RM87)" />
+			<Label text="Üllar Lainväe (ussikene)" />
 		</VBox>
 	</VBox>
 	<VBox> <Label text="French"  name="headline" />
@@ -75,18 +83,38 @@
 			<Label text="Hugues Fafard (Antagonym)" />
 			<Label text="Quentin (LawNasK)" />
 			<Label text="tintou" />
+			<Label text="Antoine Pernot (mumuxe)" />
+			<Label text="Samuel Dorsaz (ajira)" />
 		</VBox>
 	</VBox>
+	<VBox> <Label text="Croatian"  name="headline" />
+		<VBox  name="box">
+			<Label text="shile" />
+		</VBox>
+	</VBox><!--Hindi not yet available in 2012.1 - my deepest apologies! ~chris
+	<VBox> <Label text="Hindi"  name="headline" />
+		<VBox  name="box">
+			<Label text="Kinshuk Sunil (kinshuksunil)" />
+		</VBox>
+	</VBox>-->
 	<VBox> <Label text="Hungarian"  name="headline" />
 		<VBox  name="box">
 			<Label text="Szontágh Ferenc (ghostarthour)" />
+			<Label text="matyi" />
 		</VBox>
 	</VBox>
 	<VBox> <Label text="Italian"  name="headline" />
 		<VBox  name="box">
 			<Label text="Fabio Pedretti" />
 			<Label text="sioux83" />
 			<Label text="tagarista" />
+			<Label text="rayot" />
+		</VBox>
+	</VBox>
+	<VBox> <Label text="Japanese"  name="headline" />
+		<VBox  name="box">
+			<Label text="naraba" />
+			<Label text="Yuki Shira (shirayuki)" />
 		</VBox>
 	</VBox>
 	<VBox> <Label text="Lithuanian"  name="headline" />
@@ -117,6 +145,8 @@
 			<Label text="angellus" />
 			<Label text="SanderOnline" />
 			<Label text="MrRuudJ" />
+			<Label text="VinWij" />
+			<Label text="mightykai" />
 		</VBox>
 	</VBox>
 	<VBox> <Label text="Polish"  name="headline" />
@@ -126,6 +156,8 @@
 			<Label text="Mateusz Bartkowski (Eugen)" />
 			<Label text="Natrius" />
 			<Label text="mtfk" />
+			<Label text="Robert Matusewicz (matekm)" />
+			<Label text="Premislaus" />
 		</VBox>
 	</VBox>
 	<VBox> <Label text="Portuguese"  name="headline" />
@@ -145,6 +177,11 @@
 			<Label text="paulodealmeida" />
 		</VBox>
 	</VBox>
+	<VBox> <Label text="Romanian"  name="headline" />
+		<VBox  name="box">
+			<Label text="trendy" />
+		</VBox>
+	</VBox>
 	<VBox> <Label text="Russian"  name="headline" />
 		<VBox  name="box">
 			<Label text="Sergei Chistyakov (devcode)" />
@@ -164,6 +201,11 @@
 			<Label text="Aleksi Kinnunen (alluk.)" />
 		</VBox>
 	</VBox>
+	<VBox> <Label text="Chinese"  name="headline" />
+		<VBox  name="box">
+			<Label text="nifabric" />
+		</VBox>
+	</VBox>
 </VBox>
 </ScrollArea>
 

diff --git a/content/scenarios/tutorial_hu.yaml b/content/scenarios/tutorial_hu.yaml
@@ -22,20 +22,18 @@ events:
     - [Headline, "\xDCdv\xF6zli az Unknown Horizons!"]
     - [Image, content/gui/images/background/hr.png]
     - ''
-    - !!python/unicode 'This is your Captain''s log where all important information
-      is stored. A short notification of each task will be provided on the left of
-      the screen.'
-    - !!python/unicode 'If you are interested in longer descriptions, your log will
-      hopefully provide all the help you need.'
-    - !!python/unicode 'After you close this log, it can be re-opened with the "Captain''s
-      Log" icon in the top-right corner (below the mini-map, with a sealed document
-      and a feather).'
+    - "Ez a kapit\xE1nyod napl\xF3ja, ahol az \xF6sszes fontos inform\xE1ci\xF3 van.\
+      \ Egy r\xF6vid \xE9rtes\xEDt\xE9s megjelenik minden esem\xE9nyr\u0151l a k\xE9\
+      perny\u0151 bal sz\xE9l\xE9n."
+    - "Hogyha hosszabb le\xEDr\xE1s \xE9rdekel, a napl\xF3ban rem\xE9lhet\u0151leg\
+      \ seg\xEDts\xE9get tud ny\xFAjtani."
+    - "Miut\xE1n bez\xE1rod a napl\xF3t, \xFAjra megnyithatod a \"Kapit\xE1ny napl\xF3\
+      ja\" ikonnal a jobb fels\u0151 sarokban (a kis t\xE9rk\xE9p alatt, egy lepecs\xE9\
+      telt mapp\xE1val \xE9s egy tollal ell\xE1tott ikon)"
     - - Gallery
       - [content/gui/icons/widgets/minimap/captainslog.png]
-    - !!python/unicode '
-
-      To see your first task, click on the button "Read next entries" in the navigation
-      panel! It looks like this:'
+    - "\nAz els\u0151 feladathoz, kattints a \"K\xF6vetkez\u0151 bejegyz\xE9s elolvas\xE1\
+      sa\" gombra a navig\xE1ci\xF3s panelen! \xCDgy n\xE9z ki:"
     - - Gallery
       - [content/gui/images/buttons/parrow_right.png]
     - [Pagebreak]
@@ -325,9 +323,7 @@ events:
       to ''Sell'' and vice versa.'
     - !!python/unicode 'Click in the slot to choose the good you want to trade with.
       We will further explain this once you are ready to trade.'
-    - !!python/unicode '
-
-      TASK: Build a signal fire at the coast close to your warehouse.'
+    - "\n\xC9p\xEDts egy Jelz\u0151 t\xFCzet a parton a rakt\xE1rad k\xF6zel\xE9be."
     type: logbook
   - arguments: ["\xC9p\xEDts egy T\u0171zjelet a parton k\xF6zel a rakt\xE1rhoz."]
     type: message
@@ -718,16 +714,8 @@ events:
     - [Pagebreak]
     - [Headline, "K\xF6sz\xF6n\xF6m!"]
     - [Image, content/gui/images/background/hr.png]
-    - !!python/unicode '
-
-
-
-
-
-      Thanks for playing the tutorial!
-
-
-      Your UH-Team'
+    - "\n\n\n\n\n\n\nK\xF6sz\xF6n\xF6m hogy v\xE9gigj\xE1tszottad a gyakorl\xE1st!\n\
+      \nA te UH-Csapatod"
     - - Gallery
       - [content/unknown-horizons.xpm, content/gfx/misc/status_icons/as_book_flip/idle/45/book20125.png]
     type: logbook
@@ -758,6 +746,5 @@ events:
     type: var_gt
 locale: hu
 mapfile: development.sqlite
-translation_status: 36 translated messages, 2 fuzzy translations, 153 untranslated
-  messages.
+translation_status: 42 translated messages, 149 untranslated messages.