Created
October 4, 2023 10:58
-
-
Save chaeya/8b655a5ca423a2f61cb923619f95f0c5 to your computer and use it in GitHub Desktop.
Ubiquity linuxmint-21.2 to hamonikr-7.0
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff -urN a/bin/ubiquity-dm b/bin/ubiquity-dm | |
| --- a/bin/ubiquity-dm 2022-06-28 00:53:37.000000000 +0900 | |
| +++ b/bin/ubiquity-dm 2023-10-04 19:33:57.350212498 +0900 | |
| @@ -429,7 +429,7 @@ | |
| visual_a11y = 'access=v' in proc_cmdline | |
| background_image = None | |
| - for background in ('/usr/share/backgrounds/linuxmint/default_background.jpg'): | |
| + for background in ('/usr/share/backgrounds/hamonikr/default_background.jpg'): | |
| exists = os.access(background, os.R_OK) | |
| if exists: | |
| background_image = background | |
| diff -urN a/d-i/patches/localechooser-post-base-installer.patch b/d-i/patches/localechooser-post-base-installer.patch | |
| --- a/d-i/patches/localechooser-post-base-installer.patch 2022-06-08 19:05:06.000000000 +0900 | |
| +++ b/d-i/patches/localechooser-post-base-installer.patch 1970-01-01 09:00:00.000000000 +0900 | |
| @@ -1,210 +0,0 @@ | |
| -Index: b/source/localechooser/post-base-installer.d/05localechooser | |
| -=================================================================== | |
| ---- a/source/localechooser/post-base-installer.d/05localechooser | |
| -+++ b/source/localechooser/post-base-installer.d/05localechooser | |
| -@@ -21,6 +21,9 @@ | |
| - LANGLIST="$RET" | |
| - fi | |
| - | |
| -+db_get debian-installer/country | |
| -+COUNTRY="$RET" | |
| -+ | |
| - EXTRAS="" | |
| - if db_get localechooser/supported-locales; then | |
| - EXTRAS="$(echo "$RET" | sed 's/,//g')" | |
| -@@ -36,29 +39,144 @@ | |
| - # different location may imply a different dialect of the language. | |
| - # In such cases, make LANG reflect the selected language (for | |
| - # messages, character types, and collation) and make the other | |
| -- # locale categories reflect the selected language. | |
| -+ # locale categories reflect the selected location. | |
| - db_get localechooser/languagelist | |
| - ORIG_LANGUAGE="$RET" | |
| -- db_get debian-installer/country | |
| -- COUNTRY="$RET" | |
| - | |
| -- if grep -q "^$ORIG_LANGUAGE;" /usr/share/localechooser/languagelist; then | |
| -- SUPPORTEDLOCALES=/usr/share/localechooser/SUPPORTED | |
| -+ if grep -q "^$ORIG_LANGUAGE;" /usr/lib/ubiquity/localechooser/languagelist; then | |
| -+ SUPPORTEDLOCALES=/usr/lib/ubiquity/localechooser/SUPPORTED | |
| - if [ ! -f "$SUPPORTEDLOCALES" ]; then | |
| - SUPPORTEDLOCALES=/usr/share/i18n/SUPPORTED | |
| - fi | |
| - | |
| -- LOCALE_TRANSLATIONS="$(grep "^$ORIG_LANGUAGE;" /usr/share/localechooser/languagelist | cut -d';' -f4)" | |
| -+ LOCALE_TRANSLATIONS="$(grep "^$ORIG_LANGUAGE;" /usr/lib/ubiquity/localechooser/languagelist | cut -d';' -f4)" | |
| - newlocale="$(echo "$LOCALE" | sed "s/_[A-Z][A-Z]*/_$COUNTRY/")" | |
| - if grep -q "^${newlocale%%[.@]*}[.@ ]" $SUPPORTEDLOCALES && \ | |
| - [ "$newlocale" != "$LOCALE_TRANSLATIONS" ]; then | |
| - LOCALE="$newlocale" | |
| -- LANGLIST="$(grep "^$ORIG_LANGUAGE;" /usr/share/localechooser/languagelist | cut -d';' -f5)" | |
| -+ LANGLIST="$(grep "^$ORIG_LANGUAGE;" /usr/lib/ubiquity/localechooser/languagelist | cut -d';' -f5)" | |
| - fi | |
| - fi | |
| - ;; | |
| - esac | |
| - | |
| -+# It is relatively common for the combination of language and location (as | |
| -+# selected on the timezone page) not to identify a supported combined | |
| -+# locale. For example, this happens when the user is a migrant, or when | |
| -+# they prefer to use a different language to interact with their computer | |
| -+# because that language is better-supported. | |
| -+# | |
| -+# In such cases, we would like to be able to use a locale reflecting the | |
| -+# selected language in LANG for messages, character types, and collation, | |
| -+# and to make the other locale categories reflect the selected location. | |
| -+# This means that we have to guess at a suitable locale for the selected | |
| -+# location, and we do not want to ask yet another locale-related question. | |
| -+# Nevertheless, some cases are ambiguous: a user who has asked for the | |
| -+# English language and identifies their location as Switzerland will get | |
| -+# different numeric representation depending on which Swiss locale we pick. | |
| -+# | |
| -+# The goal of identifying a reasonable default for migrants makes things | |
| -+# easier: it is reasonable to default to French for France despite the | |
| -+# existence of several minority languages there, because anyone who prefers | |
| -+# those languages will probably already have selected them and won't arrive | |
| -+# here. However, in some cases we're unsure, and in some cases we actively | |
| -+# don't want to pick a "preferred" language: selecting either Greek or | |
| -+# Turkish as the default language for migrants to Cyprus would probably | |
| -+# offend somebody! In such cases we simply punt to the old behaviour of not | |
| -+# setting up a locale reflecting the location, which is suboptimal but is at | |
| -+# least unlikely to give offence. | |
| -+# | |
| -+# Our best shot at general criteria for selecting a default language in | |
| -+# these circumstances are as follows: | |
| -+# | |
| -+# * Exclude special-purpose (e.g. en_DK) and artificial (e.g. la_AU, | |
| -+# tlh_GB) locales. | |
| -+# * If there is a language specific to or very strongly associated with the | |
| -+# country in question, prefer it unless it has rather few native | |
| -+# speakers. | |
| -+# * Exclude minority languages that are relatively unlikely to be spoken by | |
| -+# migrants who have not already selected them as their preferred language | |
| -+# earlier in the installer. | |
| -+# * If there is an official national language likely to be seen in print | |
| -+# media, road signs, etc., then prefer that. | |
| -+# * In cases of doubt, selecting no default language is safe. | |
| -+# | |
| -+# This code is currently duplicated between here and | |
| -+# ubiquity/scripts/localechooser-apply. Please keep them in sync until the | |
| -+# duplication can be removed. | |
| -+ | |
| -+combined="$(echo "$LOCALE" | sed "s/_[A-Z][A-Z]*/_$COUNTRY/")" | |
| -+if [ "$LOCALE" = "$LOCALE_TRANSLATIONS" ] && \ | |
| -+ ! grep -q "^${combined%%[.@]*}[.@ ]" /usr/share/i18n/SUPPORTED; then | |
| -+ available="$(grep ' UTF-8' /usr/share/i18n/SUPPORTED | \ | |
| -+ grep "_$COUNTRY[.@ ]" | cut -d' ' -f1 | sort -u)" | |
| -+ if [ "$(echo "$available" | wc -l)" = 1 ]; then | |
| -+ combined="$available" | |
| -+ else | |
| -+ case $COUNTRY in | |
| -+ AU) deflang=en ;; | |
| -+ # Dutch is the native language for a majority of the | |
| -+ # Belgians, so in the absence of an en_BE locale, nl is | |
| -+ # a reasonable default for a user who selects English | |
| -+ # or some other language not represented by a Belgian | |
| -+ # locale. | |
| -+ BE) deflang=nl ;; | |
| -+ CN) deflang=zh ;; | |
| -+ DE) deflang=de ;; | |
| -+ DK) deflang=da ;; | |
| -+ DZ) deflang=ar ;; | |
| -+ ES) deflang=es ;; | |
| -+ # Somewhat unclear: Oromo has the greatest number of | |
| -+ # native speakers; English is the most widely spoken | |
| -+ # language and taught in secondary schools; Amharic is | |
| -+ # the official language and was taught in primary | |
| -+ # schools. | |
| -+ ET) deflang=am ;; | |
| -+ FI) deflang=fi ;; | |
| -+ FR) deflang=fr ;; | |
| -+ GB) deflang=en ;; | |
| -+ # Irish (Gaelic) is strongly associated with Ireland, | |
| -+ # but nearly all its native speakers also speak English, | |
| -+ # and migrants are likely to use English. | |
| -+ IE) deflang=en ;; | |
| -+ IT) deflang=it ;; | |
| -+ KE) deflang=sw ;; | |
| -+ MA) deflang=ar ;; | |
| -+ MK) deflang=mk ;; | |
| -+ MM) deflang=my ;; | |
| -+ NG) deflang=en ;; | |
| -+ NL) deflang=nl ;; | |
| -+ NZ) deflang=en ;; | |
| -+ IL) deflang=he ;; | |
| -+ # Filipino is a de facto version of Tagalog, which is | |
| -+ # also spoken; English is also an official language. | |
| -+ PH) deflang=fil ;; | |
| -+ PK) deflang=ur ;; | |
| -+ PL) deflang=pl ;; | |
| -+ RU) deflang=ru ;; | |
| -+ # Chinese has more speakers, but English is the "common | |
| -+ # language of the nation" (Wikipedia) and official | |
| -+ # documents must be translated into English to be | |
| -+ # accepted. | |
| -+ SG) deflang=en ;; | |
| -+ SN) deflang=wo ;; | |
| -+ TR) deflang=tr ;; | |
| -+ TW) deflang=zh ;; | |
| -+ UA) deflang=uk ;; | |
| -+ US) deflang=en ;; | |
| -+ ZM) deflang=en ;; | |
| -+ *) deflang= ;; | |
| -+ esac | |
| -+ combined="$(grep ' UTF-8' /usr/share/i18n/SUPPORTED | \ | |
| -+ grep "${deflang}_$COUNTRY[.@ ]" | head -n1 | \ | |
| -+ cut -d' ' -f1)" | |
| -+ fi | |
| -+ | |
| -+ if [ "$combined" ]; then | |
| -+ LOCALE="$combined" | |
| -+ fi | |
| -+fi | |
| -+ | |
| - # Enable translations | |
| - if [ "$LOCALE" != "C" ] && [ "$LOCALE" != "C.UTF-8" ] || [ "$EXTRAS" ]; then | |
| - apt-install locales || true | |
| -@@ -115,6 +233,7 @@ | |
| - LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION; do | |
| - set_field /target/etc/default/locale "$category" "$LOCALE" | |
| - done | |
| -+ EXTRAS="$EXTRAS $LOCALE_TRANSLATIONS" | |
| - fi | |
| - | |
| - # For languages that have no chance to be displayed at the Linux console | |
| -@@ -125,7 +244,7 @@ | |
| - # For language with multiple entries such as pt/pt_BR or zh_CN/zh_TW | |
| - # we don't really care about the entry we will match as the level will always | |
| - # be the same | |
| --LEVEL=`cat /usr/share/localechooser/languagelist |\ | |
| -+LEVEL=`cat /usr/lib/ubiquity/localechooser/languagelist |\ | |
| - cut -f 2-3 -d\; | \ | |
| - grep "$LANGUAGECODE" | \ | |
| - head -n 1 | \ | |
| -@@ -146,7 +265,25 @@ | |
| - # locale is supposed to have a meaningful existence. | |
| - mkdir -p "/target/usr/share/locale-langpack/${loc%_*}" | |
| - done | |
| -- log-output -t localechooser chroot /target /usr/sbin/locale-gen "$@" | |
| -+ # Arrange for the installation environment to have a copy of the | |
| -+ # locale as well. | |
| -+ local locale old_locales new_locales added_dirs | |
| -+ old_locales="$(ls /target/usr/lib/locale 2>/dev/null | sort -u | xargs)" | |
| -+ log-output -t localechooser chroot /target /usr/sbin/locale-gen --no-archive --no-purge "$@" || return 0 | |
| -+ new_locales="$(ls /target/usr/lib/locale 2>/dev/null | sort -u | xargs)" | |
| -+ added_dirs= | |
| -+ for locale in $new_locales; do | |
| -+ case " $old_locales " in | |
| -+ *" $locale "*) | |
| -+ ;; | |
| -+ *) | |
| -+ cp -a "/target/usr/lib/locale/$locale" "/usr/lib/locale/$locale" || true | |
| -+ added_dirs="${added_dirs:+$added_dirs }/usr/lib/locale/$locale" | |
| -+ ;; | |
| -+ esac | |
| -+ done | |
| -+ log-output -t localechooser chroot /target localedef --add-to-archive $added_dirs || true | |
| -+ log-output -t localechooser chroot /target rm -rf $added_dirs || true | |
| - } | |
| - | |
| - if [ "$LOCALE" != C ] && [ "$LOCALE" != "C.UTF-8" ]; then | |
| diff -urN a/d-i/source/apt-setup/debian/apt-cdrom-setup.install b/d-i/source/apt-setup/debian/apt-cdrom-setup.install | |
| --- a/d-i/source/apt-setup/debian/apt-cdrom-setup.install 2022-06-08 18:32:48.000000000 +0900 | |
| +++ b/d-i/source/apt-setup/debian/apt-cdrom-setup.install 2023-10-04 19:34:08.418718621 +0900 | |
| @@ -1,3 +1,4 @@ | |
| load-install-cd usr/bin | |
| finish-install.d usr/lib | |
| generators/40cdrom usr/lib/apt-setup/generators | |
| +generators/41cdset usr/lib/apt-setup/generators | |
| diff -urN a/d-i/source/apt-setup/generators/41cdset b/d-i/source/apt-setup/generators/41cdset | |
| --- a/d-i/source/apt-setup/generators/41cdset 1970-01-01 09:00:00.000000000 +0900 | |
| +++ b/d-i/source/apt-setup/generators/41cdset 2023-10-04 19:34:14.138977584 +0900 | |
| @@ -0,0 +1,145 @@ | |
| +#!/bin/sh | |
| +set -e | |
| + | |
| +. /usr/share/debconf/confmodule | |
| +. /lib/chroot-setup.sh | |
| + | |
| +# This code is copied from chroot-setup.sh, and is needed until after a d-i | |
| +# release whose initrds contain a sufficiently new version of di-utils. | |
| +if ! type chroot_cleanup_localmounts >/dev/null 2>&1; then | |
| + # Variant of chroot_cleanup that only cleans up chroot_setup's mounts. | |
| + chroot_cleanup_localmounts () { | |
| + rm -f /target/usr/sbin/policy-rc.d | |
| + mv /target/sbin/start-stop-daemon.REAL /target/sbin/start-stop-daemon | |
| + if [ -x /target/sbin/initctl.REAL ]; then | |
| + mv /target/sbin/initctl.REAL /target/sbin/initctl | |
| + fi | |
| + | |
| + # Undo the mounts done by the packages during installation. | |
| + # Reverse sorting to umount the deepest mount points first. | |
| + # Items with count of 1 are new. | |
| + for dir in $( (cat /tmp/mount.pre /tmp/mount.pre /tmp/mount.post ) | \ | |
| + sort -r | uniq -c | grep "^[[:space:]]*1[[:space:]]" | \ | |
| + sed "s/^[[:space:]]*[0-9][[:space:]]//"); do | |
| + if ! umount $dir; then | |
| + logger -t $0 "warning: Unable to umount '$dir'" | |
| + fi | |
| + done | |
| + rm -f /tmp/mount.pre /tmp/mount.post | |
| + | |
| + rm -f /var/run/chroot-setup.lock | |
| + } | |
| +fi | |
| + | |
| +file="$1" | |
| + | |
| +if [ ! -e /cdrom/.disk/cd_type ] || [ ! -e /var/lib/install-cd.id ]; then | |
| + exit 0 | |
| +fi | |
| + | |
| +# Various different image types look different here: | |
| +# | |
| +# Image Type cd_type | |
| +################################################### | |
| +# netinst "not_complete" | |
| +# full CD sets (default desktop) "full_cd" | |
| +# desktop-specific CD images "full_cd/single" | |
| +# DVD "dvd" | |
| +# bluray "bluray" | |
| +# multi-arch CD/DVD "not_complete" | |
| +# live "live" | |
| +# | |
| +# It can make sense to offer to scan more media here in most cases, | |
| +# but... on live or blu-ray it's unlikely to help; the | |
| +# desktop-specific image is designed specifically to work with only a | |
| +# single image. Hopefully the following makes sense. | |
| +# | |
| +# Images written to USB pen drives still need better support | |
| +# too... :-( | |
| +cd_type=$(cat /cdrom/.disk/cd_type) | |
| +if [ "$cd_type" = "full_cd/single" ] || \ | |
| + [ "$cd_type" = "bluray" ] || \ | |
| + [ "$cd_type" = "live" ]; then | |
| + exit 0 | |
| +fi | |
| + | |
| +get_label() { | |
| + LC_ALL=C $logoutput --pass-stdout $chroot $ROOT \ | |
| + apt-cdrom ident < /dev/null | grep "^Stored label:" | head -n1 | \ | |
| + sed "s/^[^:]*: //" | |
| +} | |
| + | |
| +logoutput="" | |
| +if [ "$CATCHLOG" ]; then | |
| + logoutput="log-output -t apt-setup" | |
| +fi | |
| + | |
| +chroot= | |
| +if [ "$ROOT" ]; then | |
| + chroot=chroot | |
| + | |
| + # We can only change CDs if current CD is unmounted | |
| + $logoutput umount /cdrom || true | |
| + | |
| + chroot_setup | |
| + # Horrible hack to let us call a subprocess that also sources the | |
| + # confmodule, since chroot_setup tears down debconf state. | |
| + export DEBIAN_HAS_FRONTEND=1 | |
| + export DEBCONF_REDIR=1 | |
| + # Needed until after a d-i release with new enough di-utils. | |
| + mountpoints > /tmp/mount.post | |
| + trap chroot_cleanup_localmounts EXIT HUP INT QUIT TERM | |
| +fi | |
| + | |
| +tmp=$($chroot $ROOT tempfile) | |
| + | |
| +cd_label=$(tail -n1 /var/lib/install-cd.id) | |
| +db_subst apt-setup/cdrom/set-first LABEL "$cd_label" | |
| +db_input high apt-setup/cdrom/set-first || true | |
| +if ! db_go; then | |
| + if [ "$ROOT" ]; then | |
| + load-install-cd "$ROOT" | |
| + fi | |
| + exit 10 | |
| +fi | |
| +db_get apt-setup/cdrom/set-first | |
| + | |
| +while [ "$RET" = true ]; do | |
| + cd_label=$(get_label) | |
| + # Hmm. The greps could fail if a label contains regexp control chars... | |
| + if [ "$cd_label" ] && \ | |
| + (grep "^deb cdrom:\[$cd_label\]" $file || \ | |
| + grep "^deb cdrom:\[$cd_label\]" $ROOT/etc/apt/sources.list.new); then | |
| + template=apt-setup/cdrom/set-double | |
| + db_subst $template LABEL "$cd_label" | |
| + else | |
| + # apt-cdrom can be interactive, avoid that | |
| + if $logoutput $chroot $ROOT apt-cdrom add \ | |
| + -o Dir::Etc::SourceList=$tmp \ | |
| + </dev/null; then | |
| + cat $ROOT$tmp >> $file | |
| + | |
| + # Label is assigned by apt-cdrom add, so get again | |
| + cd_label=$(get_label) | |
| + template=apt-setup/cdrom/set-next | |
| + db_subst $template LABEL "$cd_label" | |
| + else | |
| + template=apt-setup/cdrom/set-failed | |
| + fi | |
| + rm -f $ROOT$tmp $ROOT$tmp~ | |
| + fi | |
| + | |
| + db_input critical $template || true | |
| + if ! db_go; then | |
| + if [ "$ROOT" ]; then | |
| + load-install-cd "$ROOT" | |
| + fi | |
| + exit 10 | |
| + fi | |
| + db_get $template | |
| +done | |
| + | |
| +# Make sure the installation CD is loaded again | |
| +if [ "$ROOT" ]; then | |
| + load-install-cd "$ROOT" | |
| +fi | |
| diff -urN a/d-i/source/localechooser/debian/localechooser.templates-ko b/d-i/source/localechooser/debian/localechooser.templates-ko | |
| --- a/d-i/source/localechooser/debian/localechooser.templates-ko 1970-01-01 09:00:00.000000000 +0900 | |
| +++ b/d-i/source/localechooser/debian/localechooser.templates-ko 2023-10-04 19:34:16.547086071 +0900 | |
| @@ -0,0 +1,233 @@ | |
| +Template: debian-installer/localechooser/title | |
| +Type: text | |
| +# This menu entry may be translated. | |
| +# However, translators are required to keep "Choose language" | |
| +# as an alternative separated by the "/" character | |
| +# Example (french): Choisir la langue/Choose language | |
| +# :sl1: | |
| +_Description: 언어 선택 | |
| + | |
| +Template: debian-installer/language | |
| +Type: string | |
| +Description: 내부 사용자 용 | |
| + | |
| +Template: debian-installer/country | |
| +Type: string | |
| +Description: for internal use; can be preseeded | |
| + | |
| +Template: debian-installer/locale | |
| +Help: localechooser/help/locale | |
| +Type: select | |
| +Choices: ${LOCALELIST} | |
| +# :sl2: | |
| +_Description: 시스템 로케일: | |
| + 설치 시스템에 사용할 로케일을 선택하세요. | |
| + | |
| +Template: debian-installer/consoledisplay | |
| +Type: string | |
| +Description: for internal use only | |
| + | |
| +Template: finish-install/progress/localechooser | |
| +Type: text | |
| +# finish-install progress bar item | |
| +# :sl1: | |
| +_Description: 언어 설정 중... | |
| + | |
| +Template: localechooser/title/language | |
| +Type: title | |
| +# Displayed as dialog title during language selection | |
| +# :sl1: | |
| +_Description: 언어 선택 | |
| + | |
| +Template: localechooser/title/location | |
| +Type: title | |
| +# Displayed as dialog title during country selection | |
| +# :sl1: | |
| +_Description: 지역을 선택하세요 | |
| + | |
| +Template: localechooser/title/locale | |
| +Type: title | |
| +# Displayed as dialog title during locale selection | |
| +# :sl1: | |
| +_Description: 로케일 설정 | |
| + | |
| +Template: localechooser/languagelist | |
| +Type: select | |
| +Choices-C: ${CODES} | |
| +Choices: ${NAMES_EN} | |
| +Choices-en.UTF-8: ${NAMES_BOTH} | |
| +Default: en | |
| +Description: Language: | |
| + 설치과정에서 사용할 언어를 선택하세요. | |
| + 선택한 언어는 설치 후 기본 언어로 사용됩니다. | |
| + | |
| +Template: localechooser/translation/none-yet | |
| +Type: note | |
| +# :sl1: | |
| +Description: Translations temporarily not available | |
| + Because of the low available space on the installation media, translations | |
| + will not be available immediately. | |
| + . | |
| + The installation will continue in English until the installer | |
| + loads packages that include translations from a CD or the network. | |
| + | |
| +Template: localechooser/translation/no-select | |
| +Type: note | |
| +# :sl1: | |
| +_Description: Language selection no longer possible | |
| + At this point it is no longer possible to change the language for the | |
| + installation, but you can still change the country or locale. | |
| + . | |
| + To select a different language you will need to abort this installation | |
| + and reboot the installer. | |
| + | |
| +Template: localechooser/translation/warn-severe | |
| +Type: boolean | |
| +Default: false | |
| +# :sl1: | |
| +#flag:translate!:3,4 | |
| +_Description: Continue the installation in the selected language? | |
| + The translation of the installer is incomplete for the selected language. | |
| + . | |
| + ${TXT-WARN} | |
| + . | |
| + ${TXT-ABORT} | |
| + | |
| +Template: localechooser/translation/warn-light | |
| +Type: boolean | |
| +Default: true | |
| +# :sl1: | |
| +#flag:translate!:3 | |
| +_Description: Continue the installation in the selected language? | |
| + The translation of the installer is not fully complete for the selected | |
| + language. | |
| + . | |
| + ${TXT-WARN} | |
| + | |
| +Template: localechooser/translation/text/warn_incomplete | |
| +Type: text | |
| +# :sl1: | |
| +_Description: This means that there is a significant chance that some dialogs will be displayed in English instead. | |
| + | |
| +Template: localechooser/translation/text/warn_normal-ok | |
| +Type: text | |
| +# :sl1: | |
| +_Description: If you do anything other than a purely default installation, there is a real chance that some dialogs will be displayed in English instead. | |
| + | |
| +Template: localechooser/translation/text/warn_partial | |
| +Type: text | |
| +# :sl1: | |
| +_Description: If you continue the installation in the selected language, most dialogs should be displayed correctly but - especially if you use the more advanced options of the installer - some may be displayed in English instead. | |
| + | |
| +Template: localechooser/translation/text/warn_mostly-ok | |
| +Type: text | |
| +# :sl1: | |
| +_Description: If you continue the installation in the selected language, dialogs should normally be displayed correctly but - especially if you use the more advanced options of the installer - there is a slight chance some may be displayed in English instead. | |
| + | |
| +Template: localechooser/translation/text/warn_exceptions | |
| +Type: text | |
| +# :sl1: | |
| +_Description: The chance that you will actually encounter a dialog that is not translated into the selected language is extremely small, but it cannot be ruled out completely. | |
| + | |
| +Template: localechooser/translation/text/abort | |
| +Type: text | |
| +# :sl1: | |
| +_Description: Unless you have a good understanding of the alternative language, it is recommended to either select a different language or abort the installation. | |
| + | |
| +Template: localechooser/translation/text/maybe-abort | |
| +Type: text | |
| +# :sl1: | |
| +_Description: If you choose not to continue, you will be given the option of selecting a different language, or you can abort the installation. | |
| + | |
| +Template: localechooser/shortlist | |
| +Type: select | |
| +#flag:translate!:1 | |
| +# "other", here, is added to the list of countries that will be displayed | |
| +# for users to choose among them | |
| +# For instance, choosing "Italian" will show: | |
| +# Italy, Switzerland, other | |
| +# :sl1: | |
| +__Choices: ${SHORTLIST}, other | |
| +Description: ${TXT1} | |
| + ${TXT2} | |
| + . | |
| + ${TXT3} | |
| + | |
| +Template: localechooser/text/country/1/country | |
| +Type: text | |
| +# :sl1: | |
| +_Description: Country, territory or area: | |
| + | |
| +Template: localechooser/text/country/1/continent | |
| +Type: text | |
| +# :sl1: | |
| +_Description: Continent or region: | |
| + | |
| +Template: localechooser/text/country/2 | |
| +Type: text | |
| +# :sl1: | |
| +_Description: The selected location will be used to set your time zone and also for example to help select the system locale. Normally this should be the country where you live. | |
| + | |
| +Template: localechooser/text/country/3/shortlist | |
| +Type: text | |
| +# :sl1: | |
| +_Description: This is a shortlist of locations based on the language you selected. Choose "other" if your location is not listed. | |
| + | |
| +Template: localechooser/text/country/3/continent | |
| +Type: text | |
| +# :sl1: | |
| +_Description: Select the continent or region to which your location belongs. | |
| + | |
| +Template: localechooser/text/country/3/country | |
| +Type: text | |
| +# '%s' will be replaced with the name of the currently selected continent/region | |
| +# :sl1: | |
| +_Description: Listed are locations for: %s. Use the <Go Back> option to select a different continent or region if your location is not listed. | |
| + | |
| +Template: localechooser/preferred-locale | |
| +Help: localechooser/help/locale | |
| +Choices-C: ${CHOICES-C} | |
| +Choices: ${CHOICES} | |
| +Type: select | |
| +#flag:translate!:2 | |
| +# :sl1: | |
| +_Description: Country to base default locale settings on: | |
| + ${TXT} | |
| + | |
| +Template: localechooser/text/preferred-locale/none | |
| +Type: text | |
| +# :sl1: | |
| +_Description: There is no locale defined for the combination of language and country you have selected. You can now select your preference from the locales available for the selected language. The locale that will be used is listed in the second column. | |
| + | |
| +Template: localechooser/text/preferred-locale/multi | |
| +Type: text | |
| +# :sl1: | |
| +_Description: There are multiple locales defined for the language you have selected. You can now select your preference from those locales. The locale that will be used is listed in the second column. | |
| + | |
| +Template: localechooser/supported-locales | |
| +Help: localechooser/help/locale | |
| +Type: multiselect | |
| +Choices: ${LOCALELIST} | |
| +# :sl2: | |
| +_Description: Additional locales: | |
| + Based on your previous choices, the default locale currently selected for the | |
| + installed system is '${LOCALE}'. | |
| + . | |
| + If you wish to use a different default or to also have other locales available, | |
| + you may choose additional locales to be installed. If you are unsure it is | |
| + best to just use the selected default. | |
| + | |
| +# This template does not really belong in localechooser, but it is probably | |
| +# the best place for it. It is used to display the language currently being | |
| +# installed during babelbox demo runs. | |
| +# Note that the template is not marked translatable on purpose! | |
| +Template: babelbox/info | |
| +Type: title | |
| +Description: Demo - ${LANGNAME} | |
| + | |
| +Template: localechooser/help/locale | |
| +Type: note | |
| +# :sl2: | |
| +_Description: locale | |
| + A locale determines character encoding and contains information on for example | |
| + currency, date format and alphabetical sort order. | |
| diff -urN a/d-i/source/localechooser/finish-install.d/05localechooser b/d-i/source/localechooser/finish-install.d/05localechooser | |
| --- a/d-i/source/localechooser/finish-install.d/05localechooser 2022-06-08 17:47:43.000000000 +0900 | |
| +++ b/d-i/source/localechooser/finish-install.d/05localechooser 2023-10-04 19:34:25.175472282 +0900 | |
| @@ -24,6 +24,14 @@ | |
| # RTL languages (Arabic, Hebrew, Farsi) | |
| apt-install libfribidi0 || true | |
| ;; | |
| + ja) | |
| + # japanese | |
| + apt-install nimf-anthy fonts-takao-pgothic language-pack-gnome-ja-base language-pack-ja-base || true | |
| + ;; | |
| + zh_CN|zh_TW) | |
| + # chineses | |
| + apt-install nimf-rime language-pack-gnome-zh-hans language-pack-gnome-zh-hant language-pack-zh-hans language-pack-zh-hant || true | |
| + ;; | |
| esac | |
| fi | |
| diff -urN a/d-i/source/localechooser/languagelist b/d-i/source/localechooser/languagelist | |
| --- a/d-i/source/localechooser/languagelist 2022-06-08 19:05:06.000000000 +0900 | |
| +++ b/d-i/source/localechooser/languagelist 2023-10-04 19:34:35.407925237 +0900 | |
| @@ -1,113 +1,13 @@ | |
| -# | |
| -# This is the complete list of languages (locales) to choose from. | |
| -# langcode;language (en);language (orig);supported_environments;countrycode;fallbacklocale;langlist;console-setup | |
| -sq;Albanian;Shqip;2;AL;sq_AL.UTF-8;;console-setup | |
| -am;Amharic;አማርኛ;4;ET;am_ET;; | |
| -ar;Arabic;عربي;3;EG;ar_EG.UTF-8;;console-setup | |
| -as;Assamese;অসমীয়া;4;IN;as_IN;; | |
| ast;Asturian;Asturianu;2;ES;ast_ES.UTF-8;;console-setup | |
| -eu;Basque;Euskara;1;ES;eu_ES.UTF-8;;console-setup | |
| -be;Belarusian;Беларуская;2;BY;be_BY.UTF-8;;console-setup | |
| -bn;Bangla;বাংলা;4;BD;bn_BD;; | |
| -bs;Bosnian;Bosanski;2;BA;bs_BA.UTF-8;;console-setup | |
| -#X br;Breton;Brezhoneg;2;FR;br_FR.UTF-8;;console-setup | |
| -bg;Bulgarian;Български;2;BG;bg_BG.UTF-8;;console-setup | |
| -bo;Tibetan;བོད་ཡིག;4;IN;bo_IN;; | |
| -# For C locale, set language to 'en' to make sure questions are "translated" | |
| -# to English instead of showing codes. | |
| -C;C;No localization (ASCII);0;;C;en; | |
| -C.UTF-8;C.UTF-8;No localization (UTF-8);0;;C.UTF-8;en; | |
| -ca;Catalan;Català;1;ES;ca_ES.UTF-8;;console-setup | |
| -# Special case for Chinese as the two flavours share the same ISO 639 code | |
| -# Both will trigger countrychooser. Each will be the backup for the other | |
| -# one | |
| -zh_CN;Chinese (Simplified);中文(简体);3;CN;zh_CN.UTF-8;zh_CN:zh; | |
| -zh_TW;Chinese (Traditional);中文(繁體);3;TW;zh_TW.UTF-8;zh_TW:zh; | |
| -#X the;Chitwania Tharu;थारु;4;NP;the_NP;;console-setup | |
| -hr;Croatian;Hrvatski;2;HR;hr_HR.UTF-8;;console-setup | |
| -cs;Czech;Čeština;2;CZ;cs_CZ.UTF-8;;console-setup | |
| -da;Danish;Dansk;1;DK;da_DK.UTF-8;;console-setup | |
| -nl;Dutch;Nederlands;1;NL;nl_NL.UTF-8;;console-setup | |
| -dz;Dzongkha;རྫོང་ཁ།;4;BT;dz_BT;; | |
| +de;German;Deutsch;1;DE;de_DE.UTF-8;;console-setup | |
| en;English;English;0;US;en_US.UTF-8;;console-setup | |
| -# The Esperanto locale is eo.UTF-8 | |
| -# so no country on purpose. The default country is Antarctica because... | |
| -# ...why not..:-) | |
| -eo;Esperanto;Esperanto;2;AQ;eo.UTF-8;;console-setup | |
| -et;Estonian;Eesti;2;EE;et_EE.UTF-8;;console-setup | |
| -fi;Finnish;Suomi;1;FI;fi_FI.UTF-8;;console-setup | |
| fr;French;Français;1;FR;fr_FR.UTF-8;;console-setup | |
| -gl;Galician;Galego;1;ES;gl_ES.UTF-8;;console-setup | |
| -ka;Georgian;ქართული;3;GE;ka_GE.UTF-8;;console-setup | |
| -kab;Kabyle;Taqbaylit;1;DZ;kab_DZ.UTF-8;;console-setup | |
| -de;German;Deutsch;1;DE;de_DE.UTF-8;;console-setup | |
| -el;Greek;Ελληνικά;2;GR;el_GR.UTF-8;;console-setup | |
| -gu;Gujarati;ગુજરાતી;4;IN;gu_IN;; | |
| -he;Hebrew;עברית;3;IL;he_IL.UTF-8;;console-setup | |
| -hi;Hindi;हिन्दी ;4;IN;hi_IN;; | |
| -hu;Hungarian;Magyar;2;HU;hu_HU.UTF-8;;console-setup | |
| -is;Icelandic;Íslenska;1;IS;is_IS.UTF-8;;console-setup | |
| -id;Indonesian;Bahasa Indonesia;1;ID;id_ID.UTF-8;;console-setup | |
| -ga;Irish;Gaeilge;1;IE;ga_IE.UTF-8;;console-setup | |
| -it;Italian;Italiano;1;IT;it_IT.UTF-8;;console-setup | |
| -#X jam;Jamaican Creole English;Jamaican Creole English;1;JM;jam_JM;;console-setup | |
| ja;Japanese;日本語;3;JP;ja_JP.UTF-8;; | |
| -#X ks;Kashmiri;कोशुर;4;IN;ks_IN;; | |
| -kab;Kabyle;Taqbaylit;1;DZ;kab_DZ.UTF-8;;console-setup | |
| -kk;Kazakh;Қазақ;2;KZ;kk_KZ.UTF-8;;console-setup | |
| -km;Khmer;ខ្មែរ;4;KH;km_KH;; | |
| -kn;Kannada;ಕನ್ನಡ;4;IN;kn_IN;; | |
| ko;Korean;한국어;3;KR;ko_KR.UTF-8;; | |
| -ku;Kurdish;Kurdî;2;TR;ku_TR.UTF-8;;console-setup | |
| -ckb;Kurdish, Central;کوردیی ناوەندی;3;IQ;ckb_IQ;; | |
| -#X ky;Kirghiz;Кыргызча;2;KG;ky_KG;;console-setup | |
| -lo;Lao;ລາວ;3;LA;lo_LA;;console-setup | |
| -lv;Latvian;Latviski;2;LV;lv_LV.UTF-8;;console-setup | |
| -lt;Lithuanian;Lietuviškai;2;LT;lt_LT.UTF-8;;console-setup | |
| -#X mg;Malagasy;Malagasy;1;MG;mg_MG.UTF-8;mg_MG:fr_FR:fr:en;console-setup | |
| -#X ms;Malay;Bahasa Malaysia;1;MY;ms_MY.UTF-8;;console-setup | |
| -ml;Malayalam;മലയാളം;4;IN;ml_IN;; | |
| -mr;Marathi;मराठी;4;IN;mr_IN;; | |
| -mk;Macedonian;Македонски;2;MK;mk_MK.UTF-8;;console-setup | |
| -my;Burmese;မြန်မာစာ;4;MM;my_MM;; | |
| -ne;Nepali;नेपाली ;4;NP;ne_NP;; | |
| -# The Sami translation is really incomplete. We however keep Sami on request | |
| -# of Skolelinux as a kind of reward to them..:-). They need to be able to | |
| -# choose Sami as an option so that the Sami locale is set as default | |
| -se_NO;Northern Sami;Sámegillii;1;NO;se_NO;se_NO:nb_NO:nb:no_NO:no:nn_NO:nn:da:sv:en;console-setup | |
| -nb_NO;Norwegian Bokmaal;Norsk bokmål;1;NO;nb_NO.UTF-8;nb_NO:nb:no_NO:no:nn_NO:nn:en;console-setup | |
| -nn_NO;Norwegian Nynorsk;Norsk nynorsk;1;NO;nn_NO.UTF-8;nn_NO:nn:no_NO:no:nb_NO:nb:en;console-setup | |
| -#X os;Ossetian;Ирон æвзаг;3;RU;os_RU;;console-setup | |
| -oc;Occitan;Occitan;1;FR;oc_FR.UTF-8;;console-setup | |
| -or;Odia;ଓଡ଼ିଆ;4;IN;or_IN;; | |
| -fa;Persian;فارسی;3;IR;fa_IR;;console-setup | |
| -pl;Polish;Polski;2;PL;pl_PL.UTF-8;;console-setup | |
| -pt;Portuguese;Português;1;PT;pt_PT.UTF-8;pt:pt_BR:en;console-setup | |
| pt_BR;Portuguese (Brazil);Português do Brasil;1;BR;pt_BR.UTF-8;pt_BR:pt:en;console-setup | |
| -pa;Punjabi (Gurmukhi);ਪੰਜਾਬੀ;4;IN;pa_IN;; | |
| -ro;Romanian;Română;2;RO;ro_RO.UTF-8;;console-setup | |
| ru;Russian;Русский;2;RU;ru_RU.UTF-8;;console-setup | |
| -#X sa;Sanskrit;संस्कृत;4;IN;sa_IN;; | |
| -#X sd;Sindhi;سنڌي;3;PK;sd_PK.UTF-8;;console-setup | |
| -si;Sinhala;සිංහල;4;LK;si_LK;; | |
| -sr;Serbian (Cyrillic);Српски;2;RS;sr_RS;;console-setup | |
| -#X sr@latin;Serbian (Latin);Srpski;2;RS;sr_RS@latin;;console-setup | |
| -szl;Silesian;Ślůnski;2;PL;szl_PL;; | |
| -sk;Slovak;Slovenčina;2;SK;sk_SK.UTF-8;;console-setup | |
| -sl;Slovenian;Slovenščina;2;SI;sl_SI.UTF-8;;console-setup | |
| -es;Spanish;Español;1;ES;es_ES.UTF-8;;console-setup | |
| -sv;Swedish;Svenska;1;SE;sv_SE.UTF-8;;console-setup | |
| -tl;Tagalog;Tagalog;1;PH;tl_PH.UTF-8;;console-setup | |
| -ta;Tamil;தமிழ்;4;IN;ta_IN;; | |
| -te;Telugu;తెలుగు;4;IN;te_IN;; | |
| -tg;Tajik;Тоҷикӣ;2;TJ;tg_TJ.UTF-8;;console-setup | |
| th;Thai;ภาษาไทย;3;TH;th_TH.UTF-8;;console-setup | |
| +tl;Tagalog;Tagalog;1;PH;tl_PH.UTF-8;;console-setup | |
| tr;Turkish;Türkçe;2;TR;tr_TR.UTF-8;;console-setup | |
| -ug;Uyghur;ئۇيغۇرچە;3;CN;ug_CN;; | |
| -uk;Ukrainian;Українська;2;UA;uk_UA.UTF-8;;console-setup | |
| -#X ur;Urdu;اردو;3;PK;ur_PK.UTF-8;;console-setup | |
| -#X ca@valencia;Valencian-Catalan;Valencià-Català;1;ES;ca_ES.UTF-8@valencia;;console-setup | |
| -vi;Vietnamese;Tiếng Việt;3;VN;vi_VN;;console-setup | |
| -cy;Welsh;Cymraeg;2;GB;cy_GB.UTF-8;;console-setup | |
| -#X wo;Wolof;Wolof;2;SN;wo_SN;wo:fr:en; | |
| -#X xh;Xhosa;Xhosa;2;ZA;xh_ZA.UTF-8;;console-setup | |
| +zh_CN;Chinese (Simplified);中文(简体);3;CN;zh_CN.UTF-8;zh_CN:zh; | |
| +zh_TW;Chinese (Traditional);中文(繁體);3;TW;zh_TW.UTF-8;zh_TW:zh; | |
| \ No newline at end of file | |
| diff -urN a/d-i/source/localechooser/mklanguagelist.data b/d-i/source/localechooser/mklanguagelist.data | |
| --- a/d-i/source/localechooser/mklanguagelist.data 2022-06-08 17:47:43.000000000 +0900 | |
| +++ b/d-i/source/localechooser/mklanguagelist.data 2023-10-04 19:34:45.404362554 +0900 | |
| @@ -54,8 +54,17 @@ | |
| return @new_list; | |
| } | |
| +sub sort_K_first { | |
| + my @full_list = @_; | |
| + my @K_locale = grep /^K/, @full_list; | |
| + my @languages = grep !/^K/, @full_list; | |
| + my @new_list = sort order_trans @languages; | |
| + unshift @new_list, @K_locale; | |
| + return @new_list; | |
| +} | |
| + | |
| open(TOUT, "> $outfile") || die "Unable to write $outfile"; | |
| -for my $name (sort_C_first @languagenames) { | |
| +for my $name (sort_K_first @languagenames) { | |
| my $line; | |
| if (exists $translations{$name}) { | |
| $line = $levels{$name}. | |
| diff -urN a/d-i/source/localechooser/post-base-installer.d/05localechooser b/d-i/source/localechooser/post-base-installer.d/05localechooser | |
| --- a/d-i/source/localechooser/post-base-installer.d/05localechooser 2022-06-08 18:27:05.000000000 +0900 | |
| +++ b/d-i/source/localechooser/post-base-installer.d/05localechooser 2023-10-04 19:34:55.952818572 +0900 | |
| @@ -115,6 +115,13 @@ | |
| LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION; do | |
| set_field /target/etc/default/locale "$category" "$LOCALE" | |
| done | |
| +else | |
| + # 선택한 언어와 설치 환경의 로케일이 같아도 선택한 언어로 로케일 관련 변수 재 설정 | |
| + for category in \ | |
| + LC_NUMERIC LC_TIME LC_MONETARY LC_PAPER LC_NAME LC_ADDRESS \ | |
| + LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION; do | |
| + set_field /target/etc/default/locale "$category" "$LOCALE_TRANSLATIONS" | |
| + done | |
| fi | |
| # For languages that have no chance to be displayed at the Linux console | |
| diff -urN a/d-i/source/user-setup/user-setup-apply b/d-i/source/user-setup/user-setup-apply | |
| --- a/d-i/source/user-setup/user-setup-apply 2022-06-08 19:26:25.000000000 +0900 | |
| +++ b/d-i/source/user-setup/user-setup-apply 2023-10-04 19:35:13.965584651 +0900 | |
| @@ -209,7 +209,12 @@ | |
| fi | |
| fi | |
| if [ -x $ROOT/usr/sbin/adduser ]; then | |
| - $log $chroot $ROOT adduser --disabled-password --gecos "$RET" $UIDOPT $ENCRYPT_HOME_OPT "$USER" >/dev/null || true | |
| + # When using zsh in HamoniKR OS | |
| + if [ -x $ROOT/usr/bin/zsh ] && [ `dpkg-query -W --showformat='${db:Status-Status}' hamonikr-zsh` = "installed" ] ; then | |
| + $log $chroot $ROOT adduser --disabled-password --shell /usr/bin/zsh --gecos "$RET" $UIDOPT $ENCRYPT_HOME_OPT "$USER" >/dev/null || true | |
| + else | |
| + $log $chroot $ROOT adduser --disabled-password --gecos "$RET" $UIDOPT $ENCRYPT_HOME_OPT "$USER" >/dev/null || true | |
| + fi | |
| else | |
| $log $chroot $ROOT useradd -c "$RET" -m "$USER" $UIDOPT >/dev/null || true | |
| fi | |
| diff -urN a/data/ubiquity.desktop.in b/data/ubiquity.desktop.in | |
| --- a/data/ubiquity.desktop.in 2022-12-13 19:53:03.000000000 +0900 | |
| +++ b/data/ubiquity.desktop.in 2023-10-04 19:35:24.298017081 +0900 | |
| @@ -2,7 +2,8 @@ | |
| Type=Application | |
| Version=1.0 | |
| # Do not translate the word "RELEASE". It is used as a marker by casper. | |
| -_Name=Install RELEASE | |
| +_Name=Install HamoniKR | |
| +Name[ko]=하모니카 설치 | |
| _Comment=Install this system permanently to your hard disk | |
| _Keywords=ubiquity; | |
| #use sh because pkexec is broken under xfce/lxce http://pad.lv/1193526 | |
| diff -urN a/data/ubiquity.json b/data/ubiquity.json | |
| --- a/data/ubiquity.json 2022-06-08 17:47:43.000000000 +0900 | |
| +++ b/data/ubiquity.json 2023-10-04 19:35:30.458272519 +0900 | |
| @@ -1,8 +1,8 @@ | |
| { | |
| "hasWindows": true, | |
| "components": ["polkitAgent", "networkAgent"], | |
| - "stylesheetName": "Yaru/gnome-shell.css", | |
| - "themeResourceName": "theme/Yaru/gnome-shell-theme.gresource", | |
| + "stylesheetName": "HamoniKR/gnome-shell/gnome-shell.css", | |
| + "themeResourceName": "theme/HamoniKR/gnome-shell-theme.gresource", | |
| "panel": { "left": [], | |
| "center": ["dateMenu"], | |
| "right": ["a11y", "keyboard", "aggregateMenu"] | |
| diff -urN a/debian/po/ko.po b/debian/po/ko.po | |
| --- a/debian/po/ko.po 2022-06-08 19:05:06.000000000 +0900 | |
| +++ b/debian/po/ko.po 2023-10-04 19:35:50.439089119 +0900 | |
| @@ -114,14 +114,26 @@ | |
| "You may wish to read the <a href=\"release-notes\">release notes</a> or <a " | |
| "href=\"update\">update this installer</a>." | |
| msgstr "" | |
| -"<a href=\"release-notes\">릴리즈 노트</a>를 읽거나 <a href=\"update\">이 설치 프로그램 " | |
| -"업데이트</a>를 할 수 있습니다." | |
| +"새롭게 출시한 하모니카 7.0은 커널 5.15를 기반으로 다양한 최신 하드웨어를 지원" | |
| +"하며, \n" | |
| +"국내 GS인증 1등급을 받은 안정적인 제품으로, 2032년까지 시스템 및 보안 업데이" | |
| +"트를 제공합니다. \n" | |
| +"\n" | |
| +"보다 자세한 내용은 <a href=\"release-notes\">릴리즈 노트</a>에서 확인 할 수 " | |
| +"있습니다." | |
| #. Type: text | |
| #. Description | |
| #: ../ubiquity.templates:15001 | |
| msgid "You may wish to read the <a href=\"release-notes\">release notes</a>." | |
| -msgstr "<a href=\"release-notes\">릴리즈 노트</a>를 읽을 수 있습니다." | |
| +msgstr "" | |
| +"새롭게 출시한 하모니카 7.0은 커널 5.15를 기반으로 다양한 최신 하드웨어를 지원" | |
| +"하며, \n" | |
| +"국내 GS인증 1등급을 받은 안정적인 제품으로, 2032년까지 시스템 및 보안 업데이" | |
| +"트를 제공합니다. \n" | |
| +"\n" | |
| +"보다 자세한 내용은 <a href=\"release-notes\">릴리즈 노트</a>에서 확인 할 수 " | |
| +"있습니다." | |
| #. Type: text | |
| #. Description | |
| @@ -540,7 +552,7 @@ | |
| #. An indicator menu item. The underscore goes before an accelerator key. | |
| #: ../ubiquity.templates:80001 | |
| msgid "_On-screen Keyboard" | |
| -msgstr "화면 키보드(_O)" | |
| +msgstr "가상 키보드(_O)" | |
| #. Type: text | |
| #. Description | |
| @@ -829,7 +841,7 @@ | |
| "complete on the target partition. Please run the installer again and select " | |
| "a larger partition to install into." | |
| msgstr "" | |
| -"이 오류는 일반적으로 대상 파티션에 설치를 마칠 디스크 공간이 부족할 때 발생합니다. 설치 프로그램을 다시 실행한 후 우분투를 설치할 더 " | |
| +"이 오류는 일반적으로 대상 파티션에 설치를 마칠 디스크 공간이 부족할 때 발생합니다. 설치 프로그램을 다시 실행한 후 OS를 설치할 더 " | |
| "큰 파티션을 선택하십시오." | |
| #. Type: error | |
| @@ -1388,6 +1400,9 @@ | |
| "party software, download updates, automatically detect your timezone, and " | |
| "install full support for your language." | |
| msgstr "" | |
| +"서드 파티 소프트웨어를 설치하고 업데이트를 다운로드하며 시간대를 자동으로 검" | |
| +"색하는 동시에 언어 지원을 완전히 설치할 수 있도록 이 컴퓨터를 무선 네트워크" | |
| +"에 연결합니다." | |
| #. Type: text | |
| #. Description | |
| @@ -1407,7 +1422,7 @@ | |
| #. Description | |
| #: ../ubiquity.templates:208001 | |
| msgid "I don't want to connect to a Wi-Fi network right now" | |
| -msgstr "" | |
| +msgstr "지금은 무선 네트워크에 연결하지 않습니다" | |
| #. Type: text | |
| #. Description | |
| @@ -1505,9 +1520,9 @@ | |
| "phone or other device: <a " | |
| "href=\"https://help.ubuntu.com/rst\">help.ubuntu.com/rst</a>" | |
| msgstr "" | |
| -"이 컴퓨터는 인텔의 RST 기술 (Rapid Storage Technology)을 사용합니다. Linux Mint를 설치하기 전에 RST를 " | |
| -"꺼야 합니다. 다른 기기에서 다음 페이지로 접속하여 방법을 확인하시기 바랍니다: <a " | |
| -"href=\"https://help.ubuntu.com/rst\">help.ubuntu.com/rst</a>" | |
| +"이 컴퓨터는 Intel RST (Rapid Storage Technology) 기능을 사용합니다. 설치 전 " | |
| +"RST 기능을 꺼야 합니다. 자세한 내용을 확인하시려면 다른 장치에서 도움말을 확" | |
| +"인하세요 : <a href=\"https://help.ubuntu.com/rst\">help.ubuntu.com/rst</a>" | |
| #. Type: text | |
| #. Description | |
| @@ -1524,9 +1539,10 @@ | |
| "page on a phone or other device: <a " | |
| "href=\"https://help.ubuntu.com/bitlocker\">help.ubuntu.com/bitlocker</a>" | |
| msgstr "" | |
| -"이 컴퓨터는 Windows의 BitLocker 드라이브 암호화를 사용하고 있습니다. Linux Mint를 설치하기 전에 Windows로 들어가서 " | |
| -"BitLocker를 해제해야 합니다. 다른 기기에서 다음 페이지로 접속하여 방법을 확인하시기 바랍니다: <a " | |
| -"href=\"https://help.ubuntu.com/bitlocker\">help.ubuntu.com/bitlocker</a>" | |
| +"이 컴퓨터는 윈도우 BitLocker 암호화를 사용합니다. 설치 전 윈도우의 BitLocker " | |
| +"기능을 꺼야 합니다. 자세한 내용을 확인하시려면 다른 장치에서 도움말을 확인하" | |
| +"세요 : <a href=\"https://help.ubuntu.com/bitlocker\">help.ubuntu.com/" | |
| +"bitlocker</a>" | |
| #. Type: text | |
| #. Description | |
| @@ -1569,7 +1585,9 @@ | |
| msgid "" | |
| "Install third-party software for graphics and Wi-Fi hardware and additional " | |
| "media formats" | |
| -msgstr "그래픽과 Wi-Fi 하드웨어 그리고 추가 미디어 포맷을 위한 서드파티 소프트웨어 설치" | |
| +msgstr "" | |
| +"멀티미디어 코덱, 비주얼 스튜디오 코드, 줌, 슬랙, 크롬, 알약, 루트리스 등 서드" | |
| +"파티 소프트웨어 설치 (인터넷 속도에 따라 시간이 다소 소요됩니다.)" | |
| #. Type: text | |
| #. Description | |
| @@ -2126,6 +2144,10 @@ | |
| "hardware. Your system also has UEFI Secure Boot enabled. UEFI Secure Boot " | |
| "needs to be configured to allow the use of these third-party drivers." | |
| msgstr "" | |
| +"서드파티 소프트웨어를 활성화하기로 선택했으며 그래픽 및/또는 Wi-Fi 하드웨어" | |
| +"용 하드웨어 드라이버가 포함되어 있습니다. 시스템에는 UEFI 보안 부팅도 활성화" | |
| +"되어 있습니다. 이러한 서드파티 소프트웨어를 사용할 수 있도록 UEFI 보안 부팅" | |
| +"을 구성해야 합니다." | |
| #. Type: text | |
| #. Description | |
| @@ -2136,8 +2158,9 @@ | |
| "authorized user, and not by an attacker, you must choose a password now and " | |
| "then use the same password after reboot to confirm the change." | |
| msgstr "" | |
| -"설치가 완료된 후, Linux Mint는 UEFI Secure Boot 설정을 도와드릴 것입니다. 이 설정이 다른 공격자가 아니라 사용자 본인에 " | |
| -"의해 행해진 것임을 확인하기 위해, 지금 설정할 암호를 재시동 이후 똑같이 입력하여야 합니다." | |
| +"설치가 완료되면 UEFI 보안 부팅 구성을 지원합니다. 이 변경 사항이 공격자가 아" | |
| +"닌 인증된 사용자인지 확인하려면 지금 암호를 선택한 다음 재부팅 후 동일한 암호" | |
| +"를 사용하여 변경 사항을 확인해야 합니다." | |
| #. Type: text | |
| #. Description | |
| @@ -2148,9 +2171,10 @@ | |
| "reboot, Linux Mint will still be able to boot on your system but these third-" | |
| "party drivers will not be available for your hardware." | |
| msgstr "" | |
| -"<span foreground=\"darkred\">주의</span>: 이 드라이버를 설치하지 않기로 선택하거나 계속 진행하지만 시스템을 " | |
| -"다시 시작한 후 암호를 확인하지 않으면 우분투는 사용자의 시스템을 시작할 수는 있지만 추가 드라이버를 설치해야 하는 사용자의 하드웨어는 " | |
| -"사용할 수 없습니다.." | |
| +"<span foreground=\"darkred\">주의</span>: 이 드라이버를 설치하지 않기로 선택" | |
| +"하거나 계속 진행하지만 시스템을 다시 시작한 후 암호를 확인하지 않으면 사용자" | |
| +"의 시스템을 시작할 수는 있지만 추가 드라이버를 설치해야 하는 사용자의 하드웨" | |
| +"어는 사용할 수 없습니다.." | |
| #. Type: password | |
| #. Description | |
| diff -urN a/debian/rules b/debian/rules | |
| --- a/debian/rules 2022-06-08 19:05:06.000000000 +0900 | |
| +++ b/debian/rules 2023-10-04 19:36:10.431888489 +0900 | |
| @@ -169,8 +169,6 @@ | |
| done | |
| cp -a d-i/source/localechooser/post-base-installer.d/05localechooser \ | |
| debian/ubiquity/usr/lib/ubiquity/localechooser/post-base-installer | |
| - patch debian/ubiquity/usr/lib/ubiquity/localechooser/post-base-installer \ | |
| - < d-i/patches/localechooser-post-base-installer.patch | |
| chmod +x debian/ubiquity/usr/lib/ubiquity/localechooser/post-base-installer | |
| sed 's/\\\$${!TAB}/ /g' \ | |
| debian/ubiquity/usr/lib/ubiquity/localechooser/localechooser \ | |
| diff -urN a/gui/gtk/stepLanguage.ui b/gui/gtk/stepLanguage.ui | |
| --- a/gui/gtk/stepLanguage.ui 2022-06-08 18:27:05.000000000 +0900 | |
| +++ b/gui/gtk/stepLanguage.ui 2023-10-04 19:36:21.884338679 +0900 | |
| @@ -14,6 +14,7 @@ | |
| <child> | |
| <object class="GtkTreeView" id="language_treeview"> | |
| <property name="visible">True</property> | |
| + <property name="width_request">120</property> | |
| <property name="can_focus">True</property> | |
| <property name="headers_visible">False</property> | |
| <signal name="row-activated" handler="on_language_activated" swapped="no"/> | |
| diff -urN a/gui/gtk/stepPrepare.ui b/gui/gtk/stepPrepare.ui | |
| --- a/gui/gtk/stepPrepare.ui 2022-06-08 18:38:13.000000000 +0900 | |
| +++ b/gui/gtk/stepPrepare.ui 2023-10-04 19:36:30.480672991 +0900 | |
| @@ -244,7 +244,7 @@ | |
| </child> | |
| <child> | |
| <object class="GtkBox" id="box3"> | |
| - <property name="visible">False</property> | |
| + <property name="visible">True</property> | |
| <property name="can_focus">False</property> | |
| <property name="orientation">vertical</property> | |
| <property name="spacing">6</property> | |
| diff -urN a/po/ko.po b/po/ko.po | |
| --- a/po/ko.po 2022-06-08 18:27:05.000000000 +0900 | |
| +++ b/po/ko.po 2023-10-04 19:36:45.065233289 +0900 | |
| @@ -36,7 +36,7 @@ | |
| #: ../desktop/com.ubuntu.ubiquity.policy.in.h:1 | |
| msgid "Install Linux Mint on your machine" | |
| -msgstr "우분투를 컴퓨터에 설치합니다." | |
| +msgstr "하모니카를 컴퓨터에 설치합니다." | |
| #: ../desktop/com.ubuntu.ubiquity.policy.in.h:2 | |
| msgid "Authentication is required to install your machine" | |
| diff -urN a/ubiquity/plugins/ubi-prepare.py b/ubiquity/plugins/ubi-prepare.py | |
| --- a/ubiquity/plugins/ubi-prepare.py 2022-06-08 19:05:06.000000000 +0900 | |
| +++ b/ubiquity/plugins/ubi-prepare.py 2023-10-04 19:37:00.501817098 +0900 | |
| @@ -232,8 +232,8 @@ | |
| release = misc.get_release() | |
| - self.prepare_nonfree_software.set_label(gettext.dgettext("mintreport", "Install multimedia codecs")) | |
| - self.prepare_foss_disclaimer.set_label(gettext.dgettext("mintreport", "Multimedia codecs are required to play some video formats and to properly render some websites.")) | |
| + # self.prepare_nonfree_software.set_label(gettext.dgettext("mintreport", "Install multimedia codecs")) | |
| + # self.prepare_foss_disclaimer.set_label(gettext.dgettext("mintreport", "Multimedia codecs are required to play some video formats and to properly render some websites.")) | |
| from gi.repository import Gtk | |
| for widget in [self.prepare_download_updates, |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment