Skip to content

Commit

Permalink
locale: storage: Translate new strings to es_MX and zh_CN
Browse files Browse the repository at this point in the history
New label for labeled
New translation for passphrase encryption

Based on user feedback switched the tense of installation steps.

Signed-off-by: Mark D Horn <[email protected]>
  • Loading branch information
mdhorn committed Sep 13, 2019
1 parent b4c1c98 commit 000e0bd
Show file tree
Hide file tree
Showing 5 changed files with 77 additions and 59 deletions.
18 changes: 12 additions & 6 deletions locale/en_US/LC_MESSAGES/clr-installer.po
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,9 @@ msgstr "Erase Disk"
msgid "Advanced"
msgstr "Advanced"

msgid "Labeled"
msgstr "Labeled"

msgid "No media found for installation"
msgstr "No media found for installation"

Expand Down Expand Up @@ -513,6 +516,9 @@ msgstr "Encryption requires a Passphrase"
msgid "Encryption Passphrase"
msgstr "Encryption Passphrase"

msgid "Encryption passphrase required"
msgstr "Encryption passphrase required"

msgid "Passphrases do not match"
msgstr "Passphrases do not match"

Expand Down Expand Up @@ -728,8 +734,8 @@ msgid "."
msgstr "."

#, c-format
msgid "Formatting partition as %s."
msgstr "Formatting partition as %s."
msgid "Format partition as %s."
msgstr "Format partition as %s."

msgid "Selected media will be used for installation."
msgstr "Selected media will be used for installation."
Expand All @@ -741,14 +747,14 @@ msgstr "Updating partition table for: %s"
msgid "WARNING: partition will be removed."
msgstr "WARNING: partition will be removed."

msgid "Adding new partition."
msgstr "Adding new partition."
msgid "Add new partition."
msgstr "Add new partition."

msgid "WARNING: Failed to detected partition information."
msgstr "WARNING: Failed to detected partition information."

msgid "Reusing existing partition."
msgstr "Reusing existing partition."
msgid "Use existing partition."
msgstr "Use existing partition."

msgid "Encrypted"
msgstr "Encrypted"
52 changes: 29 additions & 23 deletions locale/es_MX/LC_MESSAGES/clr-installer.po
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,9 @@ msgstr "Borrar disco"
msgid "Advanced"
msgstr "Avanzado"

msgid "Labeled"
msgstr "Etiquetado"

msgid "No media found for installation"
msgstr "No se encontraron medios para instalar."

Expand Down Expand Up @@ -300,7 +303,7 @@ msgid "No Media Selected"
msgstr "Ningún medio seleccionado"

msgid "Too many media found"
msgstr "MX: Too many media found"
msgstr "Se han encontrado demasiados medios"

msgid "Safe Installation"
msgstr "Instalación segura"
Expand All @@ -315,40 +318,40 @@ msgid "Erase all data on selected media and install Clear Linux* OS."
msgstr "Elimina todos los datos del medio seleccionado y permite instalar el sistema operativo Clear Linux*."

msgid "Advanced Disk Partitioning"
msgstr "MX: Advanced Disk Partitioning"
msgstr "Partición de disco avanzada"

msgid "Use partitioning tool to configure and select media via partition labels."
msgstr "MX: Use partitioning tool to configure and select media via partition labels."
msgstr "Utilice la herramienta de partición para configurar y seleccionar medios a través de etiquetas de partición."

msgid "PARTITION MEDIA"
msgstr "MX: PARTITION MEDIA"
msgstr "MEDIOS DE PARTICION"

msgid "Launch the external partitioning tool to label the partitions to be used for the installation."
msgstr "MX: Launch the external partitioning tool to label the partitions to be used for the installation."
msgstr "Inicie la herramienta de particionamiento externo para etiquetar las particiones que se utilizarán para la instalación."

#, c-format
msgid "Could not launch %s. Check log %s"
msgstr "MX: Could not launch %s. Check log %s"
msgstr "No se ha podido iniciar %s. Compruebe el registro %s"

#, c-format
msgid "%s must be %s"
msgstr "MX: %s must be %s"
msgstr "%s debe ser %s"

#, c-format
msgid "Found multiple %s partition labels"
msgstr "MX: Found multiple %s partition labels"
msgstr "Se encontraron varias etiquetas de partición %s"

#, c-format
msgid "Found invalid %s partition label"
msgstr "MX: Found invalid %s partition label"
msgstr "Se ha encontrado una etiqueta de partición %s no válida"

#, c-format
msgid "Encryption of %s is not supported"
msgstr "MX: Encryption of %s is not supported"
msgstr "El cifrado de %s no es compatible"

