From e80d75648ea27f5f13a449e4b44f095153eab4d3 Mon Sep 17 00:00:00 2001
From: Daniel Kraus <krada@gmx.net>
Date: Fri, 2 Oct 2015 11:11:07 +0200
Subject: [PATCH 1/4] Update Bovender package to 0.4.0.

---
 Tests/Tests.csproj               | 4 ++--
 Tests/packages.config            | 2 +-
 zaaReloaded2/packages.config     | 2 +-
 zaaReloaded2/zaaReloaded2.csproj | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index 2fcf0fe..08833d6 100755
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -41,8 +41,8 @@
     <AssemblyOriginatorKeyFile>zaaReloaded2.pfx</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Bovender, Version=0.3.3.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
-      <HintPath>..\packages\Bovender.0.3.3.0\lib\net40\Bovender.dll</HintPath>
+    <Reference Include="Bovender, Version=0.4.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
+      <HintPath>..\packages\Bovender.0.4.0.0\lib\net40\Bovender.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Office.Interop.Word, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
diff --git a/Tests/packages.config b/Tests/packages.config
index d903c94..a98fff2 100755
--- a/Tests/packages.config
+++ b/Tests/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Bovender" version="0.3.3.0" targetFramework="net40" />
+  <package id="Bovender" version="0.4.0.0" targetFramework="net40" />
   <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
   <package id="NUnit" version="2.6.4" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/zaaReloaded2/packages.config b/zaaReloaded2/packages.config
index 9920963..c4bc546 100755
--- a/zaaReloaded2/packages.config
+++ b/zaaReloaded2/packages.config
@@ -19,6 +19,6 @@
 	limitations under the License.
 -->
 <packages>
-  <package id="Bovender" version="0.3.3.0" targetFramework="net40" />
+  <package id="Bovender" version="0.4.0.0" targetFramework="net40" />
   <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/zaaReloaded2/zaaReloaded2.csproj b/zaaReloaded2/zaaReloaded2.csproj
index dfa371f..ccde681 100755
--- a/zaaReloaded2/zaaReloaded2.csproj
+++ b/zaaReloaded2/zaaReloaded2.csproj
@@ -134,8 +134,8 @@
   -->
   <ItemGroup>
     <Reference Include="Accessibility" />
-    <Reference Include="Bovender, Version=0.3.3.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
-      <HintPath>..\packages\Bovender.0.3.3.0\lib\net40\Bovender.dll</HintPath>
+    <Reference Include="Bovender, Version=0.4.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
+      <HintPath>..\packages\Bovender.0.4.0.0\lib\net40\Bovender.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />

From 9f83041554ed7ab32d682e0b4f19cfea6d3d90c2 Mon Sep 17 00:00:00 2001
From: Daniel Kraus <krada@gmx.net>
Date: Fri, 2 Oct 2015 11:11:51 +0200
Subject: [PATCH 2/4] Fix Daniel' style.

---
 zaaReloaded2/Formatter/DanielsStyle.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zaaReloaded2/Formatter/DanielsStyle.cs b/zaaReloaded2/Formatter/DanielsStyle.cs
index e5d7276..e08574b 100755
--- a/zaaReloaded2/Formatter/DanielsStyle.cs
+++ b/zaaReloaded2/Formatter/DanielsStyle.cs
@@ -72,7 +72,7 @@ namespace zaaReloaded2.Formatter
             find.Execute2007(FindText: "RR ", ReplaceWith: "", Replace: WdReplace.wdReplaceAll, MatchCase: true, MatchWholeWord: true);
             find.Execute2007(FindText: "HF ", ReplaceWith: "", Replace: WdReplace.wdReplaceAll, MatchCase: true, MatchWholeWord: true);
             find.Execute2007(FindText: "TAC-Spiegel", ReplaceWith: "Tacrolimus-Talspiegel", Replace: WdReplace.wdReplaceAll);
-            find.Execute2007(FindText: "ammelruin", ReplaceWith: "ammelurin", Replace: WdReplace.wdReplaceAll);
+            find.Execute2007(FindText: "ammelruin", ReplaceWith: "ammelurin", Replace: WdReplace.wdReplaceAll, MatchWholeWord: false);
             find.Execute2007(FindText: "4-7", ReplaceWith: "4 bis 7", Replace: WdReplace.wdReplaceAll);
             find.Execute2007(FindText: "5-8", ReplaceWith: "5 bis 8", Replace: WdReplace.wdReplaceAll);
             find.Execute2007(FindText: "8-10", ReplaceWith: "8 bis 10", Replace: WdReplace.wdReplaceAll);

From 4ec52d290ae8435f0462b270e25667eeadd736f4 Mon Sep 17 00:00:00 2001
From: Daniel Kraus <krada@gmx.net>
Date: Fri, 2 Oct 2015 11:12:44 +0200
Subject: [PATCH 3/4] Fix wording in FirstRunView.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- VERBESSERT: Statt Sekretariatsmodus stand zweimal Ärztemodus im Begrüßungsbildschirm.
---
 zaaReloaded2/Views/FirstRunView.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zaaReloaded2/Views/FirstRunView.xaml b/zaaReloaded2/Views/FirstRunView.xaml
index ead7c8d..9fec32a 100755
--- a/zaaReloaded2/Views/FirstRunView.xaml
+++ b/zaaReloaded2/Views/FirstRunView.xaml
@@ -51,7 +51,7 @@
             <Button Height="40" DockPanel.Dock="Left" Command="{Binding SelectTypistsModeCommand}" Content="Sekretariatsmodus"
                     Width="160" Margin="0 0 10 0" VerticalAlignment="Center" />
             <TextBlock TextWrapping="Wrap" VerticalAlignment="Center">
-                Im Ärztemodus werden beim Formatieren grundsätzlich keine Zusatzinformationen abgefragt.
+                Im Sekretariatsmodus werden beim Formatieren grundsätzlich keine Zusatzinformationen abgefragt.
             </TextBlock>
         </DockPanel>
         <TextBlock TextWrapping="Wrap" Foreground="Gray">

From 7a92c7bc1eee645e0552acda329fae92ae009374 Mon Sep 17 00:00:00 2001
From: Daniel Kraus <krada@gmx.net>
Date: Fri, 2 Oct 2015 11:22:37 +0200
Subject: [PATCH 4/4] Prepare release 2.1.7.

---
 HISTORY.md           | 10 +++++++++-
 www/versioninfo.txt  |  4 ++--
 zaaReloaded2/VERSION |  4 ++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index d97a1f1..88f3992 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,12 @@
-Version 2.1.6 (2015-09-25)
+Version 2.1.7 (2015-10-02)
+========================================================================
+
+- VERBESSERT: Statt Sekretariatsmodus stand zweimal Ärztemodus im Begrüßungsbildschirm.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
+Version 2.1.6. (2015-09-27)
 ========================================================================
 
 - VERBESSERT: Eingebaute Stile überarbeitet.
diff --git a/www/versioninfo.txt b/www/versioninfo.txt
index 832ec97..46dc8b2 100644
--- a/www/versioninfo.txt
+++ b/www/versioninfo.txt
@@ -1,4 +1,4 @@
-2.1.6
+2.1.7
 http://zaa.nephrowiki.de/downloads/zaaReloaded-$VERSION.exe
-f9277549cc0d74dafbb39f152719e4fdb2c31d5d  publish/release/zaaReloaded-2.1.6.exe
+e142c709482684790e8f5779b4313647d90e44fa  publish/release/zaaReloaded-2.1.7.exe
 
diff --git a/zaaReloaded2/VERSION b/zaaReloaded2/VERSION
index d9f75ea..31cfaf6 100755
--- a/zaaReloaded2/VERSION
+++ b/zaaReloaded2/VERSION
@@ -1,2 +1,2 @@
-2.1.6
-2.1.6.0
+2.1.7
+2.1.7.0