Index: branches/ErmaC/Enoch/package/Distribution
===================================================================
--- branches/ErmaC/Enoch/package/Distribution	(revision 2812)
+++ branches/ErmaC/Enoch/package/Distribution	(revision 2813)
@@ -6,12 +6,12 @@
 	<domains enable_anywhere="true"/>
 
 	<welcome file='Welcome.html'/>
-	<!-- license file="License.rtf" sla="EA0401" -->
+	<license file="License.rtf" sla="EA0401"/>
 	<readme file='Description.html'/>
 	<conclusion file="Conclusion.html"/>
-	<background file='background' mime-type='image/png' alignment='topleft' scaling='no'/>
+	<background file='background' alignment='topleft' scaling='no'/>
 
-	<title>Enoch Bootloder revision %CHAMELEONREVISION%</title>
+	<title>Chameleon_Package_Title</title>
 
 	<script>
 
Index: branches/ErmaC/Enoch/package/buildpkg.sh
===================================================================
--- branches/ErmaC/Enoch/package/buildpkg.sh	(revision 2812)
+++ branches/ErmaC/Enoch/package/buildpkg.sh	(revision 2813)
@@ -14,6 +14,11 @@
 # Add by FurtiF fix patch of brew gettext
 export PATH=${PATH}:/usr/local/opt/gettext/bin
 
+# Micky1979, I build Clover too, gettex should be there
+if [[ -f "${HOME}"/src/opt/local/bin/gettext ]];then
+    export PATH=${PATH}:"${HOME}"/src/opt/local/bin
+fi
+
 if [[ $# -lt 3 ]];then
     echo "Too few arguments. Aborting..." >&2 && exit 1
 fi
@@ -96,10 +101,6 @@
 declare -a pkgrefs
 declare -a choice_key
 declare -a choice_options
-declare -a choice_selected
-declare -a choice_force_selected
-declare -a choice_title
-declare -a choive_description
 declare -a choice_pkgrefs
 declare -a choice_parent_group_index
 declare -a choice_group_items
@@ -108,8 +109,6 @@
 # Init Main Group
 choice_key[0]=""
 choice_options[0]=""
-choice_title[0]=""
-choice_description[0]=""
 choices_pkgrefs[0]=""
 choice_group_items[0]=""
 choice_group_exclusive[0]=""
@@ -270,8 +269,6 @@
 # Add a new choice
 addChoice () {
     # Optional arguments:
-    #    --title=<title> : Force the title
-    #    --description=<description> : Force the description
     #    --group=<group> : Group Choice Id
     #    --start-selected=<javascript code> : Specifies whether this choice is initially selected or unselected
     #    --start-enabled=<javascript code>  : Specifies the initial enabled state of this choice
@@ -281,39 +278,27 @@
     # $1 Choice Id
 
     local option
-    local title=""
-    local description=""
     local groupChoice=""
     local choiceOptions=""
-    local choiceSelected=""
-    local choiceForceSelected=""
     local pkgrefs=""
 
     # Check the arguments.
     for option in "${@}";do
         case "$option" in
-            --title=*)
-                       shift; title="${option#*=}" ;;
-            --description=*)
-                       shift; description="${option#*=}" ;;
             --group=*)
                        shift; groupChoice=${option#*=} ;;
+            --selected=*)
+                         shift; choiceOptions="$choiceOptions selected=\"${option#*=}\"" ;;
+            --enabled=*)
+                         shift; choiceOptions="$choiceOptions enabled=\"${option#*=}\"" ;;
             --start-selected=*)
-                       shift; choiceOptions="$choiceOptions start_selected=\"${option#*=}\"" ;;
+                         shift; choiceOptions="$choiceOptions start_selected=\"${option#*=}\"" ;;
             --start-enabled=*)
-                       shift; choiceOptions="$choiceOptions start_enabled=\"${option#*=}\"" ;;
+                         shift; choiceOptions="$choiceOptions start_enabled=\"${option#*=}\"" ;;
             --start-visible=*)
-                       shift; choiceOptions="$choiceOptions start_visible=\"${option#*=}\"" ;;
-            --enabled=*)
-                       shift; choiceOptions="$choiceOptions enabled=\"${option#*=}\"" ;;
-            --selected=*)
-                       shift; choiceSelected="${option#*=}" ;;
-            --force-selected=*)
-                       shift; choiceForceSelected="${option#*=}" ;;
-            --visible=*)
-                       shift; choiceOptions="$choiceOptions visible=\"${option#*=}\"" ;;
+                         shift; choiceOptions="$choiceOptions start_visible=\"${option#*=}\"" ;;
             --pkg-refs=*)
-                       shift; pkgrefs=${option#*=} ;;
+                          shift; pkgrefs=${option#*=} ;;
             -*)
                 echo "Unrecognized addChoice option '$option'" >&2
                 exit 1
@@ -352,11 +337,7 @@
 
     # Record new node
     choice_key[$idx]="$choiceId"
-    choice_title[$idx]="${title:-${choiceId}_title}"
-    choice_description[$idx]="${description:-${choiceId}_description}"
     choice_options[$idx]=$(trim "${choiceOptions}") # Removing leading and trailing whitespace(s)
-    choice_selected[$idx]=$(trim "${choiceSelected}") # Removing leading and trailing whitespace(s)
-    choice_force_selected[$idx]=$(trim "${choiceForceSelected}") # Removing leading and trailing whitespace(s)
     choice_parent_group_index[$idx]=$idx_group
     choice_pkgrefs[$idx]="$pkgrefs"
 
@@ -366,8 +347,6 @@
 # Add a group choice
 addGroupChoices() {
     # Optional arguments:
-    #    --title=<title> : Force the title
-    #    --description=<description> : Force the description
     #    --parent=<parent> : parent group choice id
     #    --exclusive_zero_or_one_choice : only zero or one choice can be selected in the group
     #    --exclusive_one_choice : only one choice can be selected in the group
@@ -375,35 +354,18 @@
     # $1 Choice Id
 
     local option
-    local title=""
-    local description=""
     local groupChoice=""
     local exclusive_function=""
-    local choiceOptions=
 
     for option in "${@}";do
         case "$option" in
-            --title=*)
-                       shift; title="${option#*=}" ;;
-            --description=*)
-                       shift; description="${option#*=}" ;;
             --exclusive_zero_or_one_choice)
                        shift; exclusive_function="exclusive_zero_or_one_choice" ;;
             --exclusive_one_choice)
                        shift; exclusive_function="exclusive_one_choice" ;;
             --parent=*)
                        shift; groupChoice=${option#*=} ;;
-            --start-selected=*)
-                       shift; choiceOptions+=("--start-selected=${option#*=}") ;;
-            --start-enabled=*)
-                       shift; choiceOptions+=("--start-enabled=${option#*=}") ;;
-            --start-visible=*)
-                       shift; choiceOptions+=("--start-visible=${option#*=}") ;;
-            --enabled=*)
-                       shift; choiceOptions+=("--enabled=${option#*=}") ;;
-            --selected=*)
-                       shift; choiceOptions+=("--selected=${option#*=}") ;;
-           -*)
+            -*)
                 echo "Unrecognized addGroupChoices option '$option'" >&2
                 exit 1
                 ;;
@@ -416,7 +378,7 @@
         exit 1
     fi
 
-    addChoice --group="$groupChoice" --title="$title" --description="$description" ${choiceOptions[*]} "${1}"
+    addChoice --group="$groupChoice" "${1}"
     local idx=$? # index of the new created choice
 
     choice_group_exclusive[$idx]="$exclusive_function"
@@ -435,8 +397,6 @@
     done
     if [[ -n "$result" ]];then
         echo "!(${result%$separator})"
-    else
-        echo "choices['$myChoice'].selected"
     fi
 }
 
@@ -445,7 +405,6 @@
     # $2..$n Others choice(s) (ie: "test2" "test3"). Current can or can't be in the others choices
     local myChoice="${1}"
     local result;
-    local exclusive_one_choice_code="$(exclusive_one_choice ${@})"
     echo "(my.choice.selected &amp;&amp; $(exclusive_one_choice ${@}))"
 }
 
@@ -1174,7 +1133,7 @@
                        --subst="YAML_FILE=${yamlFile}" CleanOptions
     generate_options_yaml_file "${PKG_BUILD_DIR}/${choiceId}/Scripts/$yamlFile"
     cp -f ${PKGROOT}/Scripts/Main/${choiceId}postinstall ${PKG_BUILD_DIR}/${choiceId}/Scripts/postinstall
-    ditto --arch i386 `which SetFile` ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/SetFile
+    # ditto --arch i386 `which SetFile` ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/SetFile
 
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
     buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"
@@ -1193,7 +1152,7 @@
                        --subst="YAML_FILE=${yamlFile}" CleanOptions
     generate_options_yaml_file "${PKG_BUILD_DIR}/${choiceId}/Scripts/$yamlFile"
     cp -f ${PKGROOT}/Scripts/Main/ESPpostinstall ${PKG_BUILD_DIR}/${choiceId}/Scripts/postinstall
-    ditto --arch i386 `which SetFile` ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/SetFile
+    #     ditto --arch i386 `which SetFile` ${PKG_BUILD_DIR}/${choiceId}/Scripts/Resources/SetFile
 
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
     buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"
@@ -1245,7 +1204,7 @@
 
         echo -e "\t[BUILD] ${packageName}"
 
-        find "${packagePath}" \( -name '.DS_Store' -o -name '.svn' \) -print0 | xargs -0 rm -rf
+        find "${packagePath}" -name '.DS_Store' -delete
         local filecount=$( find "${packagePath}/Root" | wc -l )
         if [ "${packageSize}" ]; then
             local installedsize="${packageSize}"
@@ -1332,13 +1291,9 @@
 
     for (( idx=1; idx < ${#choice_key[*]} ; idx++)); do
         local choiceId=${choice_key[$idx]}
-        local choiceTitle=${choice_title[$idx]}
-        local choiceDescription=${choice_description[$idx]}
         local choiceOptions=${choice_options[$idx]}
         local choiceParentGroupIndex=${choice_parent_group_index[$idx]}
         set +u; local group_exclusive=${choice_group_exclusive[$choiceParentGroupIndex]}; set -u
-        local selected_option="${choice_selected[$idx]}"
-        local exclusive_option=""
 
         # Create the node and standard attributes
         local choiceNode="\t<choice\n\t\tid=\"${choiceId}\"\n\t\ttitle=\"${choiceId}_title\"\n\t\tdescription=\"${choiceId}_description\""
@@ -1400,7 +1355,6 @@
 
 #   Create the Distribution file
     ditto --noextattr --noqtn "${PKGROOT}/Distribution" "${PKG_BUILD_DIR}/${packagename}/Distribution"
-    makeSubstitutions "${PKG_BUILD_DIR}/${packagename}/Distribution"
 
     local start_indent_level=2
     echo -e "\n\t<choices-outline>" >> "${PKG_BUILD_DIR}/${packagename}/Distribution"
@@ -1428,7 +1382,7 @@
         bin/po4a/po4a                                                     \
         --package-name 'Chameleon'                                        \
         --package-version "${CHAMELEON_VERSION}-r${CHAMELEON_REVISION}"   \
-        --msgmerge-opt '--lang=$lang --previous --width=79'               \
+        --msgmerge-opt '--lang=$lang'                                     \
         --variable PODIR="po"                                             \
         --variable TEMPLATES_DIR="Resources/templates"                    \
         --variable OUTPUT_DIR="${PKG_BUILD_DIR}/${packagename}/Resources" \
@@ -1438,7 +1392,8 @@
     ditto --noextattr --noqtn "${PKGROOT}/Resources/common" "${PKG_BUILD_DIR}/${packagename}/Resources/en.lproj"
 
     # CleanUp the directory
-    find "${PKG_BUILD_DIR}/${packagename}" \( -type d -name '.svn' \) -o -name '.DS_Store' -depth -exec rm -rf {} \;
+    find "${PKG_BUILD_DIR}/${packagename}" -name .svn -print0 | xargs -0 rm -rf
+    find "${PKG_BUILD_DIR}/${packagename}" -name '*.DS_Store' -type f -delete
     find "${PKG_BUILD_DIR}/${packagename}" -type d -depth -empty -exec rmdir {} \; # Remove empty directories
 
     # Make substitutions for version, revision, stage, developers, credits, etc..
Index: branches/ErmaC/Enoch/package/po/en.po
===================================================================
--- branches/ErmaC/Enoch/package/po/en.po	(revision 2812)
+++ branches/ErmaC/Enoch/package/po/en.po	(revision 2813)
@@ -2647,14 +2647,12 @@
 #. type: "IntelBroadwellx19_title"
 #: Resources/templates/Localizable.strings:684
 #, no-wrap
-#| msgid "00002216"
 msgid "07002216"
 msgstr "07002216"
 
 #. type: "IntelBroadwellx19_description"
 #: Resources/templates/Localizable.strings:685
 #, no-wrap
-#| msgid "Set 00002216 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 07002216 for Intel Broadwell AAPL,ig-platform-id."
 msgstr "Set 07002216 for Intel Broadwell AAPL,ig-platform-id."
 
@@ -3333,7 +3331,6 @@
 #. type: "CrsActiveConfig_description"
 #: Resources/templates/Localizable.strings:884
 #, no-wrap
-#| msgid "System Integrity Protection."
 msgid "System Integrity Protection (SIP)."
 msgstr "System Integrity Protection (SIP)."
 
Index: branches/ErmaC/Enoch/package/po/fr.po
===================================================================
--- branches/ErmaC/Enoch/package/po/fr.po	(revision 2812)
+++ branches/ErmaC/Enoch/package/po/fr.po	(revision 2813)
@@ -1299,9 +1299,7 @@
 #: Resources/templates/Localizable.strings:299
 #, no-wrap
 msgid "Kext signing: Introduced in 10.9, enhanced in 10.10 (kext signing required for all kexts), now become part of rootless(SIP)."
-msgstr ""
-"Kext signature: Introduit en 10.9, renforcée en 10.10 (signature kext requis "
-"pour tous les kexts), devenu maintenant partie de déracinés (SIP)."
+msgstr "Kext signature: Introduit en 10.9, renforcée en 10.10 (signature kext requis pour tous les kexts), devenu maintenant partie de déracinés (SIP)."
 
 #. type: "Crs2_title"
 #: Resources/templates/Localizable.strings:301
@@ -1313,9 +1311,7 @@
 #: Resources/templates/Localizable.strings:302
 #, no-wrap
 msgid "Filesystem protection: Important system files are protected and cannot be modified."
-msgstr ""
-"La protection de système de fichiers: fichiers système importants sont "
-"protégés et ne peuvent être modifiés."
+msgstr "La protection de système de fichiers: fichiers système importants sont protégés et ne peuvent être modifiés."
 
 #. type: "Crs4_title"
 #: Resources/templates/Localizable.strings:304
@@ -2670,182 +2666,156 @@
 #. type: "IntelBroadwellx19_title"
 #: Resources/templates/Localizable.strings:684
 #, no-wrap
-#| msgid "00002216"
 msgid "07002216"
 msgstr "07002216"
 
 #. type: "IntelBroadwellx19_description"
 #: Resources/templates/Localizable.strings:685
 #, no-wrap
-#| msgid "Set 00002216 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 07002216 for Intel Broadwell AAPL,ig-platform-id."
 msgstr "Règle 07002216 pour Intel Broadwell AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex00_title"
 #: Resources/templates/Localizable.strings:689
 #, no-wrap
-#| msgid "00000e16"
 msgid "0000e019"
 msgstr "0000e019"
 
 #. type: "IntelSkylakex00_description"
 #: Resources/templates/Localizable.strings:690
 #, no-wrap
-#| msgid "Set 00000e16 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 0000e019 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Règle 0000e019 pour Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex01_title"
 #: Resources/templates/Localizable.strings:692
 #, no-wrap
-#| msgid "00001616"
 msgid "00001619"
 msgstr "00001619"
 
 #. type: "IntelSkylakex01_description"
 #: Resources/templates/Localizable.strings:693
 #, no-wrap
-#| msgid "Set 00001616 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 00001619 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Règle 00001619 pour Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex02_title"
 #: Resources/templates/Localizable.strings:695
 #, no-wrap
-#| msgid "00002616"
 msgid "00002619"
 msgstr "00002619"
 
 #. type: "IntelSkylakex02_description"
 #: Resources/templates/Localizable.strings:696
 #, no-wrap
-#| msgid "Set 00002216 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 00002619 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Règle 00002619 pour Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex03_title"
 #: Resources/templates/Localizable.strings:698
 #, no-wrap
-#| msgid "00001616"
 msgid "00001b19"
 msgstr "00001b19"
 
 #. type: "IntelSkylakex03_description"
 #: Resources/templates/Localizable.strings:699
 #, no-wrap
-#| msgid "Set 00001e16 for Intel Broadwell (Mobile) AAPL,ig-platform-id."
 msgid "Set 00001b19 for Intel Skylake (Mobile) AAPL,ig-platform-id."
 msgstr "Règle 00001b19 pour Intel Skylake (Mobile) AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex04_title"
 #: Resources/templates/Localizable.strings:701
 #, no-wrap
-#| msgid "00001616"
 msgid "00001219"
 msgstr "00001219"
 
 #. type: "IntelSkylakex04_description"
 #: Resources/templates/Localizable.strings:702
 #, no-wrap
-#| msgid "Set 00001e16 for Intel Broadwell (Mobile) AAPL,ig-platform-id."
 msgid "Set 00001219 for Intel Skylake (Mobile) AAPL,ig-platform-id."
 msgstr "Règle 00001219 pour Intel Skylake (Mobile) AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex05_title"
 #: Resources/templates/Localizable.strings:704
 #, no-wrap
-#| msgid "01000e16"
 msgid "01000219"
 msgstr "01000219"
 
 #. type: "IntelSkylakex05_description"
 #: Resources/templates/Localizable.strings:705
 #, no-wrap
-#| msgid "Set 00002616 for Intel Broadwell (Mobile) AAPL,ig-platform-id."
 msgid "Set 01000219 for Intel Skylake (Mobile) AAPL,ig-platform-id."
 msgstr "Règle 01000219 pour Intel Skylake (Mobile) AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex06_title"
 #: Resources/templates/Localizable.strings:707
 #, no-wrap
-#| msgid "01001e16"
 msgid "01001719"
 msgstr "01001719"
 
 #. type: "IntelSkylakex06_description"
 #: Resources/templates/Localizable.strings:708
 #, no-wrap
-#| msgid "Set 01000e16 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 01001719 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Règle 01001719 pour Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex07_title"
 #: Resources/templates/Localizable.strings:710
 #, no-wrap
-#| msgid "01001e16"
 msgid "01001219"
 msgstr "01001219"
 
 #. type: "IntelSkylakex07_description"
 #: Resources/templates/Localizable.strings:711
 #, no-wrap
-#| msgid "Set 03001216 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 01001219 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Règle 01001219 pour Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex08_title"
 #: Resources/templates/Localizable.strings:713
 #, no-wrap
-#| msgid "01000e16"
 msgid "01003219"
 msgstr "01003219"
 
 #. type: "IntelSkylakex08_description"
 #: Resources/templates/Localizable.strings:714
 #, no-wrap
-#| msgid "Set 01001e16 for Intel Broadwell (Mobile) AAPL,ig-platform-id."
 msgid "Set 01003219 for Intel Skylake (Mobile) AAPL,ig-platform-id."
 msgstr "Règle 01003219 pour Intel Skylake (Mobile) AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex09_title"
 #: Resources/templates/Localizable.strings:716
 #, no-wrap
-#| msgid "02001616"
 msgid "02001619"
 msgstr "02001619"
 
 #. type: "IntelSkylakex09_description"
 #: Resources/templates/Localizable.strings:717
 #, no-wrap
-#| msgid "Set 02001616 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 02001619 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Règle 02001619 pour Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex10_title"
 #: Resources/templates/Localizable.strings:719
 #, no-wrap
-#| msgid "02002616"
 msgid "02002619"
 msgstr "02002619"
 
 #. type: "IntelSkylakex10_description"
 #: Resources/templates/Localizable.strings:720
 #, no-wrap
-#| msgid "Set 02002216 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 02002619 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Règle 02002619 pour Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex11_title"
 #: Resources/templates/Localizable.strings:722
 #, no-wrap
-#| msgid "00001e16"
 msgid "03001e19"
 msgstr "03001e19"
 
 #. type: "IntelSkylakex11_description"
 #: Resources/templates/Localizable.strings:723
 #, no-wrap
-#| msgid "Set 00001e16 for Intel Broadwell (Mobile) AAPL,ig-platform-id."
 msgid "Set 03001e19 for Intel Skylake (Mobile) AAPL,ig-platform-id."
 msgstr "Règle 03001e19 pour Intel Skylake (Mobile) AAPL,ig-platform-id."
 
@@ -3488,18 +3458,14 @@
 #. type: "IntelSkl_title"
 #: Resources/templates/Localizable.strings:923
 #, no-wrap
-#| msgid "Intel Azul AAPL,ig-platform-id"
 msgid "Intel Skl AAPL,ig-platform-id"
 msgstr "Intel Skl AAPL,ig-platform-id"
 
 #. type: "IntelSkl_description"
 #: Resources/templates/Localizable.strings:924
 #, no-wrap
-#| msgid "Set one AAPL,ig-platform-id to use for your Intel Haswell."
 msgid "Set one AAPL,ig-platform-id to use for your Intel Skylake."
-msgstr ""
-"Définir une AAPL, ig-platform-id à utiliser pour votre contrôleur Intel "
-"Skylake."
+msgstr "Définir une AAPL, ig-platform-id à utiliser pour votre contrôleur Intel Skylake."
 
 #. type: "HDEFPinConfiguration_title"
 #: Resources/templates/Localizable.strings:927
@@ -3542,21 +3508,18 @@
 #. type: "Patches_title"
 #: Resources/templates/Localizable.strings:945
 #, no-wrap
-#| msgid "Kext Patcher"
 msgid "Patches"
 msgstr "Correctifs"
 
 #. type: "Patches_description"
 #: Resources/templates/Localizable.strings:946
 #, no-wrap
-#| msgid "A selection of options that deal with video."
 msgid "A selection of options to patch the kernel."
 msgstr "Options concernant les correctifs."
 
 #. type: "kernelPatcher_title"
 #: Resources/templates/Localizable.strings:948
 #, no-wrap
-#| msgid "Kernel Patcher"
 msgid "kernel Patcher"
 msgstr "kernel Patcher"
 
@@ -3576,28 +3539,23 @@
 #: Resources/templates/Localizable.strings:953
 #, no-wrap
 msgid "Re-enable /Extra/Extensions kexts on newer OSes."
-msgstr ""
-"Re-activer /Extra/ Extensions kexts sur les systèmes d’exploitation plus "
-"récents."
+msgstr "Re-activer /Extra/ Extensions kexts sur les systèmes d’exploitation plus récents."
 
 #. type: "KernelPm_title"
 #: Resources/templates/Localizable.strings:956
 #, no-wrap
-#| msgid "Kernel Patcher"
 msgid "KernelPm"
 msgstr "KernelPm"
 
 #. type: "KernelPm_description"
 #: Resources/templates/Localizable.strings:957
 #, no-wrap
-#| msgid "Power Management"
 msgid "Kernel Power Management patch."
 msgstr "Kernel Power Management patch."
 
 #. type: "KernelLapicError_title"
 #: Resources/templates/Localizable.strings:960
 #, no-wrap
-#| msgid "Kernel Patcher"
 msgid "KernelLapicError"
 msgstr "KernelLapicError"
 
@@ -3610,7 +3568,6 @@
 #. type: "KernelLapicVersion_title"
 #: Resources/templates/Localizable.strings:964
 #, no-wrap
-#| msgid "Kernel Patcher"
 msgid "KernelLapicVersion"
 msgstr "KernelLapicVersion"
 
@@ -3623,7 +3580,6 @@
 #. type: "KernelHaswell_title"
 #: Resources/templates/Localizable.strings:968
 #, no-wrap
-#| msgid "Kernel Flags"
 msgid "KernelHaswell"
 msgstr "KernelHaswell"
 
@@ -3631,9 +3587,7 @@
 #: Resources/templates/Localizable.strings:969
 #, no-wrap
 msgid "Patch for Haswell \\\"E\\\" and \\\"ULT\\\" support on older OSes."
-msgstr ""
-"Patch pour Haswell \\\"E\\\" et support \\\"ULT\\\" sur les systèmes d’exploitation "
-"plus anciens."
+msgstr "Patch pour Haswell \\\"E\\\" et support \\\"ULT\\\" sur les systèmes d’exploitation plus anciens."
 
 #. type: "KernelcpuFamily_title"
 #: Resources/templates/Localizable.strings:972
@@ -3645,9 +3599,7 @@
 #: Resources/templates/Localizable.strings:973
 #, no-wrap
 msgid "Patch the cpuid_family address to remove the _cpuid_set_info _panic and _tsc_init _panic. For unsupported CPUs"
-msgstr ""
-"Patch l’adresse cpuid_family pour enlever le _cpuid_set_info _panic et "
-"_tsc_init _panic. Pour les CPU non pris en charge"
+msgstr "Patch l’adresse cpuid_family pour enlever le _cpuid_set_info _panic et _tsc_init _panic. Pour les CPU non pris en charge"
 
 #. type: "KernelSSE3_title"
 #: Resources/templates/Localizable.strings:976
@@ -3659,9 +3611,7 @@
 #: Resources/templates/Localizable.strings:977
 #, no-wrap
 msgid "Patch to enable more SSE3 instructions on older CPUs to run newer OSes."
-msgstr ""
-"Patch pour permettre à plus d’instructions SSE3 sur les anciennes CPU pour "
-"exécuter les systèmes d’exploitation plus récents."
+msgstr "Patch pour permettre à plus d’instructions SSE3 sur les anciennes CPU pour exécuter les systèmes d’exploitation plus récents."
 
 #. type: "Themes_title"
 #: Resources/templates/Localizable.strings:982
Index: branches/ErmaC/Enoch/package/po/nl.po
===================================================================
--- branches/ErmaC/Enoch/package/po/nl.po	(revision 2812)
+++ branches/ErmaC/Enoch/package/po/nl.po	(revision 2813)
@@ -1290,10 +1290,7 @@
 #: Resources/templates/Localizable.strings:299
 #, no-wrap
 msgid "Kext signing: Introduced in 10.9, enhanced in 10.10 (kext signing required for all kexts), now become part of rootless(SIP)."
-msgstr ""
-"Kext ondertekening: geïntroduceerd in 10.9, uitgebreid in 10.10 (kext "
-"ondertekening is voor alle kexts vereist), is nu onderdeel van rootless "
-"(SIP)"
+msgstr "Kext ondertekening: geïntroduceerd in 10.9, uitgebreid in 10.10 (kext ondertekening is voor alle kexts vereist), is nu onderdeel van rootless (SIP)"
 
 #. type: "Crs2_title"
 #: Resources/templates/Localizable.strings:301
@@ -1305,9 +1302,7 @@
 #: Resources/templates/Localizable.strings:302
 #, no-wrap
 msgid "Filesystem protection: Important system files are protected and cannot be modified."
-msgstr ""
-"Bestandssysteem beveiliging: belangrijke systeembestanden zijn beveiligd en "
-"kunnen niet gewijzigd worden."
+msgstr "Bestandssysteem beveiliging: belangrijke systeembestanden zijn beveiligd en kunnen niet gewijzigd worden."
 
 #. type: "Crs4_title"
 #: Resources/templates/Localizable.strings:304
@@ -2662,182 +2657,156 @@
 #. type: "IntelBroadwellx19_title"
 #: Resources/templates/Localizable.strings:684
 #, no-wrap
-#| msgid "00002216"
 msgid "07002216"
 msgstr "07002216"
 
 #. type: "IntelBroadwellx19_description"
 #: Resources/templates/Localizable.strings:685
 #, no-wrap
-#| msgid "Set 00002216 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 07002216 for Intel Broadwell AAPL,ig-platform-id."
 msgstr "Zet 07002216 voor Intel Broadwell AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex00_title"
 #: Resources/templates/Localizable.strings:689
 #, no-wrap
-#| msgid "00000e16"
 msgid "0000e019"
 msgstr "0000e019"
 
 #. type: "IntelSkylakex00_description"
 #: Resources/templates/Localizable.strings:690
 #, no-wrap
-#| msgid "Set 00000e16 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 0000e019 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Zet 0000e019 voor Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex01_title"
 #: Resources/templates/Localizable.strings:692
 #, no-wrap
-#| msgid "00001616"
 msgid "00001619"
 msgstr "00001619"
 
 #. type: "IntelSkylakex01_description"
 #: Resources/templates/Localizable.strings:693
 #, no-wrap
-#| msgid "Set 00001616 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 00001619 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Zet 00001619 voor Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex02_title"
 #: Resources/templates/Localizable.strings:695
 #, no-wrap
-#| msgid "00002616"
 msgid "00002619"
 msgstr "00002619"
 
 #. type: "IntelSkylakex02_description"
 #: Resources/templates/Localizable.strings:696
 #, no-wrap
-#| msgid "Set 00002216 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 00002619 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Zet 00002619 voor Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex03_title"
 #: Resources/templates/Localizable.strings:698
 #, no-wrap
-#| msgid "00001616"
 msgid "00001b19"
 msgstr "00001b19"
 
 #. type: "IntelSkylakex03_description"
 #: Resources/templates/Localizable.strings:699
 #, no-wrap
-#| msgid "Set 00001e16 for Intel Broadwell (Mobile) AAPL,ig-platform-id."
 msgid "Set 00001b19 for Intel Skylake (Mobile) AAPL,ig-platform-id."
 msgstr "Zet 00001b19 voor Intel Skylake (Mobile) AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex04_title"
 #: Resources/templates/Localizable.strings:701
 #, no-wrap
-#| msgid "00001616"
 msgid "00001219"
 msgstr "00001219"
 
 #. type: "IntelSkylakex04_description"
 #: Resources/templates/Localizable.strings:702
 #, no-wrap
-#| msgid "Set 00001e16 for Intel Broadwell (Mobile) AAPL,ig-platform-id."
 msgid "Set 00001219 for Intel Skylake (Mobile) AAPL,ig-platform-id."
 msgstr "Zet 00001219 voor Intel Skylake (Mobile) AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex05_title"
 #: Resources/templates/Localizable.strings:704
 #, no-wrap
-#| msgid "01000e16"
 msgid "01000219"
 msgstr "01000219"
 
 #. type: "IntelSkylakex05_description"
 #: Resources/templates/Localizable.strings:705
 #, no-wrap
-#| msgid "Set 00002616 for Intel Broadwell (Mobile) AAPL,ig-platform-id."
 msgid "Set 01000219 for Intel Skylake (Mobile) AAPL,ig-platform-id."
 msgstr "Zet 01000219 voor Intel Skylake (Mobile) AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex06_title"
 #: Resources/templates/Localizable.strings:707
 #, no-wrap
-#| msgid "01001e16"
 msgid "01001719"
 msgstr "01001719"
 
 #. type: "IntelSkylakex06_description"
 #: Resources/templates/Localizable.strings:708
 #, no-wrap
-#| msgid "Set 01000e16 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 01001719 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Zet 01001719 voor Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex07_title"
 #: Resources/templates/Localizable.strings:710
 #, no-wrap
-#| msgid "01001e16"
 msgid "01001219"
 msgstr "01001219"
 
 #. type: "IntelSkylakex07_description"
 #: Resources/templates/Localizable.strings:711
 #, no-wrap
-#| msgid "Set 03001216 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 01001219 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Zet 01001219 voor Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex08_title"
 #: Resources/templates/Localizable.strings:713
 #, no-wrap
-#| msgid "01000e16"
 msgid "01003219"
 msgstr "01003219"
 
 #. type: "IntelSkylakex08_description"
 #: Resources/templates/Localizable.strings:714
 #, no-wrap
-#| msgid "Set 01001e16 for Intel Broadwell (Mobile) AAPL,ig-platform-id."
 msgid "Set 01003219 for Intel Skylake (Mobile) AAPL,ig-platform-id."
 msgstr "Zet 01003219 voor Intel Skylake (Mobile) AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex09_title"
 #: Resources/templates/Localizable.strings:716
 #, no-wrap
-#| msgid "02001616"
 msgid "02001619"
 msgstr "02001619"
 
 #. type: "IntelSkylakex09_description"
 #: Resources/templates/Localizable.strings:717
 #, no-wrap
-#| msgid "Set 02001616 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 02001619 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Zet 02001619 voor Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex10_title"
 #: Resources/templates/Localizable.strings:719
 #, no-wrap
-#| msgid "02002616"
 msgid "02002619"
 msgstr "02002619"
 
 #. type: "IntelSkylakex10_description"
 #: Resources/templates/Localizable.strings:720
 #, no-wrap
-#| msgid "Set 02002216 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 02002619 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Zet 02002619 voor Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex11_title"
 #: Resources/templates/Localizable.strings:722
 #, no-wrap
-#| msgid "00001e16"
 msgid "03001e19"
 msgstr "03001e19"
 
 #. type: "IntelSkylakex11_description"
 #: Resources/templates/Localizable.strings:723
 #, no-wrap
-#| msgid "Set 00001e16 for Intel Broadwell (Mobile) AAPL,ig-platform-id."
 msgid "Set 03001e19 for Intel Skylake (Mobile) AAPL,ig-platform-id."
 msgstr "Zet 03001e19 voor Intel Skylake (Mobile) AAPL,ig-platform-id."
 
@@ -3480,14 +3449,12 @@
 #. type: "IntelSkl_title"
 #: Resources/templates/Localizable.strings:923
 #, no-wrap
-#| msgid "Intel Azul AAPL,ig-platform-id"
 msgid "Intel Skl AAPL,ig-platform-id"
 msgstr "Intel Skl AAPL,ig-platform-id"
 
 #. type: "IntelSkl_description"
 #: Resources/templates/Localizable.strings:924
 #, no-wrap
-#| msgid "Set one AAPL,ig-platform-id to use for your Intel Haswell."
 msgid "Set one AAPL,ig-platform-id to use for your Intel Skylake."
 msgstr "Zet een AAPL,ig-platform-id voor het gebruik van je Intel Skylake."
 
Index: branches/ErmaC/Enoch/package/po/ko.po
===================================================================
--- branches/ErmaC/Enoch/package/po/ko.po	(revision 2812)
+++ branches/ErmaC/Enoch/package/po/ko.po	(revision 2813)
@@ -280,7 +280,6 @@
 #. type: "Stages_title"
 #: Resources/templates/Localizable.strings:28
 #, no-wrap
-#| msgid "Chameleon Bootloader Package"
 msgid "Bootloader Stages"
 msgstr "부트로더 단계"
 
@@ -351,18 +350,14 @@
 #. type: "Standard_title"
 #: Resources/templates/Localizable.strings:47
 #, no-wrap
-#| msgid "&nbsp;has been written to the root of your chosen partition."
 msgid "Install Chameleon in the chosen partition."
 msgstr "선택된 파티션에 카멜레온을 설치합니다."
 
 #. type: "Standard_description"
 #: Resources/templates/Localizable.strings:48
 #, no-wrap
-#| msgid "Install Chameleon's files to the root of the selected partition using either boot0 or boot0md depending on your system without destroying any existing Windows installation if you have one."
 msgid "Install Chameleon's files to the root of the selected partition using either boot0, boot0md or boot0hfs depending on your system without destroying any existing Windows installation if you have one."
-msgstr ""
-"선택된 파티션의 루트 디렉토리에 카멜레온에 필요한 파일들을 사용자의 시스템에 따라 boot0, boot0md 또는 boot0hfs 를 "
-"이용하여 설치합니다. 윈도우즈가 설치되있더라도 영향을 주지 않습니다."
+msgstr "선택된 파티션의 루트 디렉토리에 카멜레온에 필요한 파일들을 사용자의 시스템에 따라 boot0, boot0md 또는 boot0hfs 를 이용하여 설치합니다. 윈도우즈가 설치되있더라도 영향을 주지 않습니다."
 
 #. type: "EFI_title"
 #: Resources/templates/Localizable.strings:50
@@ -373,11 +368,8 @@
 #. type: "EFI_description"
 #: Resources/templates/Localizable.strings:51
 #, no-wrap
-#| msgid "Install Chameleon's files in the ESP (EFI System Partition) of the target volume using either boot0 or boot0md depending on your system."
 msgid "Install Chameleon's files in the ESP (EFI System Partition) of the target volume using either boot0, boot0md or boot0hfs depending on your system."
-msgstr ""
-"평상 시 숨겨져있는 EFI (EFI System Partition) 시스템 파티션에 카멜레온에 필요한 파일들을 사용자의 시스템에 따라 "
-"boot0, boot0md 또는 boot0hfs 를 이용하여 설치합니다."
+msgstr "평상 시 숨겨져있는 EFI (EFI System Partition) 시스템 파티션에 카멜레온에 필요한 파일들을 사용자의 시스템에 따라 boot0, boot0md 또는 boot0hfs 를 이용하여 설치합니다."
 
 #. type: "Module_title"
 #: Resources/templates/Localizable.strings:56
@@ -678,7 +670,6 @@
 #. type: "EnableHiDPI_title"
 #: Resources/templates/Localizable.strings:140
 #, no-wrap
-#| msgid "EnableHDMIAudio=Yes"
 msgid "EnableHiDPI=Yes"
 msgstr "EnableHiDPI=Yes"
 
Index: branches/ErmaC/Enoch/package/po/ro.po
===================================================================
--- branches/ErmaC/Enoch/package/po/ro.po	(revision 2812)
+++ branches/ErmaC/Enoch/package/po/ro.po	(revision 2813)
@@ -3527,7 +3527,6 @@
 #. type: "Patches_description"
 #: Resources/templates/Localizable.strings:946
 #, no-wrap
-#| msgid "A selection of options that deal with video."
 msgid "A selection of options to patch the kernel."
 msgstr "O selectie de optiuni pentru a petici kernel-ul."
 
Index: branches/ErmaC/Enoch/package/po/pt.po
===================================================================
--- branches/ErmaC/Enoch/package/po/pt.po	(revision 2812)
+++ branches/ErmaC/Enoch/package/po/pt.po	(revision 2813)
@@ -1295,10 +1295,7 @@
 #: Resources/templates/Localizable.strings:299
 #, no-wrap
 msgid "Kext signing: Introduced in 10.9, enhanced in 10.10 (kext signing required for all kexts), now become part of rootless(SIP)."
-msgstr ""
-"Kext assinatura: Introduzido em 10,9, reforçada em 10,10 (assinatura kext "
-"necessária para todas as kexts), agora se tornou parte de desenraizada "
-"(SIP)."
+msgstr "Kext assinatura: Introduzido em 10,9, reforçada em 10,10 (assinatura kext necessária para todas as kexts), agora se tornou parte de desenraizada (SIP)."
 
 #. type: "Crs2_title"
 #: Resources/templates/Localizable.strings:301
@@ -1310,9 +1307,7 @@
 #: Resources/templates/Localizable.strings:302
 #, no-wrap
 msgid "Filesystem protection: Important system files are protected and cannot be modified."
-msgstr ""
-"Proteção do sistema de arquivos: arquivos de sistema importantes são "
-"protegidos e não pode ser modificado."
+msgstr "Proteção do sistema de arquivos: arquivos de sistema importantes são protegidos e não pode ser modificado."
 
 #. type: "Crs4_title"
 #: Resources/templates/Localizable.strings:304
@@ -2667,182 +2662,156 @@
 #. type: "IntelBroadwellx19_title"
 #: Resources/templates/Localizable.strings:684
 #, no-wrap
-#| msgid "00002216"
 msgid "07002216"
 msgstr "07002216"
 
 #. type: "IntelBroadwellx19_description"
 #: Resources/templates/Localizable.strings:685
 #, no-wrap
-#| msgid "Set 00002216 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 07002216 for Intel Broadwell AAPL,ig-platform-id."
 msgstr "Injeta 07002216 para Intel Broadwell AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex00_title"
 #: Resources/templates/Localizable.strings:689
 #, no-wrap
-#| msgid "00000e16"
 msgid "0000e019"
 msgstr "0000e019"
 
 #. type: "IntelSkylakex00_description"
 #: Resources/templates/Localizable.strings:690
 #, no-wrap
-#| msgid "Set 00000e16 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 0000e019 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Injeta 0000e019 para Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex01_title"
 #: Resources/templates/Localizable.strings:692
 #, no-wrap
-#| msgid "00001616"
 msgid "00001619"
 msgstr "00001619"
 
 #. type: "IntelSkylakex01_description"
 #: Resources/templates/Localizable.strings:693
 #, no-wrap
-#| msgid "Set 00001616 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 00001619 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Injeta 00001619 para Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex02_title"
 #: Resources/templates/Localizable.strings:695
 #, no-wrap
-#| msgid "00002616"
 msgid "00002619"
 msgstr "00002619"
 
 #. type: "IntelSkylakex02_description"
 #: Resources/templates/Localizable.strings:696
 #, no-wrap
-#| msgid "Set 00002216 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 00002619 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Injeta 00002619 para Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex03_title"
 #: Resources/templates/Localizable.strings:698
 #, no-wrap
-#| msgid "00001616"
 msgid "00001b19"
 msgstr "00001b19"
 
 #. type: "IntelSkylakex03_description"
 #: Resources/templates/Localizable.strings:699
 #, no-wrap
-#| msgid "Set 00001e16 for Intel Broadwell (Mobile) AAPL,ig-platform-id."
 msgid "Set 00001b19 for Intel Skylake (Mobile) AAPL,ig-platform-id."
 msgstr "Injeta 00001b19 para Intel Skylake (Mobile) AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex04_title"
 #: Resources/templates/Localizable.strings:701
 #, no-wrap
-#| msgid "00001616"
 msgid "00001219"
 msgstr "00001219"
 
 #. type: "IntelSkylakex04_description"
 #: Resources/templates/Localizable.strings:702
 #, no-wrap
-#| msgid "Set 00001e16 for Intel Broadwell (Mobile) AAPL,ig-platform-id."
 msgid "Set 00001219 for Intel Skylake (Mobile) AAPL,ig-platform-id."
 msgstr "Injeta 00001219 para Intel Skylake (Mobile) AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex05_title"
 #: Resources/templates/Localizable.strings:704
 #, no-wrap
-#| msgid "01000e16"
 msgid "01000219"
 msgstr "01000219"
 
 #. type: "IntelSkylakex05_description"
 #: Resources/templates/Localizable.strings:705
 #, no-wrap
-#| msgid "Set 00002616 for Intel Broadwell (Mobile) AAPL,ig-platform-id."
 msgid "Set 01000219 for Intel Skylake (Mobile) AAPL,ig-platform-id."
 msgstr "Injeta 01000219 para Intel Skylake (Mobile) AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex06_title"
 #: Resources/templates/Localizable.strings:707
 #, no-wrap
-#| msgid "01001e16"
 msgid "01001719"
 msgstr "01001719"
 
 #. type: "IntelSkylakex06_description"
 #: Resources/templates/Localizable.strings:708
 #, no-wrap
-#| msgid "Set 01000e16 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 01001719 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Injeta 01001719 para Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex07_title"
 #: Resources/templates/Localizable.strings:710
 #, no-wrap
-#| msgid "01001e16"
 msgid "01001219"
 msgstr "01001219"
 
 #. type: "IntelSkylakex07_description"
 #: Resources/templates/Localizable.strings:711
 #, no-wrap
-#| msgid "Set 03001216 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 01001219 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Injeta 01001219 para Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex08_title"
 #: Resources/templates/Localizable.strings:713
 #, no-wrap
-#| msgid "01000e16"
 msgid "01003219"
 msgstr "01003219"
 
 #. type: "IntelSkylakex08_description"
 #: Resources/templates/Localizable.strings:714
 #, no-wrap
-#| msgid "Set 01001e16 for Intel Broadwell (Mobile) AAPL,ig-platform-id."
 msgid "Set 01003219 for Intel Skylake (Mobile) AAPL,ig-platform-id."
 msgstr "Injeta 01003219 para Intel Skylake (Mobile) AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex09_title"
 #: Resources/templates/Localizable.strings:716
 #, no-wrap
-#| msgid "02001616"
 msgid "02001619"
 msgstr "02001619"
 
 #. type: "IntelSkylakex09_description"
 #: Resources/templates/Localizable.strings:717
 #, no-wrap
-#| msgid "Set 02001616 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 02001619 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Injeta 02001619 para Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex10_title"
 #: Resources/templates/Localizable.strings:719
 #, no-wrap
-#| msgid "02002616"
 msgid "02002619"
 msgstr "02002619"
 
 #. type: "IntelSkylakex10_description"
 #: Resources/templates/Localizable.strings:720
 #, no-wrap
-#| msgid "Set 02002216 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 02002619 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Injeta 02002619 para Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex11_title"
 #: Resources/templates/Localizable.strings:722
 #, no-wrap
-#| msgid "00001e16"
 msgid "03001e19"
 msgstr "03001e19"
 
 #. type: "IntelSkylakex11_description"
 #: Resources/templates/Localizable.strings:723
 #, no-wrap
-#| msgid "Set 00001e16 for Intel Broadwell (Mobile) AAPL,ig-platform-id."
 msgid "Set 03001e19 for Intel Skylake (Mobile) AAPL,ig-platform-id."
 msgstr "Injeta 03001e19 para Intel Skylake (Mobile) AAPL,ig-platform-id."
 
@@ -3485,14 +3454,12 @@
 #. type: "IntelSkl_title"
 #: Resources/templates/Localizable.strings:923
 #, no-wrap
-#| msgid "Intel Azul AAPL,ig-platform-id"
 msgid "Intel Skl AAPL,ig-platform-id"
 msgstr "Intel Skl AAPL,ig-platform-id"
 
 #. type: "IntelSkl_description"
 #: Resources/templates/Localizable.strings:924
 #, no-wrap
-#| msgid "Set one AAPL,ig-platform-id to use for your Intel Haswell."
 msgid "Set one AAPL,ig-platform-id to use for your Intel Skylake."
 msgstr "Injeta um AAPL,ig-platform-id para usar na sua Intel Skylake."
 
@@ -3535,21 +3502,18 @@
 #. type: "Patches_title"
 #: Resources/templates/Localizable.strings:945
 #, no-wrap
-#| msgid "Kext Patcher"
 msgid "Patches"
 msgstr "Patches"
 
 #. type: "Patches_description"
 #: Resources/templates/Localizable.strings:946
 #, no-wrap
-#| msgid "A selection of options that deal with video."
 msgid "A selection of options to patch the kernel."
 msgstr "Selecione um patch para o kernel."
 
 #. type: "kernelPatcher_title"
 #: Resources/templates/Localizable.strings:948
 #, no-wrap
-#| msgid "Kernel Patcher"
 msgid "kernel Patcher"
 msgstr "kernel Patcher"
 
@@ -3574,21 +3538,18 @@
 #. type: "KernelPm_title"
 #: Resources/templates/Localizable.strings:956
 #, no-wrap
-#| msgid "Kernel Patcher"
 msgid "KernelPm"
 msgstr "KernelPm"
 
 #. type: "KernelPm_description"
 #: Resources/templates/Localizable.strings:957
 #, no-wrap
-#| msgid "Power Management"
 msgid "Kernel Power Management patch."
 msgstr "Kernel Power Management patch."
 
 #. type: "KernelLapicError_title"
 #: Resources/templates/Localizable.strings:960
 #, no-wrap
-#| msgid "Kernel Patcher"
 msgid "KernelLapicError"
 msgstr "KernelLapicError"
 
@@ -3601,7 +3562,6 @@
 #. type: "KernelLapicVersion_title"
 #: Resources/templates/Localizable.strings:964
 #, no-wrap
-#| msgid "Kernel Patcher"
 msgid "KernelLapicVersion"
 msgstr "KernelLapicVersion"
 
@@ -3614,7 +3574,6 @@
 #. type: "KernelHaswell_title"
 #: Resources/templates/Localizable.strings:968
 #, no-wrap
-#| msgid "Kernel Flags"
 msgid "KernelHaswell"
 msgstr "KernelHaswell"
 
@@ -3622,9 +3581,7 @@
 #: Resources/templates/Localizable.strings:969
 #, no-wrap
 msgid "Patch for Haswell \\\"E\\\" and \\\"ULT\\\" support on older OSes."
-msgstr ""
-"Patch para Haswell  \\\"E\\\"  e support \\\"ULT\\ em sistemas operacionais mais "
-"antigos."
+msgstr "Patch para Haswell  \\\"E\\\"  e support \\\"ULT\\ em sistemas operacionais mais antigos."
 
 #. type: "KernelcpuFamily_title"
 #: Resources/templates/Localizable.strings:972
@@ -3636,9 +3593,7 @@
 #: Resources/templates/Localizable.strings:973
 #, no-wrap
 msgid "Patch the cpuid_family address to remove the _cpuid_set_info _panic and _tsc_init _panic. For unsupported CPUs"
-msgstr ""
-"Corrigir o endereço cpuid_family para remover o _cpuid_set_info _panic e "
-"_tsc_init _panic. Para CPUs sem suporte"
+msgstr "Corrigir o endereço cpuid_family para remover o _cpuid_set_info _panic e _tsc_init _panic. Para CPUs sem suporte"
 
 #. type: "KernelSSE3_title"
 #: Resources/templates/Localizable.strings:976
@@ -3650,9 +3605,7 @@
 #: Resources/templates/Localizable.strings:977
 #, no-wrap
 msgid "Patch to enable more SSE3 instructions on older CPUs to run newer OSes."
-msgstr ""
-"Patch para permitir mais instruções SSE3 em CPUs mais velhos para executar "
-"sistemas operacionais mais recentes."
+msgstr "Patch para permitir mais instruções SSE3 em CPUs mais velhos para executar sistemas operacionais mais recentes."
 
 #. type: "Themes_title"
 #: Resources/templates/Localizable.strings:982
Index: branches/ErmaC/Enoch/package/po/pt-BR.po
===================================================================
--- branches/ErmaC/Enoch/package/po/pt-BR.po	(revision 2812)
+++ branches/ErmaC/Enoch/package/po/pt-BR.po	(revision 2813)
@@ -1295,10 +1295,7 @@
 #: Resources/templates/Localizable.strings:299
 #, no-wrap
 msgid "Kext signing: Introduced in 10.9, enhanced in 10.10 (kext signing required for all kexts), now become part of rootless(SIP)."
-msgstr ""
-"Kext assinatura: Introduzido em 10,9, reforçada em 10,10 (assinatura kext "
-"necessária para todas as kexts), agora se tornou parte de desenraizada "
-"(SIP)."
+msgstr "Kext assinatura: Introduzido em 10,9, reforçada em 10,10 (assinatura kext necessária para todas as kexts), agora se tornou parte de desenraizada (SIP)."
 
 #. type: "Crs2_title"
 #: Resources/templates/Localizable.strings:301
@@ -1310,9 +1307,7 @@
 #: Resources/templates/Localizable.strings:302
 #, no-wrap
 msgid "Filesystem protection: Important system files are protected and cannot be modified."
-msgstr ""
-"Proteção do sistema de arquivos: arquivos de sistema importantes são "
-"protegidos e não pode ser modificado."
+msgstr "Proteção do sistema de arquivos: arquivos de sistema importantes são protegidos e não pode ser modificado."
 
 #. type: "Crs4_title"
 #: Resources/templates/Localizable.strings:304
@@ -2667,182 +2662,156 @@
 #. type: "IntelBroadwellx19_title"
 #: Resources/templates/Localizable.strings:684
 #, no-wrap
-#| msgid "00002216"
 msgid "07002216"
 msgstr "07002216"
 
 #. type: "IntelBroadwellx19_description"
 #: Resources/templates/Localizable.strings:685
 #, no-wrap
-#| msgid "Set 00002216 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 07002216 for Intel Broadwell AAPL,ig-platform-id."
 msgstr "Injeta 07002216 para Intel Broadwell AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex00_title"
 #: Resources/templates/Localizable.strings:689
 #, no-wrap
-#| msgid "00000e16"
 msgid "0000e019"
 msgstr "0000e019"
 
 #. type: "IntelSkylakex00_description"
 #: Resources/templates/Localizable.strings:690
 #, no-wrap
-#| msgid "Set 00000e16 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 0000e019 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Injeta 0000e019 para Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex01_title"
 #: Resources/templates/Localizable.strings:692
 #, no-wrap
-#| msgid "00001616"
 msgid "00001619"
 msgstr "00001619"
 
 #. type: "IntelSkylakex01_description"
 #: Resources/templates/Localizable.strings:693
 #, no-wrap
-#| msgid "Set 00001616 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 00001619 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Injeta 00001619 para Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex02_title"
 #: Resources/templates/Localizable.strings:695
 #, no-wrap
-#| msgid "00002616"
 msgid "00002619"
 msgstr "00002619"
 
 #. type: "IntelSkylakex02_description"
 #: Resources/templates/Localizable.strings:696
 #, no-wrap
-#| msgid "Set 00002216 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 00002619 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Injeta 00002619 para Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex03_title"
 #: Resources/templates/Localizable.strings:698
 #, no-wrap
-#| msgid "00001616"
 msgid "00001b19"
 msgstr "00001b19"
 
 #. type: "IntelSkylakex03_description"
 #: Resources/templates/Localizable.strings:699
 #, no-wrap
-#| msgid "Set 00001e16 for Intel Broadwell (Mobile) AAPL,ig-platform-id."
 msgid "Set 00001b19 for Intel Skylake (Mobile) AAPL,ig-platform-id."
 msgstr "Injeta 00001b19 para Intel Skylake (Mobile) AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex04_title"
 #: Resources/templates/Localizable.strings:701
 #, no-wrap
-#| msgid "00001616"
 msgid "00001219"
 msgstr "00001219"
 
 #. type: "IntelSkylakex04_description"
 #: Resources/templates/Localizable.strings:702
 #, no-wrap
-#| msgid "Set 00001e16 for Intel Broadwell (Mobile) AAPL,ig-platform-id."
 msgid "Set 00001219 for Intel Skylake (Mobile) AAPL,ig-platform-id."
 msgstr "Injeta 00001219 para Intel Skylake (Mobile) AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex05_title"
 #: Resources/templates/Localizable.strings:704
 #, no-wrap
-#| msgid "01000e16"
 msgid "01000219"
 msgstr "01000219"
 
 #. type: "IntelSkylakex05_description"
 #: Resources/templates/Localizable.strings:705
 #, no-wrap
-#| msgid "Set 00002616 for Intel Broadwell (Mobile) AAPL,ig-platform-id."
 msgid "Set 01000219 for Intel Skylake (Mobile) AAPL,ig-platform-id."
 msgstr "Injeta 01000219 para Intel Skylake (Mobile) AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex06_title"
 #: Resources/templates/Localizable.strings:707
 #, no-wrap
-#| msgid "01001e16"
 msgid "01001719"
 msgstr "01001719"
 
 #. type: "IntelSkylakex06_description"
 #: Resources/templates/Localizable.strings:708
 #, no-wrap
-#| msgid "Set 01000e16 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 01001719 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Injeta 01001719 para Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex07_title"
 #: Resources/templates/Localizable.strings:710
 #, no-wrap
-#| msgid "01001e16"
 msgid "01001219"
 msgstr "01001219"
 
 #. type: "IntelSkylakex07_description"
 #: Resources/templates/Localizable.strings:711
 #, no-wrap
-#| msgid "Set 03001216 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 01001219 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Injeta 01001219 para Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex08_title"
 #: Resources/templates/Localizable.strings:713
 #, no-wrap
-#| msgid "01000e16"
 msgid "01003219"
 msgstr "01003219"
 
 #. type: "IntelSkylakex08_description"
 #: Resources/templates/Localizable.strings:714
 #, no-wrap
-#| msgid "Set 01001e16 for Intel Broadwell (Mobile) AAPL,ig-platform-id."
 msgid "Set 01003219 for Intel Skylake (Mobile) AAPL,ig-platform-id."
 msgstr "Injeta 01003219 para Intel Skylake (Mobile) AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex09_title"
 #: Resources/templates/Localizable.strings:716
 #, no-wrap
-#| msgid "02001616"
 msgid "02001619"
 msgstr "02001619"
 
 #. type: "IntelSkylakex09_description"
 #: Resources/templates/Localizable.strings:717
 #, no-wrap
-#| msgid "Set 02001616 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 02001619 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Injeta 02001619 para Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex10_title"
 #: Resources/templates/Localizable.strings:719
 #, no-wrap
-#| msgid "02002616"
 msgid "02002619"
 msgstr "02002619"
 
 #. type: "IntelSkylakex10_description"
 #: Resources/templates/Localizable.strings:720
 #, no-wrap
-#| msgid "Set 02002216 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 02002619 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Injeta 02002619 para Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex11_title"
 #: Resources/templates/Localizable.strings:722
 #, no-wrap
-#| msgid "00001e16"
 msgid "03001e19"
 msgstr "03001e19"
 
 #. type: "IntelSkylakex11_description"
 #: Resources/templates/Localizable.strings:723
 #, no-wrap
-#| msgid "Set 00001e16 for Intel Broadwell (Mobile) AAPL,ig-platform-id."
 msgid "Set 03001e19 for Intel Skylake (Mobile) AAPL,ig-platform-id."
 msgstr "Injeta 03001e19 para Intel Skylake (Mobile) AAPL,ig-platform-id."
 
@@ -3206,11 +3175,7 @@
 #: Resources/templates/Localizable.strings:823
 #, no-wrap
 msgid "Rootless is a new feature introduced in OS X 10.11 (El Capitan), and it disallows modifying system files. To by-passing this restriction, this strict feature can be disabled by adding a 'rootless=0' boot arg. ('rootless=1' enable it)"
-msgstr ""
-"Rootless é um novo recurso introduzido no OS X 10.11 (El Capitan), e ele não "
-"permite modificações nos arquivos do sistema. Para contornar esta "
-"restrição, esse recurso pode ser desativado adicionando um 'rootless = 0' "
-"boot arg. ('rootless = 1' habilitá-lo)"
+msgstr "Rootless é um novo recurso introduzido no OS X 10.11 (El Capitan), e ele não permite modificações nos arquivos do sistema. Para contornar esta restrição, esse recurso pode ser desativado adicionando um 'rootless = 0' boot arg. ('rootless = 1' habilitá-lo)"
 
 #. type: "Dart0_title"
 #: Resources/templates/Localizable.strings:825
@@ -3489,14 +3454,12 @@
 #. type: "IntelSkl_title"
 #: Resources/templates/Localizable.strings:923
 #, no-wrap
-#| msgid "Intel Azul AAPL,ig-platform-id"
 msgid "Intel Skl AAPL,ig-platform-id"
 msgstr "Intel Skl AAPL,ig-platform-id"
 
 #. type: "IntelSkl_description"
 #: Resources/templates/Localizable.strings:924
 #, no-wrap
-#| msgid "Set one AAPL,ig-platform-id to use for your Intel Haswell."
 msgid "Set one AAPL,ig-platform-id to use for your Intel Skylake."
 msgstr "Injeta um AAPL,ig-platform-id para usar na sua Intel Skylake."
 
@@ -3539,21 +3502,18 @@
 #. type: "Patches_title"
 #: Resources/templates/Localizable.strings:945
 #, no-wrap
-#| msgid "Kext Patcher"
 msgid "Patches"
 msgstr "Patches"
 
 #. type: "Patches_description"
 #: Resources/templates/Localizable.strings:946
 #, no-wrap
-#| msgid "A selection of options that deal with video."
 msgid "A selection of options to patch the kernel."
 msgstr "Selecione um patch para o kernel."
 
 #. type: "kernelPatcher_title"
 #: Resources/templates/Localizable.strings:948
 #, no-wrap
-#| msgid "Kernel Patcher"
 msgid "kernel Patcher"
 msgstr "kernel Patcher"
 
@@ -3578,21 +3538,18 @@
 #. type: "KernelPm_title"
 #: Resources/templates/Localizable.strings:956
 #, no-wrap
-#| msgid "Kernel Patcher"
 msgid "KernelPm"
 msgstr "KernelPm"
 
 #. type: "KernelPm_description"
 #: Resources/templates/Localizable.strings:957
 #, no-wrap
-#| msgid "Power Management"
 msgid "Kernel Power Management patch."
 msgstr "Kernel Power Management patch."
 
 #. type: "KernelLapicError_title"
 #: Resources/templates/Localizable.strings:960
 #, no-wrap
-#| msgid "Kernel Patcher"
 msgid "KernelLapicError"
 msgstr "KernelLapicError"
 
@@ -3605,7 +3562,6 @@
 #. type: "KernelLapicVersion_title"
 #: Resources/templates/Localizable.strings:964
 #, no-wrap
-#| msgid "Kernel Patcher"
 msgid "KernelLapicVersion"
 msgstr "KernelLapicVersion"
 
@@ -3618,7 +3574,6 @@
 #. type: "KernelHaswell_title"
 #: Resources/templates/Localizable.strings:968
 #, no-wrap
-#| msgid "Kernel Flags"
 msgid "KernelHaswell"
 msgstr "KernelHaswell"
 
@@ -3626,9 +3581,7 @@
 #: Resources/templates/Localizable.strings:969
 #, no-wrap
 msgid "Patch for Haswell \\\"E\\\" and \\\"ULT\\\" support on older OSes."
-msgstr ""
-"Patch para Haswell  \\\"E\\\"  e support \\\"ULT\\ em sistemas operacionais mais "
-"antigos."
+msgstr "Patch para Haswell  \\\"E\\\"  e support \\\"ULT\\ em sistemas operacionais mais antigos."
 
 #. type: "KernelcpuFamily_title"
 #: Resources/templates/Localizable.strings:972
@@ -3640,9 +3593,7 @@
 #: Resources/templates/Localizable.strings:973
 #, no-wrap
 msgid "Patch the cpuid_family address to remove the _cpuid_set_info _panic and _tsc_init _panic. For unsupported CPUs"
-msgstr ""
-"Corrigir o endereço cpuid_family para remover o _cpuid_set_info _panic e "
-"_tsc_init _panic. Para CPUs sem suporte"
+msgstr "Corrigir o endereço cpuid_family para remover o _cpuid_set_info _panic e _tsc_init _panic. Para CPUs sem suporte"
 
 #. type: "KernelSSE3_title"
 #: Resources/templates/Localizable.strings:976
@@ -3654,9 +3605,7 @@
 #: Resources/templates/Localizable.strings:977
 #, no-wrap
 msgid "Patch to enable more SSE3 instructions on older CPUs to run newer OSes."
-msgstr ""
-"Patch para permitir mais instruções SSE3 em CPUs mais velhos para executar "
-"sistemas operacionais mais recentes."
+msgstr "Patch para permitir mais instruções SSE3 em CPUs mais velhos para executar sistemas operacionais mais recentes."
 
 #. type: "Themes_title"
 #: Resources/templates/Localizable.strings:982
Index: branches/ErmaC/Enoch/package/po/ru.po
===================================================================
--- branches/ErmaC/Enoch/package/po/ru.po	(revision 2812)
+++ branches/ErmaC/Enoch/package/po/ru.po	(revision 2813)
@@ -293,7 +293,6 @@
 #. type: "Stages_title"
 #: Resources/templates/Localizable.strings:28
 #, no-wrap
-#| msgid "Chameleon Bootloader Package"
 msgid "Bootloader Stages"
 msgstr "Этапы загрузчика"
 
@@ -307,12 +306,9 @@
 "boot is always copied to the target partition when you are skipping one or more stages."
 msgstr ""
 "Здесь вы можете полностью или частично пропустить установку загрузчика.\n"
-"Это может быть полезно, если вы хотите записать файлы в Extra, или "
-"пропустить какой-либо этап (0,1 и активация целевого раздела).\n"
-"Пропуск всех этапов разрешает вам оставить все, как уже рабочие загрузочные "
-"сектора, особенно полезно с 4k дисками.\n"
-"загрузка всегда копируется на целевой раздел когда вы пропускаете один или "
-"несколько этапов."
+"Это может быть полезно, если вы хотите записать файлы в Extra, или пропустить какой-либо этап (0,1 и активация целевого раздела).\n"
+"Пропуск всех этапов разрешает вам оставить все, как уже рабочие загрузочные сектора, особенно полезно с 4k дисками.\n"
+"загрузка всегда копируется на целевой раздел когда вы пропускаете один или несколько этапов."
 
 #. type: "SkipStage0_title"
 #: Resources/templates/Localizable.strings:34
@@ -361,26 +357,20 @@
 "Stage 2 is always copied/replaced."
 msgstr ""
 "Предотвращает активацию целевого раздела.\n"
-"На некоторых старых материнских платах плохая реализация GPT в биосе, и они "
-"не могут определить разделы, помеченные как Guid Partition Table.\n"
+"На некоторых старых материнских платах плохая реализация GPT в биосе, и они не могут определить разделы, помеченные как Guid Partition Table.\n"
 "Этап 2 всегда копируется/перемещается."
 
 #. type: "Standard_title"
 #: Resources/templates/Localizable.strings:47
 #, no-wrap
-#| msgid "&nbsp;has been written to the root of your chosen partition."
 msgid "Install Chameleon in the chosen partition."
 msgstr "Установить Chameleon в указанный раздел."
 
 #. type: "Standard_description"
 #: Resources/templates/Localizable.strings:48
 #, no-wrap
-#| msgid "Install Chameleon's files to the root of the selected partition using either boot0 or boot0md depending on your system without destroying any existing Windows installation if you have one."
 msgid "Install Chameleon's files to the root of the selected partition using either boot0, boot0md or boot0hfs depending on your system without destroying any existing Windows installation if you have one."
-msgstr ""
-"Установка файлов Chameleon в корень выбранного раздела используя boot0, "
-"boot0md или boot0hfs основываясь на вашей системе, без уничтожения любой "
-"установленной копии Windows, если таковая имеется."
+msgstr "Установка файлов Chameleon в корень выбранного раздела используя boot0, boot0md или boot0hfs основываясь на вашей системе, без уничтожения любой установленной копии Windows, если таковая имеется."
 
 #. type: "EFI_title"
 #: Resources/templates/Localizable.strings:50
@@ -391,11 +381,8 @@
 #. type: "EFI_description"
 #: Resources/templates/Localizable.strings:51
 #, no-wrap
-#| msgid "Install Chameleon's files in the ESP (EFI System Partition) of the target volume using either boot0 or boot0md depending on your system."
 msgid "Install Chameleon's files in the ESP (EFI System Partition) of the target volume using either boot0, boot0md or boot0hfs depending on your system."
-msgstr ""
-"Установка файлов Chameleon в ESP (системный раздел EFI) целевого тома "
-"используя boot0, boot0md или boot0hfs основываясь на вашей системе."
+msgstr "Установка файлов Chameleon в ESP (системный раздел EFI) целевого тома используя boot0, boot0md или boot0hfs основываясь на вашей системе."
 
 #. type: "Module_title"
 #: Resources/templates/Localizable.strings:56
@@ -674,7 +661,6 @@
 #. type: "EnableHiDPI_title"
 #: Resources/templates/Localizable.strings:140
 #, no-wrap
-#| msgid "EnableHDMIAudio=Yes"
 msgid "EnableHiDPI=Yes"
 msgstr "EnableHiDPI=Yes"
 
@@ -687,7 +673,6 @@
 #. type: "BlackMode_title"
 #: Resources/templates/Localizable.strings:143
 #, no-wrap
-#| msgid "Wake=Yes"
 msgid "BlackMode=Yes"
 msgstr "BlackMode=Yes"
 
@@ -695,9 +680,7 @@
 #: Resources/templates/Localizable.strings:144
 #, no-wrap
 msgid "The new BlackMode loads the white Apple logo, instead of the gray Apple logo, on a black background."
-msgstr ""
-"Новый режим BlackMode загружает белый логотип Apple, вместо серого логотипа "
-"Apple на черном фоне."
+msgstr "Новый режим BlackMode загружает белый логотип Apple, вместо серого логотипа Apple на черном фоне."
 
 #. type: "InstantMenu_title"
 #: Resources/templates/Localizable.strings:146
@@ -757,9 +740,7 @@
 #: Resources/templates/Localizable.strings:159
 #, no-wrap
 msgid "Show masked data (serial number) in bdmesg log (enbaled by default)."
-msgstr ""
-"Показать скрытую информацию (серийный номер) в логе bdmesg (по умолчанию "
-"включено)."
+msgstr "Показать скрытую информацию (серийный номер) в логе bdmesg (по умолчанию включено)."
 
 #. type: "USBBusFix_title"
 #: Resources/templates/Localizable.strings:163
@@ -2436,14 +2417,12 @@
 #. type: "IntelBroadwellx06_title"
 #: Resources/templates/Localizable.strings:645
 #, no-wrap
-#| msgid "00002604"
 msgid "00002216"
 msgstr "00002216"
 
 #. type: "IntelBroadwellx06_description"
 #: Resources/templates/Localizable.strings:646
 #, no-wrap
-#| msgid "Set 00002604 for Intel Haswell (Mobile) AAPL,ig-platform-id."
 msgid "Set 00002216 for Intel Broadwell AAPL,ig-platform-id."
 msgstr "Установить 00002216 в качестве Intel Broadwell AAPL,ig-platform-id."
 
@@ -2456,7 +2435,6 @@
 #. type: "IntelBroadwellx07_description"
 #: Resources/templates/Localizable.strings:649
 #, no-wrap
-#| msgid "Set 00001604 for Intel Haswell (Mobile) AAPL,ig-platform-id."
 msgid "Set 01000e16 for Intel Broadwell AAPL,ig-platform-id."
 msgstr "Установить 01000e16 в качестве Intel Broadwell AAPL,ig-platform-id."
 
@@ -2529,22 +2507,18 @@
 #. type: "IntelBroadwellx13_description"
 #: Resources/templates/Localizable.strings:667
 #, no-wrap
-#| msgid "Set 02001604 for Intel Haswell (Mobile) AAPL,ig-platform-id."
 msgid "Set 02002b16 for Intel Broadwell (Mobile) AAPL,ig-platform-id."
-msgstr ""
-"Установить 02002b16 в качестве Intel Broadwell (Mobile) AAPL,ig-platform-id."
+msgstr "Установить 02002b16 в качестве Intel Broadwell (Mobile) AAPL,ig-platform-id."
 
 #. type: "IntelBroadwellx14_title"
 #: Resources/templates/Localizable.strings:669
 #, no-wrap
-#| msgid "0300220d"
 msgid "03001216"
 msgstr "03001216"
 
 #. type: "IntelBroadwellx14_description"
 #: Resources/templates/Localizable.strings:670
 #, no-wrap
-#| msgid "Set 00001604 for Intel Haswell (Mobile) AAPL,ig-platform-id."
 msgid "Set 03001216 for Intel Broadwell AAPL,ig-platform-id."
 msgstr "Установить 03001216 в качестве Intel Broadwell AAPL,ig-platform-id."
 
@@ -2557,40 +2531,32 @@
 #. type: "IntelBroadwellx15_description"
 #: Resources/templates/Localizable.strings:673
 #, no-wrap
-#| msgid "Set 00001604 for Intel Haswell (Mobile) AAPL,ig-platform-id."
 msgid "Set 04002b16 for Intel Broadwell (Mobile) AAPL,ig-platform-id."
-msgstr ""
-"Установить 04002b16 в качестве Intel Broadwell (Mobile) AAPL,ig-platform-id."
+msgstr "Установить 04002b16 в качестве Intel Broadwell (Mobile) AAPL,ig-platform-id."
 
 #. type: "IntelBroadwellx16_title"
 #: Resources/templates/Localizable.strings:675
 #, no-wrap
-#| msgid "00002604"
 msgid "04002616"
 msgstr "04002616"
 
 #. type: "IntelBroadwellx16_description"
 #: Resources/templates/Localizable.strings:676
 #, no-wrap
-#| msgid "Set 00002604 for Intel Haswell (Mobile) AAPL,ig-platform-id."
 msgid "Set 04002616 for Intel Broadwell (Mobile) AAPL,ig-platform-id."
-msgstr ""
-"Установить 04002616 в качестве Intel Broadwell (Mobile) AAPL,ig-platform-id."
+msgstr "Установить 04002616 в качестве Intel Broadwell (Mobile) AAPL,ig-platform-id."
 
 #. type: "IntelBroadwellx17_title"
 #: Resources/templates/Localizable.strings:678
 #, no-wrap
-#| msgid "0500260a"
 msgid "05002616"
 msgstr "05002616"
 
 #. type: "IntelBroadwellx17_description"
 #: Resources/templates/Localizable.strings:679
 #, no-wrap
-#| msgid "Set 0500260a for Intel Haswell (Mobile) AAPL,ig-platform-id."
 msgid "Set 05002616 for Intel Broadwell (Mobile) AAPL,ig-platform-id."
-msgstr ""
-"Установить 05002616 в качестве Intel Broadwell (Mobile) AAPL,ig-platform-id."
+msgstr "Установить 05002616 в качестве Intel Broadwell (Mobile) AAPL,ig-platform-id."
 
 #. type: "IntelBroadwellx18_title"
 #: Resources/templates/Localizable.strings:681
@@ -2607,103 +2573,86 @@
 #. type: "IntelBroadwellx19_title"
 #: Resources/templates/Localizable.strings:684
 #, no-wrap
-#| msgid "00002604"
 msgid "07002216"
 msgstr "07002216"
 
 #. type: "IntelBroadwellx19_description"
 #: Resources/templates/Localizable.strings:685
 #, no-wrap
-#| msgid "Set 00002604 for Intel Haswell (Mobile) AAPL,ig-platform-id."
 msgid "Set 07002216 for Intel Broadwell AAPL,ig-platform-id."
 msgstr "Установить 07002216 в качестве Intel Broadwell  AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex00_title"
 #: Resources/templates/Localizable.strings:689
 #, no-wrap
-#| msgid "00000e16"
 msgid "0000e019"
 msgstr "0000e019"
 
 #. type: "IntelSkylakex00_description"
 #: Resources/templates/Localizable.strings:690
 #, no-wrap
-#| msgid "Set 00000e16 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 0000e019 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Установить 0000e019 в качестве Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex01_title"
 #: Resources/templates/Localizable.strings:692
 #, no-wrap
-#| msgid "00001616"
 msgid "00001619"
 msgstr "00001619"
 
 #. type: "IntelSkylakex01_description"
 #: Resources/templates/Localizable.strings:693
 #, no-wrap
-#| msgid "Set 00001616 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 00001619 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Установить 00001619 в качестве Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex02_title"
 #: Resources/templates/Localizable.strings:695
 #, no-wrap
-#| msgid "00002616"
 msgid "00002619"
 msgstr "00002619"
 
 #. type: "IntelSkylakex02_description"
 #: Resources/templates/Localizable.strings:696
 #, no-wrap
-#| msgid "Set 00002604 for Intel Haswell (Mobile) AAPL,ig-platform-id."
 msgid "Set 00002619 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Установить 00002619 в качестве IntelSkylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex03_title"
 #: Resources/templates/Localizable.strings:698
 #, no-wrap
-#| msgid "00001616"
 msgid "00001b19"
 msgstr "00001b19"
 
 #. type: "IntelSkylakex03_description"
 #: Resources/templates/Localizable.strings:699
 #, no-wrap
-#| msgid "Set 00001e16 for Intel Broadwell (Mobile) AAPL,ig-platform-id."
 msgid "Set 00001b19 for Intel Skylake (Mobile) AAPL,ig-platform-id."
-msgstr ""
-"Установить 00001b19 в качестве Intel Skylake (Mobile) AAPL,ig-platform-id."
+msgstr "Установить 00001b19 в качестве Intel Skylake (Mobile) AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex04_title"
 #: Resources/templates/Localizable.strings:701
 #, no-wrap
-#| msgid "00001616"
 msgid "00001219"
 msgstr "00001219"
 
 #. type: "IntelSkylakex04_description"
 #: Resources/templates/Localizable.strings:702
 #, no-wrap
-#| msgid "Set 00001e16 for Intel Broadwell (Mobile) AAPL,ig-platform-id."
 msgid "Set 00001219 for Intel Skylake (Mobile) AAPL,ig-platform-id."
-msgstr ""
-"Установить 00001219 в качестве Intel Skylake (Mobile) AAPL,ig-platform-id."
+msgstr "Установить 00001219 в качестве Intel Skylake (Mobile) AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex05_title"
 #: Resources/templates/Localizable.strings:704
 #, no-wrap
-#| msgid "01660002"
 msgid "01000219"
 msgstr "01000219"
 
 #. type: "IntelSkylakex05_description"
 #: Resources/templates/Localizable.strings:705
 #, no-wrap
-#| msgid "Set 00002616 for Intel Broadwell (Mobile) AAPL,ig-platform-id."
 msgid "Set 01000219 for Intel Skylake (Mobile) AAPL,ig-platform-id."
-msgstr ""
-"Установить 01000219 в качестве Intel Skylake (Mobile) AAPL,ig-platform-id."
+msgstr "Установить 01000219 в качестве Intel Skylake (Mobile) AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex06_title"
 #: Resources/templates/Localizable.strings:707
@@ -2714,21 +2663,18 @@
 #. type: "IntelSkylakex06_description"
 #: Resources/templates/Localizable.strings:708
 #, no-wrap
-#| msgid "Set 00001604 for Intel Haswell (Mobile) AAPL,ig-platform-id."
 msgid "Set 01001719 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Установить 01001719 в качестве Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex07_title"
 #: Resources/templates/Localizable.strings:710
 #, no-wrap
-#| msgid "0300220d"
 msgid "01001219"
 msgstr "01001219"
 
 #. type: "IntelSkylakex07_description"
 #: Resources/templates/Localizable.strings:711
 #, no-wrap
-#| msgid "Set 00001604 for Intel Haswell (Mobile) AAPL,ig-platform-id."
 msgid "Set 01001219 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Установить 01001219 в качестве IntelSkylake AAPL,ig-platform-id."
 
@@ -2741,53 +2687,44 @@
 #. type: "IntelSkylakex08_description"
 #: Resources/templates/Localizable.strings:714
 #, no-wrap
-#| msgid "Set 01001e16 for Intel Broadwell (Mobile) AAPL,ig-platform-id."
 msgid "Set 01003219 for Intel Skylake (Mobile) AAPL,ig-platform-id."
-msgstr ""
-"Установить 01003219 в качестве Intel Skylake (Mobile) AAPL,ig-platform-id."
+msgstr "Установить 01003219 в качестве Intel Skylake (Mobile) AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex09_title"
 #: Resources/templates/Localizable.strings:716
 #, no-wrap
-#| msgid "02001616"
 msgid "02001619"
 msgstr "02001619"
 
 #. type: "IntelSkylakex09_description"
 #: Resources/templates/Localizable.strings:717
 #, no-wrap
-#| msgid "Set 02001616 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 02001619 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Установить 02001619 в качестве Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex10_title"
 #: Resources/templates/Localizable.strings:719
 #, no-wrap
-#| msgid "02002616"
 msgid "02002619"
 msgstr "02002619"
 
 #. type: "IntelSkylakex10_description"
 #: Resources/templates/Localizable.strings:720
 #, no-wrap
-#| msgid "Set 02002216 for Intel Broadwell AAPL,ig-platform-id."
 msgid "Set 02002619 for Intel Skylake AAPL,ig-platform-id."
 msgstr "Установить 02002619 в качестве Intel Skylake AAPL,ig-platform-id."
 
 #. type: "IntelSkylakex11_title"
 #: Resources/templates/Localizable.strings:722
 #, no-wrap
-#| msgid "00001e16"
 msgid "03001e19"
 msgstr "03001e19"
 
 #. type: "IntelSkylakex11_description"
 #: Resources/templates/Localizable.strings:723
 #, no-wrap
-#| msgid "Set 00001e16 for Intel Broadwell (Mobile) AAPL,ig-platform-id."
 msgid "Set 03001e19 for Intel Skylake (Mobile) AAPL,ig-platform-id."
-msgstr ""
-"Установить 03001e19 в качестве Intel Skylake (Mobile) AAPL,ig-platform-id."
+msgstr "Установить 03001e19 в качестве Intel Skylake (Mobile) AAPL,ig-platform-id."
 
 #. type: "AD2000B_PinConf_title"
 #: Resources/templates/Localizable.strings:727
@@ -2895,11 +2832,7 @@
 #: Resources/templates/Localizable.strings:754
 #, no-wrap
 msgid "If YES, hda-gfx=onboard-1 will be injected into the GFX0 and HDEF devices. Also, if an ATI or Nvidia HDMI device is present, they'll be assigned to onboard-2. If NO, then ATI or Nvidia devices will get onboard-1 as well as the HDAU device if present."
-msgstr ""
-"Если \"Да\", hda-gfx=onboard-1 будет инжектировано в устройства GFX0 и HDEF. "
-"Также, если присуствует устройство HDMI от ATI или Nvidia, они будут "
-"назначены в onboard-2. Если \"Нет\", тогда устройства от ATI или Nvidia "
-"получат onboard-1, также как и устройство HDAU, если имеется."
+msgstr "Если \"Да\", hda-gfx=onboard-1 будет инжектировано в устройства GFX0 и HDEF. Также, если присуствует устройство HDMI от ATI или Nvidia, они будут назначены в onboard-2. Если \"Нет\", тогда устройства от ATI или Nvidia получат onboard-1, также как и устройство HDAU, если имеется."
 
 #. type: "UseAtiROM_title"
 #: Resources/templates/Localizable.strings:756
@@ -3019,9 +2952,7 @@
 #: Resources/templates/Localizable.strings:784
 #, no-wrap
 msgid "If you have two cards Nvidia and wants to inject only first one then you can set this parameter (enabled by default)."
-msgstr ""
-"Если у вас две карты Nvidia и вы хотите инжектировать только первую, тогда "
-"установите данный параметр (включен по умолчанию)."
+msgstr "Если у вас две карты Nvidia и вы хотите инжектировать только первую, тогда установите данный параметр (включен по умолчанию)."
 
 #. type: "Verbose_title"
 #: Resources/templates/Localizable.strings:790
@@ -3152,11 +3083,7 @@
 #: Resources/templates/Localizable.strings:823
 #, no-wrap
 msgid "Rootless is a new feature introduced in OS X 10.11 (El Capitan), and it disallows modifying system files. To by-passing this restriction, this strict feature can be disabled by adding a 'rootless=0' boot arg. ('rootless=1' enable it)"
-msgstr ""
-"Rootless - новая возможность представленная в OS X 10.11 (El Capitan). Она "
-"не позволяет модифицировать системные файлы. Чтобы обойти это ограничение, "
-"эту обязательную возможность можно отключить, добавив флаг 'rootless=0' "
-"('rootless=1' включает её)."
+msgstr "Rootless - новая возможность представленная в OS X 10.11 (El Capitan). Она не позволяет модифицировать системные файлы. Чтобы обойти это ограничение, эту обязательную возможность можно отключить, добавив флаг 'rootless=0' ('rootless=1' включает её)."
 
 #. type: "Dart0_title"
 #: Resources/templates/Localizable.strings:825
@@ -3433,18 +3360,14 @@
 #. type: "IntelSkl_title"
 #: Resources/templates/Localizable.strings:923
 #, no-wrap
-#| msgid "Intel Azul AAPL,ig-platform-id"
 msgid "Intel Skl AAPL,ig-platform-id"
 msgstr "Intel Skl AAPL,ig-platform-id"
 
 #. type: "IntelSkl_description"
 #: Resources/templates/Localizable.strings:924
 #, no-wrap
-#| msgid "Set one AAPL,ig-platform-id to use for your Intel Haswell."
 msgid "Set one AAPL,ig-platform-id to use for your Intel Skylake."
-msgstr ""
-"Выберите значение AAPL,ig-platform-id, используемое по умолчанию для "
-"графического процессора Intel Skylake."
+msgstr "Выберите значение AAPL,ig-platform-id, используемое по умолчанию для графического процессора Intel Skylake."
 
 #. type: "HDEFPinConfiguration_title"
 #: Resources/templates/Localizable.strings:927
@@ -3485,21 +3408,18 @@
 #. type: "Patches_title"
 #: Resources/templates/Localizable.strings:945
 #, no-wrap
-#| msgid "Kext Patcher"
 msgid "Patches"
 msgstr "Патчи"
 
 #. type: "Patches_description"
 #: Resources/templates/Localizable.strings:946
 #, no-wrap
-#| msgid "A selection of options that deal with video."
 msgid "A selection of options to patch the kernel."
 msgstr "Выбор параметров патча ядра."
 
 #. type: "kernelPatcher_title"
 #: Resources/templates/Localizable.strings:948
 #, no-wrap
-#| msgid "Kernel Patcher"
 msgid "kernel Patcher"
 msgstr "Патч ядра"
 
@@ -3524,21 +3444,18 @@
 #. type: "KernelPm_title"
 #: Resources/templates/Localizable.strings:956
 #, no-wrap
-#| msgid "Kernel Patcher"
 msgid "KernelPm"
 msgstr "KernelPm"
 
 #. type: "KernelPm_description"
 #: Resources/templates/Localizable.strings:957
 #, no-wrap
-#| msgid "Power Management"
 msgid "Kernel Power Management patch."
 msgstr "Патч ядра управления питанием."
 
 #. type: "KernelLapicError_title"
 #: Resources/templates/Localizable.strings:960
 #, no-wrap
-#| msgid "Kernel Patcher"
 msgid "KernelLapicError"
 msgstr "KernelLapicError"
 
@@ -3551,7 +3468,6 @@
 #. type: "KernelLapicVersion_title"
 #: Resources/templates/Localizable.strings:964
 #, no-wrap
-#| msgid "Kernel Patcher"
 msgid "KernelLapicVersion"
 msgstr "KernelLapicVersion"
 
@@ -3564,7 +3480,6 @@
 #. type: "KernelHaswell_title"
 #: Resources/templates/Localizable.strings:968
 #, no-wrap
-#| msgid "Kernel Flags"
 msgid "KernelHaswell"
 msgstr "KernelHaswell"
 
@@ -3584,9 +3499,7 @@
 #: Resources/templates/Localizable.strings:973
 #, no-wrap
 msgid "Patch the cpuid_family address to remove the _cpuid_set_info _panic and _tsc_init _panic. For unsupported CPUs"
-msgstr ""
-"Патч cpuid_family, что убрать паники the _cpuid_set_info _panic и _tsc_init "
-"_panic. Для неподдерживаемых CPU."
+msgstr "Патч cpuid_family, что убрать паники the _cpuid_set_info _panic и _tsc_init _panic. Для неподдерживаемых CPU."
 
 #. type: "KernelSSE3_title"
 #: Resources/templates/Localizable.strings:976
@@ -3598,9 +3511,7 @@
 #: Resources/templates/Localizable.strings:977
 #, no-wrap
 msgid "Patch to enable more SSE3 instructions on older CPUs to run newer OSes."
-msgstr ""
-"Патч для включения дополнительных инструкций SSE3 на старых CPU для запуска "
-"новых OS."
+msgstr "Патч для включения дополнительных инструкций SSE3 на старых CPU для запуска новых OS."
 
 #. type: "Themes_title"
 #: Resources/templates/Localizable.strings:982