#, c-format
msgid "Missing %s partition label"
msgstr "MX: Missing %s partition label"
msgstr "Falta la etiqueta de partición %s"

msgid "CHANGE LANGUAGE"
msgstr "CAMBIAR IDIOMA"
Expand Down Expand Up @@ -487,7 +490,7 @@ msgid "Selected media will have partitions added."
msgstr "Se añadirán particiones a los medios seleccionados."

msgid "WARNING: New Partition table will be created."
msgstr "MX:WARNING: New Partition table will be created."
msgstr "ADVERTENCIA: se creará una nueva tabla de particiones."

msgid "WARNING: Selected media will be erased."
msgstr "ADVERTENCIA: los medios seleccionados se borrarán."
Expand All @@ -513,6 +516,9 @@ msgstr "El cifrado requiere una frase de contraseña"
msgid "Encryption Passphrase"
msgstr "Contraseña de cifrado"

msgid "Encryption passphrase required"
msgstr "Se requiere una frase de contraseña de cifrado"

msgid "Passphrases do not match"
msgstr "Las frases de contraseña no coinciden"

Expand Down Expand Up @@ -728,27 +734,27 @@ msgid "."
msgstr "."

#, c-format
msgid "Formatting partition as %s."
msgstr "MX: Formatting partition as %s."
msgid "Format partition as %s."
msgstr "Formatee la partición como %s."

msgid "Selected media will be used for installation."
msgstr "MX: Selected media will be used for installation."
msgstr "Los medios seleccionados se utilizarán para la instalación."

#, c-format
msgid "Updating partition table for: %s"
msgstr "MX: Updating partition table for: %s"
msgstr "Actualizando tabla de partición para: %s"

msgid "WARNING: partition will be removed."
msgstr "MX: WARNING: partition will be removed."
msgstr "ADVERTENCIA: se eliminará la partición."

msgid "Adding new partition."
msgstr "MX: Adding new partition."
msgid "Add new partition."
msgstr "Agregue una nueva partición."

msgid "WARNING: Failed to detected partition information."
msgstr "MX: WARNING: Failed to detected partition information."
msgstr "ADVERTENCIA: no se ha detectado información de partición."

msgid "Reusing existing partition."
msgstr "MX: Reusing existing partition."
msgid "Use existing partition."
msgstr "Utilice la partición existente."

msgid "Encrypted"
msgstr "MX: Encrypted"
msgstr "Encriptado"
52 changes: 29 additions & 23 deletions locale/zh_CN/LC_MESSAGES/clr-installer.po
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,9 @@ msgstr "擦除磁盘"
msgid "Advanced"
msgstr "高级"

msgid "Labeled"
msgstr "标记"

msgid "No media found for installation"
msgstr "未找到安装媒介"

Expand Down Expand Up @@ -300,7 +303,7 @@ msgid "No Media Selected"
msgstr "未选择任何媒介"

msgid "Too many media found"
msgstr "ZH: Too many media found"
msgstr "发现太多媒体"

msgid "Safe Installation"
msgstr "安全安装"
Expand All @@ -315,40 +318,40 @@ msgid "Erase all data on selected media and install Clear Linux* OS."
msgstr "擦除选定媒介上的所有数据,然后安装 Clear Linux* OS。"

msgid "Advanced Disk Partitioning"
msgstr "CN: Advanced Disk Partitioning"
msgstr "高级磁盘分区"

msgid "Use partitioning tool to configure and select media via partition labels."
msgstr "CN: Use partitioning tool to configure and select media via partition labels."
msgstr "使用分区工具通过分区标签配置和选择媒体。"

msgid "PARTITION MEDIA"
msgstr "CN: PARTITION MEDIA"
msgstr "分区媒体"

msgid "Launch the external partitioning tool to label the partitions to be used for the installation."
msgstr "CN: Launch the external partitioning tool to label the partitions to be used for the installation."
msgstr "启动外部分区工具以标记要用于安装的分区。"

#, c-format
msgid "Could not launch %s. Check log %s"
msgstr "CN: Could not launch %s. Check log %s"
msgstr "无法启动 %s。请检查日志 %s"

#, c-format
msgid "%s must be %s"
msgstr "CN: %s must be %s"
msgstr "%s 必须为 %s"

#, c-format
msgid "Found multiple %s partition labels"
msgstr "CN: Found multiple %s partition labels"
msgstr "找到多个 %s 分区标签"

#, c-format
msgid "Found invalid %s partition label"
msgstr "CN: Found invalid %s partition label"
msgstr "发现无效的 %s 分区标签"

#, c-format
msgid "Encryption of %s is not supported"
msgstr "CN: Encryption of %s is not supported"
msgstr "不支持 %s 加密"

#, c-format
msgid "Missing %s partition label"
msgstr "CN: Missing %s partition label"
msgstr "缺少 %s 分区标签"

msgid "CHANGE LANGUAGE"
msgstr "更改语言"
Expand Down Expand Up @@ -487,7 +490,7 @@ msgid "Selected media will have partitions added."
msgstr "选定的媒介将添加分区。"

msgid "WARNING: New Partition table will be created."
msgstr "ZH: WARNING: New Partition table will be created."
msgstr "警告: 将创建新的分区表。"

msgid "WARNING: Selected media will be erased."
msgstr "警告: 选定的媒介将被删除。"
Expand All @@ -513,6 +516,9 @@ msgstr "加密需要一个密码"
msgid "Encryption Passphrase"
msgstr "加密密码"

msgid "Encryption passphrase required"
msgstr "需要加密密码"

msgid "Passphrases do not match"
msgstr "密码不一致"

Expand Down Expand Up @@ -728,27 +734,27 @@ msgid "."
msgstr "。"

#, c-format
msgid "Formatting partition as %s."
msgstr "CN: Formatting partition as %s."
msgid "Format partition as %s."
msgstr "将分区格式化为 %s。"

msgid "Selected media will be used for installation."
msgstr "CN: Selected media will be used for installation."
msgstr "所选媒体将用于安装。"

#, c-format
msgid "Updating partition table for: %s"
msgstr "CN: Updating partition table for: %s"
msgstr "更新分区表: %s"

msgid "WARNING: partition will be removed."
msgstr "CN: WARNING: partition will be removed."
msgstr "警告: 分区将被删除。"

msgid "Adding new partition."
msgstr "CN: Adding new partition."
msgid "Add new partition."
msgstr "添加新分区。"

msgid "WARNING: Failed to detected partition information."
msgstr "CN: WARNING: Failed to detected partition information."
msgstr "警告: 检测到分区信息失败。"

msgid "Reusing existing partition."
msgstr "CN: Reusing existing partition."
msgid "Use existing partition."
msgstr "使用现有分区。"

msgid "Encrypted"
msgstr "CN: Encrypted"
msgstr "加密"
4 changes: 2 additions & 2 deletions storage/ops.go
Original file line number Diff line number Diff line change
Expand Up @@ -1785,7 +1785,7 @@ func getPlannedPartitionChanges(media *BlockDevice) []string {
}

part := fmt.Sprintf("%s: %s", partName,
utils.Locale.Get(FormattingPartitionInfo, ch.FsType))
utils.Locale.Get(FormatPartitionInfo, ch.FsType))

if ch.MountPoint != "" {
part = part + fmt.Sprintf(" [%s]", ch.MountPoint)
Expand All @@ -1803,7 +1803,7 @@ func getPlannedPartitionChanges(media *BlockDevice) []string {
partName = ch.GetNewPartitionName(ch.partition)
}

part := fmt.Sprintf("%s: %s", partName, utils.Locale.Get(ReusingPartitionInfo))
part := fmt.Sprintf("%s: %s", partName, utils.Locale.Get(UsePartitionInfo))

if ch.MountPoint != "" {
part = part + fmt.Sprintf(" [%s]", ch.MountPoint)
Expand Down
10 changes: 5 additions & 5 deletions storage/storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -151,16 +151,16 @@ const (
RemoveParitionWarning = "WARNING: partition will be removed."

// AddPartitionInfo specifies the warning message for removing a media partition
AddPartitionInfo = "Adding new partition."
AddPartitionInfo = "Add new partition."

// FailedPartitionWarning specifies the warning message when we can not find partitions
FailedPartitionWarning = "WARNING: Failed to detected partition information."

// FormattingPartitionInfo specifies the warning message for formatting a media partition
FormattingPartitionInfo = "Formatting partition as %s."
// FormatPartitionInfo specifies the warning message for formatting a media partition
FormatPartitionInfo = "Format partition as %s."

// ReusingPartitionInfo specifies the warning message for reusing a media partition
ReusingPartitionInfo = "Reusing existing partition."
// UsePartitionInfo specifies the warning message for reusing a media partition
UsePartitionInfo = "Use existing partition."

// ConfirmInstallation specifies the installation warning title
ConfirmInstallation = "Confirm Installation"
Expand Down

0 comments on commit 000e0bd

Please sign in to comment.