Merge pull request #27 from ST-Apps/master

Repos update from ST-Apps

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,13 +1,13 @@
-#Fixes:
+### Fixes:
 
 - Fix 1
 - Fix 2
 
-#Changes:
+### Changes:
 
 - Change 1
 - Change 2
 
-#Change details:
+### Change details:
 
-#Other informations:
+### Other informations:

PokemonGo-UWP/App.xaml

@@ -14,6 +14,7 @@
             </ResourceDictionary.MergedDictionaries>
 
             <utils:PokemonIdToPokemonSpriteConverter x:Key="PokemonIdToPokemonSpriteConverter" />
+            <utils:PokemonTypeTranslationConverter x:Key="PokemonTypeTranslationConverter" />
             <utils:EmptyConverter x:Key="EmptyConverter" />
             <utils:PlayerTeamToTeamColorBrushConverter x:Key="PlayerTeamToTeamColorBrushConverter" />
             <utils:EncounterBackgroundToBackgroundImageConverter x:Key="EncounterBackgroundToBackgroundImageConverter" />
@@ -32,6 +33,7 @@
             <utils:PokemonSortingModesToSortingModesListConverter
                 x:Key="PokemonSortingModesToSortingModesListConverter" />
             <utils:PokemonSortingModesToIconConverter x:Key="PokemonSortingModesToIconConverter" />
+            <utils:PokemonSortingModesTranslationConverter x:Key="PokemonSortingModesTranslationConverter" />
             <utils:EggDataToEggProgressConverter x:Key="EggDataToEggProgressConverter" />
             <utils:ItemToItemDescriptionConverter x:Key="ItemToItemDescriptionConverter" />
             <utils:IncubatorUsagesCountToUsagesTextConverter x:Key="IncubatorUsagesCountToUsagesTextConverter" />

PokemonGo-UWP/App.xaml.cs

