From b3db6668794e787605c8d36922b08935cda253fc Mon Sep 17 00:00:00 2001 From: Bernhard Landauer Date: Tue, 28 Mar 2017 23:43:05 +0200 Subject: [PATCH] some more dialog formatting --- data/translations/english.trans | 8 ++++---- data/translations/german.trans | 2 +- lib/util-disk.sh | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/data/translations/english.trans b/data/translations/english.trans index 218c2c0..7df99e8 100644 --- a/data/translations/english.trans +++ b/data/translations/english.trans @@ -103,7 +103,7 @@ _LvmDelVG="Delete Volume Groups" _LvMDelAll="Delete *ALL* VGs, LVs, PVs" _LvmDetBody="Existing Logical Volume Management (LVM) detected. Activating. Please Wait..." _LvmPartErrBody="There are no viable partitions available to use for Logical Volume Management. A minimum of one is required.\n\nIf LVM is already in use, deactivating it will allow the partition(s) used for its Physical Volume(s) to be used again." -_LvmNameVgBody="Enter the name of the Volume Group (VG) to create.\n\nThe VG is the new 'virtual device / hard-disk' to create out of the partition(s) selected next." +_LvmNameVgBody="Enter the name of the Volume Group (VG) to create.\n\nThe VG is the new 'virtual device/hard-disk' to create out of the partition(s) selected next." _LvmNameVgErr="Invalid Name Entered. The Volume Group name may be alpha-numeric, but may not contain spaces, start with a '/', or already be in use." _LvmPvSelBody="Select the partition(s) to use for the Physical Volume (PV)." _LvmPvConfBody1="Confirm creation of Volume Group" @@ -113,12 +113,12 @@ _LvmPvDoneBody1="Volume Group" _LvmPvDoneBody2="has been created" _LvmLvNumBody1="Enter the number of Logical Volumes (LVs) to create in" _LvmLvNumBody2="The last (or only) LV will automatically use 100% of the remaining space in the Volume Group." -_LvmLvNameBody1="Enter the name of the Logical Volume (LV) to create.\n\nThis is like setting a name / label for a partition." +_LvmLvNameBody1="Enter the name of the Logical Volume (LV) to create.\n\nThis is like setting a name or label for a partition." _LvmLvNameBody2="NOTE: This LV will automatically use up all space remaining on the Volume Group" _LvmLvNameErrBody="Invalid Name Entered. The Logical Volume (LV) name may be alpha-numeric, but may not contain spaces or be preceeded with a '/'." _LvmLvSizeBody1="remaining" -_LvmLvSizeBody2="Enter the size of the Logical Volume (LV) in Megabytes (M) or Gigabytes (G). For example, 100M will create a 100 Megabyte LV. 10G will create a 10 Gigabyte LV." -_LvmLvSizeErrBody="Invalid value Entered. A numeric value must be entered with an 'M' (Megabytes) or a 'G' (Gigabytes) at the end.\n\nExamples include, 100M, 10G, or 250M. The value may also not be equal to or greater than the remaining size of the VG." +_LvmLvSizeBody2="Enter the size of the Logical Volume (LV) in Megabytes (M) or Gigabytes (G).\nFor example:\n100M will create a 100 Megabyte LV, 10G will create a 10 Gigabyte LV." +_LvmLvSizeErrBody="Invalid value entered.\nA numeric value must be entered with an 'M' (Megabytes) or a 'G' (Gigabytes) at the end.\nExamples include, 100M, 10G, or 250M.\nThe value may also not be equal to or greater than the remaining size of the VG!" _LvmCompBody="Done! All Logical Volumes have been created for the Volume Group.\n\nDo you wish to view the new LVM scheme?" _LvmDelQ="Confirm deletion of Volume Group(s) and Logical Volume(s).\n\nIf deleting a Volume Group, all Logical Volumes within will be deleted as well." _LvmSelVGBody="Select Volume Group to delete. All Logical Volumes within will also be deleted." diff --git a/data/translations/german.trans b/data/translations/german.trans index 5f2c2d0..e353f73 100644 --- a/data/translations/german.trans +++ b/data/translations/german.trans @@ -116,7 +116,7 @@ _LvmLvNameBody1="Geben Sie den Namen des zu erstellenden LV.\n\n Dies is der Nam _LvmLvNameBody2="HINWEIS: Dieses LV wird automatisch den gesamten verfügbaren Speicherplatz auf der Volume Group einnehmen." _LvmLvNameErrBody="Ungültiger Name eingegeben. Der Name eines LV muss alpha-numerisch sein, darf jedoch keine Leerzeichen einthalten oder mit '/' beginenn." _LvmLvSizeBody1="verbleibend" -_LvmLvSizeBody2="Geben Sie die Größe des LV in Megabytes (M) oder Gigabytes (G) ein. Z.B. wird bei 100M ein LV von 100 Megabytes erzeugt, bei 10Gein LV von 10 Gigabytes." +_LvmLvSizeBody2="Geben Sie die Größe des LV in Megabytes (M) oder Gigabytes (G) ein.\nZ.B. wird bei 100M ein LV von 100 Megabytes erzeugt, bei 10G ein LV von 10 Gigabytes." _LvmLvSizeErrBody="Ungültigen Wert eigegeben. Ein numerischer Wert mit einem 'M' (Megabytes) oder 'G' (Gigabytes) am Ende muss eigegeben werden.\n\nBeispiele: 100M, 10G, oder 250M. Der Wert darf nicht größer oder gleich der verbleibenden Größe der VG sein." _LvmCompBody="Fertig! Alle Logical Volumes für die Volume Group wurden erzeugt.\n\nMöchte Sie sich das neue LVM-Schema anzeigen lassen?" _LvmDelQ="Bestätigen Sie, dass Volume Group(s) bzw. Logical Volume(s) gelöscht werden sollen.\n\n Wenn eine Volume Group gelöscht wird, werden alle darin enthaltenen Logical Volumes ebenfalls gelöscht." diff --git a/lib/util-disk.sh b/lib/util-disk.sh index 561508f..c435506 100644 --- a/lib/util-disk.sh +++ b/lib/util-disk.sh @@ -638,7 +638,7 @@ lvm_create() { # Convert the VG size into GB and MB. These variables are used to keep tabs on space available and remaining [[ ${VG_SIZE_TYPE:0:1} == "G" ]] && LVM_VG_MB=$(( VG_SIZE * 1000 )) || LVM_VG_MB=$VG_SIZE - DIALOG " $_LvmCreateVG " --msgbox "\n$_LvmPvDoneBody1 '${LVM_VG}' (${VG_SIZE} ${VG_SIZE_TYPE}) $_LvmPvDoneBody2.\n " 0 0 || return 0 + DIALOG " $_LvmCreateVG " --msgbox "\n$_LvmPvDoneBody1 [${LVM_VG}] (${VG_SIZE} ${VG_SIZE_TYPE}) $_LvmPvDoneBody2.\n " 0 0 || return 0 fi # @@ -667,8 +667,8 @@ lvm_create() { LVM_LV_NAME=$(cat ${ANSWER}) done - DIALOG " $_LvmCreateVG (LV:$NUMBER_LOGICAL_VOLUMES) " --inputbox "\n${LVM_VG}: ${VG_SIZE}${VG_SIZE_TYPE} (${LVM_VG_MB}MB \ - $_LvmLvSizeBody1).$_LvmLvSizeBody2\n " 0 0 "" 2>${ANSWER} || return 0 + DIALOG " $_LvmCreateVG (LV:$NUMBER_LOGICAL_VOLUMES) " --inputbox \ + "\n[${LVM_VG}]: ${VG_SIZE}${VG_SIZE_TYPE} - (${LVM_VG_MB}MB $_LvmLvSizeBody1).\n\n$_LvmLvSizeBody2\n " 0 0 "" 2>${ANSWER} || return 0 LVM_LV_SIZE=$(cat ${ANSWER}) check_lv_size @@ -676,7 +676,7 @@ lvm_create() { while [[ $LV_SIZE_INVALID -eq 1 ]]; do DIALOG " $_ErrTitle " --msgbox "\n$_LvmLvSizeErrBody\n " 0 0 DIALOG " $_LvmCreateVG (LV:$NUMBER_LOGICAL_VOLUMES) " --inputbox \ - "\n${LVM_VG}: ${VG_SIZE}${VG_SIZE_TYPE} (${LVM_VG_MB}MB $_LvmLvSizeBody1).$_LvmLvSizeBody2\n " 0 0 2>${ANSWER} || return 0 + "\n[${LVM_VG}]: ${VG_SIZE}${VG_SIZE_TYPE} - (${LVM_VG_MB}MB $_LvmLvSizeBody1).\n\n$_LvmLvSizeBody2\n " 0 0 "" 2>${ANSWER} || return 0 LVM_LV_SIZE=$(cat ${ANSWER}) check_lv_size done