зеркало из https://github.com/mozilla/gecko-dev.git
Change the Camino pref pane identifiers to contain "org.mozilla.camino" rather than "org.mozilla.chimera", and fix the text encoding of many of the pref panel Localized.strings files.
This commit is contained in:
Родитель
75a33b8fbf
Коммит
f32f41c0e6
|
@ -71,7 +71,7 @@
|
|||
sourceTree = "<group>";
|
||||
};
|
||||
032FFDD3077351A800440548 = {
|
||||
fileEncoding = 30;
|
||||
fileEncoding = 10;
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = text.plist.strings;
|
||||
name = English;
|
||||
|
@ -257,7 +257,7 @@
|
|||
sourceTree = "<group>";
|
||||
};
|
||||
035A4987079DCA100084B05F = {
|
||||
fileEncoding = 30;
|
||||
fileEncoding = 10;
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = text.plist.strings;
|
||||
name = English;
|
||||
|
@ -747,7 +747,7 @@
|
|||
sourceTree = "<group>";
|
||||
};
|
||||
03E2D85B0771F78500BD2443 = {
|
||||
fileEncoding = 30;
|
||||
fileEncoding = 10;
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = text.plist.strings;
|
||||
name = English;
|
||||
|
@ -10531,7 +10531,7 @@
|
|||
sourceTree = SOURCE_ROOT;
|
||||
};
|
||||
3F8C005006800D8D00658CBC = {
|
||||
fileEncoding = 30;
|
||||
fileEncoding = 10;
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = text.plist.strings;
|
||||
name = English;
|
||||
|
@ -10556,7 +10556,7 @@
|
|||
sourceTree = SOURCE_ROOT;
|
||||
};
|
||||
3F8C005606800E1300658CBC = {
|
||||
fileEncoding = 30;
|
||||
fileEncoding = 10;
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = text.plist.strings;
|
||||
name = English;
|
||||
|
@ -14230,7 +14230,7 @@
|
|||
sourceTree = SOURCE_ROOT;
|
||||
};
|
||||
F5170530034B5E9701026D5D = {
|
||||
fileEncoding = 30;
|
||||
fileEncoding = 10;
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = text.plist.strings;
|
||||
name = English;
|
||||
|
@ -15685,7 +15685,7 @@
|
|||
sourceTree = SOURCE_ROOT;
|
||||
};
|
||||
F56F837202E47CCD01EF35C9 = {
|
||||
fileEncoding = 30;
|
||||
fileEncoding = 10;
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = text.plist.strings;
|
||||
name = RegionNames.strings;
|
||||
|
@ -16735,7 +16735,7 @@
|
|||
sourceTree = SOURCE_ROOT;
|
||||
};
|
||||
F5FCDD5D03A035E001A9666E = {
|
||||
fileEncoding = 30;
|
||||
fileEncoding = 10;
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = text.plist.strings;
|
||||
name = Localizable.strings;
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
<key>CFBundleIconFile</key>
|
||||
<string>Appearance.tiff</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>org.mozilla.chimera.preference.appearance</string>
|
||||
<string>org.mozilla.camino.preference.appearance</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
<key>CFBundleIconFile</key>
|
||||
<string>Navigation.tiff</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>org.mozilla.chimera.preference.navigation</string>
|
||||
<string>org.mozilla.camino.preference.navigation</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
<key>CFBundleIconFile</key>
|
||||
<string>Privacy.tiff</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>org.mozilla.chimera.preference.privacy</string>
|
||||
<string>org.mozilla.camino.preference.privacy</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
<key>CFBundleIconFile</key>
|
||||
<string>Security.tiff</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>org.mozilla.chimera.preference.security</string>
|
||||
<string>org.mozilla.camino.preference.security</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
<key>CFBundleIconFile</key>
|
||||
<string>WebFeatures.tiff</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>org.mozilla.chimera.preference.webfeatures</string>
|
||||
<string>org.mozilla.camino.preference.webfeatures</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
|
|
Двоичные данные
camino/resources/localized/English.lproj/Localizable.strings
Двоичные данные
camino/resources/localized/English.lproj/Localizable.strings
Двоичный файл не отображается.
|
@ -3,7 +3,7 @@
|
|||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>IBDocumentLocation</key>
|
||||
<string>74 32 356 240 0 0 1280 1002 </string>
|
||||
<string>100 32 356 240 0 0 1600 1002 </string>
|
||||
<key>IBEditorPositions</key>
|
||||
<dict>
|
||||
<key>11</key>
|
||||
|
@ -11,11 +11,7 @@
|
|||
</dict>
|
||||
<key>IBFramework Version</key>
|
||||
<string>437.0</string>
|
||||
<key>IBOpenObjects</key>
|
||||
<array>
|
||||
<integer>7</integer>
|
||||
</array>
|
||||
<key>IBSystem Version</key>
|
||||
<string>8B15</string>
|
||||
<string>8C46</string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
|
Двоичные данные
camino/resources/localized/English.lproj/MVPreferences.nib/keyedobjects.nib
сгенерированный
Двоичные данные
camino/resources/localized/English.lproj/MVPreferences.nib/keyedobjects.nib
сгенерированный
Двоичный файл не отображается.
|
@ -3392,7 +3392,7 @@ enum BWCOpenDest {
|
|||
- (IBAction)configurePopupBlocking:(id)sender
|
||||
{
|
||||
[[MVPreferencesController sharedInstance] showPreferences:nil];
|
||||
[[MVPreferencesController sharedInstance] selectPreferencePaneByIdentifier:@"org.mozilla.chimera.preference.webfeatures"];
|
||||
[[MVPreferencesController sharedInstance] selectPreferencePaneByIdentifier:@"org.mozilla.camino.preference.webfeatures"];
|
||||
}
|
||||
|
||||
// updateLock:
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
( org.mozilla.chimera.preference.navigation,
|
||||
org.mozilla.chimera.preference.appearance,
|
||||
org.mozilla.chimera.preference.privacy,
|
||||
org.mozilla.chimera.preference.security,
|
||||
( org.mozilla.camino.preference.navigation,
|
||||
org.mozilla.camino.preference.appearance,
|
||||
org.mozilla.camino.preference.privacy,
|
||||
org.mozilla.camino.preference.security,
|
||||
org.mozilla.camino.preference.history,
|
||||
org.mozilla.camino.preference.tabs,
|
||||
org.mozilla.camino.preference.downloads,
|
||||
org.mozilla.chimera.preference.webfeatures,
|
||||
org.mozilla.camino.preference.webfeatures,
|
||||
)
|
||||
|
|
|
@ -161,7 +161,7 @@ static NSString* const CacheInfoPaneSeenKey = @"MVPreferencePaneSeen"; // N
|
|||
|
||||
- (void) awakeFromNib
|
||||
{
|
||||
NSToolbar *toolbar = [[[NSToolbar alloc] initWithIdentifier:@"preferences.toolbar"] autorelease];
|
||||
NSToolbar *toolbar = [[[NSToolbar alloc] initWithIdentifier:@"preferences.toolbar.1"] autorelease];
|
||||
|
||||
[mWindow setDelegate:self];
|
||||
[mWindow setFrameAutosaveName:@"CaminoPreferenceWindowFrame"];
|
||||
|
@ -192,8 +192,8 @@ static NSString* const CacheInfoPaneSeenKey = @"MVPreferencePaneSeen"; // N
|
|||
|
||||
// If a pref pane is not showing, then show the general pane
|
||||
if (!mCurrentPaneIdentifier && (![[mWindow contentView] isEqual:mMainView]))
|
||||
[self selectPreferencePaneByIdentifier:@"org.mozilla.chimera.preference.navigation"];
|
||||
|
||||
[self selectPreferencePaneByIdentifier:@"org.mozilla.camino.preference.navigation"];
|
||||
|
||||
[mWindow makeKeyAndOrderFront:nil];
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче