merging german translation

Merge branch 'master' of https://github.com/wesen1/blokish

mobile/src/main/res/layout/help.xml

@@ -7,78 +7,69 @@
 		android:layout_width="fill_parent" android:layout_height="wrap_content" 
 		android:orientation="vertical" 
 		>
+
 		<ImageView
 		    android:id="@+id/video" 
 		    android:src="@drawable/blokish_21_youtube_arrow" 
 			android:layout_width="180dp" android:layout_height="300dp"
 			android:layout_marginTop="16dp"  
 			android:layout_gravity="center_horizontal"
 			/>
-		<TextView android:text="Click above to watch demo on YouTube" android:layout_width="fill_parent" android:layout_height="wrap_content"
+		<TextView android:text="@string/video_description_1" android:layout_width="fill_parent" android:layout_height="wrap_content"
 		    android:gravity="center"
-		    android:textStyle="italic|bold"	/>	 		
-		<TextView android:text="You can enlarge video rotating phone in landscape mode" android:layout_width="fill_parent" android:layout_height="wrap_content"
+		    android:textStyle="italic|bold"	/>
+		<TextView android:text="@string/video_description_2" android:layout_width="fill_parent" android:layout_height="wrap_content"
 		    android:gravity="center"
-		    android:textStyle="italic"	/>	 		
-		<TextView android:text="Rules of the game Blokus Classic"
+		    android:textStyle="italic"	/>
+
+
+		<TextView android:text="@string/rules_title"
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
 			android:layout_marginTop="20dp" style="@style/h1" />	 		
-		<TextView android:text="- A board with 20 * 20 squares." android:layout_width="fill_parent" android:layout_height="wrap_content"	/>	 		
-		<TextView android:text="- 4 players having each 21 pieces : 1 single-square, 1 domino, 2 triominos, 5 tetraminos and 12 pentaminos" android:layout_width="fill_parent" android:layout_height="wrap_content"	/>	 		
-		<TextView android:text="- As player, I shall place on the board most of my pieces. " android:layout_width="fill_parent" android:layout_height="wrap_content"	/>	 		
-		<TextView android:text="- For first round, I must place a piece so that it touches one of the corners of the board." android:layout_width="fill_parent" android:layout_height="wrap_content"	/>	 		
-		<TextView android:text="- Next, a piece must be placed so that it touches a corner of one of my own pieces. It may touch several corners, but never any edge of my pieces!" android:layout_width="fill_parent" android:layout_height="wrap_content"	/>
+		<TextView android:text="@string/rules_text_1" android:layout_width="fill_parent" android:layout_height="wrap_content"	/>
+
 		<ImageView android:src="@drawable/blokish_2_pieces" 
 			android:layout_margin="10dp"  
 			android:layout_gravity="center_horizontal"
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
 			android:scaleType="centerInside"
 			/>
-		<TextView android:text="- If a cannot place any more piece I pass my turn." android:layout_width="fill_parent" android:layout_height="wrap_content"	/>	 		
-		<TextView android:text="- The end of the game is reached when every player passes." android:layout_width="fill_parent" android:layout_height="wrap_content"	/>	 		
-		<TextView android:text="- My score is : addition of all the squares of the pieces I placed." android:layout_width="fill_parent" android:layout_height="wrap_content"	/>	 		
-		<TextView android:text="" android:layout_width="fill_parent" android:layout_height="wrap_content"	/>	 		
+		<TextView android:text="@string/rules_text_2" android:layout_width="fill_parent" android:layout_height="wrap_content"	/>
 
-		<TextView android:text="How to play with Blokish Android app"
+
+		<TextView android:text="@string/howToPlay_title"
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
 			android:layout_marginTop="10dp" style="@style/h1" />
-		<TextView android:text="Do notice the smooth Drag&amp;Drop and swipe gestures to place the pieces :" android:layout_width="fill_parent" android:layout_height="wrap_content"	/>	 		
-		<TextView android:text="- Scroll through your remaining pieces with you finger from left to right." android:layout_width="fill_parent" android:layout_height="wrap_content"	/>	 		
+		<TextView android:text="@string/howToPlay_text_1" android:layout_width="fill_parent" android:layout_height="wrap_content"	/>
 		<ImageView android:src="@drawable/blokish_scroll" 
 			android:layout_margin="10dp"  
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
 			android:scaleType="centerInside"
 			/>
-		<TextView android:text="- Select an drag a piece onto the board. You can now drag it around easily putting the finger on the large grey circle" android:layout_width="fill_parent" android:layout_height="wrap_content"	/>	 		
+		<TextView android:text="@string/howToPlay_text_2" android:layout_width="fill_parent" android:layout_height="wrap_content"	/>
 		<ImageView android:src="@drawable/blokish_dragging" 
 			android:layout_margin="10dp"  
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
 			android:scaleType="centerInside"
 			/>
