diff -Naur firewalld-0.2.12/config/firewalld.init firewalld-0.2.12-magellan/config/firewalld.init
--- firewalld-0.2.12/config/firewalld.init	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/config/firewalld.init	2013-01-15 16:09:33.662480276 +0000
@@ -29,7 +29,7 @@
 prog="firewalld"
 #config="/etc/firewalld/firewalld.conf"
 
-[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+[ -e /etc/conf.d/$prog ] && . /etc/conf.d/$prog
 
 lockfile=/var/lock/subsys/$prog
 
diff -Naur firewalld-0.2.12/config/firewalld.service firewalld-0.2.12-magellan/config/firewalld.service
--- firewalld-0.2.12/config/firewalld.service	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/config/firewalld.service	2013-01-15 16:10:12.097487909 +0000
@@ -8,7 +8,7 @@
 Conflicts=iptables.service ip6tables.service ebtables.service
 
 [Service]
-EnvironmentFile=-/etc/sysconfig/firewalld
+EnvironmentFile=-/etc/conf.d/firewalld
 ExecStart=/usr/sbin/firewalld --nofork $FIREWALLD_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 # supress to log debug and error output also to /var/log/messages
diff -Naur firewalld-0.2.12/config/Makefile.am firewalld-0.2.12-magellan/config/Makefile.am
--- firewalld-0.2.12/config/Makefile.am	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/config/Makefile.am	2013-01-15 16:11:04.272497811 +0000
@@ -57,12 +57,12 @@
 endif
 
 install-sysconfig:
-	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
-	$(INSTALL_DATA) $(srcdir)/firewalld.sysconfig $(DESTDIR)$(sysconfdir)/sysconfig/firewalld
+	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/conf.d
+	$(INSTALL_DATA) $(srcdir)/firewalld.sysconfig $(DESTDIR)$(sysconfdir)/conf.d/firewalld
 
 uninstall-sysconfig:
-	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/firewalld
-	rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
+	rm -f $(DESTDIR)$(sysconfdir)/conf.d/firewalld
+	rmdir $(DESTDIR)$(sysconfdir)/conf.d || :
 
 install-init: install-sysconfig
 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d
diff -Naur firewalld-0.2.12/config/Makefile.in firewalld-0.2.12-magellan/config/Makefile.in
--- firewalld-0.2.12/config/Makefile.in	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/config/Makefile.in	2013-01-15 16:13:17.163524690 +0000
@@ -566,12 +566,12 @@
 all: $(desktop_DATA) $(polkit1_action_DATA) $(gsettings_SCHEMAS)
 
 install-sysconfig:
-	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
-	$(INSTALL_DATA) $(srcdir)/firewalld.sysconfig $(DESTDIR)$(sysconfdir)/sysconfig/firewalld
+	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/conf.d
+	$(INSTALL_DATA) $(srcdir)/firewalld.sysconfig $(DESTDIR)$(sysconfdir)/conf.d/firewalld
 
 uninstall-sysconfig:
-	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/firewalld
-	rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
+	rm -f $(DESTDIR)$(sysconfdir)/conf.d/firewalld
+	rmdir $(DESTDIR)$(sysconfdir)/conf.d || :
 
 install-init: install-sysconfig
 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d
diff -Naur firewalld-0.2.12/firewalld.spec firewalld-0.2.12-magellan/firewalld.spec
--- firewalld-0.2.12/firewalld.spec	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/firewalld.spec	2013-01-15 16:11:56.978508700 +0000
@@ -143,7 +143,7 @@
 %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/services
 %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/zones
 %defattr(0644,root,root)
-%config(noreplace) %{_sysconfdir}/sysconfig/firewalld
+%config(noreplace) %{_sysconfdir}/conf.d/firewalld
 #%attr(0755,root,root) %{_initrddir}/firewalld
 %{_unitdir}/firewalld.service
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/FirewallD.conf
diff -Naur firewalld-0.2.12/po/ar.po firewalld-0.2.12-magellan/po/ar.po
--- firewalld-0.2.12/po/ar.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/ar.po	2013-01-15 16:14:15.220536966 +0000
@@ -872,7 +872,7 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "تحديد ملف قواعد مخصص للتضمين في الجدار النّاريّ بعد الإعدادات المبدئية ."
 "الميفاق المبدئي :ipv4, الجدول المبدئي:مُرشح. (مثال: ipv4:filter:/etc/"
diff -Naur firewalld-0.2.12/po/as.po firewalld-0.2.12-magellan/po/as.po
--- firewalld-0.2.12/po/as.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/as.po	2013-01-15 16:14:15.224536970 +0000
@@ -874,11 +874,11 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "অবিকল্পিত নিয়মসমূহৰ পিছত, ফায়াৰ্ৱালত অন্তৰ্ভুক্ত কৰাৰ বাবে স্বনিৰ্ধাৰিত নিয়মৰ এটা "
 "নথিপত্ৰ উল্লেখ কৰক । অবকল্পিত আচাৰ বিধিৰ ধৰণ: ipv4, default table: filter. "
-"(যেনে: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+"(যেনে: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:187
 msgid ""
diff -Naur firewalld-0.2.12/po/bn_IN.po firewalld-0.2.12-magellan/po/bn_IN.po
--- firewalld-0.2.12/po/bn_IN.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/bn_IN.po	2013-01-15 16:14:15.226536972 +0000
@@ -876,11 +876,11 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "ফায়ারওয়ালের মধ্যে অন্তর্ভুক্ত করার জন্য স্বনির্ধারিত নিয়মের একটি ফাইল উল্লেখ করুন। "
 "ডিফল্ট নিয়মগুলির পরে এইগুলি যোগ করা হবে। ডিফল্ট প্রোটোকলের বিন্যাস: ipv4, default "
-"table: filter। (উদাহরণ: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+"table: filter। (উদাহরণ: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:187
 msgid ""
diff -Naur firewalld-0.2.12/po/ca.po firewalld-0.2.12-magellan/po/ca.po
--- firewalld-0.2.12/po/ca.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/ca.po	2013-01-15 16:14:15.229536975 +0000
@@ -875,7 +875,7 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "Especifica un fitxer de regles personalitzades a incloure en el tallafoc. "
 "S'inclourà després de les regles predeterminades. El tipus predeterminat és "
diff -Naur firewalld-0.2.12/po/cs.po firewalld-0.2.12-magellan/po/cs.po
--- firewalld-0.2.12/po/cs.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/cs.po	2013-01-15 16:14:15.232536978 +0000
@@ -892,11 +892,11 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "Určete soubor s vlastními pravidly pro přidání do firewallu. Bude zařazen za "
 "výchozí pravidla. Výchozí typ protokolu: ipv4, výchozí tabulka: filter "
-"(např.: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)."
+"(např.: ipv4:filter:/etc/conf.d/ipv4_filter_addon)."
 
 #: ../src/firewall-offline-cmd:187
 msgid ""
diff -Naur firewalld-0.2.12/po/da.po firewalld-0.2.12-magellan/po/da.po
--- firewalld-0.2.12/po/da.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/da.po	2013-01-15 16:14:15.235536981 +0000
@@ -877,11 +877,11 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "Angiv en tilpasset regelfil til inkludering i firewallen, efter "
 "standardreglerne. Standard protokoltype: \"ipv4\", standard tabel: \"filter"
-"\". (Eksempel: \"ipv4:filter:/etc/sysconfig/ipv4_filter_addon\")"
+"\". (Eksempel: \"ipv4:filter:/etc/conf.d/ipv4_filter_addon\")"
 
 #: ../src/firewall-offline-cmd:187
 msgid ""
diff -Naur firewalld-0.2.12/po/de.po firewalld-0.2.12-magellan/po/de.po
--- firewalld-0.2.12/po/de.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/de.po	2013-01-15 16:14:15.238536984 +0000
@@ -923,12 +923,12 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "Wählen Sie eine eigene Regeldatei aus, die in die Firewall eingebunden "
 "werden soll. Sie wird nach den Standardregeln eingebunden. "
 "Standardprotokolltyp: ipv4, Standardtabelle: filter. (Beispiel: ipv4:filter:/"
-"etc/sysconfig/ipv4_filter_addon)"
+"etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:187
 msgid ""
diff -Naur firewalld-0.2.12/po/en_GB.po firewalld-0.2.12-magellan/po/en_GB.po
--- firewalld-0.2.12/po/en_GB.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/en_GB.po	2013-01-15 16:14:15.241536987 +0000
@@ -873,11 +873,11 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:187
 msgid ""
diff -Naur firewalld-0.2.12/po/es.po firewalld-0.2.12-magellan/po/es.po
--- firewalld-0.2.12/po/es.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/es.po	2013-01-15 16:14:15.244536990 +0000
@@ -907,11 +907,11 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "Especifique un archivo de reglas personalizadas para incluir en el "
 "cortafuegos. Tipo por defecto: ipv4, tabla por defecto: filter. (Ejemplo: "
-"ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+"ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:187
 msgid ""
diff -Naur firewalld-0.2.12/po/fi.po firewalld-0.2.12-magellan/po/fi.po
--- firewalld-0.2.12/po/fi.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/fi.po	2013-01-15 16:14:15.246536992 +0000
@@ -874,11 +874,11 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "Määritä mukautettu sääntötiedosto, joka lisätään palomuuriin. Lisäys tehdään "
 "oletussääntöjen jälkeen. Oletusprotokollatyyppi: ipv4, oletustaulu: filter. "
-"(Esimerkki: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+"(Esimerkki: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:187
 msgid ""
diff -Naur firewalld-0.2.12/po/fr.po firewalld-0.2.12-magellan/po/fr.po
--- firewalld-0.2.12/po/fr.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/fr.po	2013-01-15 16:14:15.249536995 +0000
@@ -917,7 +917,7 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "Spécifier un fichier de règles personnalisées à inclure dans le pare-feu. "
 "Elles seront incluses après les règles par défaut. Type de protocole par "
diff -Naur firewalld-0.2.12/po/gu.po firewalld-0.2.12-magellan/po/gu.po
--- firewalld-0.2.12/po/gu.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/gu.po	2013-01-15 16:14:15.252536998 +0000
@@ -871,10 +871,10 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "ફાયરવોલમાં સમાવવા માટે વૈવિધ્યપૂર્ણ નિયમો ફાઈલ સ્પષ્ટ કરો, મૂળભૂત નિયમો પછી. મૂળભૂત "
-"પ્રોટોકોલ પ્રકાર: ipv4, મૂળભૂત કોષ્ટક: ગાળક. (ઉદાહરણ: ipv4:filter:/etc/sysconfig/"
+"પ્રોટોકોલ પ્રકાર: ipv4, મૂળભૂત કોષ્ટક: ગાળક. (ઉદાહરણ: ipv4:filter:/etc/conf.d/"
 "ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:187
diff -Naur firewalld-0.2.12/po/hi.po firewalld-0.2.12-magellan/po/hi.po
--- firewalld-0.2.12/po/hi.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/hi.po	2013-01-15 16:14:15.255537001 +0000
@@ -870,11 +870,11 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "फायरवॉल में शामिल किए जाने के लिए पसंदीदा नियम फाइल तयशुदा नियम के बाद निर्दिष्ट करें. "
 "तयशुदा प्रोटोकॉल प्रकार:: ipv4, default table: filter. (Example: ipv4:filter:/"
-"etc/sysconfig/ipv4_filter_addon)"
+"etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:187
 msgid ""
diff -Naur firewalld-0.2.12/po/hu.po firewalld-0.2.12-magellan/po/hu.po
--- firewalld-0.2.12/po/hu.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/hu.po	2013-01-15 16:14:15.258537004 +0000
@@ -905,11 +905,11 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "Megad egy egyéni szabályfájlt, mely az alapértelmezett szabályok után kerül "
 "beillesztésre. Alapértelmezett protokoll típus: ipv4, alapértelmezett tábla: "
-"szűrő. (pl. ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+"szűrő. (pl. ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:187
 msgid ""
diff -Naur firewalld-0.2.12/po/it.po firewalld-0.2.12-magellan/po/it.po
--- firewalld-0.2.12/po/it.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/it.po	2013-01-15 16:14:15.261537007 +0000
@@ -911,11 +911,11 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "Specifica un file di regole personalizzato da includere nel firewall dopo le "
 "regole predefinite. Tipo protocollo predefinito: ipv4, tavola predefinita: "
-"filter. (Esempio: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter. (Esempio: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:187
 msgid ""
diff -Naur firewalld-0.2.12/po/ja.po firewalld-0.2.12-magellan/po/ja.po
--- firewalld-0.2.12/po/ja.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/ja.po	2013-01-15 16:14:15.264537010 +0000
@@ -876,11 +876,11 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "ファイアーウォールでデフォルトのルールの後に取り込むカスタムルールファイルを"
 "指定します。 デフォルトタイプ: ipv4、 デフォルトテーブル: フィルター。 (例: "
-"ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+"ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:187
 msgid ""
diff -Naur firewalld-0.2.12/po/kn.po firewalld-0.2.12-magellan/po/kn.po
--- firewalld-0.2.12/po/kn.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/kn.po	2013-01-15 16:14:15.266537012 +0000
@@ -873,11 +873,11 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "ಫೈರ್ವಾಲಿನಲ್ಲಿ ಒಳಗೊಳ್ಳಿಸಲು, ಪೂರ್ವನಿಯೋಜಿತ ನಿಯಮಗಳ ನಂತರ ಒಂದು ಇಚ್ಛೆಯ(ಕಸ್ಟಮ್) ನಿಯಮಗಳ "
 "ಕಡತವನ್ನು ಸೂಚಿಸಿ. ಅದು ಪೂರ್ವನಿಯೋಜಿತ ಪ್ರೊಟೋಕಾಲ್‌ ಬಗೆ: ipv4, default table: filter. "
-"(ಉದಾಹರಣೆ: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+"(ಉದಾಹರಣೆ: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:187
 msgid ""
diff -Naur firewalld-0.2.12/po/ko.po firewalld-0.2.12-magellan/po/ko.po
--- firewalld-0.2.12/po/ko.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/ko.po	2013-01-15 16:14:15.269537015 +0000
@@ -878,11 +878,11 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "방화벽 설정에 포함할 사용자 규칙 파일을 지정합니다. 이는 기본값 규칙 다음에 "
 "포함됩니다. 기본값 프로토콜 형식: ipv4, 기본값 테이블: filter. (예: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon) "
+"filter:/etc/conf.d/ipv4_filter_addon) "
 
 #: ../src/firewall-offline-cmd:187
 msgid ""
diff -Naur firewalld-0.2.12/po/ml.po firewalld-0.2.12-magellan/po/ml.po
--- firewalld-0.2.12/po/ml.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/ml.po	2013-01-15 16:14:15.272537018 +0000
@@ -870,11 +870,11 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "നിങ്ങള്‍ ഉണ്ടാക്കിയ നിയമങ്ങളുടെ ഒരു ഫയല്‍ ഫയര്‍വോളില്‍ ഉള്‍പ്പെടുത്തുക. സ്വതവേയുള്ള ‌നിയമങ്ങള്‍ക്ക് ശേഷം "
 "ഇത് ഉള്‍‌പ്പെടുത്തുന്നതാണ്. സ്വതവേയുള്ളത്: ipv4, തനത് പട്ടിക: അരിപ്പ. (ഉദാഹരണം: ipv4:filter:/"
-"etc/sysconfig/ipv4_filter_addon)"
+"etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:187
 msgid ""
diff -Naur firewalld-0.2.12/po/mr.po firewalld-0.2.12-magellan/po/mr.po
--- firewalld-0.2.12/po/mr.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/mr.po	2013-01-15 16:14:15.275537021 +0000
@@ -874,11 +874,11 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "फायरवॉल अंतर्गत समाविष्ट करण्याकरीता पूर्वनिर्धारीत नियम नंतर, इच्छिक नियम निश्चित "
 "करा. पूर्वनिर्धारीत शिष्टाचार प्रकार: ipv4, पूर्वनिर्धारीत तक्ता: फिल्टर. (उदाहरणार्थ: "
-"ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+"ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:187
 msgid ""
diff -Naur firewalld-0.2.12/po/nl.po firewalld-0.2.12-magellan/po/nl.po
--- firewalld-0.2.12/po/nl.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/nl.po	2013-01-15 16:14:15.278537024 +0000
@@ -903,11 +903,11 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "Specificeer een aangepast regel bestand om na de standaard regels toe te "
 "voegen aan de firewall. Standaard protocol type: ipv4, standaard tabel: "
-"filter. (Bijvoorbeeld: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter. (Bijvoorbeeld: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:187
 msgid ""
diff -Naur firewalld-0.2.12/po/or.po firewalld-0.2.12-magellan/po/or.po
--- firewalld-0.2.12/po/or.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/or.po	2013-01-15 16:14:15.280537026 +0000
@@ -873,11 +873,11 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "ପୂର୍ବନିର୍ଦ୍ଧାରିତ ନିୟମାବଳୀ ପରେ, ଅଗ୍ନିକବଚରେ ଅନ୍ତର୍ଭୁକ୍ତ ହେବା ପାଇଁ ଗୋଟିଏ ଇଚ୍ଛାରୂପୀ ନିୟମାବଳୀ ଫାଇଲ "
 "ଉଲ୍ଲେଖ କରନ୍ତୁ. ପୂର୍ବନିର୍ଦ୍ଧାରିତ ପ୍ରୋଟୋକଲ ପ୍ରକାର: ipv4, ପୂର୍ବନିର୍ଦ୍ଧାରିତ ସାରଣୀ: ଛାଣକ. (ଉଦାହରଣ "
-"ସ୍ୱରୂପ: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+"ସ୍ୱରୂପ: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:187
 msgid ""
diff -Naur firewalld-0.2.12/po/pa.po firewalld-0.2.12-magellan/po/pa.po
--- firewalld-0.2.12/po/pa.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/pa.po	2013-01-15 16:14:15.283537029 +0000
@@ -875,10 +875,10 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "ਮੂਲ ਨਿਯਮਾਂ ਤੋਂ ਬਾਅਦ ਫਾਇਰਵਾਲ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਪਸੰਦੀ ਦੀ ਨਿਯਮ ਫਾਇਲ ਦਿਓ। ਮੂਲ ਪਰੋਟੋਕਾਲ "
-"ਕਿਸਮ: ipv4, ਮੂਲ ਸਾਰਣੀ: ਫਿਲਟਰ। (ਉਦਾਹਰਨ: ipv4:filter:/etc/sysconfig/"
+"ਕਿਸਮ: ipv4, ਮੂਲ ਸਾਰਣੀ: ਫਿਲਟਰ। (ਉਦਾਹਰਨ: ipv4:filter:/etc/conf.d/"
 "ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:187
diff -Naur firewalld-0.2.12/po/pl.po firewalld-0.2.12-magellan/po/pl.po
--- firewalld-0.2.12/po/pl.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/pl.po	2013-01-15 16:14:15.286537032 +0000
@@ -899,11 +899,11 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "Można podać własny plik reguł do dołączenia do zapory po domyślnych "
 "regułach. Domyślny typ protokołu: ipv4, domyślna tablica: filter (przykład: "
-"ipv4:filter:/etc/sysconfig/ipv4_filter_addon)."
+"ipv4:filter:/etc/conf.d/ipv4_filter_addon)."
 
 #: ../src/firewall-offline-cmd:187
 msgid ""
diff -Naur firewalld-0.2.12/po/pt_BR.po firewalld-0.2.12-magellan/po/pt_BR.po
--- firewalld-0.2.12/po/pt_BR.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/pt_BR.po	2013-01-15 16:14:15.289537035 +0000
@@ -888,11 +888,11 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "Especifique um arquivo de regras personalizadas para inclusão no firewall "
 "após as regras padrão. Tipo padrão do protocolo: ipv4, tabela padrão: "
-"filter. (Exemplo: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter. (Exemplo: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:187
 msgid ""
diff -Naur firewalld-0.2.12/po/pt.po firewalld-0.2.12-magellan/po/pt.po
--- firewalld-0.2.12/po/pt.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/pt.po	2013-01-15 16:14:15.292537038 +0000
@@ -875,11 +875,11 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "Especifique um ficheiro com regras personalizadas para incluir na firewall a "
 "seguir às regras por omissão. Tipo de protocolo por omissão: ipv4, tabela "
-"por omissão: filter. (Exemplo: ipv4:filter:/etc/sysconfig/"
+"por omissão: filter. (Exemplo: ipv4:filter:/etc/conf.d/"
 "ipv4_filter_as_minhas_regras)"
 
 #: ../src/firewall-offline-cmd:187
diff -Naur firewalld-0.2.12/po/ru.po firewalld-0.2.12-magellan/po/ru.po
--- firewalld-0.2.12/po/ru.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/ru.po	2013-01-15 16:14:15.294537040 +0000
@@ -900,12 +900,12 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "Позволяет определить произвольный файл правил для включения в правила "
 "межсетевого экрана. Новые правила будут добавлены после существующих. "
 "Стандартный тип протокола: ipv4. Стандартная таблица: filter.  Пример: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon"
+"filter:/etc/conf.d/ipv4_filter_addon"
 
 #: ../src/firewall-offline-cmd:187
 msgid ""
diff -Naur firewalld-0.2.12/po/sk.po firewalld-0.2.12-magellan/po/sk.po
--- firewalld-0.2.12/po/sk.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/sk.po	2013-01-15 16:14:15.297537043 +0000
@@ -873,11 +873,11 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "Zadajte súbor s vlastnými pravidlami pre pridanie do firewallu. Budú "
 "zaradené za predvolené pravidlá. Predvolený typ protokolu: ipv4, predvolená "
-"tabuľka: filter. (Napr.: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+"tabuľka: filter. (Napr.: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:187
 msgid ""
diff -Naur firewalld-0.2.12/po/sr@latin.po firewalld-0.2.12-magellan/po/sr@latin.po
--- firewalld-0.2.12/po/sr@latin.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/sr@latin.po	2013-01-15 16:14:15.300537046 +0000
@@ -874,11 +874,11 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "Navedite datoteku prilagođenih pravila za pridruživanje zaštitnom zidu, "
 "nakon podrazumevanih pravila. Podrazumevana vrsta protokola: ipv4, "
-"podrazumevana tabela: filter. (Primer: ipv4:filter:/etc/sysconfig/"
+"podrazumevana tabela: filter. (Primer: ipv4:filter:/etc/conf.d/"
 "ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:187
diff -Naur firewalld-0.2.12/po/sr.po firewalld-0.2.12-magellan/po/sr.po
--- firewalld-0.2.12/po/sr.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/sr.po	2013-01-15 16:14:15.303537049 +0000
@@ -874,11 +874,11 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "Наведите датотеку прилагођених правила за придруживање заштитном зиду, након "
 "подразумеваних правила. Подразумевана врста протокола: ipv4, подразумевана "
-"табела: filter. (Пример: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+"табела: filter. (Пример: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:187
 msgid ""
diff -Naur firewalld-0.2.12/po/sv.po firewalld-0.2.12-magellan/po/sv.po
--- firewalld-0.2.12/po/sv.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/sv.po	2013-01-15 16:14:15.306537052 +0000
@@ -896,11 +896,11 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "Ange en anpassad regelfil som skall läggas till i brandväggen efter "
 "standardreglerna. Standardprotokolltyp: ipv4, standardtabell: filter. "
-"(Exempel: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+"(Exempel: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:187
 msgid ""
diff -Naur firewalld-0.2.12/po/ta.po firewalld-0.2.12-magellan/po/ta.po
--- firewalld-0.2.12/po/ta.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/ta.po	2013-01-15 16:14:15.309537055 +0000
@@ -875,11 +875,11 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "முன்னிருப்பு விதிகளுக்கு பின், ஒரு தனிபயன் விதிகள் கோப்பினை ஃபயர்வாலில் குறிப்பிடவும். "
 "முன்னிருப்பு நெறிமுறை வகை: ipv4, default table: filter. (எடுத்துக்காட்டு: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:187
 msgid ""
diff -Naur firewalld-0.2.12/po/te.po firewalld-0.2.12-magellan/po/te.po
--- firewalld-0.2.12/po/te.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/te.po	2013-01-15 16:14:15.311537057 +0000
@@ -870,10 +870,10 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "firewall లో కలుపుటకు వినియోగదారుని నియమాల దస్త్రంను తెలుపండి. దీనిని సిద్దనియమాల తర్వాత కలపవలెను. "
-"అప్రమేయ నియమం రకము: ipv4, అప్రమేయ పట్టిక: వడపోత. (ఉదాహరణ: ipv4:filter:/etc/sysconfig/"
+"అప్రమేయ నియమం రకము: ipv4, అప్రమేయ పట్టిక: వడపోత. (ఉదాహరణ: ipv4:filter:/etc/conf.d/"
 "ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:187
diff -Naur firewalld-0.2.12/po/tr.po firewalld-0.2.12-magellan/po/tr.po
--- firewalld-0.2.12/po/tr.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/tr.po	2013-01-15 16:14:15.314537060 +0000
@@ -869,7 +869,7 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 
 #: ../src/firewall-offline-cmd:187
diff -Naur firewalld-0.2.12/po/uk.po firewalld-0.2.12-magellan/po/uk.po
--- firewalld-0.2.12/po/uk.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/uk.po	2013-01-15 16:14:15.317537063 +0000
@@ -903,11 +903,11 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "Вкажіть власні правила для включення до правил мережного екрану. Вони будуть "
 "додані після типових правил. Стандартний тип: ipv4, типова таблиця: filter. "
-"(Приклад: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
+"(Приклад: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
 
 #: ../src/firewall-offline-cmd:187
 msgid ""
diff -Naur firewalld-0.2.12/po/zh_CN.po firewalld-0.2.12-magellan/po/zh_CN.po
--- firewalld-0.2.12/po/zh_CN.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/zh_CN.po	2013-01-15 16:14:15.320537066 +0000
@@ -877,10 +877,10 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "在默认规则后指定防火墙中包含的定制规则文件。默认协议类型：ipv4，默认 "
-"iptable：filter。（示例：ipv4:filter:/etc/sysconfig/ipv4_filter_addon）"
+"iptable：filter。（示例：ipv4:filter:/etc/conf.d/ipv4_filter_addon）"
 
 #: ../src/firewall-offline-cmd:187
 msgid ""
diff -Naur firewalld-0.2.12/po/zh_TW.po firewalld-0.2.12-magellan/po/zh_TW.po
--- firewalld-0.2.12/po/zh_TW.po	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/po/zh_TW.po	2013-01-15 16:14:15.323537069 +0000
@@ -868,10 +868,10 @@
 msgid ""
 "Specify a custom rules file for inclusion in the firewall, after the default "
 "rules. Default protocol type: ipv4, default table: filter. (Example: ipv4:"
-"filter:/etc/sysconfig/ipv4_filter_addon)"
+"filter:/etc/conf.d/ipv4_filter_addon)"
 msgstr ""
 "指定一個自訂規則檔案來包含在防火牆中，位於預設的規則之後。預設的協定類型："
-"ipv4，預設表格: filter。（例如：ipv4:filter:/etc/sysconfig/"
+"ipv4，預設表格: filter。（例如：ipv4:filter:/etc/conf.d/"
 "ipv4_filter_addon）"
 
 #: ../src/firewall-offline-cmd:187
diff -Naur firewalld-0.2.12/src/firewall-offline-cmd firewalld-0.2.12-magellan/src/firewall-offline-cmd
--- firewalld-0.2.12/src/firewall-offline-cmd	2013-01-14 15:27:39.000000000 +0000
+++ firewalld-0.2.12-magellan/src/firewall-offline-cmd	2013-01-15 16:08:59.558473783 +0000
@@ -179,7 +179,7 @@
                              "the firewall, after the "
                              "default rules. Default protocol type: ipv4, "
                              "default table: filter. "
-                             "(Example: ipv4:filter:/etc/sysconfig/"
+                             "(Example: ipv4:filter:/etc/conf.d/"
                              "ipv4_filter_addon)"))
     parser.add_option("--forward-port",
                       action="callback", dest="forward_port",
@@ -314,7 +314,7 @@
 
 def read_sysconfig_args():
     filename = None
-    CONFIG = '/etc/sysconfig/system-config-firewall'
+    CONFIG = '/etc/conf.d/system-config-firewall'
     if os.path.exists(CONFIG) and os.path.isfile(CONFIG):
         filename = CONFIG
     try: