diff -Naur firewalld-0.3.3/config/firewalld.init firewalld-0.3.3-magellan/config/firewalld.init --- firewalld-0.3.3/config/firewalld.init 2011-12-15 18:03:32.000000000 +0000 +++ firewalld-0.3.3-magellan/config/firewalld.init 2013-06-10 11:47:36.156000000 +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.3.3/config/firewalld.service.in firewalld-0.3.3-magellan/config/firewalld.service.in --- firewalld-0.3.3/config/firewalld.service.in 2013-05-06 13:38:20.000000000 +0000 +++ firewalld-0.3.3-magellan/config/firewalld.service.in 2013-06-10 11:47:10.624000000 +0000 @@ -6,7 +6,7 @@ Conflicts=iptables.service ip6tables.service ebtables.service [Service] -EnvironmentFile=-/etc/sysconfig/firewalld +EnvironmentFile=-/etc/conf.d/firewalld ExecStart=@sbindir@/firewalld --nofork --nopid $FIREWALLD_ARGS ExecReload=/bin/kill -HUP $MAINPID # supress to log debug and error output also to /var/log/messages diff -Naur firewalld-0.3.3/po/ar.po firewalld-0.3.3-magellan/po/ar.po --- firewalld-0.3.3/po/ar.po 2013-06-06 16:07:06.000000000 +0000 +++ firewalld-0.3.3-magellan/po/ar.po 2013-06-10 11:49:14.060000000 +0000 @@ -874,7 +874,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.3.3/po/as.po firewalld-0.3.3-magellan/po/as.po --- firewalld-0.3.3/po/as.po 2013-06-06 16:07:06.000000000 +0000 +++ firewalld-0.3.3-magellan/po/as.po 2013-06-10 11:49:14.063000000 +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)" +"(যেনে: ipv4:filter:/etc/conf.d/ipv4_filter_addon)" #: ../src/firewall-offline-cmd:187 msgid "" diff -Naur firewalld-0.3.3/po/bn_IN.po firewalld-0.3.3-magellan/po/bn_IN.po --- firewalld-0.3.3/po/bn_IN.po 2013-06-06 16:07:06.000000000 +0000 +++ firewalld-0.3.3-magellan/po/bn_IN.po 2013-06-10 11:49:14.066000000 +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, 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.3.3/po/ca.po firewalld-0.3.3-magellan/po/ca.po --- firewalld-0.3.3/po/ca.po 2013-06-06 16:07:06.000000000 +0000 +++ firewalld-0.3.3-magellan/po/ca.po 2013-06-10 11:49:14.068000000 +0000 @@ -877,7 +877,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.3.3/po/cs.po firewalld-0.3.3-magellan/po/cs.po --- firewalld-0.3.3/po/cs.po 2013-06-06 16:07:06.000000000 +0000 +++ firewalld-0.3.3-magellan/po/cs.po 2013-06-10 11:49:14.071000000 +0000 @@ -895,11 +895,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.3.3/po/da.po firewalld-0.3.3-magellan/po/da.po --- firewalld-0.3.3/po/da.po 2013-06-06 16:07:06.000000000 +0000 +++ firewalld-0.3.3-magellan/po/da.po 2013-06-10 11:49:14.074000000 +0000 @@ -879,11 +879,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.3.3/po/de.po firewalld-0.3.3-magellan/po/de.po --- firewalld-0.3.3/po/de.po 2013-06-06 16:07:06.000000000 +0000 +++ firewalld-0.3.3-magellan/po/de.po 2013-06-10 11:49:14.077000000 +0000 @@ -930,7 +930,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 "" "Wählen Sie eine eigene Regeldatei aus, die in die Firewall eingebunden " "werden soll. Sie wird nach den Standardregeln eingebunden. " diff -Naur firewalld-0.3.3/po/en_GB.po firewalld-0.3.3-magellan/po/en_GB.po --- firewalld-0.3.3/po/en_GB.po 2013-06-06 16:07:07.000000000 +0000 +++ firewalld-0.3.3-magellan/po/en_GB.po 2013-06-10 11:49:14.079000000 +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 "" "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.3.3/po/es.po firewalld-0.3.3-magellan/po/es.po --- firewalld-0.3.3/po/es.po 2013-06-06 16:07:07.000000000 +0000 +++ firewalld-0.3.3-magellan/po/es.po 2013-06-10 11:49:14.082000000 +0000 @@ -913,11 +913,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.3.3/po/fi.po firewalld-0.3.3-magellan/po/fi.po --- firewalld-0.3.3/po/fi.po 2013-06-06 16:07:07.000000000 +0000 +++ firewalld-0.3.3-magellan/po/fi.po 2013-06-10 11:49:14.085000000 +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 "" "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.3.3/po/fr.po firewalld-0.3.3-magellan/po/fr.po --- firewalld-0.3.3/po/fr.po 2013-06-06 16:07:07.000000000 +0000 +++ firewalld-0.3.3-magellan/po/fr.po 2013-06-10 11:49:14.087000000 +0000 @@ -923,7 +923,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.3.3/po/gu.po firewalld-0.3.3-magellan/po/gu.po --- firewalld-0.3.3/po/gu.po 2013-06-06 16:07:07.000000000 +0000 +++ firewalld-0.3.3-magellan/po/gu.po 2013-06-10 11:49:14.090000000 +0000 @@ -873,10 +873,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.3.3/po/hi.po firewalld-0.3.3-magellan/po/hi.po --- firewalld-0.3.3/po/hi.po 2013-06-06 16:07:07.000000000 +0000 +++ firewalld-0.3.3-magellan/po/hi.po 2013-06-10 11:49:14.092000000 +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, default table: filter. (Example: ipv4:filter:/" diff -Naur firewalld-0.3.3/po/hu.po firewalld-0.3.3-magellan/po/hu.po --- firewalld-0.3.3/po/hu.po 2013-06-06 16:07:07.000000000 +0000 +++ firewalld-0.3.3-magellan/po/hu.po 2013-06-10 11:49:14.095000000 +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 "" "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.3.3/po/it.po firewalld-0.3.3-magellan/po/it.po --- firewalld-0.3.3/po/it.po 2013-06-06 16:07:07.000000000 +0000 +++ firewalld-0.3.3-magellan/po/it.po 2013-06-10 11:49:14.098000000 +0000 @@ -917,11 +917,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.3.3/po/ja.po firewalld-0.3.3-magellan/po/ja.po --- firewalld-0.3.3/po/ja.po 2013-06-06 16:07:07.000000000 +0000 +++ firewalld-0.3.3-magellan/po/ja.po 2013-06-10 11:49:14.101000000 +0000 @@ -902,11 +902,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.3.3/po/kn.po firewalld-0.3.3-magellan/po/kn.po --- firewalld-0.3.3/po/kn.po 2013-06-06 16:07:07.000000000 +0000 +++ firewalld-0.3.3-magellan/po/kn.po 2013-06-10 11:49:14.104000000 +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)" +"(ಉದಾಹರಣೆ: ipv4:filter:/etc/conf.d/ipv4_filter_addon)" #: ../src/firewall-offline-cmd:187 msgid "" diff -Naur firewalld-0.3.3/po/ko.po firewalld-0.3.3-magellan/po/ko.po --- firewalld-0.3.3/po/ko.po 2013-06-06 16:07:08.000000000 +0000 +++ firewalld-0.3.3-magellan/po/ko.po 2013-06-10 11:49:14.106000000 +0000 @@ -880,11 +880,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.3.3/po/ml.po firewalld-0.3.3-magellan/po/ml.po --- firewalld-0.3.3/po/ml.po 2013-06-06 16:07:08.000000000 +0000 +++ firewalld-0.3.3-magellan/po/ml.po 2013-06-10 11:49:14.110000000 +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:/" diff -Naur firewalld-0.3.3/po/mr.po firewalld-0.3.3-magellan/po/mr.po --- firewalld-0.3.3/po/mr.po 2013-06-06 16:07:08.000000000 +0000 +++ firewalld-0.3.3-magellan/po/mr.po 2013-06-10 11:49:14.112000000 +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.3.3/po/nl.po firewalld-0.3.3-magellan/po/nl.po --- firewalld-0.3.3/po/nl.po 2013-06-06 16:07:08.000000000 +0000 +++ firewalld-0.3.3-magellan/po/nl.po 2013-06-10 11:49:14.115000000 +0000 @@ -909,11 +909,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.3.3/po/or.po firewalld-0.3.3-magellan/po/or.po --- firewalld-0.3.3/po/or.po 2013-06-06 16:07:08.000000000 +0000 +++ firewalld-0.3.3-magellan/po/or.po 2013-06-10 11:49:14.118000000 +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, ପୂର୍ବନିର୍ଦ୍ଧାରିତ ସାରଣୀ: ଛାଣକ. (ଉଦାହରଣ " -"ସ୍ୱରୂପ: 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.3.3/po/pa.po firewalld-0.3.3-magellan/po/pa.po --- firewalld-0.3.3/po/pa.po 2013-06-06 16:07:08.000000000 +0000 +++ firewalld-0.3.3-magellan/po/pa.po 2013-06-10 11:49:14.120000000 +0000 @@ -879,10 +879,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.3.3/po/pl.po firewalld-0.3.3-magellan/po/pl.po --- firewalld-0.3.3/po/pl.po 2013-06-06 16:07:08.000000000 +0000 +++ firewalld-0.3.3-magellan/po/pl.po 2013-06-10 11:49:14.123000000 +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 "" "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.3.3/po/pt_BR.po firewalld-0.3.3-magellan/po/pt_BR.po --- firewalld-0.3.3/po/pt_BR.po 2013-06-06 16:07:08.000000000 +0000 +++ firewalld-0.3.3-magellan/po/pt_BR.po 2013-06-10 11:49:14.126000000 +0000 @@ -918,11 +918,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.3.3/po/pt.po firewalld-0.3.3-magellan/po/pt.po --- firewalld-0.3.3/po/pt.po 2013-06-06 16:07:08.000000000 +0000 +++ firewalld-0.3.3-magellan/po/pt.po 2013-06-10 11:49:14.129000000 +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 "" "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.3.3/po/ru.po firewalld-0.3.3-magellan/po/ru.po --- firewalld-0.3.3/po/ru.po 2013-06-06 16:07:09.000000000 +0000 +++ firewalld-0.3.3-magellan/po/ru.po 2013-06-10 11:49:14.132000000 +0000 @@ -906,12 +906,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.3.3/po/sk.po firewalld-0.3.3-magellan/po/sk.po --- firewalld-0.3.3/po/sk.po 2013-06-06 16:07:09.000000000 +0000 +++ firewalld-0.3.3-magellan/po/sk.po 2013-06-10 11:49:14.135000000 +0000 @@ -897,11 +897,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.3.3/po/sr@latin.po firewalld-0.3.3-magellan/po/sr@latin.po --- firewalld-0.3.3/po/sr@latin.po 2013-06-06 16:07:09.000000000 +0000 +++ firewalld-0.3.3-magellan/po/sr@latin.po 2013-06-10 11:49:14.137000000 +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 "" "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.3.3/po/sr.po firewalld-0.3.3-magellan/po/sr.po --- firewalld-0.3.3/po/sr.po 2013-06-06 16:07:09.000000000 +0000 +++ firewalld-0.3.3-magellan/po/sr.po 2013-06-10 11:49:14.140000000 +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, подразумевана " -"табела: 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.3.3/po/sv.po firewalld-0.3.3-magellan/po/sv.po --- firewalld-0.3.3/po/sv.po 2013-06-06 16:07:09.000000000 +0000 +++ firewalld-0.3.3-magellan/po/sv.po 2013-06-10 11:49:14.143000000 +0000 @@ -902,11 +902,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.3.3/po/ta.po firewalld-0.3.3-magellan/po/ta.po --- firewalld-0.3.3/po/ta.po 2013-06-06 16:07:09.000000000 +0000 +++ firewalld-0.3.3-magellan/po/ta.po 2013-06-10 11:49:14.145000000 +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 "" "முன்னிருப்பு விதிகளுக்கு பின், ஒரு தனிபயன் விதிகள் கோப்பினை ஃபயர்வாலில் குறிப்பிடவும். " "முன்னிருப்பு நெறிமுறை வகை: 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.3.3/po/te.po firewalld-0.3.3-magellan/po/te.po --- firewalld-0.3.3/po/te.po 2013-06-06 16:07:09.000000000 +0000 +++ firewalld-0.3.3-magellan/po/te.po 2013-06-10 11:49:14.148000000 +0000 @@ -872,10 +872,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.3.3/po/tr.po firewalld-0.3.3-magellan/po/tr.po --- firewalld-0.3.3/po/tr.po 2013-06-06 16:07:09.000000000 +0000 +++ firewalld-0.3.3-magellan/po/tr.po 2013-06-10 11:49:14.151000000 +0000 @@ -910,11 +910,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.3.3/po/uk.po firewalld-0.3.3-magellan/po/uk.po --- firewalld-0.3.3/po/uk.po 2013-06-06 16:07:09.000000000 +0000 +++ firewalld-0.3.3-magellan/po/uk.po 2013-06-10 11:49:14.154000000 +0000 @@ -909,11 +909,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.3.3/po/zh_CN.po firewalld-0.3.3-magellan/po/zh_CN.po --- firewalld-0.3.3/po/zh_CN.po 2013-06-06 16:07:10.000000000 +0000 +++ firewalld-0.3.3-magellan/po/zh_CN.po 2013-06-10 11:49:14.156000000 +0000 @@ -884,10 +884,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.3.3/po/zh_TW.po firewalld-0.3.3-magellan/po/zh_TW.po --- firewalld-0.3.3/po/zh_TW.po 2013-06-06 16:07:10.000000000 +0000 +++ firewalld-0.3.3-magellan/po/zh_TW.po 2013-06-10 11:49:14.159000000 +0000 @@ -880,10 +880,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.3.3/src/firewall-offline-cmd firewalld-0.3.3-magellan/src/firewall-offline-cmd --- firewalld-0.3.3/src/firewall-offline-cmd 2013-06-06 15:21:17.000000000 +0000 +++ firewalld-0.3.3-magellan/src/firewall-offline-cmd 2013-06-10 11:48:39.798000000 +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: