зеркало из https://github.com/mozilla/pjs.git
Fix "can't launch 2 copies" strings so the branding can be swapped out
This commit is contained in:
Родитель
f069d0fb0c
Коммит
203848bedd
|
@ -166,8 +166,8 @@ app_getModuleInfo(nsStaticModuleInfo **info, PRUint32 *count);
|
||||||
rv = profileService->SetCurrentProfile(newProfileName.get());
|
rv = profileService->SetCurrentProfile(newProfileName.get());
|
||||||
if (NS_FAILED(rv)) {
|
if (NS_FAILED(rv)) {
|
||||||
if (rv == NS_ERROR_FILE_ACCESS_DENIED) {
|
if (rv == NS_ERROR_FILE_ACCESS_DENIED) {
|
||||||
NSString *alert = NSLocalizedString(@"AlreadyRunningAlert",@"");
|
NSString *alert = [NSString stringWithFormat: NSLocalizedString(@"AlreadyRunningAlert", @""), NSLocalizedString(@"Navigator", @"")];
|
||||||
NSString *message = NSLocalizedString(@"AlreadyRunningMsg",@"");
|
NSString *message = [NSString stringWithFormat: NSLocalizedString(@"AlreadyRunningMsg", @""), NSLocalizedString(@"Navigator", @"")];
|
||||||
NSString *quit = NSLocalizedString(@"AlreadyRunningButton",@"");
|
NSString *quit = NSLocalizedString(@"AlreadyRunningButton",@"");
|
||||||
NSRunAlertPanel(alert,message,quit,nil,nil);
|
NSRunAlertPanel(alert,message,quit,nil,nil);
|
||||||
[NSApp terminate:self];
|
[NSApp terminate:self];
|
||||||
|
|
Двоичные данные
camino/English.lproj/Localizable.strings
Двоичные данные
camino/English.lproj/Localizable.strings
Двоичный файл не отображается.
Двоичные данные
camino/resources/localized/English.lproj/Localizable.strings
Двоичные данные
camino/resources/localized/English.lproj/Localizable.strings
Двоичный файл не отображается.
|
@ -166,8 +166,8 @@ app_getModuleInfo(nsStaticModuleInfo **info, PRUint32 *count);
|
||||||
rv = profileService->SetCurrentProfile(newProfileName.get());
|
rv = profileService->SetCurrentProfile(newProfileName.get());
|
||||||
if (NS_FAILED(rv)) {
|
if (NS_FAILED(rv)) {
|
||||||
if (rv == NS_ERROR_FILE_ACCESS_DENIED) {
|
if (rv == NS_ERROR_FILE_ACCESS_DENIED) {
|
||||||
NSString *alert = NSLocalizedString(@"AlreadyRunningAlert",@"");
|
NSString *alert = [NSString stringWithFormat: NSLocalizedString(@"AlreadyRunningAlert", @""), NSLocalizedString(@"Navigator", @"")];
|
||||||
NSString *message = NSLocalizedString(@"AlreadyRunningMsg",@"");
|
NSString *message = [NSString stringWithFormat: NSLocalizedString(@"AlreadyRunningMsg", @""), NSLocalizedString(@"Navigator", @"")];
|
||||||
NSString *quit = NSLocalizedString(@"AlreadyRunningButton",@"");
|
NSString *quit = NSLocalizedString(@"AlreadyRunningButton",@"");
|
||||||
NSRunAlertPanel(alert,message,quit,nil,nil);
|
NSRunAlertPanel(alert,message,quit,nil,nil);
|
||||||
[NSApp terminate:self];
|
[NSApp terminate:self];
|
||||||
|
|
|
@ -166,8 +166,8 @@ app_getModuleInfo(nsStaticModuleInfo **info, PRUint32 *count);
|
||||||
rv = profileService->SetCurrentProfile(newProfileName.get());
|
rv = profileService->SetCurrentProfile(newProfileName.get());
|
||||||
if (NS_FAILED(rv)) {
|
if (NS_FAILED(rv)) {
|
||||||
if (rv == NS_ERROR_FILE_ACCESS_DENIED) {
|
if (rv == NS_ERROR_FILE_ACCESS_DENIED) {
|
||||||
NSString *alert = NSLocalizedString(@"AlreadyRunningAlert",@"");
|
NSString *alert = [NSString stringWithFormat: NSLocalizedString(@"AlreadyRunningAlert", @""), NSLocalizedString(@"Navigator", @"")];
|
||||||
NSString *message = NSLocalizedString(@"AlreadyRunningMsg",@"");
|
NSString *message = [NSString stringWithFormat: NSLocalizedString(@"AlreadyRunningMsg", @""), NSLocalizedString(@"Navigator", @"")];
|
||||||
NSString *quit = NSLocalizedString(@"AlreadyRunningButton",@"");
|
NSString *quit = NSLocalizedString(@"AlreadyRunningButton",@"");
|
||||||
NSRunAlertPanel(alert,message,quit,nil,nil);
|
NSRunAlertPanel(alert,message,quit,nil,nil);
|
||||||
[NSApp terminate:self];
|
[NSApp terminate:self];
|
||||||
|
|
Двоичные данные
chimera/English.lproj/Localizable.strings
Двоичные данные
chimera/English.lproj/Localizable.strings
Двоичный файл не отображается.
Двоичные данные
chimera/resources/localized/English.lproj/Localizable.strings
Двоичные данные
chimera/resources/localized/English.lproj/Localizable.strings
Двоичный файл не отображается.
|
@ -166,8 +166,8 @@ app_getModuleInfo(nsStaticModuleInfo **info, PRUint32 *count);
|
||||||
rv = profileService->SetCurrentProfile(newProfileName.get());
|
rv = profileService->SetCurrentProfile(newProfileName.get());
|
||||||
if (NS_FAILED(rv)) {
|
if (NS_FAILED(rv)) {
|
||||||
if (rv == NS_ERROR_FILE_ACCESS_DENIED) {
|
if (rv == NS_ERROR_FILE_ACCESS_DENIED) {
|
||||||
NSString *alert = NSLocalizedString(@"AlreadyRunningAlert",@"");
|
NSString *alert = [NSString stringWithFormat: NSLocalizedString(@"AlreadyRunningAlert", @""), NSLocalizedString(@"Navigator", @"")];
|
||||||
NSString *message = NSLocalizedString(@"AlreadyRunningMsg",@"");
|
NSString *message = [NSString stringWithFormat: NSLocalizedString(@"AlreadyRunningMsg", @""), NSLocalizedString(@"Navigator", @"")];
|
||||||
NSString *quit = NSLocalizedString(@"AlreadyRunningButton",@"");
|
NSString *quit = NSLocalizedString(@"AlreadyRunningButton",@"");
|
||||||
NSRunAlertPanel(alert,message,quit,nil,nil);
|
NSRunAlertPanel(alert,message,quit,nil,nil);
|
||||||
[NSApp terminate:self];
|
[NSApp terminate:self];
|
||||||
|
|
Загрузка…
Ссылка в новой задаче