Annotation of /trunk/firewalld/patches/firewalld-0.3.3-confd.patch
Parent Directory | Revision Log
Revision 2193 -
(hide annotations)
(download)
Mon Jun 10 09:21:53 2013 UTC (11 years, 3 months ago) by niro
File size: 35353 byte(s)
Mon Jun 10 09:21:53 2013 UTC (11 years, 3 months ago) by niro
File size: 35353 byte(s)
-rediffed for 0.3.3
1 | niro | 2193 | diff -Naur firewalld-0.3.3/config/firewalld.init firewalld-0.3.3-magellan/config/firewalld.init |
2 | --- firewalld-0.3.3/config/firewalld.init 2011-12-15 18:03:32.000000000 +0000 | ||
3 | +++ firewalld-0.3.3-magellan/config/firewalld.init 2013-06-10 11:47:36.156000000 +0000 | ||
4 | @@ -29,7 +29,7 @@ | ||
5 | prog="firewalld" | ||
6 | #config="/etc/firewalld/firewalld.conf" | ||
7 | |||
8 | -[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog | ||
9 | +[ -e /etc/conf.d/$prog ] && . /etc/conf.d/$prog | ||
10 | |||
11 | lockfile=/var/lock/subsys/$prog | ||
12 | |||
13 | diff -Naur firewalld-0.3.3/config/firewalld.service.in firewalld-0.3.3-magellan/config/firewalld.service.in | ||
14 | --- firewalld-0.3.3/config/firewalld.service.in 2013-05-06 13:38:20.000000000 +0000 | ||
15 | +++ firewalld-0.3.3-magellan/config/firewalld.service.in 2013-06-10 11:47:10.624000000 +0000 | ||
16 | @@ -6,7 +6,7 @@ | ||
17 | Conflicts=iptables.service ip6tables.service ebtables.service | ||
18 | |||
19 | [Service] | ||
20 | -EnvironmentFile=-/etc/sysconfig/firewalld | ||
21 | +EnvironmentFile=-/etc/conf.d/firewalld | ||
22 | ExecStart=@sbindir@/firewalld --nofork --nopid $FIREWALLD_ARGS | ||
23 | ExecReload=/bin/kill -HUP $MAINPID | ||
24 | # supress to log debug and error output also to /var/log/messages | ||
25 | diff -Naur firewalld-0.3.3/po/ar.po firewalld-0.3.3-magellan/po/ar.po | ||
26 | --- firewalld-0.3.3/po/ar.po 2013-06-06 16:07:06.000000000 +0000 | ||
27 | +++ firewalld-0.3.3-magellan/po/ar.po 2013-06-10 11:49:14.060000000 +0000 | ||
28 | @@ -874,7 +874,7 @@ | ||
29 | msgid "" | ||
30 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
31 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
32 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
33 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
34 | msgstr "" | ||
35 | "تحديد ملف قواعد مخصص للتضمين في الجدار النّاريّ بعد الإعدادات المبدئية ." | ||
36 | "الميفاق المبدئي :ipv4, الجدول المبدئي:مُرشح. (مثال: ipv4:filter:/etc/" | ||
37 | diff -Naur firewalld-0.3.3/po/as.po firewalld-0.3.3-magellan/po/as.po | ||
38 | --- firewalld-0.3.3/po/as.po 2013-06-06 16:07:06.000000000 +0000 | ||
39 | +++ firewalld-0.3.3-magellan/po/as.po 2013-06-10 11:49:14.063000000 +0000 | ||
40 | @@ -876,11 +876,11 @@ | ||
41 | msgid "" | ||
42 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
43 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
44 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
45 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
46 | msgstr "" | ||
47 | "অবিকল্পিত নিয়মসমূহৰ পিছত, ফায়াৰ্ৱালত অন্তৰ্ভুক্ত কৰাৰ বাবে স্বনিৰ্ধাৰিত নিয়মৰ এটা " | ||
48 | "নথিপত্ৰ উল্লেখ কৰক । অবকল্পিত আচাৰ বিধিৰ ধৰণ: ipv4, default table: filter. " | ||
49 | -"(যেনে: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" | ||
50 | +"(যেনে: ipv4:filter:/etc/conf.d/ipv4_filter_addon)" | ||
51 | |||
52 | #: ../src/firewall-offline-cmd:187 | ||
53 | msgid "" | ||
54 | diff -Naur firewalld-0.3.3/po/bn_IN.po firewalld-0.3.3-magellan/po/bn_IN.po | ||
55 | --- firewalld-0.3.3/po/bn_IN.po 2013-06-06 16:07:06.000000000 +0000 | ||
56 | +++ firewalld-0.3.3-magellan/po/bn_IN.po 2013-06-10 11:49:14.066000000 +0000 | ||
57 | @@ -878,11 +878,11 @@ | ||
58 | msgid "" | ||
59 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
60 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
61 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
62 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
63 | msgstr "" | ||
64 | "ফায়ারওয়ালের মধ্যে অন্তর্ভুক্ত করার জন্য স্বনির্ধারিত নিয়মের একটি ফাইল উল্লেখ করুন। " | ||
65 | "ডিফল্ট নিয়মগুলির পরে এইগুলি যোগ করা হবে। ডিফল্ট প্রোটোকলের বিন্যাস: ipv4, default " | ||
66 | -"table: filter। (উদাহরণ: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" | ||
67 | +"table: filter। (উদাহরণ: ipv4:filter:/etc/conf.d/ipv4_filter_addon)" | ||
68 | |||
69 | #: ../src/firewall-offline-cmd:187 | ||
70 | msgid "" | ||
71 | diff -Naur firewalld-0.3.3/po/ca.po firewalld-0.3.3-magellan/po/ca.po | ||
72 | --- firewalld-0.3.3/po/ca.po 2013-06-06 16:07:06.000000000 +0000 | ||
73 | +++ firewalld-0.3.3-magellan/po/ca.po 2013-06-10 11:49:14.068000000 +0000 | ||
74 | @@ -877,7 +877,7 @@ | ||
75 | msgid "" | ||
76 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
77 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
78 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
79 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
80 | msgstr "" | ||
81 | "Especifica un fitxer de regles personalitzades a incloure en el tallafoc. " | ||
82 | "S'inclourà després de les regles predeterminades. El tipus predeterminat és " | ||
83 | diff -Naur firewalld-0.3.3/po/cs.po firewalld-0.3.3-magellan/po/cs.po | ||
84 | --- firewalld-0.3.3/po/cs.po 2013-06-06 16:07:06.000000000 +0000 | ||
85 | +++ firewalld-0.3.3-magellan/po/cs.po 2013-06-10 11:49:14.071000000 +0000 | ||
86 | @@ -895,11 +895,11 @@ | ||
87 | msgid "" | ||
88 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
89 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
90 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
91 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
92 | msgstr "" | ||
93 | "Určete soubor s vlastními pravidly pro přidání do firewallu. Bude zařazen za " | ||
94 | "výchozí pravidla. Výchozí typ protokolu: ipv4, výchozí tabulka: filter " | ||
95 | -"(např.: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)." | ||
96 | +"(např.: ipv4:filter:/etc/conf.d/ipv4_filter_addon)." | ||
97 | |||
98 | #: ../src/firewall-offline-cmd:187 | ||
99 | msgid "" | ||
100 | diff -Naur firewalld-0.3.3/po/da.po firewalld-0.3.3-magellan/po/da.po | ||
101 | --- firewalld-0.3.3/po/da.po 2013-06-06 16:07:06.000000000 +0000 | ||
102 | +++ firewalld-0.3.3-magellan/po/da.po 2013-06-10 11:49:14.074000000 +0000 | ||
103 | @@ -879,11 +879,11 @@ | ||
104 | msgid "" | ||
105 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
106 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
107 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
108 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
109 | msgstr "" | ||
110 | "Angiv en tilpasset regelfil til inkludering i firewallen, efter " | ||
111 | "standardreglerne. Standard protokoltype: \"ipv4\", standard tabel: \"filter" | ||
112 | -"\". (Eksempel: \"ipv4:filter:/etc/sysconfig/ipv4_filter_addon\")" | ||
113 | +"\". (Eksempel: \"ipv4:filter:/etc/conf.d/ipv4_filter_addon\")" | ||
114 | |||
115 | #: ../src/firewall-offline-cmd:187 | ||
116 | msgid "" | ||
117 | diff -Naur firewalld-0.3.3/po/de.po firewalld-0.3.3-magellan/po/de.po | ||
118 | --- firewalld-0.3.3/po/de.po 2013-06-06 16:07:06.000000000 +0000 | ||
119 | +++ firewalld-0.3.3-magellan/po/de.po 2013-06-10 11:49:14.077000000 +0000 | ||
120 | @@ -930,7 +930,7 @@ | ||
121 | msgid "" | ||
122 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
123 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
124 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
125 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
126 | msgstr "" | ||
127 | "Wählen Sie eine eigene Regeldatei aus, die in die Firewall eingebunden " | ||
128 | "werden soll. Sie wird nach den Standardregeln eingebunden. " | ||
129 | diff -Naur firewalld-0.3.3/po/en_GB.po firewalld-0.3.3-magellan/po/en_GB.po | ||
130 | --- firewalld-0.3.3/po/en_GB.po 2013-06-06 16:07:07.000000000 +0000 | ||
131 | +++ firewalld-0.3.3-magellan/po/en_GB.po 2013-06-10 11:49:14.079000000 +0000 | ||
132 | @@ -875,11 +875,11 @@ | ||
133 | msgid "" | ||
134 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
135 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
136 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
137 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
138 | msgstr "" | ||
139 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
140 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
141 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
142 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
143 | |||
144 | #: ../src/firewall-offline-cmd:187 | ||
145 | msgid "" | ||
146 | diff -Naur firewalld-0.3.3/po/es.po firewalld-0.3.3-magellan/po/es.po | ||
147 | --- firewalld-0.3.3/po/es.po 2013-06-06 16:07:07.000000000 +0000 | ||
148 | +++ firewalld-0.3.3-magellan/po/es.po 2013-06-10 11:49:14.082000000 +0000 | ||
149 | @@ -913,11 +913,11 @@ | ||
150 | msgid "" | ||
151 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
152 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
153 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
154 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
155 | msgstr "" | ||
156 | "Especifique un archivo de reglas personalizadas para incluir en el " | ||
157 | "cortafuegos. Tipo por defecto: ipv4, tabla por defecto: filter. (Ejemplo: " | ||
158 | -"ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" | ||
159 | +"ipv4:filter:/etc/conf.d/ipv4_filter_addon)" | ||
160 | |||
161 | #: ../src/firewall-offline-cmd:187 | ||
162 | msgid "" | ||
163 | diff -Naur firewalld-0.3.3/po/fi.po firewalld-0.3.3-magellan/po/fi.po | ||
164 | --- firewalld-0.3.3/po/fi.po 2013-06-06 16:07:07.000000000 +0000 | ||
165 | +++ firewalld-0.3.3-magellan/po/fi.po 2013-06-10 11:49:14.085000000 +0000 | ||
166 | @@ -878,11 +878,11 @@ | ||
167 | msgid "" | ||
168 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
169 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
170 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
171 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
172 | msgstr "" | ||
173 | "Määritä mukautettu sääntötiedosto, joka lisätään palomuuriin. Lisäys tehdään " | ||
174 | "oletussääntöjen jälkeen. Oletusprotokollatyyppi: ipv4, oletustaulu: filter. " | ||
175 | -"(Esimerkki: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" | ||
176 | +"(Esimerkki: ipv4:filter:/etc/conf.d/ipv4_filter_addon)" | ||
177 | |||
178 | #: ../src/firewall-offline-cmd:187 | ||
179 | msgid "" | ||
180 | diff -Naur firewalld-0.3.3/po/fr.po firewalld-0.3.3-magellan/po/fr.po | ||
181 | --- firewalld-0.3.3/po/fr.po 2013-06-06 16:07:07.000000000 +0000 | ||
182 | +++ firewalld-0.3.3-magellan/po/fr.po 2013-06-10 11:49:14.087000000 +0000 | ||
183 | @@ -923,7 +923,7 @@ | ||
184 | msgid "" | ||
185 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
186 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
187 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
188 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
189 | msgstr "" | ||
190 | "Spécifier un fichier de règles personnalisées à inclure dans le pare-feu. " | ||
191 | "Elles seront incluses après les règles par défaut. Type de protocole par " | ||
192 | diff -Naur firewalld-0.3.3/po/gu.po firewalld-0.3.3-magellan/po/gu.po | ||
193 | --- firewalld-0.3.3/po/gu.po 2013-06-06 16:07:07.000000000 +0000 | ||
194 | +++ firewalld-0.3.3-magellan/po/gu.po 2013-06-10 11:49:14.090000000 +0000 | ||
195 | @@ -873,10 +873,10 @@ | ||
196 | msgid "" | ||
197 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
198 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
199 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
200 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
201 | msgstr "" | ||
202 | "ફાયરવોલમાં સમાવવા માટે વૈવિધ્યપૂર્ણ નિયમો ફાઈલ સ્પષ્ટ કરો, મૂળભૂત નિયમો પછી. મૂળભૂત " | ||
203 | -"પ્રોટોકોલ પ્રકાર: ipv4, મૂળભૂત કોષ્ટક: ગાળક. (ઉદાહરણ: ipv4:filter:/etc/sysconfig/" | ||
204 | +"પ્રોટોકોલ પ્રકાર: ipv4, મૂળભૂત કોષ્ટક: ગાળક. (ઉદાહરણ: ipv4:filter:/etc/conf.d/" | ||
205 | "ipv4_filter_addon)" | ||
206 | |||
207 | #: ../src/firewall-offline-cmd:187 | ||
208 | diff -Naur firewalld-0.3.3/po/hi.po firewalld-0.3.3-magellan/po/hi.po | ||
209 | --- firewalld-0.3.3/po/hi.po 2013-06-06 16:07:07.000000000 +0000 | ||
210 | +++ firewalld-0.3.3-magellan/po/hi.po 2013-06-10 11:49:14.092000000 +0000 | ||
211 | @@ -872,7 +872,7 @@ | ||
212 | msgid "" | ||
213 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
214 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
215 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
216 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
217 | msgstr "" | ||
218 | "फायरवॉल में शामिल किए जाने के लिए पसंदीदा नियम फाइल तयशुदा नियम के बाद निर्दिष्ट करें. " | ||
219 | "तयशुदा प्रोटोकॉल प्रकार:: ipv4, default table: filter. (Example: ipv4:filter:/" | ||
220 | diff -Naur firewalld-0.3.3/po/hu.po firewalld-0.3.3-magellan/po/hu.po | ||
221 | --- firewalld-0.3.3/po/hu.po 2013-06-06 16:07:07.000000000 +0000 | ||
222 | +++ firewalld-0.3.3-magellan/po/hu.po 2013-06-10 11:49:14.095000000 +0000 | ||
223 | @@ -911,11 +911,11 @@ | ||
224 | msgid "" | ||
225 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
226 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
227 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
228 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
229 | msgstr "" | ||
230 | "Megad egy egyéni szabályfájlt, mely az alapértelmezett szabályok után kerül " | ||
231 | "beillesztésre. Alapértelmezett protokoll típus: ipv4, alapértelmezett tábla: " | ||
232 | -"szűrő. (pl. ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" | ||
233 | +"szűrő. (pl. ipv4:filter:/etc/conf.d/ipv4_filter_addon)" | ||
234 | |||
235 | #: ../src/firewall-offline-cmd:187 | ||
236 | msgid "" | ||
237 | diff -Naur firewalld-0.3.3/po/it.po firewalld-0.3.3-magellan/po/it.po | ||
238 | --- firewalld-0.3.3/po/it.po 2013-06-06 16:07:07.000000000 +0000 | ||
239 | +++ firewalld-0.3.3-magellan/po/it.po 2013-06-10 11:49:14.098000000 +0000 | ||
240 | @@ -917,11 +917,11 @@ | ||
241 | msgid "" | ||
242 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
243 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
244 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
245 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
246 | msgstr "" | ||
247 | "Specifica un file di regole personalizzato da includere nel firewall dopo le " | ||
248 | "regole predefinite. Tipo protocollo predefinito: ipv4, tavola predefinita: " | ||
249 | -"filter. (Esempio: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" | ||
250 | +"filter. (Esempio: ipv4:filter:/etc/conf.d/ipv4_filter_addon)" | ||
251 | |||
252 | #: ../src/firewall-offline-cmd:187 | ||
253 | msgid "" | ||
254 | diff -Naur firewalld-0.3.3/po/ja.po firewalld-0.3.3-magellan/po/ja.po | ||
255 | --- firewalld-0.3.3/po/ja.po 2013-06-06 16:07:07.000000000 +0000 | ||
256 | +++ firewalld-0.3.3-magellan/po/ja.po 2013-06-10 11:49:14.101000000 +0000 | ||
257 | @@ -902,11 +902,11 @@ | ||
258 | msgid "" | ||
259 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
260 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
261 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
262 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
263 | msgstr "" | ||
264 | "ファイアーウォールでデフォルトのルールの後に取り込むカスタムルールファイルを" | ||
265 | "指定します。 デフォルトタイプ: ipv4、 デフォルトテーブル: フィルター。 (例: " | ||
266 | -"ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" | ||
267 | +"ipv4:filter:/etc/conf.d/ipv4_filter_addon)" | ||
268 | |||
269 | #: ../src/firewall-offline-cmd:187 | ||
270 | msgid "" | ||
271 | diff -Naur firewalld-0.3.3/po/kn.po firewalld-0.3.3-magellan/po/kn.po | ||
272 | --- firewalld-0.3.3/po/kn.po 2013-06-06 16:07:07.000000000 +0000 | ||
273 | +++ firewalld-0.3.3-magellan/po/kn.po 2013-06-10 11:49:14.104000000 +0000 | ||
274 | @@ -875,11 +875,11 @@ | ||
275 | msgid "" | ||
276 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
277 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
278 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
279 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
280 | msgstr "" | ||
281 | "ಫೈರ್ವಾಲಿನಲ್ಲಿ ಒಳಗೊಳ್ಳಿಸಲು, ಪೂರ್ವನಿಯೋಜಿತ ನಿಯಮಗಳ ನಂತರ ಒಂದು ಇಚ್ಛೆಯ(ಕಸ್ಟಮ್) ನಿಯಮಗಳ " | ||
282 | "ಕಡತವನ್ನು ಸೂಚಿಸಿ. ಅದು ಪೂರ್ವನಿಯೋಜಿತ ಪ್ರೊಟೋಕಾಲ್ ಬಗೆ: ipv4, default table: filter. " | ||
283 | -"(ಉದಾಹರಣೆ: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" | ||
284 | +"(ಉದಾಹರಣೆ: ipv4:filter:/etc/conf.d/ipv4_filter_addon)" | ||
285 | |||
286 | #: ../src/firewall-offline-cmd:187 | ||
287 | msgid "" | ||
288 | diff -Naur firewalld-0.3.3/po/ko.po firewalld-0.3.3-magellan/po/ko.po | ||
289 | --- firewalld-0.3.3/po/ko.po 2013-06-06 16:07:08.000000000 +0000 | ||
290 | +++ firewalld-0.3.3-magellan/po/ko.po 2013-06-10 11:49:14.106000000 +0000 | ||
291 | @@ -880,11 +880,11 @@ | ||
292 | msgid "" | ||
293 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
294 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
295 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
296 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
297 | msgstr "" | ||
298 | "방화벽 설정에 포함할 사용자 규칙 파일을 지정합니다. 이는 기본값 규칙 다음에 " | ||
299 | "포함됩니다. 기본값 프로토콜 형식: ipv4, 기본값 테이블: filter. (예: ipv4:" | ||
300 | -"filter:/etc/sysconfig/ipv4_filter_addon) " | ||
301 | +"filter:/etc/conf.d/ipv4_filter_addon) " | ||
302 | |||
303 | #: ../src/firewall-offline-cmd:187 | ||
304 | msgid "" | ||
305 | diff -Naur firewalld-0.3.3/po/ml.po firewalld-0.3.3-magellan/po/ml.po | ||
306 | --- firewalld-0.3.3/po/ml.po 2013-06-06 16:07:08.000000000 +0000 | ||
307 | +++ firewalld-0.3.3-magellan/po/ml.po 2013-06-10 11:49:14.110000000 +0000 | ||
308 | @@ -872,7 +872,7 @@ | ||
309 | msgid "" | ||
310 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
311 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
312 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
313 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
314 | msgstr "" | ||
315 | "നിങ്ങള് ഉണ്ടാക്കിയ നിയമങ്ങളുടെ ഒരു ഫയല് ഫയര്വോളില് ഉള്പ്പെടുത്തുക. സ്വതവേയുള്ള നിയമങ്ങള്ക്ക് ശേഷം " | ||
316 | "ഇത് ഉള്പ്പെടുത്തുന്നതാണ്. സ്വതവേയുള്ളത്: ipv4, തനത് പട്ടിക: അരിപ്പ. (ഉദാഹരണം: ipv4:filter:/" | ||
317 | diff -Naur firewalld-0.3.3/po/mr.po firewalld-0.3.3-magellan/po/mr.po | ||
318 | --- firewalld-0.3.3/po/mr.po 2013-06-06 16:07:08.000000000 +0000 | ||
319 | +++ firewalld-0.3.3-magellan/po/mr.po 2013-06-10 11:49:14.112000000 +0000 | ||
320 | @@ -876,11 +876,11 @@ | ||
321 | msgid "" | ||
322 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
323 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
324 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
325 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
326 | msgstr "" | ||
327 | "फायरवॉल अंतर्गत समाविष्ट करण्याकरीता पूर्वनिर्धारीत नियम नंतर, इच्छिक नियम निश्चित " | ||
328 | "करा. पूर्वनिर्धारीत शिष्टाचार प्रकार: ipv4, पूर्वनिर्धारीत तक्ता: फिल्टर. (उदाहरणार्थ: " | ||
329 | -"ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" | ||
330 | +"ipv4:filter:/etc/conf.d/ipv4_filter_addon)" | ||
331 | |||
332 | #: ../src/firewall-offline-cmd:187 | ||
333 | msgid "" | ||
334 | diff -Naur firewalld-0.3.3/po/nl.po firewalld-0.3.3-magellan/po/nl.po | ||
335 | --- firewalld-0.3.3/po/nl.po 2013-06-06 16:07:08.000000000 +0000 | ||
336 | +++ firewalld-0.3.3-magellan/po/nl.po 2013-06-10 11:49:14.115000000 +0000 | ||
337 | @@ -909,11 +909,11 @@ | ||
338 | msgid "" | ||
339 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
340 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
341 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
342 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
343 | msgstr "" | ||
344 | "Specificeer een aangepast regel bestand om na de standaard regels toe te " | ||
345 | "voegen aan de firewall. Standaard protocol type: ipv4, standaard tabel: " | ||
346 | -"filter. (Bijvoorbeeld: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" | ||
347 | +"filter. (Bijvoorbeeld: ipv4:filter:/etc/conf.d/ipv4_filter_addon)" | ||
348 | |||
349 | #: ../src/firewall-offline-cmd:187 | ||
350 | msgid "" | ||
351 | diff -Naur firewalld-0.3.3/po/or.po firewalld-0.3.3-magellan/po/or.po | ||
352 | --- firewalld-0.3.3/po/or.po 2013-06-06 16:07:08.000000000 +0000 | ||
353 | +++ firewalld-0.3.3-magellan/po/or.po 2013-06-10 11:49:14.118000000 +0000 | ||
354 | @@ -875,11 +875,11 @@ | ||
355 | msgid "" | ||
356 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
357 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
358 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
359 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
360 | msgstr "" | ||
361 | "ପୂର୍ବନିର୍ଦ୍ଧାରିତ ନିୟମାବଳୀ ପରେ, ଅଗ୍ନିକବଚରେ ଅନ୍ତର୍ଭୁକ୍ତ ହେବା ପାଇଁ ଗୋଟିଏ ଇଚ୍ଛାରୂପୀ ନିୟମାବଳୀ ଫାଇଲ " | ||
362 | "ଉଲ୍ଲେଖ କରନ୍ତୁ. ପୂର୍ବନିର୍ଦ୍ଧାରିତ ପ୍ରୋଟୋକଲ ପ୍ରକାର: ipv4, ପୂର୍ବନିର୍ଦ୍ଧାରିତ ସାରଣୀ: ଛାଣକ. (ଉଦାହରଣ " | ||
363 | -"ସ୍ୱରୂପ: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" | ||
364 | +"ସ୍ୱରୂପ: ipv4:filter:/etc/conf.d/ipv4_filter_addon)" | ||
365 | |||
366 | #: ../src/firewall-offline-cmd:187 | ||
367 | msgid "" | ||
368 | diff -Naur firewalld-0.3.3/po/pa.po firewalld-0.3.3-magellan/po/pa.po | ||
369 | --- firewalld-0.3.3/po/pa.po 2013-06-06 16:07:08.000000000 +0000 | ||
370 | +++ firewalld-0.3.3-magellan/po/pa.po 2013-06-10 11:49:14.120000000 +0000 | ||
371 | @@ -879,10 +879,10 @@ | ||
372 | msgid "" | ||
373 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
374 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
375 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
376 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
377 | msgstr "" | ||
378 | "ਮੂਲ ਨਿਯਮਾਂ ਤੋਂ ਬਾਅਦ ਫਾਇਰਵਾਲ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਪਸੰਦੀ ਦੀ ਨਿਯਮ ਫਾਇਲ ਦਿਓ। ਮੂਲ ਪਰੋਟੋਕਾਲ " | ||
379 | -"ਕਿਸਮ: ipv4, ਮੂਲ ਸਾਰਣੀ: ਫਿਲਟਰ। (ਉਦਾਹਰਨ: ipv4:filter:/etc/sysconfig/" | ||
380 | +"ਕਿਸਮ: ipv4, ਮੂਲ ਸਾਰਣੀ: ਫਿਲਟਰ। (ਉਦਾਹਰਨ: ipv4:filter:/etc/conf.d/" | ||
381 | "ipv4_filter_addon)" | ||
382 | |||
383 | #: ../src/firewall-offline-cmd:187 | ||
384 | diff -Naur firewalld-0.3.3/po/pl.po firewalld-0.3.3-magellan/po/pl.po | ||
385 | --- firewalld-0.3.3/po/pl.po 2013-06-06 16:07:08.000000000 +0000 | ||
386 | +++ firewalld-0.3.3-magellan/po/pl.po 2013-06-10 11:49:14.123000000 +0000 | ||
387 | @@ -907,11 +907,11 @@ | ||
388 | msgid "" | ||
389 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
390 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
391 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
392 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
393 | msgstr "" | ||
394 | "Można podać własny plik reguł do dołączenia do zapory po domyślnych " | ||
395 | "regułach. Domyślny typ protokołu: ipv4, domyślna tablica: filter (przykład: " | ||
396 | -"ipv4:filter:/etc/sysconfig/ipv4_filter_addon)." | ||
397 | +"ipv4:filter:/etc/conf.d/ipv4_filter_addon)." | ||
398 | |||
399 | #: ../src/firewall-offline-cmd:187 | ||
400 | msgid "" | ||
401 | diff -Naur firewalld-0.3.3/po/pt_BR.po firewalld-0.3.3-magellan/po/pt_BR.po | ||
402 | --- firewalld-0.3.3/po/pt_BR.po 2013-06-06 16:07:08.000000000 +0000 | ||
403 | +++ firewalld-0.3.3-magellan/po/pt_BR.po 2013-06-10 11:49:14.126000000 +0000 | ||
404 | @@ -918,11 +918,11 @@ | ||
405 | msgid "" | ||
406 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
407 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
408 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
409 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
410 | msgstr "" | ||
411 | "Especifique um arquivo de regras personalizadas para inclusão no firewall " | ||
412 | "após as regras padrão. Tipo padrão do protocolo: ipv4, tabela padrão: " | ||
413 | -"filter. (Exemplo: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" | ||
414 | +"filter. (Exemplo: ipv4:filter:/etc/conf.d/ipv4_filter_addon)" | ||
415 | |||
416 | #: ../src/firewall-offline-cmd:187 | ||
417 | msgid "" | ||
418 | diff -Naur firewalld-0.3.3/po/pt.po firewalld-0.3.3-magellan/po/pt.po | ||
419 | --- firewalld-0.3.3/po/pt.po 2013-06-06 16:07:08.000000000 +0000 | ||
420 | +++ firewalld-0.3.3-magellan/po/pt.po 2013-06-10 11:49:14.129000000 +0000 | ||
421 | @@ -877,11 +877,11 @@ | ||
422 | msgid "" | ||
423 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
424 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
425 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
426 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
427 | msgstr "" | ||
428 | "Especifique um ficheiro com regras personalizadas para incluir na firewall a " | ||
429 | "seguir às regras por omissão. Tipo de protocolo por omissão: ipv4, tabela " | ||
430 | -"por omissão: filter. (Exemplo: ipv4:filter:/etc/sysconfig/" | ||
431 | +"por omissão: filter. (Exemplo: ipv4:filter:/etc/conf.d/" | ||
432 | "ipv4_filter_as_minhas_regras)" | ||
433 | |||
434 | #: ../src/firewall-offline-cmd:187 | ||
435 | diff -Naur firewalld-0.3.3/po/ru.po firewalld-0.3.3-magellan/po/ru.po | ||
436 | --- firewalld-0.3.3/po/ru.po 2013-06-06 16:07:09.000000000 +0000 | ||
437 | +++ firewalld-0.3.3-magellan/po/ru.po 2013-06-10 11:49:14.132000000 +0000 | ||
438 | @@ -906,12 +906,12 @@ | ||
439 | msgid "" | ||
440 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
441 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
442 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
443 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
444 | msgstr "" | ||
445 | "Позволяет определить произвольный файл правил для включения в правила " | ||
446 | "межсетевого экрана. Новые правила будут добавлены после существующих. " | ||
447 | "Стандартный тип протокола: ipv4. Стандартная таблица: filter. Пример: ipv4:" | ||
448 | -"filter:/etc/sysconfig/ipv4_filter_addon" | ||
449 | +"filter:/etc/conf.d/ipv4_filter_addon" | ||
450 | |||
451 | #: ../src/firewall-offline-cmd:187 | ||
452 | msgid "" | ||
453 | diff -Naur firewalld-0.3.3/po/sk.po firewalld-0.3.3-magellan/po/sk.po | ||
454 | --- firewalld-0.3.3/po/sk.po 2013-06-06 16:07:09.000000000 +0000 | ||
455 | +++ firewalld-0.3.3-magellan/po/sk.po 2013-06-10 11:49:14.135000000 +0000 | ||
456 | @@ -897,11 +897,11 @@ | ||
457 | msgid "" | ||
458 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
459 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
460 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
461 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
462 | msgstr "" | ||
463 | "Zadajte súbor s vlastnými pravidlami pre pridanie do firewallu. Budú " | ||
464 | "zaradené za predvolené pravidlá. Predvolený typ protokolu: ipv4, predvolená " | ||
465 | -"tabuľka: filter. (Napr.: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" | ||
466 | +"tabuľka: filter. (Napr.: ipv4:filter:/etc/conf.d/ipv4_filter_addon)" | ||
467 | |||
468 | #: ../src/firewall-offline-cmd:187 | ||
469 | msgid "" | ||
470 | diff -Naur firewalld-0.3.3/po/sr@latin.po firewalld-0.3.3-magellan/po/sr@latin.po | ||
471 | --- firewalld-0.3.3/po/sr@latin.po 2013-06-06 16:07:09.000000000 +0000 | ||
472 | +++ firewalld-0.3.3-magellan/po/sr@latin.po 2013-06-10 11:49:14.137000000 +0000 | ||
473 | @@ -876,11 +876,11 @@ | ||
474 | msgid "" | ||
475 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
476 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
477 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
478 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
479 | msgstr "" | ||
480 | "Navedite datoteku prilagođenih pravila za pridruživanje zaštitnom zidu, " | ||
481 | "nakon podrazumevanih pravila. Podrazumevana vrsta protokola: ipv4, " | ||
482 | -"podrazumevana tabela: filter. (Primer: ipv4:filter:/etc/sysconfig/" | ||
483 | +"podrazumevana tabela: filter. (Primer: ipv4:filter:/etc/conf.d/" | ||
484 | "ipv4_filter_addon)" | ||
485 | |||
486 | #: ../src/firewall-offline-cmd:187 | ||
487 | diff -Naur firewalld-0.3.3/po/sr.po firewalld-0.3.3-magellan/po/sr.po | ||
488 | --- firewalld-0.3.3/po/sr.po 2013-06-06 16:07:09.000000000 +0000 | ||
489 | +++ firewalld-0.3.3-magellan/po/sr.po 2013-06-10 11:49:14.140000000 +0000 | ||
490 | @@ -876,11 +876,11 @@ | ||
491 | msgid "" | ||
492 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
493 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
494 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
495 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
496 | msgstr "" | ||
497 | "Наведите датотеку прилагођених правила за придруживање заштитном зиду, након " | ||
498 | "подразумеваних правила. Подразумевана врста протокола: ipv4, подразумевана " | ||
499 | -"табела: filter. (Пример: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" | ||
500 | +"табела: filter. (Пример: ipv4:filter:/etc/conf.d/ipv4_filter_addon)" | ||
501 | |||
502 | #: ../src/firewall-offline-cmd:187 | ||
503 | msgid "" | ||
504 | diff -Naur firewalld-0.3.3/po/sv.po firewalld-0.3.3-magellan/po/sv.po | ||
505 | --- firewalld-0.3.3/po/sv.po 2013-06-06 16:07:09.000000000 +0000 | ||
506 | +++ firewalld-0.3.3-magellan/po/sv.po 2013-06-10 11:49:14.143000000 +0000 | ||
507 | @@ -902,11 +902,11 @@ | ||
508 | msgid "" | ||
509 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
510 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
511 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
512 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
513 | msgstr "" | ||
514 | "Ange en anpassad regelfil som skall läggas till i brandväggen efter " | ||
515 | "standardreglerna. Standardprotokolltyp: ipv4, standardtabell: filter. " | ||
516 | -"(Exempel: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" | ||
517 | +"(Exempel: ipv4:filter:/etc/conf.d/ipv4_filter_addon)" | ||
518 | |||
519 | #: ../src/firewall-offline-cmd:187 | ||
520 | msgid "" | ||
521 | diff -Naur firewalld-0.3.3/po/ta.po firewalld-0.3.3-magellan/po/ta.po | ||
522 | --- firewalld-0.3.3/po/ta.po 2013-06-06 16:07:09.000000000 +0000 | ||
523 | +++ firewalld-0.3.3-magellan/po/ta.po 2013-06-10 11:49:14.145000000 +0000 | ||
524 | @@ -877,11 +877,11 @@ | ||
525 | msgid "" | ||
526 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
527 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
528 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
529 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
530 | msgstr "" | ||
531 | "முன்னிருப்பு விதிகளுக்கு பின், ஒரு தனிபயன் விதிகள் கோப்பினை ஃபயர்வாலில் குறிப்பிடவும். " | ||
532 | "முன்னிருப்பு நெறிமுறை வகை: ipv4, default table: filter. (எடுத்துக்காட்டு: ipv4:" | ||
533 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
534 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
535 | |||
536 | #: ../src/firewall-offline-cmd:187 | ||
537 | msgid "" | ||
538 | diff -Naur firewalld-0.3.3/po/te.po firewalld-0.3.3-magellan/po/te.po | ||
539 | --- firewalld-0.3.3/po/te.po 2013-06-06 16:07:09.000000000 +0000 | ||
540 | +++ firewalld-0.3.3-magellan/po/te.po 2013-06-10 11:49:14.148000000 +0000 | ||
541 | @@ -872,10 +872,10 @@ | ||
542 | msgid "" | ||
543 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
544 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
545 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
546 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
547 | msgstr "" | ||
548 | "firewall లో కలుపుటకు వినియోగదారుని నియమాల దస్త్రంను తెలుపండి. దీనిని సిద్దనియమాల తర్వాత కలపవలెను. " | ||
549 | -"అప్రమేయ నియమం రకము: ipv4, అప్రమేయ పట్టిక: వడపోత. (ఉదాహరణ: ipv4:filter:/etc/sysconfig/" | ||
550 | +"అప్రమేయ నియమం రకము: ipv4, అప్రమేయ పట్టిక: వడపోత. (ఉదాహరణ: ipv4:filter:/etc/conf.d/" | ||
551 | "ipv4_filter_addon)" | ||
552 | |||
553 | #: ../src/firewall-offline-cmd:187 | ||
554 | diff -Naur firewalld-0.3.3/po/tr.po firewalld-0.3.3-magellan/po/tr.po | ||
555 | --- firewalld-0.3.3/po/tr.po 2013-06-06 16:07:09.000000000 +0000 | ||
556 | +++ firewalld-0.3.3-magellan/po/tr.po 2013-06-10 11:49:14.151000000 +0000 | ||
557 | @@ -910,11 +910,11 @@ | ||
558 | msgid "" | ||
559 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
560 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
561 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
562 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
563 | msgstr "" | ||
564 | "Especifique um ficheiro com regras personalizadas para incluir na firewall a " | ||
565 | "seguir às regras por omissão. Tipo de protocolo por omissão: ipv4, tabela " | ||
566 | -"por omissão: filter. (Exemplo: ipv4:filter:/etc/sysconfig/" | ||
567 | +"por omissão: filter. (Exemplo: ipv4:filter:/etc/conf.d/" | ||
568 | "ipv4_filter_as_minhas_regras)" | ||
569 | |||
570 | #: ../src/firewall-offline-cmd:187 | ||
571 | diff -Naur firewalld-0.3.3/po/uk.po firewalld-0.3.3-magellan/po/uk.po | ||
572 | --- firewalld-0.3.3/po/uk.po 2013-06-06 16:07:09.000000000 +0000 | ||
573 | +++ firewalld-0.3.3-magellan/po/uk.po 2013-06-10 11:49:14.154000000 +0000 | ||
574 | @@ -909,11 +909,11 @@ | ||
575 | msgid "" | ||
576 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
577 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
578 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
579 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
580 | msgstr "" | ||
581 | "Вкажіть власні правила для включення до правил мережного екрану. Вони будуть " | ||
582 | "додані після типових правил. Стандартний тип: ipv4, типова таблиця: filter. " | ||
583 | -"(Приклад: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" | ||
584 | +"(Приклад: ipv4:filter:/etc/conf.d/ipv4_filter_addon)" | ||
585 | |||
586 | #: ../src/firewall-offline-cmd:187 | ||
587 | msgid "" | ||
588 | diff -Naur firewalld-0.3.3/po/zh_CN.po firewalld-0.3.3-magellan/po/zh_CN.po | ||
589 | --- firewalld-0.3.3/po/zh_CN.po 2013-06-06 16:07:10.000000000 +0000 | ||
590 | +++ firewalld-0.3.3-magellan/po/zh_CN.po 2013-06-10 11:49:14.156000000 +0000 | ||
591 | @@ -884,10 +884,10 @@ | ||
592 | msgid "" | ||
593 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
594 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
595 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
596 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
597 | msgstr "" | ||
598 | "在默认规则后指定防火墙中包含的定制规则文件。默认协议类型:ipv4,默认 " | ||
599 | -"iptable:filter。(示例:ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" | ||
600 | +"iptable:filter。(示例:ipv4:filter:/etc/conf.d/ipv4_filter_addon)" | ||
601 | |||
602 | #: ../src/firewall-offline-cmd:187 | ||
603 | msgid "" | ||
604 | diff -Naur firewalld-0.3.3/po/zh_TW.po firewalld-0.3.3-magellan/po/zh_TW.po | ||
605 | --- firewalld-0.3.3/po/zh_TW.po 2013-06-06 16:07:10.000000000 +0000 | ||
606 | +++ firewalld-0.3.3-magellan/po/zh_TW.po 2013-06-10 11:49:14.159000000 +0000 | ||
607 | @@ -880,10 +880,10 @@ | ||
608 | msgid "" | ||
609 | "Specify a custom rules file for inclusion in the firewall, after the default " | ||
610 | "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:" | ||
611 | -"filter:/etc/sysconfig/ipv4_filter_addon)" | ||
612 | +"filter:/etc/conf.d/ipv4_filter_addon)" | ||
613 | msgstr "" | ||
614 | "指定一個自訂規則檔案來包含在防火牆中,位於預設的規則之後。預設的協定類型:" | ||
615 | -"ipv4,預設表格: filter。(例如:ipv4:filter:/etc/sysconfig/" | ||
616 | +"ipv4,預設表格: filter。(例如:ipv4:filter:/etc/conf.d/" | ||
617 | "ipv4_filter_addon)" | ||
618 | |||
619 | #: ../src/firewall-offline-cmd:187 | ||
620 | diff -Naur firewalld-0.3.3/src/firewall-offline-cmd firewalld-0.3.3-magellan/src/firewall-offline-cmd | ||
621 | --- firewalld-0.3.3/src/firewall-offline-cmd 2013-06-06 15:21:17.000000000 +0000 | ||
622 | +++ firewalld-0.3.3-magellan/src/firewall-offline-cmd 2013-06-10 11:48:39.798000000 +0000 | ||
623 | @@ -179,7 +179,7 @@ | ||
624 | "the firewall, after the " | ||
625 | "default rules. Default protocol type: ipv4, " | ||
626 | "default table: filter. " | ||
627 | - "(Example: ipv4:filter:/etc/sysconfig/" | ||
628 | + "(Example: ipv4:filter:/etc/conf.d/" | ||
629 | "ipv4_filter_addon)")) | ||
630 | parser.add_option("--forward-port", | ||
631 | action="callback", dest="forward_port", | ||
632 | @@ -314,7 +314,7 @@ | ||
633 | |||
634 | def read_sysconfig_args(): | ||
635 | filename = None | ||
636 | - CONFIG = '/etc/sysconfig/system-config-firewall' | ||
637 | + CONFIG = '/etc/conf.d/system-config-firewall' | ||
638 | if os.path.exists(CONFIG) and os.path.isfile(CONFIG): | ||
639 | filename = CONFIG | ||
640 | try: |