ui: adjustements for french translations
French is more verbose than English. This implies refactoring some UIs to ease
constraints on text widths and adjust some strings.
Issue: #80347
Change-Id: I50c419416ab7e2263487679746d2bcba7ed35ac7
diff --git a/src/AccSecurityVC.h b/src/AccSecurityVC.h
index 9aaf995..3fa4615 100644
--- a/src/AccSecurityVC.h
+++ b/src/AccSecurityVC.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015 Savoir-faire Linux Inc.
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,25 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
-#ifndef ACCSECURITYVC_H
-#define ACCSECURITYVC_H
-
#import <Cocoa/Cocoa.h>
@interface AccSecurityVC : NSViewController<NSMenuDelegate, NSPathControlDelegate, NSOpenSavePanelDelegate>
@end
-
-#endif // ACCSECURITYVC_H
diff --git a/src/AccSecurityVC.mm b/src/AccSecurityVC.mm
index 859c430..2470c24 100644
--- a/src/AccSecurityVC.mm
+++ b/src/AccSecurityVC.mm
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2015 Savoir-faire Linux Inc.
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
#import "AccSecurityVC.h"
@@ -361,11 +350,14 @@
{
NSMenuItem *item;
if(pathControl == caListPathControl) {
- item = [menu addItemWithTitle:@"Remove value" action:@selector(caListPathControlSingleClick:) keyEquivalent:@""];
+ item = [menu addItemWithTitle:NSLocalizedString(@"Remove value", @"Contextual menu entry")
+ action:@selector(caListPathControlSingleClick:) keyEquivalent:@""];
} else if (pathControl == certificatePathControl) {
- item = [menu addItemWithTitle:@"Remove value" action:@selector(certificatePathControlSingleClick:) keyEquivalent:@""];
+ item = [menu addItemWithTitle:NSLocalizedString(@"Remove value", @"Contextual menu entry")
+ action:@selector(certificatePathControlSingleClick:) keyEquivalent:@""];
} else {
- item = [menu addItemWithTitle:@"Remove value" action:@selector(pvkFilePathControlSingleClick:) keyEquivalent:@""];
+ item = [menu addItemWithTitle:NSLocalizedString(@"Remove value", @"Contextual menu entry")
+ action:@selector(pvkFilePathControlSingleClick:) keyEquivalent:@""];
}
[item setTarget:self]; // or whatever target you want
}
diff --git a/src/RingWizardWC.mm b/src/RingWizardWC.mm
index 21fb68c..5377104 100644
--- a/src/RingWizardWC.mm
+++ b/src/RingWizardWC.mm
@@ -278,11 +278,14 @@
{
NSMenuItem *item;
if(pathControl == caListPathControl) {
- item = [menu addItemWithTitle:@"Remove value" action:@selector(caListPathControlSingleClick:) keyEquivalent:@""];
+ item = [menu addItemWithTitle:NSLocalizedString(@"Remove value", @"Contextual menu entry")
+ action:@selector(caListPathControlSingleClick:) keyEquivalent:@""];
} else if (pathControl == certificatePathControl) {
- item = [menu addItemWithTitle:@"Remove value" action:@selector(certificatePathControlSingleClick:) keyEquivalent:@""];
+ item = [menu addItemWithTitle:NSLocalizedString(@"Remove value", @"Contextual menu entry")
+ action:@selector(certificatePathControlSingleClick:) keyEquivalent:@""];
} else {
- item = [menu addItemWithTitle:@"Remove value" action:@selector(pvkFilePathControlSingleClick:) keyEquivalent:@""];
+ item = [menu addItemWithTitle:NSLocalizedString(@"Remove value", @"Contextual menu entry")
+ action:@selector(pvkFilePathControlSingleClick:) keyEquivalent:@""];
}
[item setTarget:self]; // or whatever target you want
}
diff --git a/src/views/CallView.mm b/src/views/CallView.mm
index e75ef3a..b375f4d 100644
--- a/src/views/CallView.mm
+++ b/src/views/CallView.mm
@@ -184,7 +184,10 @@
}
[contextualMenu addItem:[NSMenuItem separatorItem]];
- [contextualMenu insertItemWithTitle:@"Choose file" action:@selector(chooseFile:) keyEquivalent:@"" atIndex:contextualMenu.itemArray.count];
+ [contextualMenu insertItemWithTitle:NSLocalizedString(@"Choose file", @"Contextual menu entry")
+ action:@selector(chooseFile:)
+ keyEquivalent:@""
+ atIndex:contextualMenu.itemArray.count];
[NSMenu popUpContextMenu:contextualMenu withEvent:theEvent forView:self];
}