From 8cc352fb28013801c56cc5138dba97f12de0ff6c Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Mon, 10 Mar 2014 14:45:10 -0400
Subject: [PATCH 1/5] It is now possible to see the version on the general page
 of the preferences window

---
 UI/PreferencesUI/UIxPreferences.m             | 9 +++++++++
 UI/Templates/PreferencesUI/UIxPreferences.wox | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index 7ba612cac..e2da3249d 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -46,6 +46,7 @@
 #import <SOGo/SOGoSystemDefaults.h>
 #import <SOGo/SOGoUserFolder.h>
 #import <SOGo/WOResourceManager+SOGo.h>
+#import <SOGo/SOGoBuild.h>
 #import <Mailer/SOGoMailAccount.h>
 #import <Mailer/SOGoMailAccounts.h>
 #import <Mailer/SOGoMailLabel.h>
@@ -1137,6 +1138,14 @@ static NSArray *reminderValues = nil;
     }
 }
 
+- (NSString *) sogoVersion
+{
+  NSString *sogoVersion = [NSString stringWithString: SOGoVersion];
+  
+  return sogoVersion;
+}
+
+
 - (id <WOActionResults>) defaultAction
 {
   id <WOActionResults> results;
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index 66f69b6a9..7cc6cebdd 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -158,6 +158,8 @@
                   const:id="defaultModule"
                   const:name="defaultModule"
                   string="itemModuleText" selection="userDefaultModule"/></dd>
+            <dt><var:string label:value="SOGo version :"/></dt>
+            <dd><var:string value="sogoVersion"/></dd>
           </dl>
         </div>
         <var:if condition="userHasCalendarAccess">

From d108777e89593ac4b6e62b12a78c6f6df92e18d7 Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Tue, 11 Mar 2014 10:25:01 -0400
Subject: [PATCH 2/5] Display the version at the top of the general tap

---
 UI/Templates/PreferencesUI/UIxPreferences.wox | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index 7cc6cebdd..21ccf63ed 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -124,6 +124,8 @@
       <div class="tabs">
         <div id="generalView" class="tab">
           <dl class="dl-horizontal">
+            <dt><var:string label:value="SOGo version :"/></dt>
+            <dd><var:string value="sogoVersion"/></dd>
             <dt><var:string label:value="Language :"/></dt>
             <dd><var:popup list="languages" item="item"
                   const:id="language"
@@ -158,8 +160,6 @@
                   const:id="defaultModule"
                   const:name="defaultModule"
                   string="itemModuleText" selection="userDefaultModule"/></dd>
-            <dt><var:string label:value="SOGo version :"/></dt>
-            <dd><var:string value="sogoVersion"/></dd>
           </dl>
         </div>
         <var:if condition="userHasCalendarAccess">

From b16911edc1f36956c94800cfbfa6900af7812657 Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Mon, 24 Mar 2014 13:55:52 -0400
Subject: [PATCH 3/5] Modified the displayed name of SOGo version and added the
 label in the .lproj

---
 UI/PreferencesUI/English.lproj/Localizable.strings | 1 +
 UI/Templates/PreferencesUI/UIxPreferences.wox      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings
index afa832c3e..c9156d9d6 100644
--- a/UI/PreferencesUI/English.lproj/Localizable.strings
+++ b/UI/PreferencesUI/English.lproj/Localizable.strings
@@ -204,6 +204,7 @@
 "Mail" = "Mail";
 "Last" = "Last used";
 "Default module :" = "Default module:";
+"SOGo version:" ="SOGo version:";
 
 "Language :" = "Language:";
 "choose" = "Choose ...";
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index 21ccf63ed..f626accb2 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -124,7 +124,7 @@
       <div class="tabs">
         <div id="generalView" class="tab">
           <dl class="dl-horizontal">
-            <dt><var:string label:value="SOGo version :"/></dt>
+            <dt><var:string label:value="SOGo version:"/></dt>
             <dd><var:string value="sogoVersion"/></dd>
             <dt><var:string label:value="Language :"/></dt>
             <dd><var:popup list="languages" item="item"

From 365e271a8458f26bf5101dddbfdfc3d28baf37fd Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Tue, 25 Mar 2014 15:44:28 -0400
Subject: [PATCH 4/5] Correct typo

---
 UI/PreferencesUI/English.lproj/Localizable.strings | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings
index c9156d9d6..f53f19a21 100644
--- a/UI/PreferencesUI/English.lproj/Localizable.strings
+++ b/UI/PreferencesUI/English.lproj/Localizable.strings
@@ -204,7 +204,7 @@
 "Mail" = "Mail";
 "Last" = "Last used";
 "Default module :" = "Default module:";
-"SOGo version:" ="SOGo version:";
+"SOGo version:" = "SOGo version:";
 
 "Language :" = "Language:";
 "choose" = "Choose ...";

From f999c87d4d737ed69512bc4150daa85c361f3f47 Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Thu, 3 Apr 2014 17:09:00 -0400
Subject: [PATCH 5/5] added traduction in localstring french, added some
 specification in function sogoVersion

---
 .gitignore                                        | 1 +
 UI/PreferencesUI/French.lproj/Localizable.strings | 1 +
 UI/PreferencesUI/UIxPreferences.m                 | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 88becdaa6..2b228461b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 config.make
 tags
 */obj/
+*._*
 */*/obj/
 */*/*/obj/
 */*/*.SOGo/
diff --git a/UI/PreferencesUI/French.lproj/Localizable.strings b/UI/PreferencesUI/French.lproj/Localizable.strings
index b3d49aab2..0f0f55535 100644
--- a/UI/PreferencesUI/French.lproj/Localizable.strings
+++ b/UI/PreferencesUI/French.lproj/Localizable.strings
@@ -204,6 +204,7 @@
 "Mail" = "Courrier";
 "Last" = "Dernier utilisé";
 "Default module :" = "Module par défaut :";
+"SOGo version:" = "SOGo version:";
 
 "Language :" = "Langue :";
 "choose" = "Choisir ...";
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index e2da3249d..0320602d1 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -1140,12 +1140,12 @@ static NSArray *reminderValues = nil;
 
 - (NSString *) sogoVersion
 {
+  // The variable SOGoVersion comes from the import: SOGo/Build.h
   NSString *sogoVersion = [NSString stringWithString: SOGoVersion];
   
   return sogoVersion;
 }
 
-
 - (id <WOActionResults>) defaultAction
 {
   id <WOActionResults> results;