Merge pull request #15 from ST-Apps/master

Repos update from ST-Apps
ST-Apps · Aug 16, 2016 · 71d3456 · 71d3456
2 parents 5b89c7b + 750293f
commit 71d3456
Show file tree

Hide file tree

Showing 37 changed files with 209 additions and 126 deletions.
diff --git a/PokemonGo-UWP/Assets/Buttons/btn_settings.png b/PokemonGo-UWP/Assets/Buttons/btn_settings.png
diff --git a/PokemonGo-UWP/Assets/Pokemons/103.png b/PokemonGo-UWP/Assets/Pokemons/103.png
diff --git a/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.cs.xlf b/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.cs.xlf
@@ -370,8 +370,8 @@ Chcete otevřít stránku se soubory pro manuální instalaci? </target>
           <target state="new">Pokémon Caught</target>
         </trans-unit>
         <trans-unit id="ActivityCatchLegendPokemon" translate="yes" xml:space="preserve">
-          <source>Catch Legend Pokémon</source>
-          <target state="new">Catch Legend Pokémon</target>
+          <source>Catch Legendary Pokémon</source>
+          <target state="new">Catch Legendary Pokémon</target>
         </trans-unit>
         <trans-unit id="ActivityFleePokemon" translate="yes" xml:space="preserve">
           <source>Pokémon Fled</source>

diff --git a/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.de.xlf b/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.de.xlf
@@ -370,8 +370,9 @@ Seite zu den Dateien für manuelle Installation öffnen?</target>
           <target state="translated">Pokémon gefangen</target>
         </trans-unit>
         <trans-unit id="ActivityCatchLegendPokemon" translate="yes" xml:space="preserve">
-          <source>Catch Legend Pokémon</source>
-          <target state="translated">Fange legendäres Pokémon</target>
+          <source>Catch Legendary Pokémon</source>
+          <target state="needs-review-translation">Fange legendäres Pokémon</target>
+          <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
         </trans-unit>
         <trans-unit id="ActivityFleePokemon" translate="yes" xml:space="preserve">
           <source>Pokémon Fled</source>

diff --git a/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.el.xlf b/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.el.xlf
@@ -369,8 +369,8 @@ Open page with installation files for manual install?</source>
           <target state="new">Pokémon Caught</target>
         </trans-unit>
         <trans-unit id="ActivityCatchLegendPokemon" translate="yes" xml:space="preserve">
-          <source>Catch Legend Pokémon</source>
-          <target state="new">Catch Legend Pokémon</target>
+          <source>Catch Legendary Pokémon</source>
+          <target state="new">Catch Legendary Pokémon</target>
         </trans-unit>
         <trans-unit id="ActivityFleePokemon" translate="yes" xml:space="preserve">
           <source>Pokémon Fled</source>

diff --git a/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.es.xlf b/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.es.xlf
@@ -369,8 +369,9 @@ Open page with installation files for manual install?</source>
           <target state="translated">¡Pokemon capturado!</target>
         </trans-unit>
         <trans-unit id="ActivityCatchLegendPokemon" translate="yes" xml:space="preserve">
-          <source>Catch Legend Pokémon</source>
-          <target state="translated">Capturar pokemon legendario</target>
+          <source>Catch Legendary Pokémon</source>
+          <target state="needs-review-translation">Capturar pokemon legendario</target>
+          <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
         </trans-unit>
         <trans-unit id="ActivityFleePokemon" translate="yes" xml:space="preserve">
           <source>Pokémon Fled</source>

diff --git a/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.fi.xlf b/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.fi.xlf
@@ -312,8 +312,8 @@ Open page with installation files for manual install?</target>
           <target state="new">Pokémon Caught</target>
         </trans-unit>
         <trans-unit id="ActivityCatchLegendPokemon" translate="yes" xml:space="preserve">
-          <source>Catch Legend Pokémon</source>
-          <target state="new">Catch Legend Pokémon</target>
+          <source>Catch Legendary Pokémon</source>
+          <target state="new">Catch Legendary Pokémon</target>
         </trans-unit>
         <trans-unit id="ActivityFleePokemon" translate="yes" xml:space="preserve">
           <source>Pokémon Fled</source>

diff --git a/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.fr.xlf b/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.fr.xlf
@@ -368,8 +368,9 @@ Ouvrir la page avec les fichiers d'installation pour une installation manuelle ?
           <target state="translated">Pokémon Capturé</target>
         </trans-unit>
         <trans-unit id="ActivityCatchLegendPokemon" translate="yes" xml:space="preserve">
-          <source>Catch Legend Pokémon</source>
-          <target state="translated">Capture un pokémon légendaire</target>
+          <source>Catch Legendary Pokémon</source>
+          <target state="needs-review-translation">Capture un pokémon légendaire</target>
+          <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
         </trans-unit>
         <trans-unit id="ActivityFleePokemon" translate="yes" xml:space="preserve">
           <source>Pokémon Fled</source>

diff --git a/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.hu.xlf b/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.hu.xlf
@@ -368,8 +368,8 @@ Open page with installation files for manual install?</target>
           <target state="new">Pokémon Caught</target>
         </trans-unit>
         <trans-unit id="ActivityCatchLegendPokemon" translate="yes" xml:space="preserve">
-          <source>Catch Legend Pokémon</source>
-          <target state="new">Catch Legend Pokémon</target>
+          <source>Catch Legendary Pokémon</source>
+          <target state="new">Catch Legendary Pokémon</target>
         </trans-unit>
         <trans-unit id="ActivityFleePokemon" translate="yes" xml:space="preserve">
           <source>Pokémon Fled</source>

diff --git a/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.id.xlf b/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.id.xlf
@@ -368,8 +368,8 @@ Open page with installation files for manual install?</target>
           <target state="new">Pokémon Caught</target>
         </trans-unit>
         <trans-unit id="ActivityCatchLegendPokemon" translate="yes" xml:space="preserve">
-          <source>Catch Legend Pokémon</source>
-          <target state="new">Catch Legend Pokémon</target>
+          <source>Catch Legendary Pokémon</source>
+          <target state="new">Catch Legendary Pokémon</target>
         </trans-unit>
         <trans-unit id="ActivityFleePokemon" translate="yes" xml:space="preserve">
           <source>Pokémon Fled</source>

diff --git a/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.it.xlf b/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.it.xlf
@@ -368,8 +368,8 @@ Vuoi aprire la pagina con il file di installazione per l'installazione manuale?<
           <target state="new">Pokémon catturato</target>
         </trans-unit>
         <trans-unit id="ActivityCatchLegendPokemon" translate="yes" xml:space="preserve">
-          <source>Catch Legend Pokémon</source>
-          <target state="new">Cattura un Pokémon Leggendario</target>
+          <source>Catch Legendary Pokémon</source>
+          <target state="new">Catch Legendary Pokémon</target>
         </trans-unit>
         <trans-unit id="ActivityFleePokemon" translate="yes" xml:space="preserve">
           <source>Pokémon Fled</source>

diff --git a/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.ja.xlf b/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.ja.xlf
@@ -368,8 +368,8 @@ Open page with installation files for manual install?</target>
           <target state="new">Pokémon Caught</target>
         </trans-unit>
         <trans-unit id="ActivityCatchLegendPokemon" translate="yes" xml:space="preserve">
-          <source>Catch Legend Pokémon</source>
-          <target state="new">Catch Legend Pokémon</target>
+          <source>Catch Legendary Pokémon</source>
+          <target state="new">Catch Legendary Pokémon</target>
         </trans-unit>
         <trans-unit id="ActivityFleePokemon" translate="yes" xml:space="preserve">
           <source>Pokémon Fled</source>

diff --git a/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.nl.xlf b/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.nl.xlf
@@ -370,8 +370,8 @@ Open page with installation files for manual install?</target>
           <target state="new">Pokémon gevangen</target>
         </trans-unit>
         <trans-unit id="ActivityCatchLegendPokemon" translate="yes" xml:space="preserve">
-          <source>Catch Legend Pokémon</source>
-          <target state="new">Legendarische Pokémon gevangen</target>
+          <source>Catch Legendary Pokémon</source>
+          <target state="new">Catch Legendary Pokémon</target>
         </trans-unit>
         <trans-unit id="ActivityFleePokemon" translate="yes" xml:space="preserve">
           <source>Pokémon Fled</source>

diff --git a/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.pl.xlf b/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.pl.xlf
@@ -369,8 +369,8 @@ Czy otworzyć stronę z plikami instalacyjnymi w celu instalacji manualnej?</tar
           <target state="new">Pokémon Caught</target>
         </trans-unit>
         <trans-unit id="ActivityCatchLegendPokemon" translate="yes" xml:space="preserve">
-          <source>Catch Legend Pokémon</source>
-          <target state="new">Catch Legend Pokémon</target>
+          <source>Catch Legendary Pokémon</source>
+          <target state="new">Catch Legendary Pokémon</target>
         </trans-unit>
         <trans-unit id="ActivityFleePokemon" translate="yes" xml:space="preserve">
           <source>Pokémon Fled</source>

diff --git a/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.pt-BR.xlf b/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.pt-BR.xlf
@@ -369,8 +369,8 @@ Abrir a página com os arquivos de instalação para instalação manual?</targe
           <target state="new">Pokémon Caught</target>
         </trans-unit>
         <trans-unit id="ActivityCatchLegendPokemon" translate="yes" xml:space="preserve">
-          <source>Catch Legend Pokémon</source>
-          <target state="new">Catch Legend Pokémon</target>
+          <source>Catch Legendary Pokémon</source>
+          <target state="new">Catch Legendary Pokémon</target>
         </trans-unit>
         <trans-unit id="ActivityFleePokemon" translate="yes" xml:space="preserve">
           <source>Pokémon Fled</source>

diff --git a/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.pt-PT.xlf b/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.pt-PT.xlf
@@ -369,8 +369,8 @@ Abrir a página com os arquivos de instalação para instalação manual?</targe
           <target state="new">Pokémon Caught</target>
         </trans-unit>
         <trans-unit id="ActivityCatchLegendPokemon" translate="yes" xml:space="preserve">
-          <source>Catch Legend Pokémon</source>
-          <target state="new">Catch Legend Pokémon</target>
+          <source>Catch Legendary Pokémon</source>
+          <target state="new">Catch Legendary Pokémon</target>
         </trans-unit>
         <trans-unit id="ActivityFleePokemon" translate="yes" xml:space="preserve">
           <source>Pokémon Fled</source>

diff --git a/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.ru.xlf b/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.ru.xlf
@@ -370,8 +370,8 @@ Open page with installation files for manual install?</source>
           <target state="new">Pokémon Caught</target>
         </trans-unit>
         <trans-unit id="ActivityCatchLegendPokemon" translate="yes" xml:space="preserve">
-          <source>Catch Legend Pokémon</source>
-          <target state="new">Catch Legend Pokémon</target>
+          <source>Catch Legendary Pokémon</source>
+          <target state="new">Catch Legendary Pokémon</target>
         </trans-unit>
         <trans-unit id="ActivityFleePokemon" translate="yes" xml:space="preserve">
           <source>Pokémon Fled</source>

diff --git a/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.sk.xlf b/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.sk.xlf
@@ -368,8 +368,8 @@ Open page with installation files for manual install?</target>
           <target state="new">Pokémon Caught</target>
         </trans-unit>
         <trans-unit id="ActivityCatchLegendPokemon" translate="yes" xml:space="preserve">
-          <source>Catch Legend Pokémon</source>
-          <target state="new">Catch Legend Pokémon</target>
+          <source>Catch Legendary Pokémon</source>
+          <target state="new">Catch Legendary Pokémon</target>
         </trans-unit>
         <trans-unit id="ActivityFleePokemon" translate="yes" xml:space="preserve">
           <source>Pokémon Fled</source>

diff --git a/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.tr.xlf b/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.tr.xlf
@@ -369,8 +369,8 @@ Elle yükleme için yükleme dosyaları sayfası açılsın mı?</target>
           <target state="new">Pokémon Caught</target>
         </trans-unit>
         <trans-unit id="ActivityCatchLegendPokemon" translate="yes" xml:space="preserve">
-          <source>Catch Legend Pokémon</source>
-          <target state="new">Catch Legend Pokémon</target>
+          <source>Catch Legendary Pokémon</source>
+          <target state="new">Catch Legendary Pokémon</target>
         </trans-unit>
         <trans-unit id="ActivityFleePokemon" translate="yes" xml:space="preserve">
           <source>Pokémon Fled</source>

diff --git a/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.zh-CN.xlf b/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.zh-CN.xlf
@@ -369,8 +369,9 @@ Open page with installation files for manual install?</source>
           <target state="translated">捕抓的宝可梦</target>
         </trans-unit>
         <trans-unit id="ActivityCatchLegendPokemon" translate="yes" xml:space="preserve">
