From 73c0d6a9e41cbf655ec2769ad418239735982737 Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <philipp@crocoll.net>
Date: Mon, 23 Oct 2017 20:26:18 +0200
Subject: [PATCH 1/3] removed nuget check for Xamarin Insights which was
 removed. fixed library build type.

---
 src/KeePassLib2Android/KeePassLib2Android.csproj | 7 -------
 src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj   | 3 ---
 src/PluginSdkBinding/PluginSdkBinding.csproj     | 4 ++--
 src/keepass2android/keepass2android.csproj       | 7 -------
 4 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/src/KeePassLib2Android/KeePassLib2Android.csproj b/src/KeePassLib2Android/KeePassLib2Android.csproj
index 5c59160b..c10e7427 100644
--- a/src/KeePassLib2Android/KeePassLib2Android.csproj
+++ b/src/KeePassLib2Android/KeePassLib2Android.csproj
@@ -176,11 +176,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
-  <Import Project="..\packages\Xamarin.Insights.1.11.3\build\MonoAndroid10\Xamarin.Insights.targets" Condition="Exists('..\packages\Xamarin.Insights.1.11.3\build\MonoAndroid10\Xamarin.Insights.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Aktivieren Sie die Wiederherstellung von NuGet-Paketen, um die fehlende Datei herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Xamarin.Insights.1.11.3\build\MonoAndroid10\Xamarin.Insights.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Insights.1.11.3\build\MonoAndroid10\Xamarin.Insights.targets'))" />
-  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj b/src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj
index dba89564..b51f04ce 100644
--- a/src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj
+++ b/src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj
@@ -55,9 +55,6 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xml" />
-    <Reference Include="Xamarin.Insights">
-      <HintPath>..\packages\Xamarin.Insights.1.11.3\lib\MonoAndroid10\Xamarin.Insights.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="database\CheckDatabaseForChanges.cs" />
diff --git a/src/PluginSdkBinding/PluginSdkBinding.csproj b/src/PluginSdkBinding/PluginSdkBinding.csproj
index 0b3273e2..b9916ccd 100644
--- a/src/PluginSdkBinding/PluginSdkBinding.csproj
+++ b/src/PluginSdkBinding/PluginSdkBinding.csproj
@@ -52,9 +52,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedJar Include="..\java\Keepass2AndroidPluginSDK2\app\build\outputs\aar\app-debug.aar">
+    <LibraryProjectZip Include="..\java\Keepass2AndroidPluginSDK2\app\build\outputs\aar\app-debug.aar">
       <Link>Jars\app-debug.aar</Link>
-    </EmbeddedJar>
+    </LibraryProjectZip>
     <None Include="Jars\AboutJars.txt" />
     <None Include="Additions\AboutAdditions.txt" />
   </ItemGroup>
diff --git a/src/keepass2android/keepass2android.csproj b/src/keepass2android/keepass2android.csproj
index c0f8b039..0c32a663 100644
--- a/src/keepass2android/keepass2android.csproj
+++ b/src/keepass2android/keepass2android.csproj
@@ -1710,13 +1710,6 @@
     <AndroidResource Include="Resources\layout\owncloudcredentials.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <Import Project="..\packages\Xamarin.Insights.1.11.3\build\MonoAndroid10\Xamarin.Insights.targets" Condition="Exists('..\packages\Xamarin.Insights.1.11.3\build\MonoAndroid10\Xamarin.Insights.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Aktivieren Sie die Wiederherstellung von NuGet-Paketen, um die fehlende Datei herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Xamarin.Insights.1.11.3\build\MonoAndroid10\Xamarin.Insights.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Insights.1.11.3\build\MonoAndroid10\Xamarin.Insights.targets'))" />
-  </Target>
   <Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
   <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
     <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />

From 553d3021bbc447badb61f5b36afefd0940a2b87f Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <philipp@crocoll.net>
Date: Mon, 23 Oct 2017 20:50:57 +0200
Subject: [PATCH 2/3] removed AncientIconSet from solution file

---
 src/KeePass.sln | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/src/KeePass.sln b/src/KeePass.sln
index 49962a46..4c59d566 100644
--- a/src/KeePass.sln
+++ b/src/KeePass.sln
@@ -23,8 +23,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluginSdkBinding", "PluginS
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZlibAndroid", "ZlibAndroid\ZlibAndroid.csproj", "{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AncientIconSet", "AncientIconSet\AncientIconSet.csproj", "{7F059603-7041-4BBB-93A2-DAA7AB5CA528}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.FtpClient.Android", "netftpandroid\System.Net.FtpClient\System.Net.FtpClient.Android.csproj", "{146FD497-BA03-4740-B6C5-5C84EA8FCDE2}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SamsungPass", "SamsungPass\Xamarin.SamsungPass\SamsungPass\SamsungPass.csproj", "{3A4B8E88-FA9B-4663-BCDA-21C12E3AF98A}"
@@ -249,30 +247,6 @@ Global
 		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Win32.Build.0 = Release|Any CPU
 		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
 		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|x64.Build.0 = Release|Any CPU
-		{7F059603-7041-4BBB-93A2-DAA7AB5CA528}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7F059603-7041-4BBB-93A2-DAA7AB5CA528}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7F059603-7041-4BBB-93A2-DAA7AB5CA528}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7F059603-7041-4BBB-93A2-DAA7AB5CA528}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7F059603-7041-4BBB-93A2-DAA7AB5CA528}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{7F059603-7041-4BBB-93A2-DAA7AB5CA528}.Debug|Win32.Build.0 = Debug|Any CPU
-		{7F059603-7041-4BBB-93A2-DAA7AB5CA528}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7F059603-7041-4BBB-93A2-DAA7AB5CA528}.Debug|x64.Build.0 = Debug|Any CPU
-		{7F059603-7041-4BBB-93A2-DAA7AB5CA528}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7F059603-7041-4BBB-93A2-DAA7AB5CA528}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7F059603-7041-4BBB-93A2-DAA7AB5CA528}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{7F059603-7041-4BBB-93A2-DAA7AB5CA528}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{7F059603-7041-4BBB-93A2-DAA7AB5CA528}.Release|Win32.ActiveCfg = Release|Any CPU
-		{7F059603-7041-4BBB-93A2-DAA7AB5CA528}.Release|Win32.Build.0 = Release|Any CPU
-		{7F059603-7041-4BBB-93A2-DAA7AB5CA528}.Release|x64.ActiveCfg = Release|Any CPU
-		{7F059603-7041-4BBB-93A2-DAA7AB5CA528}.Release|x64.Build.0 = Release|Any CPU
-		{7F059603-7041-4BBB-93A2-DAA7AB5CA528}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
-		{7F059603-7041-4BBB-93A2-DAA7AB5CA528}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
-		{7F059603-7041-4BBB-93A2-DAA7AB5CA528}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{7F059603-7041-4BBB-93A2-DAA7AB5CA528}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
-		{7F059603-7041-4BBB-93A2-DAA7AB5CA528}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
-		{7F059603-7041-4BBB-93A2-DAA7AB5CA528}.ReleaseNoNet|Win32.Build.0 = Release|Any CPU
-		{7F059603-7041-4BBB-93A2-DAA7AB5CA528}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
-		{7F059603-7041-4BBB-93A2-DAA7AB5CA528}.ReleaseNoNet|x64.Build.0 = Release|Any CPU
 		{146FD497-BA03-4740-B6C5-5C84EA8FCDE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{146FD497-BA03-4740-B6C5-5C84EA8FCDE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{146FD497-BA03-4740-B6C5-5C84EA8FCDE2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU

From 54e2eb3c4cf457e6a711705d4f248edc5f33dc09 Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <philipp@crocoll.net>
Date: Mon, 23 Oct 2017 21:28:14 +0200
Subject: [PATCH 3/3] update translation from crowdin

---
 .../Resources/values-no/strings.xml           | 45 ++++++++-----------
 1 file changed, 18 insertions(+), 27 deletions(-)

diff --git a/src/keepass2android/Resources/values-no/strings.xml b/src/keepass2android/Resources/values-no/strings.xml
index a3635000..1dbf1f2a 100644
--- a/src/keepass2android/Resources/values-no/strings.xml
+++ b/src/keepass2android/Resources/values-no/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--Generated by crowdin.net-->
 <resources>
   <string name="about_feedback">Tilbakemelding</string>
@@ -10,32 +11,28 @@
   <string name="add_group_title">Legg til gruppe</string>
   <string name="algorithm">Algoritme</string>
   <string name="algorithm_colon">Algoritme</string>
+  <string name="app_name">Keepass2Android</string>
+  <string name="short_app_name">KP2A</string>
   <string name="app_timeout">Programtidsavbrot</string>
   <string name="app_timeout_summary">Tid før databasen blir låst når programmet ikkje er i bruk.</string>
   <string name="application">Program</string>
   <string name="application_settings">Programinnstillingar</string>
   <string name="brackets">Parentesar</string>
-  <string name="browser_intall_text">Du må ha Open Intents filbehandlar for å kunna bla i filer. Klikk nedanfor for å installera han. Grunna nokre småfeil i programmet kan det vera at det ikkje fungerer heilt den første gongen du bruker det.</string>
-  <string name="building_search_idx">Byggjer søkjeindeksen …</string>
   <string name="cancel">Avbryt</string>
   <string name="ClearClipboard">Utklippstavla er tømt.</string>
   <string name="clipboard_timeout">Tidsavbrot på utklippstavla</string>
   <string name="clipboard_timeout_summary">Tid før utklippstavla blir tømt etter at brukarnamnet eller passordet er kopiert.</string>
   <string name="copy_username">Kopier brukarnamnet til utklippstavla</string>
   <string name="copy_password">Kopier passordet til utklippstavla</string>
-  <string name="creating_db_key">Lagar databasenøkkelen …</string>
+  <string name="creating_db_key">Lagar databasenøkkelen &#8230;</string>
   <string name="current_group">Gjeldande gruppe</string>
   <string name="current_group_root">Gjeldande gruppe: Rot</string>
-  <string name="decrypting_db">Dekrypterer databasen …</string>
-  <string name="decrypting_entry">Dekrypterer oppføringa</string>
-  <string name="default_checkbox">Standarddatabasen</string>
   <string name="digits">Tal</string>
   <string name="disclaimer_formal">Keepass2Android kjem med INGEN SOM HELST GARANTI. Dette er eit fritt program. Du er velkomen til å redistribuera det i samsvar med vilkåra til GPL utgåve 2 eller nyare.</string>
+  <string name="ellipsis">\u2026</string>
   <string name="enter_filename">Skriv filnamnet til databasen</string>
   <string name="entry_accessed">Brukt</string>
-  <string name="entry_and_or">Skriv inn passordet og/eller nøkkelfil for å låsa opp databasen</string>
   <string name="entry_cancel">Avbryt</string>
-  <string name="entry_comment">Merknader</string>
   <string name="entry_confpassword">Stadfest passordet</string>
   <string name="entry_created">Laga</string>
   <string name="entry_expires">Går ut</string>
@@ -46,12 +43,10 @@
   <string name="entry_title">Namn</string>
   <string name="entry_url">Adresse</string>
   <string name="entry_user_name">Brukaramn</string>
-  <string name="error_arc4">Kan ikkje bruka ArcFour dataflytkryptering.</string>
   <string name="error_can_not_handle_uri">Keepass2Android kan ikkje bruka denne ressursen.</string>
   <string name="error_could_not_create_group">Klarte ikkje å laga gruppa.</string>
   <string name="error_could_not_create_parent">Klarte ikkje å laga foreldrekatalogen.</string>
   <string name="error_database_exists">Denne fila finst allereie.</string>
-  <string name="error_database_settings">Klarte ikkje å bestemma databaseinnstillingane.</string>
   <string name="error_failed_to_launch_link">Klarte ikkje å lasta lenkja.</string>
   <string name="error_filename_required">Treng eit filnamn.</string>
   <string name="error_file_not_create">Klarte ikkje å laga fila</string>
@@ -59,18 +54,15 @@
   <string name="error_invalid_path">Ugyldig stig.</string>
   <string name="error_no_name">Treng eit namn.</string>
   <string name="error_nopass">Treng eit passord eller ei nøkkelfil.</string>
-  <string name="error_out_of_memory">Telefonen gjekk tom for minne ved lesinga av databasen din. Databasen er kanskje for stor.</string>
   <string name="error_pass_gen_type">Du må velja minst éin passordlagingstype</string>
   <string name="error_pass_match">Passorda samsvarer ikkje.</string>
   <string name="error_rounds_not_number">Omgangar må vera eit tal.</string>
-  <string name="error_rounds_too_large">For mange omgangar. Bruker 2147483648.</string>
   <string name="error_title_required">Treng ein tittel.</string>
   <string name="error_wrong_length">Bruk eit positivt heiltal i lengdfeltet</string>
   <string name="FileNotFound">Fann ikkje fila.</string>
   <string name="file_browser">Filbehandlar</string>
   <string name="generate_password">Lag passord</string>
   <string name="group">Gruppe</string>
-  <string name="hint_comment">merknad</string>
   <string name="hint_conf_pass">stadfest passordet</string>
   <string name="hint_generated_password">laga passord</string>
   <string name="hint_group_name">Gruppenamn</string>
@@ -81,14 +73,12 @@
   <string name="hint_title">namn</string>
   <string name="hint_url">adresse</string>
   <string name="hint_username">brukarnamn</string>
-  <string name="install_from_market">Installer frå marknaden</string>
-  <string name="install_from_website">Installer frå nettet</string>
   <string name="InvalidPassword">Ugyldig passord eller nøkkelfil.</string>
   <string name="invalid_db_sig">Ukjent databaseformat.</string>
   <string name="length">Lengd</string>
   <string name="list_size_title">Gruppelistestorleik</string>
   <string name="list_size_summary">Tekststorleik i gruppelista</string>
-  <string name="loading_database">Lastar databasen …</string>
+  <string name="loading_database">Lastar databasen &#8230;</string>
   <string name="lowercase">Små bokstavar</string>
   <string name="maskpass_title">Masker passord</string>
   <string name="maskpass_summary">Gøym passorda (standardval)</string>
@@ -100,16 +90,16 @@
   <string name="menu_app_settings">Innstillingar</string>
   <string name="menu_db_settings">Databaseinnstillingar</string>
   <string name="menu_delete">Slett</string>
-  <string name="menu_donate">Doner</string>
   <string name="menu_edit">Endra</string>
   <string name="menu_hide_password">Gøym passordet</string>
-  <string name="menu_homepage">Gå til heimesida</string>
   <string name="menu_lock">Lås databasen</string>
   <string name="menu_open">Opna</string>
   <string name="menu_rename">Gje nytt namn</string>
   <string name="menu_search">Søk</string>
   <string name="menu_url">Gå til adressa</string>
   <string name="never">Aldri</string>
+  <string name="yes">Ja</string>
+  <string name="no">Nei</string>
   <string name="no_keys">Ingen oppføringar i databasen eller gruppa.</string>
   <string name="no_results">Ingen søkjeresultat</string>
   <string name="no_url_handler">Ingen behandlar for denne adressa.</string>
@@ -118,22 +108,24 @@
   <string name="omitbackup_summary">Søkjeresultatet inneheld ikkje oppføringar frå \'Backup\' eller søppelbøtta</string>
   <string name="pass_filename">Filnamnet til KeePass-databasen</string>
   <string name="password_title">Skriv databasepassordet</string>
-  <string name="progress_create">Lager ny database …</string>
-  <string name="progress_title">Arbeider …</string>
+  <string name="progress_create">Lager ny database &#8230;</string>
+  <string name="progress_title">Arbeider &#8230;</string>
   <string name="remember_keyfile_summary">Hugsar staden til nøkkelfilene</string>
   <string name="remember_keyfile_title">Lagra nøkkelfila</string>
   <string name="remove_from_filelist">Ta vekk</string>
+  <string name="rijndael">Rijndael (AES)</string>
   <string name="root">Rot</string>
   <string name="rounds">Krypteringsomgangar</string>
   <string name="rounds_explaination">Fleire krypteringsomgangar gjev tilleggsvern mot rå makt-åtak, men kan òg gjera lasting og lagring mykje tregare.</string>
   <string name="rounds_hint">omgangar</string>
-  <string name="saving_database">Lagrar databasen …</string>
+  <string name="saving_database">Lagrar databasen &#8230;</string>
   <string name="space">Mellomrom</string>
   <string name="search_label">Søk</string>
   <string name="show_password">Syn passordet</string>
   <string name="sort_name">Sorter etter namn</string>
   <string name="sort_db">DB-sortering</string>
   <string name="special">Spesial</string>
+  <string name="twofish">Twofish</string>
   <string name="underline">Understreking</string>
   <string name="unsupported_db_version">Kan ikkje bruka databaseutgåva.</string>
   <string name="uppercase">Store bokstavar</string>
@@ -144,16 +136,15 @@
     <item>30 sekund</item>
     <item>1 minutt</item>
     <item>5 minutt</item>
-    <item>Aldri</item>
+    <item>10 minutes</item>
+    <item>15 minutes</item>
+    <item>30 minutes</item>
+    <item>1 hour</item>
+    <item>Never</item>
   </string-array>
   <string-array name="list_size_options">
     <item>Liten</item>
     <item>Middels</item>
     <item>Stor</item>
   </string-array>
-  <string-array name="cred_remember_modes">
-    <item>Do not remember username and password</item>
-    <item>Remember username only</item>
-    <item>Remember username and password</item>
-  </string-array>
 </resources>