/[smeserver]/rpms/e-smith-email/sme8/e-smith-email-4.17.0-rmDuplicates.patch
ViewVC logotype

Contents of /rpms/e-smith-email/sme8/e-smith-email-4.17.0-rmDuplicates.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.2 - (show annotations) (download)
Tue Mar 11 17:12:44 2008 UTC (16 years, 2 months ago) by slords
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Import on branch sme8 of package e-smith-email-4.18.0-1.el5.sme.src.rpm

1 diff -Nur -x '*.orig' -x '*.rej' e-smith-email-4.17.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings mezzanine_patched_e-smith-email-4.17.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings
2 --- e-smith-email-4.17.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings 2007-12-27 06:48:39.000000000 +1100
3 +++ mezzanine_patched_e-smith-email-4.17.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings 2008-02-10 10:36:22.000000000 +1100
4 @@ -3,6 +3,10 @@
5 -->
6 <entry>
7 <base>FORM_TITLE</base>
8 + <trans>E-mail settings</trans>
9 + </entry>
10 + <entry>
11 + <base>E-mail</base>
12 <trans>E-mail</trans>
13 </entry>
14 <entry>
15 @@ -149,20 +153,6 @@
16 <base>LABEL_SORT_HEADER</base>
17 <trans>Select sort header (for multi-drop)</trans>
18 </entry>
19 -
20 - <entry>
21 - <base>SAVE</base>
22 - <trans>Save</trans>
23 - </entry>
24 -
25 - <entry>
26 - <base>FORM_TITLE</base>
27 - <trans>E-mail settings</trans>
28 - </entry>
29 - <entry>
30 - <base>SUCCESS</base>
31 - <trans>The new e-mail settings have been saved.</trans>
32 - </entry>
33 <entry>
34 <base>ENABLED</base>
35 <trans>Enabled</trans>
36 @@ -204,7 +194,7 @@
37 <trans>Allow both POP3 and POP3S</trans>
38 </entry>
39 <entry>
40 - <base>PRIVATE_POP3</base>
41 + <base>ALLOW_PRIVATE</base>
42 <trans>Allow private</trans>
43 </entry>
44 <entry>
45 @@ -216,10 +206,6 @@
46 <trans>Allow both IMAP and IMAPS</trans>
47 </entry>
48 <entry>
49 - <base>PRIVATE_IMAP</base>
50 - <trans>Allow private</trans>
51 - </entry>
52 - <entry>
53 <base>SECURE_IMAP</base>
54 <trans>Allow private and public (secure IMAPS)</trans>
55 </entry>
56 @@ -342,18 +328,6 @@
57 <trans>Webmail access</trans>
58 </entry>
59 <entry>
60 - <base>SAVE</base>
61 - <trans>Save</trans>
62 - </entry>
63 - <entry>
64 - <base>Configuration</base>
65 - <trans>Configuration</trans>
66 - </entry>
67 - <entry>
68 - <base>E-mail</base>
69 - <trans>E-mail</trans>
70 - </entry>
71 - <entry>
72 <base>ERROR_UPDATING</base>
73 <trans>Error occurred while updating system configuration.</trans>
74 </entry>
75 @@ -543,10 +517,6 @@
76 <base>CUSTOM</base>
77 <trans>Custom</trans>
78 </entry>
79 - <entry>
80 - <base>SAVE</base>
81 - <trans>Save</trans>
82 - </entry>
83
84 <entry>
85 <base>LABEL_SMARTHOST_SMTPAUTH_STATUS</base>
86 diff -Nur -x '*.orig' -x '*.rej' e-smith-email-4.17.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm mezzanine_patched_e-smith-email-4.17.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm
87 --- e-smith-email-4.17.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm 2007-12-27 06:48:39.000000000 +1100
88 +++ mezzanine_patched_e-smith-email-4.17.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm 2008-02-10 10:33:10.000000000 +1100
89 @@ -708,7 +708,7 @@
90 {
91 my %options = (
92 disabled => 'DISABLED',
93 - private => 'PRIVATE_POP3',
94 + private => 'ALLOW_PRIVATE',
95 publicSSL => 'SECURE_POP3'
96 );
97
98 @@ -723,7 +723,7 @@
99 {
100 my %options = (
101 disabled => 'DISABLED',
102 - private => 'PRIVATE_IMAP',
103 + private => 'ALLOW_PRIVATE',
104 publicSSL => 'SECURE_IMAP'
105 );
106

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed