LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Slightly improved previous pull request merge.

Browse source
This commit is contained in:
Ludovic Marcotte 2014-04-04 08:39:13 -04:00
parent 7b0ffacff0
commit 3eec753b73
4 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
UI/PreferencesUI/English.lproj/Localizable.strings
View file

@ -204,7 +204,7 @@
"Mail" = "Mail"; "Mail" = "Mail";
"Last" = "Last used"; "Last" = "Last used";
"Default module :" = "Default module:"; "Default module :" = "Default module:";
"SOGo version:" = "SOGo version:"; "SOGo version :" = "SOGo version :";
"Language :" = "Language:"; "Language :" = "Language:";
"choose" = "Choose ..."; "choose" = "Choose ...";
@ -307,4 +307,4 @@
"Unhandled policy error: %{0}" = "Unhandled policy error: %{0}"; "Unhandled policy error: %{0}" = "Unhandled policy error: %{0}";
"Unhandled error response" = "Unhandled error response"; "Unhandled error response" = "Unhandled error response";
"Password change is not supported." = "Password change is not supported."; "Password change is not supported." = "Password change is not supported.";
"Unhandled HTTP error code: %{0}" = "Unhandled HTTP error code: %{0}"; "Unhandled HTTP error code: %{0}" = "Unhandled HTTP error code: %{0}";

4
UI/PreferencesUI/French.lproj/Localizable.strings
View file

@ -204,7 +204,7 @@
"Mail" = "Courrier"; "Mail" = "Courrier";
"Last" = "Dernier utilisé"; "Last" = "Dernier utilisé";
"Default module :" = "Module par défaut :"; "Default module :" = "Module par défaut :";
"SOGo version:" = "SOGo version:"; "SOGo version :" = "SOGo version :";
"Language :" = "Langue :"; "Language :" = "Langue :";
"choose" = "Choisir ..."; "choose" = "Choisir ...";
@ -307,4 +307,4 @@
"Unhandled policy error: %{0}" = "Erreur inconnue pour le ppolicy: %{0}"; "Unhandled policy error: %{0}" = "Erreur inconnue pour le ppolicy: %{0}";
"Unhandled error response" = "Erreur inconnue"; "Unhandled error response" = "Erreur inconnue";
"Password change is not supported." = "Changement de mot de passe non-supporté."; "Password change is not supported." = "Changement de mot de passe non-supporté.";
"Unhandled HTTP error code: %{0}" = "Code HTTP non-géré: %{0}"; "Unhandled HTTP error code: %{0}" = "Code HTTP non-géré: %{0}";

6
UI/PreferencesUI/UIxPreferences.m
View file

@ -1,6 +1,6 @@
/* UIxPreferences.m - this file is part of SOGo /* 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 * 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 * it under the terms of the GNU General Public License as published by
@ -1141,9 +1141,7 @@ static NSArray *reminderValues = nil;
- (NSString *) sogoVersion - (NSString *) sogoVersion
{ {
// The variable SOGoVersion comes from the import: SOGo/Build.h // The variable SOGoVersion comes from the import: SOGo/Build.h
NSString *sogoVersion = [NSString stringWithString: SOGoVersion]; return [NSString stringWithString: SOGoVersion];
return sogoVersion;
} }
- (id <WOActionResults>) defaultAction - (id <WOActionResults>) defaultAction

2
UI/Templates/PreferencesUI/UIxPreferences.wox
View file

@ -124,7 +124,7 @@
<div class="tabs"> <div class="tabs">
<div id="generalView" class="tab"> <div id="generalView" class="tab">
<dl class="dl-horizontal"> <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> <dd><var:string value="sogoVersion"/></dd>
<dt><var:string label:value="Language :"/></dt> <dt><var:string label:value="Language :"/></dt>
<dd><var:popup list="languages" item="item" <dd><var:popup list="languages" item="item"