From 741874d3821cc63917adfbe53123f8117ef09166 Mon Sep 17 00:00:00 2001
From: Oliver Hauff <ochauu@hotmail.com>
Date: Mon, 2 May 2022 21:56:32 +0200
Subject: [PATCH] Version 3.0.297

---
 .../Properties/AndroidManifest.xml            |  2 +-
 LastenradBayern/TINK.iOS/Info.plist           |  4 +--
 .../TINK/View/Account/AccountPage.xaml        | 15 ++++++-----
 .../Properties/AndroidManifest.xml            |  2 +-
 Meinkonrad/TINK.iOS/Info.plist                |  4 +--
 Meinkonrad/TINK/View/Account/AccountPage.xaml |  2 +-
 .../Properties/AndroidManifest.xml            |  2 +-
 TINK/TINK.iOS/Info.plist                      |  4 +--
 TINK/TINK/View/Account/AccountPage.xaml       | 15 ++++++-----
 TINK/TINK/View/Login/LoginPage.xaml           |  2 +-
 TINKLib/Model/WhatsNew.cs                     |  2 +-
 .../AppResources.Designer.cs                  | 27 ++++++++++++++++---
 .../AppResources.de.resx                      |  9 ++++---
 .../MultilingualResources/AppResources.resx   |  7 ++---
 TINKLib/MultilingualResources/TINKLib.de.xlf  | 14 +++++-----
 15 files changed, 68 insertions(+), 43 deletions(-)

diff --git a/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml b/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml
index 14d78ec..3774b03 100644
--- a/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml
+++ b/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.LastenradBayern" android:versionName="3.0.294" android:versionCode="294">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.LastenradBayern" android:versionName="3.0.297" android:versionCode="297">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="31" />
 	<!-- Google Maps related permissions -->
 	<!-- Permission to receive remote notifications from Google Play Services -->
diff --git a/LastenradBayern/TINK.iOS/Info.plist b/LastenradBayern/TINK.iOS/Info.plist
index 470ac84..7226753 100644
--- a/LastenradBayern/TINK.iOS/Info.plist
+++ b/LastenradBayern/TINK.iOS/Info.plist
@@ -53,8 +53,8 @@
 	<key>CFBundleDisplayName</key>
 	<string>LastenradBayern</string>
 	<key>CFBundleVersion</key>
-	<string>294</string>
+	<string>297</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.294</string>
+	<string>3.0.297</string>
 </dict>
 </plist>
diff --git a/LastenradBayern/TINK/View/Account/AccountPage.xaml b/LastenradBayern/TINK/View/Account/AccountPage.xaml
index 3655cd9..9631f32 100644
--- a/LastenradBayern/TINK/View/Account/AccountPage.xaml
+++ b/LastenradBayern/TINK/View/Account/AccountPage.xaml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:d="http://xamarin.com/schemas/2014/forms/design"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d"
-             x:Class="TINK.View.Account.AccountPage">
+            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+            xmlns:d="http://xamarin.com/schemas/2014/forms/design"
+            xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+            xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"             
+            mc:Ignorable="d"
+            x:Class="TINK.View.Account.AccountPage">
     <ContentPage.Content>
         <Frame>
             <StackLayout>
@@ -13,10 +14,10 @@
                         <Label Text="{Binding LoggedInInfo}" />
                         <Label IsVisible="{Binding IsBookingStateInfoVisible}"
                                 Text="{Binding BookingStateInfo}" />
-                        <Button Text="Persönliche Daten Verwalten"
+                        <Button Text="{x:Static resources:AppResources.MessageAccountPageManagePersonalData}" 
                                 Command="{Binding OnManageAccount}"
                                 IsEnabled="{Binding IsLogoutPossible}"/>
-                        <Button Text="Abmelden"
+                        <Button Text="{x:Static resources:AppResources.MessageAccountPageManageLogout}" 
                                 Command="{Binding OnLogoutRequest}"
                                 IsEnabled="{Binding IsLogoutPossible}"/>
                     </StackLayout>
diff --git a/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml b/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
index d321fc8..ee53cb0 100644
--- a/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
+++ b/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.Meinkonrad" android:versionName="3.0.294" android:versionCode="294">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.Meinkonrad" android:versionName="3.0.297" android:versionCode="297">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="31" />
 	<!-- Google Maps related permissions -->
 	<!-- Permission to receive remote notifications from Google Play Services -->
diff --git a/Meinkonrad/TINK.iOS/Info.plist b/Meinkonrad/TINK.iOS/Info.plist
index e81b18d..2ca97af 100644
--- a/Meinkonrad/TINK.iOS/Info.plist
+++ b/Meinkonrad/TINK.iOS/Info.plist
@@ -53,8 +53,8 @@
 	<key>CFBundleDisplayName</key>
 	<string>Mein konrad</string>
 	<key>CFBundleVersion</key>
-	<string>294</string>
+	<string>297</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.294</string>
+	<string>3.0.297</string>
 </dict>
 </plist>
diff --git a/Meinkonrad/TINK/View/Account/AccountPage.xaml b/Meinkonrad/TINK/View/Account/AccountPage.xaml
index ee0345e..9631f32 100644
--- a/Meinkonrad/TINK/View/Account/AccountPage.xaml
+++ b/Meinkonrad/TINK/View/Account/AccountPage.xaml
@@ -17,7 +17,7 @@
                         <Button Text="{x:Static resources:AppResources.MessageAccountPageManagePersonalData}" 
                                 Command="{Binding OnManageAccount}"
                                 IsEnabled="{Binding IsLogoutPossible}"/>
-                        <Button Text="{x:Static resources:AppResources.MessageAccountPageManageLogin}" 
+                        <Button Text="{x:Static resources:AppResources.MessageAccountPageManageLogout}" 
                                 Command="{Binding OnLogoutRequest}"
                                 IsEnabled="{Binding IsLogoutPossible}"/>
                     </StackLayout>
diff --git a/TINK/TINK.Android/Properties/AndroidManifest.xml b/TINK/TINK.Android/Properties/AndroidManifest.xml
index 5307823..1c2371b 100644
--- a/TINK/TINK.Android/Properties/AndroidManifest.xml
+++ b/TINK/TINK.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="preferExternal" package="com.hauffware.sharee" android:versionName="3.0.294" android:versionCode="294">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="preferExternal" package="com.hauffware.sharee" android:versionName="3.0.297" android:versionCode="297">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="31" />
 	<!-- Google Maps related permissions -->
 	<!-- Permission to receive remote notifications from Google Play Services -->
diff --git a/TINK/TINK.iOS/Info.plist b/TINK/TINK.iOS/Info.plist
index 4607300..b7b04f4 100644
--- a/TINK/TINK.iOS/Info.plist
+++ b/TINK/TINK.iOS/Info.plist
@@ -53,8 +53,8 @@
 	<key>CFBundleDisplayName</key>
 	<string>sharee.bike</string>
 	<key>CFBundleVersion</key>
-	<string>294</string>
+	<string>297</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.294</string>
+	<string>3.0.297</string>
 </dict>
 </plist>
diff --git a/TINK/TINK/View/Account/AccountPage.xaml b/TINK/TINK/View/Account/AccountPage.xaml
index 3655cd9..9631f32 100644
--- a/TINK/TINK/View/Account/AccountPage.xaml
+++ b/TINK/TINK/View/Account/AccountPage.xaml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:d="http://xamarin.com/schemas/2014/forms/design"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d"
-             x:Class="TINK.View.Account.AccountPage">
+            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+            xmlns:d="http://xamarin.com/schemas/2014/forms/design"
+            xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+            xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"             
+            mc:Ignorable="d"
+            x:Class="TINK.View.Account.AccountPage">
     <ContentPage.Content>
         <Frame>
             <StackLayout>
@@ -13,10 +14,10 @@
                         <Label Text="{Binding LoggedInInfo}" />
                         <Label IsVisible="{Binding IsBookingStateInfoVisible}"
                                 Text="{Binding BookingStateInfo}" />
-                        <Button Text="Persönliche Daten Verwalten"
+                        <Button Text="{x:Static resources:AppResources.MessageAccountPageManagePersonalData}" 
                                 Command="{Binding OnManageAccount}"
                                 IsEnabled="{Binding IsLogoutPossible}"/>
-                        <Button Text="Abmelden"
+                        <Button Text="{x:Static resources:AppResources.MessageAccountPageManageLogout}" 
                                 Command="{Binding OnLogoutRequest}"
                                 IsEnabled="{Binding IsLogoutPossible}"/>
                     </StackLayout>
diff --git a/TINK/TINK/View/Login/LoginPage.xaml b/TINK/TINK/View/Login/LoginPage.xaml
index ef3d3d4..ece9c74 100644
--- a/TINK/TINK/View/Login/LoginPage.xaml
+++ b/TINK/TINK/View/Login/LoginPage.xaml
@@ -20,7 +20,7 @@
                         <Entry 
                                 Placeholder="{x:Static resources:AppResources.MarkingLoginPasswordPlaceholder}" 
                                 AutomationId="password_text"
-                                IsPassword="true" 
+                                IsPassword="true"                             
                                 x:Name="PasswordEntry" 
                                 Text="{Binding Password}"
                                 IsEnabled="{Binding IsLoggedOut}"/>
diff --git a/TINKLib/Model/WhatsNew.cs b/TINKLib/Model/WhatsNew.cs
index 9722a00..04329d8 100644
--- a/TINKLib/Model/WhatsNew.cs
+++ b/TINKLib/Model/WhatsNew.cs
@@ -516,7 +516,7 @@ namespace TINK.Model
                     AppResources.ChangeLog3_0_290
                 },
                 {
-                    new Version(3, 0, 294),
+                    new Version(3, 0, 297),
                     AppResources.ChangeLog3_0_293
                 }
         };
diff --git a/TINKLib/MultilingualResources/AppResources.Designer.cs b/TINKLib/MultilingualResources/AppResources.Designer.cs
index c9f317d..48734fc 100644
--- a/TINKLib/MultilingualResources/AppResources.Designer.cs
+++ b/TINKLib/MultilingualResources/AppResources.Designer.cs
@@ -1036,7 +1036,8 @@ namespace TINK.MultilingualResources {
         /// <summary>
         ///   Looks up a localized string similar to Target Android framework set from 11.0  to 12.0 (Level 31 S).
         ///NuGet packages updated.
-        ///Started adding support for new lock type..
+        ///Started adding support for new lock type.
+        ///Minor bugfixes..
         /// </summary>
         public static string ChangeLog3_0_293 {
             get {
@@ -1385,6 +1386,24 @@ namespace TINK.MultilingualResources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Error returning bike!.
+        /// </summary>
+        public static string ErrorReturnBikeTitle {
+            get {
+                return ResourceManager.GetString("ErrorReturnBikeTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Connection error when returning the bike!.
+        /// </summary>
+        public static string ErrorReturnBikeNoWebTitle {
+            get {
+                return ResourceManager.GetString("ErrorReturnBikeNoWebTitle", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Error returning bike!.
         /// </summary>
@@ -1794,11 +1813,11 @@ namespace TINK.MultilingualResources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Log in.
+        ///   Looks up a localized string similar to Log out.
         /// </summary>
-        public static string MessageAccountPageManageLogin {
+        public static string MessageAccountPageManageLogout {
             get {
-                return ResourceManager.GetString("MessageAccountPageManageLogin", resourceCulture);
+                return ResourceManager.GetString("MessageAccountPageManageLogout", resourceCulture);
             }
         }
         
diff --git a/TINKLib/MultilingualResources/AppResources.de.resx b/TINKLib/MultilingualResources/AppResources.de.resx
index 3bae05e..6e1bed9 100644
--- a/TINKLib/MultilingualResources/AppResources.de.resx
+++ b/TINKLib/MultilingualResources/AppResources.de.resx
@@ -847,8 +847,8 @@ Hinweise, um das Verbinden Schlosses zu erleichtern, falls dies nicht beim erste
   <data name="ChangeLog3_0_284" xml:space="preserve">
     <value>Anzeige einer benutzerfreundlichen Meldung, wenn die Authentifizierung abgelaufen ist.</value>
   </data>
-  <data name="MessageAccountPageManageLogin" xml:space="preserve">
-    <value>Anmelden</value>
+  <data name="MessageAccountPageManageLogout" xml:space="preserve">
+    <value>Abmelden</value>
   </data>
   <data name="MessageAccountPageManagePersonalData" xml:space="preserve">
     <value>Persönliche Daten Verwalten</value>
@@ -870,9 +870,10 @@ Activity Indicator zu Konto-Verwaltungsseiten hinzugefügt und Logging erweitert
     <value>Der aktuelle Standort wird mit höherer Genauigkeit abgefragt.</value>
   </data>
   <data name="ChangeLog3_0_293" xml:space="preserve">
-    <value>Target Android framework von 11.0  auf 12.0 (Level 31 S) gesetzt.
+    <value>Target Android Framework von 11.0  auf 12.0 (Level 31 S) gesetzt.
 NuGet packages aktualisiert.
-Entwurf Untertützung eines neuen Schlosstyps hinzugefügt.
+Entwurf Unterstützung eines neuen Schlosstyps hinzugefügt.
+Kleinere Fehlerbehebungen.
 </value>
   </data>
 </root>
\ No newline at end of file
diff --git a/TINKLib/MultilingualResources/AppResources.resx b/TINKLib/MultilingualResources/AppResources.resx
index 357b6ab..2e78bb6 100644
--- a/TINKLib/MultilingualResources/AppResources.resx
+++ b/TINKLib/MultilingualResources/AppResources.resx
@@ -940,8 +940,8 @@ Hints to ease connecting to lock in case connecting does not succeed on first tr
   <data name="ChangeLog3_0_284" xml:space="preserve">
     <value>User friendly message is shown if authentication expired.</value>
   </data>
-  <data name="MessageAccountPageManageLogin" xml:space="preserve">
-    <value>Log in</value>
+  <data name="MessageAccountPageManageLogout" xml:space="preserve">
+    <value>Log out</value>
   </data>
   <data name="MessageAccountPageManagePersonalData" xml:space="preserve">
     <value>Manage personal data</value>
@@ -965,6 +965,7 @@ Activity indicator added account management pages and logging extended.</value>
   <data name="ChangeLog3_0_293" xml:space="preserve">
     <value>Target Android framework set from 11.0  to 12.0 (Level 31 S).
 NuGet packages updated.
-Started adding support for new lock type.</value>
+Started adding support for new lock type.
+Minor bugfixes.</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/TINKLib/MultilingualResources/TINKLib.de.xlf b/TINKLib/MultilingualResources/TINKLib.de.xlf
index 03f68a9..7464a2e 100644
--- a/TINKLib/MultilingualResources/TINKLib.de.xlf
+++ b/TINKLib/MultilingualResources/TINKLib.de.xlf
@@ -1152,9 +1152,9 @@ Hinweise, um das Verbinden Schlosses zu erleichtern, falls dies nicht beim erste
           <source>User friendly message is shown if authentication expired.</source>
           <target state="translated">Anzeige einer benutzerfreundlichen Meldung, wenn die Authentifizierung abgelaufen ist.</target>
         </trans-unit>
-        <trans-unit id="MessageAccountPageManageLogin" translate="yes" xml:space="preserve">
-          <source>Log in</source>
-          <target state="translated">Anmelden</target>
+        <trans-unit id="MessageAccountPageManageLogout" translate="yes" xml:space="preserve">
+          <source>Log out</source>
+          <target state="translated">Abmelden</target>
         </trans-unit>
         <trans-unit id="MessageAccountPageManagePersonalData" translate="yes" xml:space="preserve">
           <source>Manage personal data</source>
@@ -1185,10 +1185,12 @@ Activity Indicator zu Konto-Verwaltungsseiten hinzugefügt und Logging erweitert
         <trans-unit id="ChangeLog3_0_293" translate="yes" xml:space="preserve">
           <source>Target Android framework set from 11.0  to 12.0 (Level 31 S).
 NuGet packages updated.
-Started adding support for new lock type.</source>
-          <target state="translated">Target Android framework von 11.0  auf 12.0 (Level 31 S) gesetzt.
+Started adding support for new lock type.
+Minor bugfixes.</source>
+          <target state="translated">Target Android Framework von 11.0  auf 12.0 (Level 31 S) gesetzt.
 NuGet packages aktualisiert.
-Entwurf Untertützung eines neuen Schlosstyps hinzugefügt.
+Entwurf Unterstützung eines neuen Schlosstyps hinzugefügt.
+Kleinere Fehlerbehebungen.
 </target>
         </trans-unit>
       </group>