Slightly improved previous pull request merge.
This commit is contained in:
parent
7b0ffacff0
commit
3eec753b73
|
@ -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 ...";
|
||||
|
|
|
@ -204,7 +204,7 @@
|
|||
"Mail" = "Courrier";
|
||||
"Last" = "Dernier utilisé";
|
||||
"Default module :" = "Module par défaut :";
|
||||
"SOGo version:" = "SOGo version:";
|
||||
"SOGo version :" = "SOGo version :";
|
||||
|
||||
"Language :" = "Langue :";
|
||||
"choose" = "Choisir ...";
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* UIxPreferences.m - this file is part of SOGo
|
||||
*
|
||||
* Copyright (C) 2007-2013 Inverse inc.
|
||||
* Copyright (C) 2007-2014 Inverse inc.
|
||||
*
|
||||
* This file is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1141,9 +1141,7 @@ static NSArray *reminderValues = nil;
|
|||
- (NSString *) sogoVersion
|
||||
{
|
||||
// The variable SOGoVersion comes from the import: SOGo/Build.h
|
||||
NSString *sogoVersion = [NSString stringWithString: SOGoVersion];
|
||||
|
||||
return sogoVersion;
|
||||
return [NSString stringWithString: SOGoVersion];
|
||||
}
|
||||
|
||||
- (id <WOActionResults>) defaultAction
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue