From f32f41c0e6af3ddb54ba2326edaa1e28670dee7d Mon Sep 17 00:00:00 2001 From: "smfr%smfr.org" Date: Thu, 20 Oct 2005 02:31:36 +0000 Subject: [PATCH] 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. --- camino/Camino.xcode/project.pbxproj | 16 ++++++++-------- camino/Info-AppearancePrefPane.plist | 2 +- camino/Info-NavigationPrefPane.plist | 2 +- camino/Info-PrivacyPrefPane.plist | 2 +- camino/Info-SecurityPrefPane.plist | 2 +- camino/Info-WebFeaturesPrefPane.plist | 2 +- .../English.lproj/Localizable.strings | Bin 27282 -> 27284 bytes .../English.lproj/MVPreferences.nib/info.nib | 8 ++------ .../MVPreferences.nib/keyedobjects.nib | Bin 5004 -> 5008 bytes camino/src/browser/BrowserWindowController.mm | 2 +- .../MVPreferencePaneDefaults.plist | 10 +++++----- .../preferences/MVPreferencesController.mm | 6 +++--- 12 files changed, 24 insertions(+), 28 deletions(-) diff --git a/camino/Camino.xcode/project.pbxproj b/camino/Camino.xcode/project.pbxproj index 17e7678e0dba..4639cd90b3cc 100644 --- a/camino/Camino.xcode/project.pbxproj +++ b/camino/Camino.xcode/project.pbxproj @@ -71,7 +71,7 @@ sourceTree = ""; }; 032FFDD3077351A800440548 = { - fileEncoding = 30; + fileEncoding = 10; isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; @@ -257,7 +257,7 @@ sourceTree = ""; }; 035A4987079DCA100084B05F = { - fileEncoding = 30; + fileEncoding = 10; isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; @@ -747,7 +747,7 @@ sourceTree = ""; }; 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; diff --git a/camino/Info-AppearancePrefPane.plist b/camino/Info-AppearancePrefPane.plist index db563a17c446..1ab7785163e0 100644 --- a/camino/Info-AppearancePrefPane.plist +++ b/camino/Info-AppearancePrefPane.plist @@ -11,7 +11,7 @@ CFBundleIconFile Appearance.tiff CFBundleIdentifier - org.mozilla.chimera.preference.appearance + org.mozilla.camino.preference.appearance CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/camino/Info-NavigationPrefPane.plist b/camino/Info-NavigationPrefPane.plist index 7ab3da8af202..2d20bcfea2dc 100644 --- a/camino/Info-NavigationPrefPane.plist +++ b/camino/Info-NavigationPrefPane.plist @@ -11,7 +11,7 @@ CFBundleIconFile Navigation.tiff CFBundleIdentifier - org.mozilla.chimera.preference.navigation + org.mozilla.camino.preference.navigation CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/camino/Info-PrivacyPrefPane.plist b/camino/Info-PrivacyPrefPane.plist index e334cd21756c..a8acd2a8b326 100644 --- a/camino/Info-PrivacyPrefPane.plist +++ b/camino/Info-PrivacyPrefPane.plist @@ -11,7 +11,7 @@ CFBundleIconFile Privacy.tiff CFBundleIdentifier - org.mozilla.chimera.preference.privacy + org.mozilla.camino.preference.privacy CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/camino/Info-SecurityPrefPane.plist b/camino/Info-SecurityPrefPane.plist index 8b4036bb705a..51b95e08de39 100644 --- a/camino/Info-SecurityPrefPane.plist +++ b/camino/Info-SecurityPrefPane.plist @@ -11,7 +11,7 @@ CFBundleIconFile Security.tiff CFBundleIdentifier - org.mozilla.chimera.preference.security + org.mozilla.camino.preference.security CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/camino/Info-WebFeaturesPrefPane.plist b/camino/Info-WebFeaturesPrefPane.plist index 4ce69a4270ad..5986cc7b387b 100644 --- a/camino/Info-WebFeaturesPrefPane.plist +++ b/camino/Info-WebFeaturesPrefPane.plist @@ -11,7 +11,7 @@ CFBundleIconFile WebFeatures.tiff CFBundleIdentifier - org.mozilla.chimera.preference.webfeatures + org.mozilla.camino.preference.webfeatures CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/camino/resources/localized/English.lproj/Localizable.strings b/camino/resources/localized/English.lproj/Localizable.strings index 059cb34dfbf4019e074fc3fa4d0e9c53291ec147..35063b5baec72f52cd1e7bdbdd0c5670e662a046 100644 GIT binary patch delta 17 YcmbPqm2t{d#tj{IObQ~KJM6f006``OE&u=k delta 14 VcmbPom2uKl#tj{Io4f3|bO18(1^NI0 diff --git a/camino/resources/localized/English.lproj/MVPreferences.nib/info.nib b/camino/resources/localized/English.lproj/MVPreferences.nib/info.nib index eb7caadd8271..c8d190b4c586 100644 --- a/camino/resources/localized/English.lproj/MVPreferences.nib/info.nib +++ b/camino/resources/localized/English.lproj/MVPreferences.nib/info.nib @@ -3,7 +3,7 @@ IBDocumentLocation - 74 32 356 240 0 0 1280 1002 + 100 32 356 240 0 0 1600 1002 IBEditorPositions 11 @@ -11,11 +11,7 @@ IBFramework Version 437.0 - IBOpenObjects - - 7 - IBSystem Version - 8B15 + 8C46 diff --git a/camino/resources/localized/English.lproj/MVPreferences.nib/keyedobjects.nib b/camino/resources/localized/English.lproj/MVPreferences.nib/keyedobjects.nib index 87d1a7a4bbbae0451e4d793d2dd331115e2cc57e..8f82161a80693efa8dd4d36ac8b42b60c7ad7b5a 100644 GIT binary patch delta 1026 zcmW-aYfzMB9L3)kc<#^he_n%KM3%SRk%Y%u3%YZS&_@@D~nE~^d;HS zhP+FBZg-K(<93&XLJd|%u(G(a#8>X~-{|!fxyp-6eI9ScjIl#2=qYx4%e^JGw>h5S zi^xec2aQpq*Z9x~7;&RMk{!v7WJO#ND^eWc(JaU;pUK?Dpiw`g*Rv$M#qCZ~UX zD#K}ZncMsAPVaR>lHHlvwm^=&Bhc(G+~&IXi5CCXXeSgzKY{t48e^r6sy9{`ciEFc zdo*f~@3b##BbhdqN75s8HYD4|d?y_3#|oKnnkQaYmp_aRLfyGEk3+SXPe;* zDN`x`pcDis6**8gnvcp+HM$2ipe7VR8_-6y1MNXQXdfCxpQ1D9GWr|+hiBmooQD_T z+i)#z#OtshH{k%@f}h4a@J`&0JMbVL#vkKRJdVG?-{F(^6h4E`;&XTsU&6oRE2Myw zkXy-pVX~Gqkyg@1_K+^}Jc*KCvX{I>_K`lapByBwkbd$e86rnWjEs;tNsuvef{c^X z;OB&2H5K?#y(;r>|1u0O|q-p;B$EnpU3lfJ}=-4 zcr|b2t$aJ*&0paCe1N~k5A!$pTYQMW!;kVfKh4kcN&W}_i(lja@@XN3Lu80~!Y8Uk zjd(!#MUx1K4Pv9%6c&$*Hqk9!6#ZgAye(p4M8rixjENIsLR=AlimPH;QkfwOrCZ)2 zSIX70K|Uf|Wk~Ll2jqY}CO?y(%Mlru2{|q&SQ zom!(FR_j%(dP?n5Jt}-i9Z@m$u6kb`RSET@`bqt)Ce$zL8YIIFkOoee0~wG7+2Dd) zSPX8cgcVQ&cf%^Eg*vE*)$kxR!g^?i7T641;V}roPH2Y?=!EB>8~Wfdya&hNI3!>U zzK4@=3MOD$n>tyeIhtsug;rYYSvpla^lY83Gj)D6Kh>MQMQ_tj>W~iWcKxj0t$TE@ P-m4GlSEJ3TIcDsC$}$#w delta 1049 zcmYL@ZA_JA7{{LnxZm&lx*r9OA_!-soL zh+0aCok&4wL{6-nouu4~56(Hl0}*AJmYI}`=F)6bu7%AWKD54E*L_|8|Mmaf?VdJI zWRaO*OqplQs5xSenxC3u=4a-(`T4*D=I+=zbA!RGB{^PqAP{Kwx`Wxd+0HxL7rqkL z6XUcN6v+1H_`L2cpU>aiTp9Fd1u_G<&g{=^uCnF@1DT6`{v3bpJ%O2!|A&Da$VHP! zj1HsU7&S_aL8H!2w^Qs?JJaU2+qS}PNG=^Te2!zL_8TS6HpX$x)Kte)de+D@T;^VL z+abp@li_pJnd_MUwAUTY+;1K*JIyY;%znZyw=3+@a1Ugtiu}6zTF(~uV_O?)H-}Hd z!mNiJ%Amt}#27IOjMYx!!%k+0ZQ0C8bUVyq=Z9rRVUVql9-HA9nezsKD|2x*jnTqq4?pd7Rk6`^%#1KNn{Q3Kk6UO^qG8y!KX z&^Wq={zQLcg>)3cy<{H=lMb?tTJYpGDY5Y>1s@7uh76 zVz+n_Pv-M^8h7(_zJM?1mAsKR^IiN^-pl*=A%2)2;qUOH{C$3c5AzHBGN0r(_#gZx z|BFuxDrO0nm@oWdsmK?Pi)v9LYQ@u{PCOG5n?*>piPuE0=o9aXh!_&XA}U73n3xdP z#cyItOv^awl6Oe2%$2KTu`HKQ%0}5Fx66aFPo9*gRa`l`d&?_AJt8D z8vrbr4GG|axiAk>AQe2|g=}~b@?kX;Kp_;t8YqSmsD$;f0X9NCG{7ckf);3no$w;; zhBoMg!*CogEws{F&(iTaQP0tCy-cqNFNhB$ cKBt>>P`BzGdY5k3`*c`$>o>!j;?vB?zjgH<8vp