Callback based client implementation is now finished. Testing is up.

1 files changed, 68 insertions, 13 deletions

diff --git a/client/pracro_dk.ts b/client/pracro_dk.ts
index 9188e10..7234f0a 100644
--- a/client/pracro_dk.ts
+++ b/client/pracro_dk.ts
@@ -51,41 +51,96 @@ et CPR nummer på 10 cifre.</translation>
     </message>
 </context>
 <context>
+    <name>MacroWindow</name>
+    <message>
+        <location filename="macrowindow.cc" line="168"/>
+        <source>Error</source>
+        <translation>Der er sket en fejl</translation>
+    </message>
+    <message>
+        <location filename="macrowindow.cc" line="169"/>
+        <source>The macro </source>
+        <translation>Makroen </translation>
+    </message>
+    <message>
+        <location filename="macrowindow.cc" line="170"/>
+        <source> was not filled out correctly, please try again.
+</source>
+        <translation> er ikke.udfyldt korrekt. Prøv igen.</translation>
+    </message>
+    <message>
+        <location filename="macrowindow.cc" line="204"/>
+        <source>Save the macro changes?</source>
+        <translation>Gem makro ændringer?</translation>
+    </message>
+    <message>
+        <location filename="macrowindow.cc" line="205"/>
+        <source>you have choosen to close the macro </source>
+        <translation>Du har valgt at lukke makroen </translation>
+    </message>
+    <message>
+        <location filename="macrowindow.cc" line="207"/>
+        <source>do you want to save before closing?</source>
+        <translation>ønsker du at gemme dine ændringer først?</translation>
+    </message>
+    <message>
+        <location filename="macrowindow.cc" line="232"/>
+        <source>Close first</source>
+        <translation>Luk først</translation>
+    </message>
+    <message>
+        <location filename="macrowindow.cc" line="232"/>
+        <source>Close other one first.</source>
+        <translation>Luk den åbne makro først.</translation>
+    </message>
+</context>
+<context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.cc" line="86"/>
+        <location filename="mainwindow.cc" line="112"/>
         <source>Close and commit</source>
         <translation>Gem og commit</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="89"/>
+        <location filename="mainwindow.cc" line="115"/>
         <source>Close no commit</source>
         <translation>Gem uden commit</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="98"/>
+        <location filename="mainwindow.cc" line="150"/>
+        <location filename="mainwindow.cc" line="162"/>
+        <location filename="mainwindow.cc" line="174"/>
+        <source>Close first.</source>
+        <translation>Luk først.</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cc" line="151"/>
+        <location filename="mainwindow.cc" line="163"/>
+        <location filename="mainwindow.cc" line="175"/>
+        <source>Close open macros first.</source>
+        <translation>Luk åbne makroer først.</translation>
+    </message>
+    <message>
         <source>Show sessions</source>
-        <translation>Vis sessioner</translation>
+        <translation type="obsolete">Vis sessioner</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="138"/>
         <source>Closing without commit</source>
-        <translation>Lukker uden commit</translation>
+        <translation type="obsolete">Lukker uden commit</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="139"/>
         <source>This session will be stored on this computer only. To reopen it at a later time, simply open the same patient again.</source>
-        <translation>Denne session bliver husket på denne specifikke maskine. For at genåbne på et senere tidspunkt, skal du blot genåbne på samme patient.</translation>
+        <translation type="obsolete">Denne session bliver husket på denne specifikke maskine. For at genåbne på et senere tidspunkt, skal du blot genåbne på samme patient.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="150"/>
-        <location filename="mainwindow.cc" line="173"/>
+        <location filename="mainwindow.cc" line="181"/>
+        <location filename="mainwindow.cc" line="203"/>
         <source>Discard</source>
         <translation>Kassér</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="151"/>
-        <location filename="mainwindow.cc" line="174"/>
+        <location filename="mainwindow.cc" line="182"/>
+        <location filename="mainwindow.cc" line="204"/>
         <source>This session will &lt;strong&gt;NOT&lt;/strong&gt; be stored in the journal.&lt;br/&gt;Are you sure you want to continue?</source>
         <translation>Denne session vil &lt;strong&gt;IKKE&lt;/strong&gt; blive gemt i journalen.&lt;br/&gt;Er du sikker på du vil fortsætte?</translation>
     </message>
@@ -197,7 +252,7 @@ et CPR nummer på 10 cifre.</translation>
         <translation>Ignorér</translation>
     </message>
     <message>
-        <location filename="macro.cc" line="162"/>
+        <location filename="macro.cc" line="119"/>
         <source>Depends on: </source>
         <translation>Afhænger af: </translation>
     </message>