@@ -146,11 +146,9 @@ private async void CatchablePokemons_CollectionChanged(object sender, NotifyColl
         /// <param name="prelaunchActivated"></param>
         /// <returns></returns>
         public override Task OnSuspendingAsync(object s, SuspendingEventArgs e, bool prelaunchActivated)
-        {
+        {            
             GameClient.PokemonsInventory.CollectionChanged -= PokemonsInventory_CollectionChanged;
             GameClient.CatchablePokemons.CollectionChanged -= CatchablePokemons_CollectionChanged;
-            // TODO: Probably not needed as stated here: https://blogs.windows.com/buildingapps/2016/05/24/how-to-prevent-screen-locks-in-your-uwp-apps/
-            _displayRequest.RequestRelease();
             if (SettingsService.Instance.LiveTileMode == LiveTileModes.Peek)
             {
                 LiveTileUpdater.EnableNotificationQueue(false);
@@ -168,8 +166,7 @@ public override async Task OnInitializeAsync(IActivatedEventArgs args)
 #if DEBUG
             // Init logger
             Logger.SetLogger(new ConsoleLogger(LogLevel.Info));
-#endif
-
+#endif            
             // If we have a phone contract, hide the status bar
             if (ApiInformation.IsApiContractPresent("Windows.Phone.PhoneContract", 1, 0))
             {

PokemonGo-UWP/Entities/FortDataWrapper.cs

@@ -37,6 +37,9 @@ public FortDataStatus FortDataStatus {
                 if(CooldownCompleteTimestampMs > DateTime.UtcNow.ToUnixTime())
                     retVal |= FortDataStatus.Cooldown;
 
+                if(_fortData.LureInfo != null && _fortData.LureInfo.LureExpiresTimestampMs > DateTime.UtcNow.ToUnixTime())
+                    retVal |= FortDataStatus.Lure;
+
                 return retVal;
             }
         }

PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.cs.xlf

@@ -643,6 +643,14 @@ Chcete otevřít stránku se soubory pro manuální instalaci? </target>
           <source>Remember Map Zoom</source>
           <target state="new">Remember Map Zoom</target>
         </trans-unit>
+        <trans-unit id="EggDetailButtonTextBlock.Text" translate="yes" xml:space="preserve">
+          <source>START INCUBATION</source>
+          <target state="new">START INCUBATION</target>
+        </trans-unit>
+        <trans-unit id="EggDetailTextBlock.Text" translate="yes" xml:space="preserve">
+          <source>Use an incubator to incubate the Egg.</source>
+          <target state="new">Use an incubator to incubate the Egg.</target>
+        </trans-unit>
       </group>
     </body>
   </file>

PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.de.xlf

@@ -140,7 +140,7 @@
         </trans-unit>
         <trans-unit id="BadgeHatchedTotalDescription" translate="yes" xml:space="preserve">
           <source>Hatched {x} Pokemon</source>
-          <target state="translated">{x} Pokemon geschlüpft</target>
+          <target state="translated">{x} Pokémon geschlüpft</target>
         </trans-unit>
         <trans-unit id="BadgePikachuDescription" translate="yes" xml:space="preserve">
           <source>Caught {0} Pikachu</source>
@@ -351,11 +351,11 @@ Seite zu den Dateien für manuelle Installation öffnen?</target>
         </trans-unit>
         <trans-unit id="TransferPokemonSuccessText" translate="yes" xml:space="preserve">
           <source>Transfer succeeded! Got a {0} Candy from the Professor.</source>
-          <target state="translated">Transfer erfolgreich! Du hast ein {0} Bonbon vom Professor erhalten.</target>
+          <target state="translated">Erfolgreich verschickt! {0}-Bonbon vom Professor erhalten!</target>
         </trans-unit>
         <trans-unit id="TransferPokemonWarningText" translate="yes" xml:space="preserve">
           <source>You can't take it back after it's transferred to the Professor. Do you really want to transfer {0} to the Professor?</source>
-          <target state="translated">Nach dem Transfer zum Professor kannst du es nicht mehr zurückerhalten. Willst du {0} wirklich zum Professor transferieren?</target>
+          <target state="translated">Nachdem du es an den Professor geschickt hast, kannst du es nicht zurückholen. Möchtest du {0} wirklich an den Professor schicken?</target>
         </trans-unit>
         <trans-unit id="LoginExpired" translate="yes" xml:space="preserve">
           <source>Previous login expired.</source>
@@ -458,6 +458,31 @@ Seite zu den Dateien für manuelle Installation öffnen?</target>
           <source>Defeat Gym Leader</source>
           <target state="translated">Besiege Arenen Anführer</target>
         </trans-unit>
+        <trans-unit id="Combat" translate="yes" xml:space="preserve">
+          <source>Combat</source>
+          <target state="needs-review-translation">Angiffspunkte</target>
+        </trans-unit>
+        <trans-unit id="Date" translate="yes" xml:space="preserve">
+          <source>Date</source>
+          <target state="translated">Datum</target>
+        </trans-unit>
+        <trans-unit id="Fav" translate="yes" xml:space="preserve">
+          <source>Favorite</source>
+          <target state="translated">Favorit</target>
+        </trans-unit>
+        <trans-unit id="Health" translate="yes" xml:space="preserve">
+          <source>Health</source>
+          <target state="translated">Gesundheit</target>
+        </trans-unit>
+        <trans-unit id="Name" translate="yes" xml:space="preserve">
+          <source>Name</source>
+          <target state="translated">Name</target>
+        </trans-unit>
+        <trans-unit id="Number" translate="yes" xml:space="preserve">
+          <source>Number</source>
+          <target state="translated">Nummer
+</target>
+        </trans-unit>
       </group>
     </body>
   </file>
@@ -489,7 +514,7 @@ Seite zu den Dateien für manuelle Installation öffnen?</target>
         </trans-unit>
         <trans-unit id="NearbyPokemonTextBlock.Text" translate="yes" xml:space="preserve">
           <source>nearby</source>
-          <target state="translated">in der Nähe</target>
+          <target state="translated">GESICHTETE POKÉMON</target>
         </trans-unit>
         <trans-unit id="OutOfRangeTextBlock.Text" translate="yes" xml:space="preserve">
           <source>THIS POKÉSTOP IS TOO FAR AWAY</source>
@@ -582,11 +607,11 @@ Seite zu den Dateien für manuelle Installation öffnen?</target>
         </trans-unit>
         <trans-unit id="StartDateTextBlock.Text" translate="yes" xml:space="preserve">
           <source>START DATE</source>
-          <target state="translated">BEGINN</target>
+          <target state="translated">STARTDATUM</target>
         </trans-unit>
         <trans-unit id="IncubatorsTextBlock.Text" translate="yes" xml:space="preserve">
           <source>INCUBATORS</source>
-          <target state="translated">Brutmaschine</target>
+          <target state="translated">BRUTMASCHINEN</target>
         </trans-unit>
         <trans-unit id="SettingsUseNianticMapTextBlock.Text" translate="yes" xml:space="preserve">
           <source>Use Niantic Map</source>
@@ -618,11 +643,11 @@ Seite zu den Dateien für manuelle Installation öffnen?</target>
         </trans-unit>
         <trans-unit id="StardustTextBlock.Text" translate="yes" xml:space="preserve">
           <source>STARDUST</source>
-          <target state="translated">STERNSTAUB</target>
+          <target state="translated">STERNENSTAUB</target>
         </trans-unit>
         <trans-unit id="CandyTextBlock.Text" translate="yes" xml:space="preserve">
           <source> CANDY</source>
-          <target state="translated">BONBON</target>
+          <target state="translated">-BONBON</target>
           <note from="MultilingualBuild" annotates="source" priority="2">Watch out: space before the word!</note>
         </trans-unit>
         <trans-unit id="EvolveButton.Content" translate="yes" xml:space="preserve">
@@ -631,16 +656,24 @@ Seite zu den Dateien für manuelle Installation öffnen?</target>
         </trans-unit>
         <trans-unit id="PowerUpButton.Content" translate="yes" xml:space="preserve">
           <source>POWER UP</source>
-          <target state="needs-review-translation">POWER UP</target>
+          <target state="translated">POWER-UP</target>
         </trans-unit>
         <trans-unit id="TransferButton.Content" translate="yes" xml:space="preserve">
           <source>TRANSFER</source>
-          <target state="translated">TRANSFER</target>
+          <target state="translated">VERSCHICKEN</target>
         </trans-unit>
         <trans-unit id="SettingsRememberMapZoomTextBlock" translate="yes" xml:space="preserve">
           <source>Remember Map Zoom</source>
           <target state="translated">Speichere Karten Zoom</target>
         </trans-unit>
+        <trans-unit id="EggDetailButtonTextBlock.Text" translate="yes" xml:space="preserve">
+          <source>START INCUBATION</source>
+          <target state="translated">AUSBRÜTEN BEGINNEN</target>
+        </trans-unit>
+        <trans-unit id="EggDetailTextBlock.Text" translate="yes" xml:space="preserve">
+          <source>Use an incubator to incubate the Egg.</source>
+          <target state="translated">Benutze eine Brutmaschine, um dieses Ei auszubrüten.</target>
+        </trans-unit>
       </group>
     </body>
   </file>
@@ -732,7 +765,7 @@ Seite zu den Dateien für manuelle Installation öffnen?</target>
         </trans-unit>
         <trans-unit id="ItemIncubatorBasicUnlimited" translate="yes" xml:space="preserve">
           <source>Incubator Basic Unlimited</source>
-          <target state="translated">Ei-Brutmaschine (Unbegrenzt)</target>
+          <target state="translated">Ei-Brutmaschine ∞</target>
         </trans-unit>
         <trans-unit id="ItemItemStorageUpgrade" translate="yes" xml:space="preserve">
           <source>Item Storage Upgrade</source>

PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.el.xlf

@@ -642,6 +642,14 @@ Open page with installation files for manual install?</source>
           <source>Remember Map Zoom</source>
           <target state="new">Remember Map Zoom</target>
         </trans-unit>
+        <trans-unit id="EggDetailButtonTextBlock.Text" translate="yes" xml:space="preserve">
+          <source>START INCUBATION</source>
+          <target state="new">START INCUBATION</target>
+        </trans-unit>
+        <trans-unit id="EggDetailTextBlock.Text" translate="yes" xml:space="preserve">
+          <source>Use an incubator to incubate the Egg.</source>
+          <target state="new">Use an incubator to incubate the Egg.</target>
+        </trans-unit>
       </group>
     </body>
   </file>

PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.es.xlf

@@ -640,6 +640,14 @@ Open page with installation files for manual install?</source>
           <source>TRANSFER</source>
           <target state="translated">Transferir</target>
         </trans-unit>
+        <trans-unit id="EggDetailButtonTextBlock.Text" translate="yes" xml:space="preserve">
+          <source>START INCUBATION</source>
+          <target state="new">START INCUBATION</target>
+        </trans-unit>
+        <trans-unit id="EggDetailTextBlock.Text" translate="yes" xml:space="preserve">
+          <source>Use an incubator to incubate the Egg.</source>
+          <target state="new">Use an incubator to incubate the Egg.</target>
+        </trans-unit>
       </group>
     </body>
   </file>

PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.fi.xlf

@@ -815,6 +815,14 @@ Open page with installation files for manual install?</target>
           <source>Remember Map Zoom</source>
           <target state="new">Remember Map Zoom</target>
         </trans-unit>
+        <trans-unit id="EggDetailButtonTextBlock.Text" translate="yes" xml:space="preserve">
+          <source>START INCUBATION</source>
+          <target state="new">START INCUBATION</target>
+        </trans-unit>
+        <trans-unit id="EggDetailTextBlock.Text" translate="yes" xml:space="preserve">
+          <source>Use an incubator to incubate the Egg.</source>
+          <target state="new">Use an incubator to incubate the Egg.</target>
+        </trans-unit>
       </group>
     </body>
   </file>

PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.fr.xlf

@@ -644,6 +644,14 @@ Ouvrir la page avec les fichiers d'installation pour une installation manuelle ?
           <source>Remember Map Zoom</source>
           <target state="translated">Mémoriser le zoom de la carte</target>
         </trans-unit>
+        <trans-unit id="EggDetailButtonTextBlock.Text" translate="yes" xml:space="preserve">
+          <source>START INCUBATION</source>
+          <target state="new">START INCUBATION</target>
+        </trans-unit>
+        <trans-unit id="EggDetailTextBlock.Text" translate="yes" xml:space="preserve">
+          <source>Use an incubator to incubate the Egg.</source>
+          <target state="new">Use an incubator to incubate the Egg.</target>
+        </trans-unit>
       </group>
     </body>
   </file>
@@ -1056,8 +1064,7 @@ Ouvrir la page avec les fichiers d'installation pour une installation manuelle ?
         </trans-unit>
         <trans-unit id="Ivysaur" translate="yes" xml:space="preserve">
           <source>Ivysaur</source>
-          <target state="translated">Herbizarre
-</target>
+          <target state="translated">Herbizarre</target>
         </trans-unit>
         <trans-unit id="Jigglypuff" translate="yes" xml:space="preserve">
           <source>Jigglypuff</source>
@@ -1257,9 +1264,7 @@ Ouvrir la page avec les fichiers d'installation pour une installation manuelle ?
         </trans-unit>
         <trans-unit id="Poliwag" translate="yes" xml:space="preserve">
           <source>Poliwag</source>
-          <target state="translated">Ptitard
-
-</target>
+          <target state="translated">Ptitard</target>
         </trans-unit>
         <trans-unit id="Poliwhirl" translate="yes" xml:space="preserve">
           <source>Poliwhirl</source>
@@ -1291,12 +1296,11 @@ Ouvrir la page avec les fichiers d'installation pour une installation manuelle ?
         </trans-unit>
         <trans-unit id="Rapidash" translate="yes" xml:space="preserve">
           <source>Rapidash</source>
-          <target state="translated">Galopa </target>
+          <target state="translated">Galopa</target>
         </trans-unit>
         <trans-unit id="Raticate" translate="yes" xml:space="preserve">
           <source>Raticate</source>
-          <target state="translated">Rattatac
-</target>
+          <target state="translated">Rattatac</target>
         </trans-unit>
         <trans-unit id="Rattata" translate="yes" xml:space="preserve">
           <source>Rattata</source>
@@ -1481,8 +1485,7 @@ Ouvrir la page avec les fichiers d'installation pour une installation manuelle ?
         </trans-unit>
         <trans-unit id="FlameWheel" translate="yes" xml:space="preserve">
           <source>Flame Wheel</source>
-          <target state="translated">Roue de Feu
-</target>
+          <target state="translated">Roue de Feu</target>
         </trans-unit>
         <trans-unit id="HyperBeam" translate="yes" xml:space="preserve">
           <source>Hyper Beam</source>
@@ -1594,8 +1597,7 @@ Ouvrir la page avec les fichiers d'installation pour une installation manuelle ?
         </trans-unit>
         <trans-unit id="AirSlash" translate="yes" xml:space="preserve">
           <source>Air Slash</source>
-          <target state="translated">Lame d'Air
-</target>
+          <target state="translated">Lame d'Air</target>
         </trans-unit>
         <trans-unit id="AncientPower" translate="yes" xml:space="preserve">
           <source>Ancient Power</source>
@@ -2052,8 +2054,7 @@ Ouvrir la page avec les fichiers d'installation pour une installation manuelle ?
         </trans-unit>
         <trans-unit id="SludgeBomb" translate="yes" xml:space="preserve">
           <source>Sludge Bomb</source>
-          <target state="translated">Bomb-Beurk
-</target>
+          <target state="translated">Bomb-Beurk</target>
         </trans-unit>
         <trans-unit id="SludgeWave" translate="yes" xml:space="preserve">
           <source>Sludge Wave</source>
@@ -2182,4 +2183,4 @@ Ouvrir la page avec les fichiers d'installation pour une installation manuelle ?
       </group>
     </body>
   </file>
-</xliff>
+</xliff>