-          <source>Catch Legend Pokémon</source>
-          <target state="translated">捕抓传奇宝可梦</target>
+          <source>Catch Legendary Pokémon</source>
+          <target state="needs-review-translation">捕抓传奇宝可梦</target>
+          <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
         </trans-unit>
         <trans-unit id="ActivityFleePokemon" translate="yes" xml:space="preserve">
           <source>Pokémon Fled</source>

diff --git a/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.zh-HK.xlf b/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.zh-HK.xlf
@@ -730,8 +730,8 @@ Open page with installation files for manual install?</target>
           <target state="new">Pokémon Caught</target>
         </trans-unit>
         <trans-unit id="ActivityCatchLegendPokemon" translate="yes" xml:space="preserve">
-          <source>Catch Legend Pokémon</source>
-          <target state="new">Catch Legend Pokémon</target>
+          <source>Catch Legendary Pokémon</source>
+          <target state="new">Catch Legendary Pokémon</target>
         </trans-unit>
         <trans-unit id="ActivityFleePokemon" translate="yes" xml:space="preserve">
           <source>Pokémon Fled</source>

diff --git a/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.zh-TW.xlf b/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.zh-TW.xlf
@@ -135,8 +135,9 @@ Open page with installation files for manual install?</source>
           <target state="translated">抓到精靈寶可夢</target>
         </trans-unit>
         <trans-unit id="ActivityCatchLegendPokemon" translate="yes" xml:space="preserve">
-          <source>Catch Legend Pokémon</source>
-          <target state="translated">捕捉傳說中的精靈寶可夢</target>
+          <source>Catch Legendary Pokémon</source>
+          <target state="needs-review-translation">捕捉傳說中的精靈寶可夢</target>
+          <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
         </trans-unit>
         <trans-unit id="ActivityFleePokemon" translate="yes" xml:space="preserve">
           <source>Pokémon Fled</source>

diff --git a/PokemonGo-UWP/PokemonGo-UWP.csproj b/PokemonGo-UWP/PokemonGo-UWP.csproj
@@ -189,6 +189,7 @@
     <Content Include="Assets\Icons\pokestop_far_inactive.png" />
     <Content Include="Assets\Icons\pokestop_near.png" />
     <Content Include="Assets\Icons\pokestop_near_inactive.png" />
+    <Content Include="Assets\Icons\RecenterMapIcon.png" />
     <Content Include="Assets\Icons\stardust_painted.png" />
     <Content Include="Assets\Icons\stardust_vector.png" />
     <Content Include="Assets\Items\Egg.png" />

diff --git a/PokemonGo-UWP/Strings/en-US/CodeResources.resw b/PokemonGo-UWP/Strings/en-US/CodeResources.resw
@@ -213,7 +213,7 @@ Open page with installation files for manual install?</value>
     <value>Pokémon Caught</value>
   </data>
   <data name="ActivityCatchLegendPokemon" xml:space="preserve">
-    <value>Catch Legend Pokémon</value>
+    <value>Catch Legendary Pokémon</value>
   </data>
   <data name="ActivityFleePokemon" xml:space="preserve">
     <value>Pokémon Fled</value>
@@ -278,4 +278,4 @@ Open page with installation files for manual install?</value>
   <data name="ActivityDefeatGymLeader" xml:space="preserve">
     <value>Defeat Gym Leader</value>
   </data>
-</root>
+</root>
diff --git a/PokemonGo-UWP/Utils/Game/Converters.cs b/PokemonGo-UWP/Utils/Game/Converters.cs
@@ -255,11 +255,9 @@ public class PlayerTeamToTeamColorBrushConverter : IValueConverter
         public object Convert(object value, Type targetType, object parameter, string language)
         {
             var teamColor = (TeamColor) value;
-            var currentTime = int.Parse(DateTime.Now.ToString("HH"));
-            var noTeamColor = currentTime > 7 && currentTime < 19 ? Colors.Black : Colors.White;
             return new SolidColorBrush(teamColor == TeamColor.Neutral
-                ? noTeamColor
-                : teamColor == TeamColor.Blue ? Colors.Blue : teamColor == TeamColor.Red ? Colors.Red : Colors.Yellow);
+                ? Color.FromArgb(255, 26, 237, 213)
+                : teamColor == TeamColor.Blue ? Color.FromArgb(255, 36, 176, 253) : teamColor == TeamColor.Red ? Color.FromArgb(255, 237, 90, 90) : Color.FromArgb(255, 254, 225, 63));
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, string language)