Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/firewalld/patches/firewalld-0.2.12-confd.patch

    Contents of /trunk/firewalld/patches/firewalld-0.2.12-confd.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2027 - (show annotations) (download)
    Tue Jan 15 14:03:07 2013 UTC (11 years, 3 months ago) by niro
    File size: 38076 byte(s) 
    -reworked patch for 0.2.12
    1 diff -Naur firewalld-0.2.12/config/firewalld.init firewalld-0.2.12-magellan/config/firewalld.init
    2 --- firewalld-0.2.12/config/firewalld.init 2013-01-14 15:27:39.000000000 +0000
    3 +++ firewalld-0.2.12-magellan/config/firewalld.init 2013-01-15 16:09:33.662480276 +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.2.12/config/firewalld.service firewalld-0.2.12-magellan/config/firewalld.service
    14 --- firewalld-0.2.12/config/firewalld.service 2013-01-14 15:27:39.000000000 +0000
    15 +++ firewalld-0.2.12-magellan/config/firewalld.service 2013-01-15 16:10:12.097487909 +0000
    16 @@ -8,7 +8,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=/usr/sbin/firewalld --nofork $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.2.12/config/Makefile.am firewalld-0.2.12-magellan/config/Makefile.am
    26 --- firewalld-0.2.12/config/Makefile.am 2013-01-14 15:27:39.000000000 +0000
    27 +++ firewalld-0.2.12-magellan/config/Makefile.am 2013-01-15 16:11:04.272497811 +0000
    28 @@ -57,12 +57,12 @@
    29 endif
    30
    31 install-sysconfig:
    32 - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
    33 - $(INSTALL_DATA) $(srcdir)/firewalld.sysconfig $(DESTDIR)$(sysconfdir)/sysconfig/firewalld
    34 + $(MKDIR_P) $(DESTDIR)$(sysconfdir)/conf.d
    35 + $(INSTALL_DATA) $(srcdir)/firewalld.sysconfig $(DESTDIR)$(sysconfdir)/conf.d/firewalld
    36
    37 uninstall-sysconfig:
    38 - rm -f $(DESTDIR)$(sysconfdir)/sysconfig/firewalld
    39 - rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
    40 + rm -f $(DESTDIR)$(sysconfdir)/conf.d/firewalld
    41 + rmdir $(DESTDIR)$(sysconfdir)/conf.d || :
    42
    43 install-init: install-sysconfig
    44 $(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d
    45 diff -Naur firewalld-0.2.12/config/Makefile.in firewalld-0.2.12-magellan/config/Makefile.in
    46 --- firewalld-0.2.12/config/Makefile.in 2013-01-14 15:27:39.000000000 +0000
    47 +++ firewalld-0.2.12-magellan/config/Makefile.in 2013-01-15 16:13:17.163524690 +0000
    48 @@ -566,12 +566,12 @@
    49 all: $(desktop_DATA) $(polkit1_action_DATA) $(gsettings_SCHEMAS)
    50
    51 install-sysconfig:
    52 - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
    53 - $(INSTALL_DATA) $(srcdir)/firewalld.sysconfig $(DESTDIR)$(sysconfdir)/sysconfig/firewalld
    54 + $(MKDIR_P) $(DESTDIR)$(sysconfdir)/conf.d
    55 + $(INSTALL_DATA) $(srcdir)/firewalld.sysconfig $(DESTDIR)$(sysconfdir)/conf.d/firewalld
    56
    57 uninstall-sysconfig:
    58 - rm -f $(DESTDIR)$(sysconfdir)/sysconfig/firewalld
    59 - rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
    60 + rm -f $(DESTDIR)$(sysconfdir)/conf.d/firewalld
    61 + rmdir $(DESTDIR)$(sysconfdir)/conf.d || :
    62
    63 install-init: install-sysconfig
    64 $(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d
    65 diff -Naur firewalld-0.2.12/firewalld.spec firewalld-0.2.12-magellan/firewalld.spec
    66 --- firewalld-0.2.12/firewalld.spec 2013-01-14 15:27:39.000000000 +0000
    67 +++ firewalld-0.2.12-magellan/firewalld.spec 2013-01-15 16:11:56.978508700 +0000
    68 @@ -143,7 +143,7 @@
    69 %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/services
    70 %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/zones
    71 %defattr(0644,root,root)
    72 -%config(noreplace) %{_sysconfdir}/sysconfig/firewalld
    73 +%config(noreplace) %{_sysconfdir}/conf.d/firewalld
    74 #%attr(0755,root,root) %{_initrddir}/firewalld
    75 %{_unitdir}/firewalld.service
    76 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/FirewallD.conf
    77 diff -Naur firewalld-0.2.12/po/ar.po firewalld-0.2.12-magellan/po/ar.po
    78 --- firewalld-0.2.12/po/ar.po 2013-01-14 15:27:39.000000000 +0000
    79 +++ firewalld-0.2.12-magellan/po/ar.po 2013-01-15 16:14:15.220536966 +0000
    80 @@ -872,7 +872,7 @@
    81 msgid ""
    82 "Specify a custom rules file for inclusion in the firewall, after the default "
    83 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    84 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    85 +"filter:/etc/conf.d/ipv4_filter_addon)"
    86 msgstr ""
    87 "تحديد ملف قواعد مخصص للتضمين في الجدار النّاريّ بعد الإعدادات المبدئية ."
    88 "الميفاق المبدئي :ipv4, الجدول المبدئي:مُرشح. (مثال: ipv4:filter:/etc/"
    89 diff -Naur firewalld-0.2.12/po/as.po firewalld-0.2.12-magellan/po/as.po
    90 --- firewalld-0.2.12/po/as.po 2013-01-14 15:27:39.000000000 +0000
    91 +++ firewalld-0.2.12-magellan/po/as.po 2013-01-15 16:14:15.224536970 +0000
    92 @@ -874,11 +874,11 @@
    93 msgid ""
    94 "Specify a custom rules file for inclusion in the firewall, after the default "
    95 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    96 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    97 +"filter:/etc/conf.d/ipv4_filter_addon)"
    98 msgstr ""
    99 "অবিকল্পিত নিয়মসমূহৰ পিছত, ফায়াৰ্ৱালত অন্তৰ্ভুক্ত কৰাৰ বাবে স্বনিৰ্ধাৰিত নিয়মৰ এটা "
    100 "নথিপত্ৰ উল্লেখ কৰক । অবকল্পিত আচাৰ বিধিৰ ধৰণ: ipv4, default table: filter. "
    101 -"(যেনে: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
    102 +"(যেনে: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
    103
    104 #: ../src/firewall-offline-cmd:187
    105 msgid ""
    106 diff -Naur firewalld-0.2.12/po/bn_IN.po firewalld-0.2.12-magellan/po/bn_IN.po
    107 --- firewalld-0.2.12/po/bn_IN.po 2013-01-14 15:27:39.000000000 +0000
    108 +++ firewalld-0.2.12-magellan/po/bn_IN.po 2013-01-15 16:14:15.226536972 +0000
    109 @@ -876,11 +876,11 @@
    110 msgid ""
    111 "Specify a custom rules file for inclusion in the firewall, after the default "
    112 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    113 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    114 +"filter:/etc/conf.d/ipv4_filter_addon)"
    115 msgstr ""
    116 "ফায়ারওয়ালের মধ্যে অন্তর্ভুক্ত করার জন্য স্বনির্ধারিত নিয়মের একটি ফাইল উল্লেখ করুন। "
    117 "ডিফল্ট নিয়মগুলির পরে এইগুলি যোগ করা হবে। ডিফল্ট প্রোটোকলের বিন্যাস: ipv4, default "
    118 -"table: filter। (উদাহরণ: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
    119 +"table: filter। (উদাহরণ: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
    120
    121 #: ../src/firewall-offline-cmd:187
    122 msgid ""
    123 diff -Naur firewalld-0.2.12/po/ca.po firewalld-0.2.12-magellan/po/ca.po
    124 --- firewalld-0.2.12/po/ca.po 2013-01-14 15:27:39.000000000 +0000
    125 +++ firewalld-0.2.12-magellan/po/ca.po 2013-01-15 16:14:15.229536975 +0000
    126 @@ -875,7 +875,7 @@
    127 msgid ""
    128 "Specify a custom rules file for inclusion in the firewall, after the default "
    129 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    130 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    131 +"filter:/etc/conf.d/ipv4_filter_addon)"
    132 msgstr ""
    133 "Especifica un fitxer de regles personalitzades a incloure en el tallafoc. "
    134 "S'inclourà després de les regles predeterminades. El tipus predeterminat és "
    135 diff -Naur firewalld-0.2.12/po/cs.po firewalld-0.2.12-magellan/po/cs.po
    136 --- firewalld-0.2.12/po/cs.po 2013-01-14 15:27:39.000000000 +0000
    137 +++ firewalld-0.2.12-magellan/po/cs.po 2013-01-15 16:14:15.232536978 +0000
    138 @@ -892,11 +892,11 @@
    139 msgid ""
    140 "Specify a custom rules file for inclusion in the firewall, after the default "
    141 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    142 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    143 +"filter:/etc/conf.d/ipv4_filter_addon)"
    144 msgstr ""
    145 "Určete soubor s vlastními pravidly pro přidání do firewallu. Bude zařazen za "
    146 "výchozí pravidla. Výchozí typ protokolu: ipv4, výchozí tabulka: filter "
    147 -"(např.: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)."
    148 +"(např.: ipv4:filter:/etc/conf.d/ipv4_filter_addon)."
    149
    150 #: ../src/firewall-offline-cmd:187
    151 msgid ""
    152 diff -Naur firewalld-0.2.12/po/da.po firewalld-0.2.12-magellan/po/da.po
    153 --- firewalld-0.2.12/po/da.po 2013-01-14 15:27:39.000000000 +0000
    154 +++ firewalld-0.2.12-magellan/po/da.po 2013-01-15 16:14:15.235536981 +0000
    155 @@ -877,11 +877,11 @@
    156 msgid ""
    157 "Specify a custom rules file for inclusion in the firewall, after the default "
    158 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    159 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    160 +"filter:/etc/conf.d/ipv4_filter_addon)"
    161 msgstr ""
    162 "Angiv en tilpasset regelfil til inkludering i firewallen, efter "
    163 "standardreglerne. Standard protokoltype: \"ipv4\", standard tabel: \"filter"
    164 -"\". (Eksempel: \"ipv4:filter:/etc/sysconfig/ipv4_filter_addon\")"
    165 +"\". (Eksempel: \"ipv4:filter:/etc/conf.d/ipv4_filter_addon\")"
    166
    167 #: ../src/firewall-offline-cmd:187
    168 msgid ""
    169 diff -Naur firewalld-0.2.12/po/de.po firewalld-0.2.12-magellan/po/de.po
    170 --- firewalld-0.2.12/po/de.po 2013-01-14 15:27:39.000000000 +0000
    171 +++ firewalld-0.2.12-magellan/po/de.po 2013-01-15 16:14:15.238536984 +0000
    172 @@ -923,12 +923,12 @@
    173 msgid ""
    174 "Specify a custom rules file for inclusion in the firewall, after the default "
    175 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    176 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    177 +"filter:/etc/conf.d/ipv4_filter_addon)"
    178 msgstr ""
    179 "Wählen Sie eine eigene Regeldatei aus, die in die Firewall eingebunden "
    180 "werden soll. Sie wird nach den Standardregeln eingebunden. "
    181 "Standardprotokolltyp: ipv4, Standardtabelle: filter. (Beispiel: ipv4:filter:/"
    182 -"etc/sysconfig/ipv4_filter_addon)"
    183 +"etc/conf.d/ipv4_filter_addon)"
    184
    185 #: ../src/firewall-offline-cmd:187
    186 msgid ""
    187 diff -Naur firewalld-0.2.12/po/en_GB.po firewalld-0.2.12-magellan/po/en_GB.po
    188 --- firewalld-0.2.12/po/en_GB.po 2013-01-14 15:27:39.000000000 +0000
    189 +++ firewalld-0.2.12-magellan/po/en_GB.po 2013-01-15 16:14:15.241536987 +0000
    190 @@ -873,11 +873,11 @@
    191 msgid ""
    192 "Specify a custom rules file for inclusion in the firewall, after the default "
    193 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    194 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    195 +"filter:/etc/conf.d/ipv4_filter_addon)"
    196 msgstr ""
    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
    202 #: ../src/firewall-offline-cmd:187
    203 msgid ""
    204 diff -Naur firewalld-0.2.12/po/es.po firewalld-0.2.12-magellan/po/es.po
    205 --- firewalld-0.2.12/po/es.po 2013-01-14 15:27:39.000000000 +0000
    206 +++ firewalld-0.2.12-magellan/po/es.po 2013-01-15 16:14:15.244536990 +0000
    207 @@ -907,11 +907,11 @@
    208 msgid ""
    209 "Specify a custom rules file for inclusion in the firewall, after the default "
    210 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    211 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    212 +"filter:/etc/conf.d/ipv4_filter_addon)"
    213 msgstr ""
    214 "Especifique un archivo de reglas personalizadas para incluir en el "
    215 "cortafuegos. Tipo por defecto: ipv4, tabla por defecto: filter. (Ejemplo: "
    216 -"ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
    217 +"ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
    218
    219 #: ../src/firewall-offline-cmd:187
    220 msgid ""
    221 diff -Naur firewalld-0.2.12/po/fi.po firewalld-0.2.12-magellan/po/fi.po
    222 --- firewalld-0.2.12/po/fi.po 2013-01-14 15:27:39.000000000 +0000
    223 +++ firewalld-0.2.12-magellan/po/fi.po 2013-01-15 16:14:15.246536992 +0000
    224 @@ -874,11 +874,11 @@
    225 msgid ""
    226 "Specify a custom rules file for inclusion in the firewall, after the default "
    227 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    228 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    229 +"filter:/etc/conf.d/ipv4_filter_addon)"
    230 msgstr ""
    231 "Määritä mukautettu sääntötiedosto, joka lisätään palomuuriin. Lisäys tehdään "
    232 "oletussääntöjen jälkeen. Oletusprotokollatyyppi: ipv4, oletustaulu: filter. "
    233 -"(Esimerkki: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
    234 +"(Esimerkki: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
    235
    236 #: ../src/firewall-offline-cmd:187
    237 msgid ""
    238 diff -Naur firewalld-0.2.12/po/fr.po firewalld-0.2.12-magellan/po/fr.po
    239 --- firewalld-0.2.12/po/fr.po 2013-01-14 15:27:39.000000000 +0000
    240 +++ firewalld-0.2.12-magellan/po/fr.po 2013-01-15 16:14:15.249536995 +0000
    241 @@ -917,7 +917,7 @@
    242 msgid ""
    243 "Specify a custom rules file for inclusion in the firewall, after the default "
    244 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    245 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    246 +"filter:/etc/conf.d/ipv4_filter_addon)"
    247 msgstr ""
    248 "Spécifier un fichier de règles personnalisées à inclure dans le pare-feu. "
    249 "Elles seront incluses après les règles par défaut. Type de protocole par "
    250 diff -Naur firewalld-0.2.12/po/gu.po firewalld-0.2.12-magellan/po/gu.po
    251 --- firewalld-0.2.12/po/gu.po 2013-01-14 15:27:39.000000000 +0000
    252 +++ firewalld-0.2.12-magellan/po/gu.po 2013-01-15 16:14:15.252536998 +0000
    253 @@ -871,10 +871,10 @@
    254 msgid ""
    255 "Specify a custom rules file for inclusion in the firewall, after the default "
    256 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    257 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    258 +"filter:/etc/conf.d/ipv4_filter_addon)"
    259 msgstr ""
    260 "ફાયરવોલમાં સમાવવા માટે વૈવિધ્યપૂર્ણ નિયમો ફાઈલ સ્પષ્ટ કરો, મૂળભૂત નિયમો પછી. મૂળભૂત "
    261 -"પ્રોટોકોલ પ્રકાર: ipv4, મૂળભૂત કોષ્ટક: ગાળક. (ઉદાહરણ: ipv4:filter:/etc/sysconfig/"
    262 +"પ્રોટોકોલ પ્રકાર: ipv4, મૂળભૂત કોષ્ટક: ગાળક. (ઉદાહરણ: ipv4:filter:/etc/conf.d/"
    263 "ipv4_filter_addon)"
    264
    265 #: ../src/firewall-offline-cmd:187
    266 diff -Naur firewalld-0.2.12/po/hi.po firewalld-0.2.12-magellan/po/hi.po
    267 --- firewalld-0.2.12/po/hi.po 2013-01-14 15:27:39.000000000 +0000
    268 +++ firewalld-0.2.12-magellan/po/hi.po 2013-01-15 16:14:15.255537001 +0000
    269 @@ -870,11 +870,11 @@
    270 msgid ""
    271 "Specify a custom rules file for inclusion in the firewall, after the default "
    272 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    273 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    274 +"filter:/etc/conf.d/ipv4_filter_addon)"
    275 msgstr ""
    276 "फायरवॉल में शामिल किए जाने के लिए पसंदीदा नियम फाइल तयशुदा नियम के बाद निर्दिष्ट करें. "
    277 "तयशुदा प्रोटोकॉल प्रकार:: ipv4, default table: filter. (Example: ipv4:filter:/"
    278 -"etc/sysconfig/ipv4_filter_addon)"
    279 +"etc/conf.d/ipv4_filter_addon)"
    280
    281 #: ../src/firewall-offline-cmd:187
    282 msgid ""
    283 diff -Naur firewalld-0.2.12/po/hu.po firewalld-0.2.12-magellan/po/hu.po
    284 --- firewalld-0.2.12/po/hu.po 2013-01-14 15:27:39.000000000 +0000
    285 +++ firewalld-0.2.12-magellan/po/hu.po 2013-01-15 16:14:15.258537004 +0000
    286 @@ -905,11 +905,11 @@
    287 msgid ""
    288 "Specify a custom rules file for inclusion in the firewall, after the default "
    289 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    290 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    291 +"filter:/etc/conf.d/ipv4_filter_addon)"
    292 msgstr ""
    293 "Megad egy egyéni szabályfájlt, mely az alapértelmezett szabályok után kerül "
    294 "beillesztésre. Alapértelmezett protokoll típus: ipv4, alapértelmezett tábla: "
    295 -"szűrő. (pl. ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
    296 +"szűrő. (pl. ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
    297
    298 #: ../src/firewall-offline-cmd:187
    299 msgid ""
    300 diff -Naur firewalld-0.2.12/po/it.po firewalld-0.2.12-magellan/po/it.po
    301 --- firewalld-0.2.12/po/it.po 2013-01-14 15:27:39.000000000 +0000
    302 +++ firewalld-0.2.12-magellan/po/it.po 2013-01-15 16:14:15.261537007 +0000
    303 @@ -911,11 +911,11 @@
    304 msgid ""
    305 "Specify a custom rules file for inclusion in the firewall, after the default "
    306 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    307 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    308 +"filter:/etc/conf.d/ipv4_filter_addon)"
    309 msgstr ""
    310 "Specifica un file di regole personalizzato da includere nel firewall dopo le "
    311 "regole predefinite. Tipo protocollo predefinito: ipv4, tavola predefinita: "
    312 -"filter. (Esempio: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
    313 +"filter. (Esempio: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
    314
    315 #: ../src/firewall-offline-cmd:187
    316 msgid ""
    317 diff -Naur firewalld-0.2.12/po/ja.po firewalld-0.2.12-magellan/po/ja.po
    318 --- firewalld-0.2.12/po/ja.po 2013-01-14 15:27:39.000000000 +0000
    319 +++ firewalld-0.2.12-magellan/po/ja.po 2013-01-15 16:14:15.264537010 +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.2.12/po/kn.po firewalld-0.2.12-magellan/po/kn.po
    335 --- firewalld-0.2.12/po/kn.po 2013-01-14 15:27:39.000000000 +0000
    336 +++ firewalld-0.2.12-magellan/po/kn.po 2013-01-15 16:14:15.266537012 +0000
    337 @@ -873,11 +873,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 "ಫೈರ್ವಾಲಿನಲ್ಲಿ ಒಳಗೊಳ್ಳಿಸಲು, ಪೂರ್ವನಿಯೋಜಿತ ನಿಯಮಗಳ ನಂತರ ಒಂದು ಇಚ್ಛೆಯ(ಕಸ್ಟಮ್) ನಿಯಮಗಳ "
    345 "ಕಡತವನ್ನು ಸೂಚಿಸಿ. ಅದು ಪೂರ್ವನಿಯೋಜಿತ ಪ್ರೊಟೋಕಾಲ್‌ ಬಗೆ: ipv4, default table: filter. "
    346 -"(ಉದಾಹರಣೆ: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
    347 +"(ಉದಾಹರಣೆ: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
    348
    349 #: ../src/firewall-offline-cmd:187
    350 msgid ""
    351 diff -Naur firewalld-0.2.12/po/ko.po firewalld-0.2.12-magellan/po/ko.po
    352 --- firewalld-0.2.12/po/ko.po 2013-01-14 15:27:39.000000000 +0000
    353 +++ firewalld-0.2.12-magellan/po/ko.po 2013-01-15 16:14:15.269537015 +0000
    354 @@ -878,11 +878,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, 기본값 테이블: filter. (예: ipv4:"
    363 -"filter:/etc/sysconfig/ipv4_filter_addon) "
    364 +"filter:/etc/conf.d/ipv4_filter_addon) "
    365
    366 #: ../src/firewall-offline-cmd:187
    367 msgid ""
    368 diff -Naur firewalld-0.2.12/po/ml.po firewalld-0.2.12-magellan/po/ml.po
    369 --- firewalld-0.2.12/po/ml.po 2013-01-14 15:27:39.000000000 +0000
    370 +++ firewalld-0.2.12-magellan/po/ml.po 2013-01-15 16:14:15.272537018 +0000
    371 @@ -870,11 +870,11 @@
    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:/"
    380 -"etc/sysconfig/ipv4_filter_addon)"
    381 +"etc/conf.d/ipv4_filter_addon)"
    382
    383 #: ../src/firewall-offline-cmd:187
    384 msgid ""
    385 diff -Naur firewalld-0.2.12/po/mr.po firewalld-0.2.12-magellan/po/mr.po
    386 --- firewalld-0.2.12/po/mr.po 2013-01-14 15:27:39.000000000 +0000
    387 +++ firewalld-0.2.12-magellan/po/mr.po 2013-01-15 16:14:15.275537021 +0000
    388 @@ -874,11 +874,11 @@
    389 msgid ""
    390 "Specify a custom rules file for inclusion in the firewall, after the default "
    391 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    392 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    393 +"filter:/etc/conf.d/ipv4_filter_addon)"
    394 msgstr ""
    395 "फायरवॉल अंतर्गत समाविष्ट करण्याकरीता पूर्वनिर्धारीत नियम नंतर, इच्छिक नियम निश्चित "
    396 "करा. पूर्वनिर्धारीत शिष्टाचार प्रकार: ipv4, पूर्वनिर्धारीत तक्ता: फिल्टर. (उदाहरणार्थ: "
    397 -"ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
    398 +"ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
    399
    400 #: ../src/firewall-offline-cmd:187
    401 msgid ""
    402 diff -Naur firewalld-0.2.12/po/nl.po firewalld-0.2.12-magellan/po/nl.po
    403 --- firewalld-0.2.12/po/nl.po 2013-01-14 15:27:39.000000000 +0000
    404 +++ firewalld-0.2.12-magellan/po/nl.po 2013-01-15 16:14:15.278537024 +0000
    405 @@ -903,11 +903,11 @@
    406 msgid ""
    407 "Specify a custom rules file for inclusion in the firewall, after the default "
    408 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    409 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    410 +"filter:/etc/conf.d/ipv4_filter_addon)"
    411 msgstr ""
    412 "Specificeer een aangepast regel bestand om na de standaard regels toe te "
    413 "voegen aan de firewall. Standaard protocol type: ipv4, standaard tabel: "
    414 -"filter. (Bijvoorbeeld: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
    415 +"filter. (Bijvoorbeeld: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
    416
    417 #: ../src/firewall-offline-cmd:187
    418 msgid ""
    419 diff -Naur firewalld-0.2.12/po/or.po firewalld-0.2.12-magellan/po/or.po
    420 --- firewalld-0.2.12/po/or.po 2013-01-14 15:27:39.000000000 +0000
    421 +++ firewalld-0.2.12-magellan/po/or.po 2013-01-15 16:14:15.280537026 +0000
    422 @@ -873,11 +873,11 @@
    423 msgid ""
    424 "Specify a custom rules file for inclusion in the firewall, after the default "
    425 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    426 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    427 +"filter:/etc/conf.d/ipv4_filter_addon)"
    428 msgstr ""
    429 "ପୂର୍ବନିର୍ଦ୍ଧାରିତ ନିୟମାବଳୀ ପରେ, ଅଗ୍ନିକବଚରେ ଅନ୍ତର୍ଭୁକ୍ତ ହେବା ପାଇଁ ଗୋଟିଏ ଇଚ୍ଛାରୂପୀ ନିୟମାବଳୀ ଫାଇଲ "
    430 "ଉଲ୍ଲେଖ କରନ୍ତୁ. ପୂର୍ବନିର୍ଦ୍ଧାରିତ ପ୍ରୋଟୋକଲ ପ୍ରକାର: ipv4, ପୂର୍ବନିର୍ଦ୍ଧାରିତ ସାରଣୀ: ଛାଣକ. (ଉଦାହରଣ "
    431 -"ସ୍ୱରୂପ: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
    432 +"ସ୍ୱରୂପ: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
    433
    434 #: ../src/firewall-offline-cmd:187
    435 msgid ""
    436 diff -Naur firewalld-0.2.12/po/pa.po firewalld-0.2.12-magellan/po/pa.po
    437 --- firewalld-0.2.12/po/pa.po 2013-01-14 15:27:39.000000000 +0000
    438 +++ firewalld-0.2.12-magellan/po/pa.po 2013-01-15 16:14:15.283537029 +0000
    439 @@ -875,10 +875,10 @@
    440 msgid ""
    441 "Specify a custom rules file for inclusion in the firewall, after the default "
    442 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    443 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    444 +"filter:/etc/conf.d/ipv4_filter_addon)"
    445 msgstr ""
    446 "ਮੂਲ ਨਿਯਮਾਂ ਤੋਂ ਬਾਅਦ ਫਾਇਰਵਾਲ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਪਸੰਦੀ ਦੀ ਨਿਯਮ ਫਾਇਲ ਦਿਓ। ਮੂਲ ਪਰੋਟੋਕਾਲ "
    447 -"ਕਿਸਮ: ipv4, ਮੂਲ ਸਾਰਣੀ: ਫਿਲਟਰ। (ਉਦਾਹਰਨ: ipv4:filter:/etc/sysconfig/"
    448 +"ਕਿਸਮ: ipv4, ਮੂਲ ਸਾਰਣੀ: ਫਿਲਟਰ। (ਉਦਾਹਰਨ: ipv4:filter:/etc/conf.d/"
    449 "ipv4_filter_addon)"
    450
    451 #: ../src/firewall-offline-cmd:187
    452 diff -Naur firewalld-0.2.12/po/pl.po firewalld-0.2.12-magellan/po/pl.po
    453 --- firewalld-0.2.12/po/pl.po 2013-01-14 15:27:39.000000000 +0000
    454 +++ firewalld-0.2.12-magellan/po/pl.po 2013-01-15 16:14:15.286537032 +0000
    455 @@ -899,11 +899,11 @@
    456 msgid ""
    457 "Specify a custom rules file for inclusion in the firewall, after the default "
    458 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    459 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    460 +"filter:/etc/conf.d/ipv4_filter_addon)"
    461 msgstr ""
    462 "Można podać własny plik reguł do dołączenia do zapory po domyślnych "
    463 "regułach. Domyślny typ protokołu: ipv4, domyślna tablica: filter (przykład: "
    464 -"ipv4:filter:/etc/sysconfig/ipv4_filter_addon)."
    465 +"ipv4:filter:/etc/conf.d/ipv4_filter_addon)."
    466
    467 #: ../src/firewall-offline-cmd:187
    468 msgid ""
    469 diff -Naur firewalld-0.2.12/po/pt_BR.po firewalld-0.2.12-magellan/po/pt_BR.po
    470 --- firewalld-0.2.12/po/pt_BR.po 2013-01-14 15:27:39.000000000 +0000
    471 +++ firewalld-0.2.12-magellan/po/pt_BR.po 2013-01-15 16:14:15.289537035 +0000
    472 @@ -888,11 +888,11 @@
    473 msgid ""
    474 "Specify a custom rules file for inclusion in the firewall, after the default "
    475 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    476 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    477 +"filter:/etc/conf.d/ipv4_filter_addon)"
    478 msgstr ""
    479 "Especifique um arquivo de regras personalizadas para inclusão no firewall "
    480 "após as regras padrão. Tipo padrão do protocolo: ipv4, tabela padrão: "
    481 -"filter. (Exemplo: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
    482 +"filter. (Exemplo: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
    483
    484 #: ../src/firewall-offline-cmd:187
    485 msgid ""
    486 diff -Naur firewalld-0.2.12/po/pt.po firewalld-0.2.12-magellan/po/pt.po
    487 --- firewalld-0.2.12/po/pt.po 2013-01-14 15:27:39.000000000 +0000
    488 +++ firewalld-0.2.12-magellan/po/pt.po 2013-01-15 16:14:15.292537038 +0000
    489 @@ -875,11 +875,11 @@
    490 msgid ""
    491 "Specify a custom rules file for inclusion in the firewall, after the default "
    492 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    493 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    494 +"filter:/etc/conf.d/ipv4_filter_addon)"
    495 msgstr ""
    496 "Especifique um ficheiro com regras personalizadas para incluir na firewall a "
    497 "seguir às regras por omissão. Tipo de protocolo por omissão: ipv4, tabela "
    498 -"por omissão: filter. (Exemplo: ipv4:filter:/etc/sysconfig/"
    499 +"por omissão: filter. (Exemplo: ipv4:filter:/etc/conf.d/"
    500 "ipv4_filter_as_minhas_regras)"
    501
    502 #: ../src/firewall-offline-cmd:187
    503 diff -Naur firewalld-0.2.12/po/ru.po firewalld-0.2.12-magellan/po/ru.po
    504 --- firewalld-0.2.12/po/ru.po 2013-01-14 15:27:39.000000000 +0000
    505 +++ firewalld-0.2.12-magellan/po/ru.po 2013-01-15 16:14:15.294537040 +0000
    506 @@ -900,12 +900,12 @@
    507 msgid ""
    508 "Specify a custom rules file for inclusion in the firewall, after the default "
    509 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    510 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    511 +"filter:/etc/conf.d/ipv4_filter_addon)"
    512 msgstr ""
    513 "Позволяет определить произвольный файл правил для включения в правила "
    514 "межсетевого экрана. Новые правила будут добавлены после существующих. "
    515 "Стандартный тип протокола: ipv4. Стандартная таблица: filter. Пример: ipv4:"
    516 -"filter:/etc/sysconfig/ipv4_filter_addon"
    517 +"filter:/etc/conf.d/ipv4_filter_addon"
    518
    519 #: ../src/firewall-offline-cmd:187
    520 msgid ""
    521 diff -Naur firewalld-0.2.12/po/sk.po firewalld-0.2.12-magellan/po/sk.po
    522 --- firewalld-0.2.12/po/sk.po 2013-01-14 15:27:39.000000000 +0000
    523 +++ firewalld-0.2.12-magellan/po/sk.po 2013-01-15 16:14:15.297537043 +0000
    524 @@ -873,11 +873,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 "Zadajte súbor s vlastnými pravidlami pre pridanie do firewallu. Budú "
    532 "zaradené za predvolené pravidlá. Predvolený typ protokolu: ipv4, predvolená "
    533 -"tabuľka: filter. (Napr.: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
    534 +"tabuľka: filter. (Napr.: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
    535
    536 #: ../src/firewall-offline-cmd:187
    537 msgid ""
    538 diff -Naur firewalld-0.2.12/po/sr@latin.po firewalld-0.2.12-magellan/po/sr@latin.po
    539 --- firewalld-0.2.12/po/sr@latin.po 2013-01-14 15:27:39.000000000 +0000
    540 +++ firewalld-0.2.12-magellan/po/sr@latin.po 2013-01-15 16:14:15.300537046 +0000
    541 @@ -874,11 +874,11 @@
    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 "Navedite datoteku prilagođenih pravila za pridruživanje zaštitnom zidu, "
    549 "nakon podrazumevanih pravila. Podrazumevana vrsta protokola: ipv4, "
    550 -"podrazumevana tabela: filter. (Primer: ipv4:filter:/etc/sysconfig/"
    551 +"podrazumevana tabela: filter. (Primer: ipv4:filter:/etc/conf.d/"
    552 "ipv4_filter_addon)"
    553
    554 #: ../src/firewall-offline-cmd:187
    555 diff -Naur firewalld-0.2.12/po/sr.po firewalld-0.2.12-magellan/po/sr.po
    556 --- firewalld-0.2.12/po/sr.po 2013-01-14 15:27:39.000000000 +0000
    557 +++ firewalld-0.2.12-magellan/po/sr.po 2013-01-15 16:14:15.303537049 +0000
    558 @@ -874,11 +874,11 @@
    559 msgid ""
    560 "Specify a custom rules file for inclusion in the firewall, after the default "
    561 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    562 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    563 +"filter:/etc/conf.d/ipv4_filter_addon)"
    564 msgstr ""
    565 "Наведите датотеку прилагођених правила за придруживање заштитном зиду, након "
    566 "подразумеваних правила. Подразумевана врста протокола: ipv4, подразумевана "
    567 -"табела: filter. (Пример: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
    568 +"табела: filter. (Пример: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
    569
    570 #: ../src/firewall-offline-cmd:187
    571 msgid ""
    572 diff -Naur firewalld-0.2.12/po/sv.po firewalld-0.2.12-magellan/po/sv.po
    573 --- firewalld-0.2.12/po/sv.po 2013-01-14 15:27:39.000000000 +0000
    574 +++ firewalld-0.2.12-magellan/po/sv.po 2013-01-15 16:14:15.306537052 +0000
    575 @@ -896,11 +896,11 @@
    576 msgid ""
    577 "Specify a custom rules file for inclusion in the firewall, after the default "
    578 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    579 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    580 +"filter:/etc/conf.d/ipv4_filter_addon)"
    581 msgstr ""
    582 "Ange en anpassad regelfil som skall läggas till i brandväggen efter "
    583 "standardreglerna. Standardprotokolltyp: ipv4, standardtabell: filter. "
    584 -"(Exempel: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
    585 +"(Exempel: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
    586
    587 #: ../src/firewall-offline-cmd:187
    588 msgid ""
    589 diff -Naur firewalld-0.2.12/po/ta.po firewalld-0.2.12-magellan/po/ta.po
    590 --- firewalld-0.2.12/po/ta.po 2013-01-14 15:27:39.000000000 +0000
    591 +++ firewalld-0.2.12-magellan/po/ta.po 2013-01-15 16:14:15.309537055 +0000
    592 @@ -875,11 +875,11 @@
    593 msgid ""
    594 "Specify a custom rules file for inclusion in the firewall, after the default "
    595 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    596 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    597 +"filter:/etc/conf.d/ipv4_filter_addon)"
    598 msgstr ""
    599 "முன்னிருப்பு விதிகளுக்கு பின், ஒரு தனிபயன் விதிகள் கோப்பினை ஃபயர்வாலில் குறிப்பிடவும். "
    600 "முன்னிருப்பு நெறிமுறை வகை: ipv4, default table: filter. (எடுத்துக்காட்டு: ipv4:"
    601 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    602 +"filter:/etc/conf.d/ipv4_filter_addon)"
    603
    604 #: ../src/firewall-offline-cmd:187
    605 msgid ""
    606 diff -Naur firewalld-0.2.12/po/te.po firewalld-0.2.12-magellan/po/te.po
    607 --- firewalld-0.2.12/po/te.po 2013-01-14 15:27:39.000000000 +0000
    608 +++ firewalld-0.2.12-magellan/po/te.po 2013-01-15 16:14:15.311537057 +0000
    609 @@ -870,10 +870,10 @@
    610 msgid ""
    611 "Specify a custom rules file for inclusion in the firewall, after the default "
    612 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    613 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    614 +"filter:/etc/conf.d/ipv4_filter_addon)"
    615 msgstr ""
    616 "firewall లో కలుపుటకు వినియోగదారుని నియమాల దస్త్రంను తెలుపండి. దీనిని సిద్దనియమాల తర్వాత కలపవలెను. "
    617 -"అప్రమేయ నియమం రకము: ipv4, అప్రమేయ పట్టిక: వడపోత. (ఉదాహరణ: ipv4:filter:/etc/sysconfig/"
    618 +"అప్రమేయ నియమం రకము: ipv4, అప్రమేయ పట్టిక: వడపోత. (ఉదాహరణ: ipv4:filter:/etc/conf.d/"
    619 "ipv4_filter_addon)"
    620
    621 #: ../src/firewall-offline-cmd:187
    622 diff -Naur firewalld-0.2.12/po/tr.po firewalld-0.2.12-magellan/po/tr.po
    623 --- firewalld-0.2.12/po/tr.po 2013-01-14 15:27:39.000000000 +0000
    624 +++ firewalld-0.2.12-magellan/po/tr.po 2013-01-15 16:14:15.314537060 +0000
    625 @@ -869,7 +869,7 @@
    626 msgid ""
    627 "Specify a custom rules file for inclusion in the firewall, after the default "
    628 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    629 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    630 +"filter:/etc/conf.d/ipv4_filter_addon)"
    631 msgstr ""
    632
    633 #: ../src/firewall-offline-cmd:187
    634 diff -Naur firewalld-0.2.12/po/uk.po firewalld-0.2.12-magellan/po/uk.po
    635 --- firewalld-0.2.12/po/uk.po 2013-01-14 15:27:39.000000000 +0000
    636 +++ firewalld-0.2.12-magellan/po/uk.po 2013-01-15 16:14:15.317537063 +0000
    637 @@ -903,11 +903,11 @@
    638 msgid ""
    639 "Specify a custom rules file for inclusion in the firewall, after the default "
    640 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    641 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    642 +"filter:/etc/conf.d/ipv4_filter_addon)"
    643 msgstr ""
    644 "Вкажіть власні правила для включення до правил мережного екрану. Вони будуть "
    645 "додані після типових правил. Стандартний тип: ipv4, типова таблиця: filter. "
    646 -"(Приклад: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
    647 +"(Приклад: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
    648
    649 #: ../src/firewall-offline-cmd:187
    650 msgid ""
    651 diff -Naur firewalld-0.2.12/po/zh_CN.po firewalld-0.2.12-magellan/po/zh_CN.po
    652 --- firewalld-0.2.12/po/zh_CN.po 2013-01-14 15:27:39.000000000 +0000
    653 +++ firewalld-0.2.12-magellan/po/zh_CN.po 2013-01-15 16:14:15.320537066 +0000
    654 @@ -877,10 +877,10 @@
    655 msgid ""
    656 "Specify a custom rules file for inclusion in the firewall, after the default "
    657 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    658 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    659 +"filter:/etc/conf.d/ipv4_filter_addon)"
    660 msgstr ""
    661 "在默认规则后指定防火墙中包含的定制规则文件。默认协议类型：ipv4，默认 "
    662 -"iptable：filter。（示例：ipv4:filter:/etc/sysconfig/ipv4_filter_addon）"
    663 +"iptable：filter。（示例：ipv4:filter:/etc/conf.d/ipv4_filter_addon）"
    664
    665 #: ../src/firewall-offline-cmd:187
    666 msgid ""
    667 diff -Naur firewalld-0.2.12/po/zh_TW.po firewalld-0.2.12-magellan/po/zh_TW.po
    668 --- firewalld-0.2.12/po/zh_TW.po 2013-01-14 15:27:39.000000000 +0000
    669 +++ firewalld-0.2.12-magellan/po/zh_TW.po 2013-01-15 16:14:15.323537069 +0000
    670 @@ -868,10 +868,10 @@
    671 msgid ""
    672 "Specify a custom rules file for inclusion in the firewall, after the default "
    673 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
    674 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    675 +"filter:/etc/conf.d/ipv4_filter_addon)"
    676 msgstr ""
    677 "指定一個自訂規則檔案來包含在防火牆中，位於預設的規則之後。預設的協定類型："
    678 -"ipv4，預設表格: filter。（例如：ipv4:filter:/etc/sysconfig/"
    679 +"ipv4，預設表格: filter。（例如：ipv4:filter:/etc/conf.d/"
    680 "ipv4_filter_addon）"
    681
    682 #: ../src/firewall-offline-cmd:187
    683 diff -Naur firewalld-0.2.12/src/firewall-offline-cmd firewalld-0.2.12-magellan/src/firewall-offline-cmd
    684 --- firewalld-0.2.12/src/firewall-offline-cmd 2013-01-14 15:27:39.000000000 +0000
    685 +++ firewalld-0.2.12-magellan/src/firewall-offline-cmd 2013-01-15 16:08:59.558473783 +0000
    686 @@ -179,7 +179,7 @@
    687 "the firewall, after the "
    688 "default rules. Default protocol type: ipv4, "
    689 "default table: filter. "
    690 - "(Example: ipv4:filter:/etc/sysconfig/"
    691 + "(Example: ipv4:filter:/etc/conf.d/"
    692 "ipv4_filter_addon)"))
    693 parser.add_option("--forward-port",
    694 action="callback", dest="forward_port",
    695 @@ -314,7 +314,7 @@
    696
    697 def read_sysconfig_args():
    698 filename = None
    699 - CONFIG = '/etc/sysconfig/system-config-firewall'
    700 + CONFIG = '/etc/conf.d/system-config-firewall'
    701 if os.path.exists(CONFIG) and os.path.isfile(CONFIG):
    702 filename = CONFIG
    703 try: