Index: trunk/package/Resources/ja.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/package/Resources/zh_TW.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/package/Resources/he.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/package/Resources/id.lproj/Localizable.strings =================================================================== --- trunk/package/Resources/id.lproj/Localizable.strings (revision 1796) +++ trunk/package/Resources/id.lproj/Localizable.strings (revision 1797) @@ -237,7 +237,7 @@ // ---------------------------------------------------------------------------- -// Boot options - KEYLAYOUTS +// Boot options - KEYMAPS // ---------------------------------------------------------------------------- "mac-de_title" = "Mac Keyboard Jerman"; @@ -322,9 +322,9 @@ "Video_title" = "Video"; "Video_description" = "Opsi seleksi untuk video."; -// KeyLayout -"KeyLayout_title" = "Layout keyboard"; -"KeyLayout_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; +// Keymaps +"Keymaps_title" = "Layout keyboard"; +"Keymaps_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; // Themes "Themes_title" = "Tema"; Index: trunk/package/Resources/el.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/package/Resources/zh_CN.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/package/Resources/ar.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/package/Resources/en.lproj/Localizable.strings =================================================================== --- trunk/package/Resources/en.lproj/Localizable.strings (revision 1796) +++ trunk/package/Resources/en.lproj/Localizable.strings (revision 1797) @@ -237,7 +237,7 @@ // ---------------------------------------------------------------------------- -// Boot options - KEYLAYOUTS +// Boot options - KEYMAPS // ---------------------------------------------------------------------------- "mac-de_title" = "German Mac Keyboard"; @@ -322,9 +322,9 @@ "Video_title" = "Video"; "Video_description" = "A selection of options that deal with video."; -// KeyLayout -"KeyLayout_title" = "KeyLayout"; -"KeyLayout_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; +// Keymaps +"Keymaps_title" = "KeyLayout"; +"Keymaps_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; // Themes "Themes_title" = "Themes"; Index: trunk/package/Resources/pt-PT.lproj/Localizable.strings =================================================================== --- trunk/package/Resources/pt-PT.lproj/Localizable.strings (revision 1796) +++ trunk/package/Resources/pt-PT.lproj/Localizable.strings (revision 1797) @@ -238,7 +238,7 @@ // ---------------------------------------------------------------------------- -// Boot options - KEYLAYOUTS +// Boot options - KEYMAPS // ---------------------------------------------------------------------------- "mac-de_title" = "Teclado Mac Alemão"; @@ -323,9 +323,9 @@ "Video_title" = "Video"; "Video_description" = "Preferências de Video."; -// KeyLayout -"KeyLayout_title" = "KeyLayout"; -"KeyLayout_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; +// Keymaps +"Keymaps_title" = "KeyLayout"; +"Keymaps_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; // Themes "Themes_title" = "Temas"; Index: trunk/package/Resources/bs.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/package/Resources/es.lproj/Localizable.strings =================================================================== --- trunk/package/Resources/es.lproj/Localizable.strings (revision 1796) +++ trunk/package/Resources/es.lproj/Localizable.strings (revision 1797) @@ -296,7 +296,7 @@ -"CSTUsingSystemIO_title" = "New - Generate C-States=Yes"; +"CSTUsingSystemIO_title" = "KEYMAPSNew - Generate C-States=Yes"; "CSTUsingSystemIO_description" = "Nuevo flag para generar C-States usando los registros SystemIO en lugar de FixedHW."; @@ -478,7 +478,7 @@ // ---------------------------------------------------------------------------- -// Boot options - KEYLAYOUTS +// Boot options - KEYMAPS // ---------------------------------------------------------------------------- @@ -648,11 +648,11 @@ -// KeyLayout +// Keymaps -"KeyLayout_title" = "KeyLayout"; +"Keymaps_title" = "KeyLayout"; -"KeyLayout_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; +"Keymaps_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; Index: trunk/package/Resources/fr.lproj/Localizable.strings =================================================================== --- trunk/package/Resources/fr.lproj/Localizable.strings (revision 1796) +++ trunk/package/Resources/fr.lproj/Localizable.strings (revision 1797) @@ -323,9 +323,9 @@ "Video_title" = "Vidéo"; "Video_description" = "Options concernant la partie vidéo du système."; -// KeyLayout -"KeyLayout_title" = "Mappage de clavier"; -"KeyLayout_description" = "Sélectionnez un mappage de clavier à utiliser. +// Keymaps +"Keymaps_title" = "Mappage de clavier"; +"Keymaps_description" = "Sélectionnez un mappage de clavier à utiliser. Cela installera aussi le module Keylayout ainsi que les différentes configurations de clavier."; // Themes Index: trunk/package/Resources/mk.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/package/Resources/nl.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/package/Resources/hr.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/package/Resources/ko.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/package/Resources/pl.lproj/Localizable.strings =================================================================== --- trunk/package/Resources/pl.lproj/Localizable.strings (revision 1796) +++ trunk/package/Resources/pl.lproj/Localizable.strings (revision 1797) @@ -239,7 +239,7 @@ // ---------------------------------------------------------------------------- -// Boot options - KEYLAYOUTS +// Boot options - KEYMAPS // ---------------------------------------------------------------------------- "mac-de_title" = "German Mac Keyboard"; @@ -324,9 +324,9 @@ "Video_title" = "Grafika"; "Video_description" = "Wybierz ustawienia zwizane z obsBug grafiki."; -// KeyLayout -"KeyLayout_title" = "KeyLayout"; -"KeyLayout_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; +// Keymaps +"Keymaps_title" = "KeyLayout"; +"Keymaps_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; // Themes "Themes_title" = "Tematy"; Index: trunk/package/Resources/it.lproj/Localizable.strings =================================================================== --- trunk/package/Resources/it.lproj/Localizable.strings (revision 1796) +++ trunk/package/Resources/it.lproj/Localizable.strings (revision 1797) @@ -238,7 +238,7 @@ // ---------------------------------------------------------------------------- -// Boot options - KEYLAYOUTS +// Boot options - KEYMAPS // ---------------------------------------------------------------------------- "mac-de_title" = "Mappatura tastiera Tedesca Mac"; @@ -323,9 +323,9 @@ "Video_title" = "Video"; "Video_description" = "Selezione di opzioni per il video."; -// KeyLayout -"KeyLayout_title" = "Mappatura tastiera"; -"KeyLayout_description" = "Seleziona la mappatura da utilizzare, Verrá anche installato il modulo Keylayout e le mappature tastiera."; +// Keymaps +"Keymaps_title" = "Mappatura tastiera"; +"Keymaps_description" = "Seleziona la mappatura da utilizzare, Verrá anche installato il modulo Keylayout e le mappature tastiera."; // Themes "Themes_title" = "Temi"; Index: trunk/package/Resources/pt-BR.lproj/Localizable.strings =================================================================== --- trunk/package/Resources/pt-BR.lproj/Localizable.strings (revision 1796) +++ trunk/package/Resources/pt-BR.lproj/Localizable.strings (revision 1797) @@ -238,7 +238,7 @@ // ---------------------------------------------------------------------------- -// Boot options - KEYLAYOUTS +// Boot options - KEYMAPS // ---------------------------------------------------------------------------- "mac-de_title" = "Teclado Mac Alemão"; @@ -323,9 +323,9 @@ "Video_title" = "Video"; "Video_description" = "Preferências de Video."; -// KeyLayout -"KeyLayout_title" = "KeyLayout"; -"KeyLayout_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; +// Keymaps +"Keymaps_title" = "KeyLayout"; +"Keymaps_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; // Themes "Themes_title" = "Temas"; Index: trunk/package/Resources/sr.lproj/Localizable.strings =================================================================== --- trunk/package/Resources/sr.lproj/Localizable.strings (revision 1796) +++ trunk/package/Resources/sr.lproj/Localizable.strings (revision 1797) @@ -288,7 +288,7 @@ // ---------------------------------------------------------------------------- -// Boot options - KEYLAYOUTS +// Boot options - KEYMAPS // ---------------------------------------------------------------------------- "mac-de_title" = "German Mac Keyboard"; @@ -374,9 +374,9 @@ "Video_title" = "Video"; "Video_description" = "Izbor opcija koje se bave videom."; -// KeyLayout -"KeyLayout_title" = "KeyLayout"; -"KeyLayout_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; +// Keymaps +"Keymaps_title" = "KeyLayout"; +"Keymaps_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; // Themes "Themes_title" = "Themes"; Index: trunk/package/Resources/ru.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/package/Resources/de.lproj/Localizable.strings =================================================================== --- trunk/package/Resources/de.lproj/Localizable.strings (revision 1796) +++ trunk/package/Resources/de.lproj/Localizable.strings (revision 1797) @@ -239,7 +239,7 @@ // ---------------------------------------------------------------------------- -// Boot options - KEYLAYOUTS +// Boot options - KEYMAPS // ---------------------------------------------------------------------------- "mac-de_title" = "German Mac Keyboard"; @@ -324,9 +324,9 @@ "Video_title" = "Video"; "Video_description" = "Optionen zur Grafik."; -// KeyLayout -"KeyLayout_title" = "Tastaturbelegung"; -"KeyLayout_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; +// Keymaps +"Keymaps_title" = "Tastaturbelegung"; +"Keymaps_description" = "Select one keylayout to use. This will also install the Keylayout module and keymaps."; // Themes "Themes_title" = "Erscheinungsbild"; Index: trunk/package/Resources/bg.lproj/Localizable.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/package/buildpkg.sh =================================================================== --- trunk/package/buildpkg.sh (revision 1796) +++ trunk/package/buildpkg.sh (revision 1797) @@ -682,10 +682,10 @@ # End build options packages if [[ -n "${CONFIG_KEYLAYOUT_MODULE}" ]];then -# build KeyLayout options packages +# build Keymaps options packages echo "================= Keymaps Options =================" - addGroupChoices --exclusive_zero_or_one_choice "KeyLayout" - packagesidentity="${chameleon_package_identity}.options.keylayout" + addGroupChoices --exclusive_zero_or_one_choice "Keymaps" + packagesidentity="${chameleon_package_identity}.options.keymaps" keylayoutPackageRefId="" if [[ "${CONFIG_MODULES}" == 'y' && "${CONFIG_KEYLAYOUT_MODULE}" = 'm' ]];then keylayoutPackageRefId=$(getPackageRefId "${modules_packages_identity}" "Keylayout") @@ -710,12 +710,12 @@ packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}") buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/$chamTemp/options" # Add the Keylayout package because the Keylayout module is needed - addChoice --group="KeyLayout" \ - --start-selected="check_chameleon_option('${chameleon_keylayout_key}','${choiceId}')" \ + addChoice --group="Keymaps" \ + --start-selected="check_chameleon_text_option('${chameleon_keylayout_key}','${choiceId}')" \ --pkg-refs="$packageRefId $keylayoutPackageRefId" "${choiceId}" done -# End build KeyLayout options packages +# End build Keymaps options packages fi # build theme packages