-		<TextView android:text="- Rotate the piece using one the handles" android:layout_width="fill_parent" android:layout_height="wrap_content"	/>	 		
+		<TextView android:text="@string/howToPlay_text_3" android:layout_width="fill_parent" android:layout_height="wrap_content"	/>
 		<ImageView android:src="@drawable/blokish_rotating" 
 			android:layout_margin="10dp"  
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
 			android:scaleType="centerInside"
 			/>
-		<TextView android:text="- You can flip the piece to its mirror position : with a long press on the piece." android:layout_width="fill_parent" android:layout_height="wrap_content"	/>
-		<TextView android:text="Flip a piece can also be done using the menu, specially usefull for tablets." android:layout_width="fill_parent" android:layout_height="wrap_content"	/>
-		<TextView android:text="- You can cancel with the red button. It will replace the piece in your store." android:layout_width="fill_parent" android:layout_height="wrap_content"	/>	 		
-		<TextView android:text="- When the move is valid a green 'ok' button appears. You can commit the move by clicking it!" android:layout_width="fill_parent" android:layout_height="wrap_content"	/>	 		
+		<TextView android:text="@string/howToPlay_text_4" android:layout_width="fill_parent" android:layout_height="wrap_content"	/>
+
 		<ImageView android:src="@drawable/blokish_21_1" 
 			android:layout_margin="10dp"  
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
 			android:scaleType="centerInside"
 			/>
-		<TextView android:text="- At any time you can see you oponent remaining pieces : just select tab of corresponding color at the bottom." android:layout_width="fill_parent" android:layout_height="wrap_content"	/>	 		
-		<TextView android:text="- When you win against the machine, you can select a harder level : Menu &gt; Preferences." android:layout_width="fill_parent" android:layout_height="wrap_content"	/>	 		
+		<TextView android:text="@string/howToPlay_text_5" android:layout_width="fill_parent" android:layout_height="wrap_content"	/>
+
+		<TextView android:text="@string/about" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingTop="15dp" />
+
 
-		<TextView android:text="http://scoutant.org" android:layout_width="fill_parent" android:layout_height="wrap_content"	/>	 		
-
-		<TextView android:text="Blokish is an Free/Libre open-source app, licence GPL." android:layout_width="fill_parent" android:layout_height="wrap_content"	/>	 		
-		<TextView android:text="Fell free to use the code you can get at http://github.com/scoutant." android:layout_width="fill_parent" android:layout_height="wrap_content"	/>	 		
-		<TextView android:text="Stephane Coutant" android:layout_width="fill_parent" android:layout_height="wrap_content"	/>	 		
-
 	</LinearLayout>
 </ScrollView> 
 

mobile/src/main/res/values-de/strings.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
     <!-- DE, by Sascha Hlusiak -->
 
@@ -44,4 +44,52 @@
 	<string name="later">Später</string>
 	<string name="never">Nein</string>
 
+
+	<!-- preferences -->
+	<string name="displaySeeds_title">Anlegepunkte zeigen</string>
+	<string name="displaySeeds_description">Felder markieren, an denen Anlegen möglich ist.</string>
+
+	<string name="ai_title">Computergegner</string>
+	<string name="ai_description">Computer übernimmt Grün, Blau und Gelb</string>
+
+	<string name="aiLevel_title">Spielstärke</string>
+	<string name="aiLevel_dialog">Spielstärke auswählen</string>
+
+
+	<!-- help -->
+	<string name="video_description_1">Drücke auf das Bild um ein Demo-Video auf YouTube abzuspielen</string>
+	<string name="video_description_2">Du kannst das Video vergrößern, indem du das Handy quer hältst</string>
+
+	<string name="rules_title">Regeln des Spiels Blokus Classic</string>
+	<string name="rules_text_1">
+		- Ein Spielbrett mit 20 * 20 Kästchen.
+		\n- 4 Spieler, die jeweils 21 Teile haben : 1 einzelnes Viereck, 1 Domino, 2 Triominos, 5 Tetraminos und 12 Pentaminos
+		\n- Jeder Spieler muss so viele Teile wie möglich auf das Spielbrett legen.
+		\n- Das erste Teil muss so gelegt werden, dass es eine der Ecken des Spielbretts berührt.
+		\n- Die darauf folgenden Teile müssen so gelegt werden, dass sie eine Ecke der eigenen Teile berühren. Sie dürfen mehrere Ecken auf einmal, aber keine Kante eines Teils berühren!
+	</string>
+	<string name="rules_text_2">
+		- Wenn man kein Teil mehr legen kann, muss man seinen Zug überspringen.
+		\n- Das Spiel endet, wenn kein Spieler mehr Teile legen kann.
+		\n- Die Punktzahl eines Spielers ist gleich der Anzahl von Vierecken der eigenen Teile, die auf dem Spielbrett liegen.
+	</string>
+
+	<string name="howToPlay_title">Kurzanleitung für die Blokish Android App</string>
+	<string name="howToPlay_text_1">
+		Benutze Drag&amp;Drop und Wisch-Gesten, um Teile zu platzieren:
+		\n- Navigiere durch deine verbleibenden Teile mit Wischen.
+	</string>
+	<string name="howToPlay_text_2">- Wähle und ziehe ein Teil auf das Spielbrett. Jetzt kannst du es umherziehen, indem du den großen grauen Kreis berührst.</string>
+	<string name="howToPlay_text_3">- Drehe das Teil, indem du einen der Griffe benutzt.</string>
+	<string name="howToPlay_text_4">
+		- Du kannst ein Teil spiegeln, indem du es lange berührst.
+		\nDu kannst auch über das Menü ein Teil spiegeln, das ist besonders bei Tablets nützlich.
+		\n- Mit dem roten Knopf kannst du einen Zug abbrechen. Er setzt das Teil zurück in deinen Bestand.
+		\n- Wenn der Zug gültig ist, erscheint ein grüner \'ok\' Knopf. Du kannst den Zug ausführen, indem du darauf drückst!
+	</string>
+	<string name="howToPlay_text_5">
+		- Du kannst jederzeit die verbleibenden Teile deiner Gegner sehen : wähle einfach unten den Reiter der entsprechenden Farbe aus.
+		\n- Wenn du gegen den Computer gewinnst, kannst du eine höhere Spielstärke auswählen : Menü &gt; Einstellungen.
+	</string>
+
 </resources>

mobile/src/main/res/values-es/strings.xml

@@ -41,6 +41,17 @@
 	<string name="now">Si</string>
 	<string name="later">Más tarde</string>
 	<string name="never">No</string>
+
+
+	<!-- preferences -->
+	<string name="displaySeeds_title">Mostrar puntos claves</string>
+	<string name="displaySeeds_description">Mostar un punto donde puedo colocar una pieza</string>
+
+	<string name="ai_title">Inteligencia artificial</string>
+	<string name="ai_description">La machina juega para los Verdes, Azules y Naranjos</string>
+
+	<string name="aiLevel_title">Nivél de juego</string>
+	<string name="aiLevel_dialog">Elija un nivel</string>
 
 </resources>
 

mobile/src/main/res/values-fr/strings.xml

@@ -47,6 +47,17 @@
 	<string name="rate">Evaluer Blokish?</string>
 	<string name="remind_me">Me rappeler plus tard</string>
 	<string name="no_thansk">Non merci!</string>
-	 -->		
+	 -->
+
+
+	<!-- preferences -->
+	<string name="displaySeeds_title">Afficher les points d\'encrage</string>
+	<string name="displaySeeds_description">Afficher un point là où une pièce peut être positionnée</string>
+
+	<string name="ai_title">Intelligence Artificielle</string>
+	<string name="ai_description">La machine joue les Verts, les Bleus et les Oranges</string>
+
+	<string name="aiLevel_title">Niveau</string>
+	<string name="aiLevel_dialog">Choisir le niveau</string>
 
 </resources>

mobile/src/main/res/values-ru/strings.xml

@@ -41,4 +41,15 @@
     <string name="later">Позже</string>
     <string name="never">Нет</string>
 
+
+    <!-- preferences -->
+    <string name="displaySeeds_title">Рисовать точки</string>
+    <string name="displaySeeds_description">Рисовать точку там, где можно разместить фигуру</string>
+
+    <string name="ai_title">Искусственный интеллект</string>
+    <string name="ai_description">Компьютер играет за Зеленых, Синих и Желтых</string>
+
+    <string name="aiLevel_title">Уровень сложности</string>
+    <string name="aiLevel_dialog">Выберите уровень сложности</string>
+
 </resources>

mobile/src/main/res/values-sv/strings.xml

@@ -41,5 +41,16 @@
 	<string name="now">Ja</string>
 	<string name="later">Senare</string>
 	<string name="never">Nej</string>
+
+
+	<!-- preferences -->
+	<string name="displaySeeds_title">Seeds display</string>
+	<string name="displaySeeds_description">Display a dot where you may place a piece</string>
+
+	<string name="ai_title">Artificial Intelligence</string>
+	<string name="ai_description">Computer plays Green, Blue and Yellow</string>
+
+	<string name="aiLevel_title">Level</string>
+	<string name="aiLevel_dialog">Select level</string>
 
 </resources>

mobile/src/main/res/values/strings.xml

@@ -37,11 +37,67 @@
 	<string name="Green">Player Green</string>
 	<string name="Blue">Player Blue</string>
 	<string name="Orange">Player Orange</string>
-
+
+
     <!-- rate form -->
 	<string name="if_you_enjoy">If you enjoy the game Blokish, shall you take a moment to rate the app?</string>
 	<string name="now">OK</string>
 	<string name="later">Later</string>
 	<string name="never">No</string>
-
+
+
+	<!-- preferences -->
+	<string name="displaySeeds_title">Seeds display</string>
+	<string name="displaySeeds_description">Display a dot where you may place a piece</string>
+
+	<string name="ai_title">Artificial Intelligence</string>
+	<string name="ai_description">Computer plays Green, Blue and Yellow</string>
+
+	<string name="aiLevel_title">Level</string>
+	<string name="aiLevel_dialog">Select level</string>
+
+
+	<!-- help -->
+	<string name="video_description_1">Click above to watch demo on YouTube</string>
+	<string name="video_description_2">You can enlarge video rotating phone in landscape mode</string>
+
+	<string name="rules_title">Rules of the game Blokus Classic</string>
+	<string name="rules_text_1">
+		- A board with 20 * 20 squares.
+		\n- 4 players having each 21 pieces : 1 single-square, 1 domino, 2 triominos, 5 tetraminos and 12 pentaminos
+		\n- As player, I shall place on the board most of my pieces.
+		\n- For first round, I must place a piece so that it touches one of the corners of the board.
+		\n- Next, a piece must be placed so that it touches a corner of one of my own pieces. It may touch several corners, but never any edge of my pieces!
+	</string>
+	<string name="rules_text_2">
+		- If I cannot place any more piece I pass my turn.
+		\n- The end of the game is reached when every player passes.
+		\n- My score is : addition of all the squares of the pieces I placed.
+	</string>
+
+	<string name="howToPlay_title">How to play with Blokish Android app</string>
+	<string name="howToPlay_text_1">
+		Do notice the smooth Drag&amp;Drop and swipe gestures to place the pieces :
+		\n- Scroll through your remaining pieces with you finger from left to right.
+	</string>
+	<string name="howToPlay_text_2">- Select an drag a piece onto the board. You can now drag it around easily putting the finger on the large grey circle</string>
+	<string name="howToPlay_text_3">- Rotate the piece using one the handles</string>
+	<string name="howToPlay_text_4">
+		- You can flip the piece to its mirror position : with a long press on the piece.
+		\nFlip a piece can also be done using the menu, specially usefull for tablets.
+		\n- You can cancel with the red button. It will replace the piece in your store.
+		\n- When the move is valid a green \'ok\' button appears. You can commit the move by clicking it!
+	</string>
+	<string name="howToPlay_text_5">
+		- At any time you can see you oponent remaining pieces : just select tab of corresponding color at the bottom.
+		\n- When you win against the machine, you can select a harder level : Menu &gt; Preferences.
+	</string>
+
+	<string name="about" translatable="false">
+		http://scoutant.org
+		\nBlokish is an Free/Libre open-source app, licence GPL.
+		\nFell free to use the code you can get at http://github.com/scoutant.
+		\nStephane Coutant
+	</string>
+
 </resources>

mobile/src/main/res/xml/preferences.xml

@@ -1,13 +1,13 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 	<CheckBoxPreference 
-		android:key="displaySeeds" android:title="Seeds display" android:summary="Display a dot where you may place a piece" 
+		android:key="displaySeeds" android:title="@string/displaySeeds_title" android:summary="@string/displaySeeds_description"
 		android:defaultValue="true" />
-	<CheckBoxPreference android:key="ai" android:title="Artificial Intelligence" android:summary="Computer plays Green, Blue and Yellow" android:defaultValue="true" />
+	<CheckBoxPreference android:key="ai" android:title="@string/ai_title" android:summary="@string/ai_description" android:defaultValue="true" />
 	<ListPreference 
-		android:key="aiLevel" android:title="Level"
+		android:key="aiLevel" android:title="@string/aiLevel_title"
 		android:summary="%s"
 		android:entries="@array/aiLevelNames" android:entryValues="@array/aiLevelValues"
-		android:dialogTitle="Select level" android:defaultValue="0" 
+		android:dialogTitle="@string/aiLevel_dialog" android:defaultValue="0"
 		android:persistent="true"
 		/>
 </PreferenceScreen>