[gnome-disk-utility] Update Scottish Gaelic translation



commit 0b9e418413568fe170d55b0f917c9e97911e30a6
Author: Gun Chleoc <fios foramnagaidhlig net>
Date:   Fri Jun 1 11:01:26 2018 +0000

    Update Scottish Gaelic translation
    
    (cherry picked from commit f5b802982d38460018f23d9bb6e2ef9613169ce6)

 po/gd.po | 1335 ++++++++++++++++++++++++++++----------------------------------
 1 file changed, 611 insertions(+), 724 deletions(-)
---
diff --git a/po/gd.po b/po/gd.po
index ee16ab3d..7f5a1a15 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-disk-utility\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product";
-"=gnome-disk-utility&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-10-02 13:32+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-disk-utility/";
+"issues\n"
+"POT-Creation-Date: 2018-05-31 09:23+0000\n"
 "PO-Revision-Date: 2018-03-01 13:13+0100\n"
 "Last-Translator: GunChleoc <fios foramnagaidhlig net>\n"
 "Language-Team: Fòram na Gàidhlig\n"
@@ -47,17 +47,13 @@ msgstr "Sgrìobh ìomhaighean diosga gu uidheaman"
 
 #: data/org.gnome.Disks.gschema.xml:6
 msgid "Default location for the Create/Restore disk image dialogs"
-msgstr ""
-"Ionad bunaiteach nan còmhraidhean airson cruthachadh/aiseag ìomhaighean "
-"diosga"
+msgstr "Ionad bunaiteach nan còmhraidhean airson cruthachadh/aiseag ìomhaighean diosga"
 
 #: data/org.gnome.Disks.gschema.xml:7
 msgid ""
 "Default location for the Create/Restore disk image dialogs. If blank the ~/"
 "Documents folder is used."
-msgstr ""
-"Ionad bunaiteach nan còmhraidhean airson cruthachadh/aiseag ìomhaighean "
-"diosga. Ma tha seo bàn, thèid am pasgan ~/Sgrìobhainnean a chleachdadh."
+msgstr "Ionad bunaiteach nan còmhraidhean airson cruthachadh/aiseag ìomhaighean diosga. Ma tha seo bàn, 
thèid am pasgan ~/Sgrìobhainnean a chleachdadh."
 
 #: data/org.gnome.DiskUtility.appdata.xml.in:7
 msgid "GNOME Disks"
@@ -71,22 +67,13 @@ msgstr "Goireas stiùireadh dhiosgan airson GNOME"
 msgid ""
 "Disks provides an easy way to inspect, format, partition, and configure "
 "disks and block devices."
-msgstr ""
-"Bheir Diosgan dòigh furasta dhut gus diosgan is uidheaman bloca a sgrùdadh, "
-"fhòrmatadh, a phàirteachadh ’s a rèiteachadh."
+msgstr "Bheir Diosgan dòigh furasta dhut gus diosgan is uidheaman bloca a sgrùdadh, fhòrmatadh, a 
phàirteachadh ’s a rèiteachadh."
 
 #: data/org.gnome.DiskUtility.appdata.xml.in:14
-#| msgid ""
-#| "Using Disks, you can view SMART data, manage RAID devices, benchmark "
-#| "physical disks, and image USB sticks. Tasks are executed in the "
-#| "background, even after the application has been closed by the user."
 msgid ""
 "Using Disks, you can view SMART data, manage devices, benchmark physical "
 "disks, and image USB sticks."
-msgstr ""
-"Le Diosgan, ’s urrainn dhut dàta SMART a shealltainn, uidheaman a "
-"stiùireadh, tomhas-measaidh air diosgan fiosaigeach a dhèanamh is "
-"ìomhaighean de USB sticks a chruthachadh."
+msgstr "Le Diosgan, ’s urrainn dhut dàta SMART a shealltainn, uidheaman a stiùireadh, tomhas-measaidh air 
diosgan fiosaigeach a dhèanamh is ìomhaighean de USB sticks a chruthachadh."
 
 #: data/org.gnome.DiskUtility.appdata.xml.in:22
 msgid "An easy way to manage your disks"
@@ -96,7 +83,7 @@ msgstr "Stiùirich na diosgan agad gun duilgheadas"
 msgid "The GNOME Project"
 msgstr "Pròiseact GNOME"
 
-#: data/org.gnome.DiskUtility.desktop.in:3 src/disks/gduwindow.c:1111
+#: data/org.gnome.DiskUtility.desktop.in:3 src/disks/gduwindow.c:1110
 msgid "Disks"
 msgstr "Diosgan"
 
@@ -109,10 +96,7 @@ msgstr "Stiùirich draibhean is meadhanan"
 msgid ""
 "disk;drive;volume;harddisk;hdd;disc;cdrom;dvd;partition;iso;image;backup;"
 "restore;benchmark;raid;luks;encryption;S.M.A.R.T.;smart;"
-msgstr ""
-"disk;drive;volume;harddisk;hdd;disc;cdrom;dvd;partition;iso;image;backup;"
-"restore;benchmark;raid;luks;encryption;S.M.A.R.T.;smart;diosg;draibh;clàr-"
-"cruaidh;pàirteachadh;lethbhreac-glèidhidh;"
+msgstr 
"disk;drive;volume;harddisk;hdd;disc;cdrom;dvd;partition;iso;image;backup;restore;benchmark;raid;luks;encryption;S.M.A.R.T.;smart;diosg;draibh;clàr-cruaidh;pàirteachadh;lethbhreac-glèidhidh;"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.DiskUtility.desktop.in:9
@@ -131,8 +115,9 @@ msgstr "Ceadaich sgrìobhadh dhan ìomhaigh"
 msgid "Select Disk Image(s) to Mount"
 msgstr "Tagh na h-ìomhaigh(ean) diosga ri am munntachadh"
 
-#: src/disk-image-mounter/main.c:85 src/disks/gducreatediskimagedialog.c:930
-#: src/disks/gdunewdiskimagedialog.c:329 src/disks/gduwindow.c:804
+#: src/disk-image-mounter/main.c:85 src/disks/gducreatediskimagedialog.c:929
+#: src/disks/gducreateformatdialog.c:173 src/disks/gducreateformatdialog.c:455
+#: src/disks/gdunewdiskimagedialog.c:329 src/disks/gduwindow.c:803
 msgid "_Cancel"
 msgstr "_Sguir dheth"
 
@@ -146,16 +131,10 @@ msgid "Set up _read-only mount"
 msgstr "Suidhich munntachadh _ri leughadh a-mhàin"
 
 #: src/disk-image-mounter/main.c:95
-#| msgid ""
-#| "If checked, the mount will be read-only. This is useful if you don't want "
-#| "the underlying disk image to be modified"
 msgid ""
 "If checked, the mount will be read-only. This is useful if you don’t want "
 "the underlying disk image to be modified"
-msgstr ""
-"Ma chuireas tu cromag ris, bidh am munntachadh ri leughadh a-mhàin. Tha seo "
-"feumail mur eil thu ag iarraidh gun dèid ìomhaigh an diosga air a bheil e "
-"stèidhichte atharrachadh."
+msgstr "Ma chuireas tu cromag ris, bidh am munntachadh ri leughadh a-mhàin. Tha seo feumail mur eil thu ag 
iarraidh gun dèid ìomhaigh an diosga air a bheil e stèidhichte atharrachadh."
 
 #: src/disk-image-mounter/main.c:136
 #, c-format
@@ -168,13 +147,11 @@ msgstr "Ceangail ris agus munntaich co-dhiù aon fhaidhle ìomhaigh diosga."
 
 #: src/disk-image-mounter/main.c:192
 #, c-format
-#| msgid "Cannot open `%s' - maybe the volume isn't mounted?"
 msgid "Cannot open “%s” — maybe the volume isn’t mounted?"
 msgstr "Cha ghabh “%s” fhosgladh – saoil nach deach an draibh a mhunntachadh?"
 
 #: src/disk-image-mounter/main.c:199
 #, c-format
-#| msgid "Error opening `%s': %m"
 msgid "Error opening “%s”: %m"
 msgstr "Mearachd a’ fosgladh “%s”: %m"
 
@@ -184,16 +161,12 @@ msgid "Error attaching disk image: %s (%s, %d)"
 msgstr "Mearachd a’ ceangal ìomhaigh an diosga ris: %s (%s, %d)"
 
 #: src/disks/gduapplication.c:92
-#| msgctxt "mdraid"
-#| msgid "Not running"
 msgid "Stop running jobs?"
 msgstr "A bheil thu airson stad a chur air na h-obraichean?"
 
 #: src/disks/gduapplication.c:94
 msgid "Closing now stops the running jobs and leads to a corrupt result."
-msgstr ""
-"Ma dhùineas tu an-dràsta e, thèid stad a chur air na h-obraichean a tha ’gan "
-"ruith agus bidh an toradh coirbte."
+msgstr "Ma dhùineas tu an-dràsta e, thèid stad a chur air na h-obraichean a tha ’gan ruith agus bidh an 
toradh coirbte."
 
 #: src/disks/gduapplication.c:144
 #, c-format
@@ -234,14 +207,12 @@ msgstr "Feumar --format-device a shònrachadh nuair a chleachdar --xid\n"
 #. *              The second %s is the version of the running udisks daemon (for example "2.0.90").
 #. *              The third, fourth and fifth %d are the major, minor and micro versions of libudisks2 that 
was used when compiling the Disks application (for example 2, 0 and 90).
 #.
-#: src/disks/gduapplication.c:335
+#: src/disks/gduapplication.c:336
 #, c-format
 msgid ""
 "gnome-disk-utility %s\n"
 "UDisks %s (built against %d.%d.%d)"
-msgstr ""
-"gnome-disk-utility %s\n"
-"UDisks %s (air a thogail le %d.%d.%d)"
+msgstr "gnome-disk-utility %s\nUDisks %s (air a thogail le %d.%d.%d)"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
@@ -254,10 +225,7 @@ msgstr "Reat nam mearachdan leughaidh"
 msgid ""
 "Frequency of errors while reading raw data from the disk. A non-zero value "
 "indicates a problem with either the disk surface or read/write heads"
-msgstr ""
-"Tricead nam mearachdan rè leughadh dàta amh on diosga. Mur eil an luach ’na "
-"neoni, tha seo ag innse gu bheil duilgheadas ann le uachdar an diosga no na "
-"cinn leughaidh/sgrìobhaidh."
+msgstr "Tricead nam mearachdan rè leughadh dàta amh on diosga. Mur eil an luach ’na neoni, tha seo ag innse 
gu bheil duilgheadas ann le uachdar an diosga no na cinn leughaidh/sgrìobhaidh."
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
@@ -279,9 +247,7 @@ msgstr "Ùine spinup"
 
 #: src/disks/gduatasmartdialog.c:170
 msgid "Time needed to spin up the disk"
-msgstr ""
-"An ùine a dh’fheumas an diosga mus bi e a’ dol mun cuairt aig an astar "
-"cheart"
+msgstr "An ùine a dh’fheumas an diosga mus bi e a’ dol mun cuairt aig an astar cheart"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
@@ -306,11 +272,7 @@ msgid ""
 "Count of remapped sectors. When the hard drive finds a read/write/"
 "verification error, it marks the sector as “reallocated” and transfers data "
 "to a special reserved area (spare area)"
-msgstr ""
-"Co mheud roinn a tha ann a chaidh ath-mhapadh. Nuair a thachras an "
-"clàr-cruaidh ri mearachd leughaidh, sgrìobhaidh no dearbhaidh, cuiridh e "
-"comharra “Air ath-riarachadh” ris an roinn ud agus gluaisidh e an dàta gu "
-"raon sònraichte (falamh)."
+msgstr "Co mheud roinn a tha ann a chaidh ath-mhapadh. Nuair a thachras an clàr-cruaidh ri mearachd 
leughaidh, sgrìobhaidh no dearbhaidh, cuiridh e comharra “Air ath-riarachadh” ris an roinn ud agus gluaisidh 
e an dàta gu raon sònraichte (falamh)."
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
@@ -409,8 +371,7 @@ msgstr "Mearachdan nach gabh a cheartachadh a chaidh aithris"
 
 #: src/disks/gduatasmartdialog.c:261
 msgid "Number of errors that could not be recovered using hardware ECC"
-msgstr ""
-"Uiread a mhearachdan nach b’ urrainn dhuinn a chàradh le bathar-cruaidh ECC"
+msgstr "Uiread a mhearachdan nach b’ urrainn dhuinn a chàradh le bathar-cruaidh ECC"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
@@ -422,9 +383,7 @@ msgstr "High Fly Writes"
 #: src/disks/gduatasmartdialog.c:269
 msgid ""
 "Number of times a recording head is flying outside its normal operating range"
-msgstr ""
-"Co mheud turas a tha ceann clàraidh ag itealaich taobh a-muigh na rainse "
-"obrachaidh àbhaisteach aige"
+msgstr "Co mheud turas a tha ceann clàraidh ag itealaich taobh a-muigh na rainse obrachaidh àbhaisteach aige"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
@@ -457,9 +416,7 @@ msgstr "Power-off Retract Count"
 
 #: src/disks/gduatasmartdialog.c:293
 msgid "Number of power-off or emergency retract cycles"
-msgstr ""
-"Co mheud turas a chaidh a’ chumhachd a chur dheth no an uiread de Retract "
-"Cycles èiginneach"
+msgstr "Co mheud turas a chaidh a’ chumhachd a chur dheth no an uiread de Retract Cycles èiginneach"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
@@ -507,10 +464,7 @@ msgid ""
 "Number of remapping operations. The raw value of this attribute shows the "
 "total number of (successful and unsuccessful) attempts to transfer data from "
 "reallocated sectors to a spare area"
-msgstr ""
-"Co mheud turas a chaidh ath-mhapachadh a dhèanamh. Seallaidh luach amh na "
-"buaidhe seo co mheud turas gu h-iomlan (soirbheachail is neo-shoirbheachail) "
-"a dh’fheuchadh ri dàta a ghluasad o roinn ath-riarachadh gu raon falamh."
+msgstr "Co mheud turas a chaidh ath-mhapachadh a dhèanamh. Seallaidh luach amh na buaidhe seo co mheud turas 
gu h-iomlan (soirbheachail is neo-shoirbheachail) a dh’fheuchadh ri dàta a ghluasad o roinn ath-riarachadh gu 
raon falamh."
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
@@ -525,13 +479,7 @@ msgid ""
 "remapped is subsequently written or read successfully, this value is "
 "decreased and the sector is not remapped. Read errors on the sector will not "
 "remap the sector, it will only be remapped on a failed write attempt"
-msgstr ""
-"Àireamh nan earrannan a tha a’ fuireach ri ath-mhapachadh. Ma thèid an "
-"earrann a tha ri mhapachadh a sgrìobhadh no a leughadh gu soirbheachail às a "
-"dhèidh sin, thèid an luach seo a lùghdachadh agus cha dèid an earrann ath-"
-"mhapachadh. Cha dèanar ath-mhapachadh air an earrann ri linn mearachd "
-"leughaidh, cha dèid ath-mhapachadh ach an dèidh oidhirp sgrìobhaidh a "
-"dh’fhàillig."
+msgstr "Àireamh nan earrannan a tha a’ fuireach ri ath-mhapachadh. Ma thèid an earrann a tha ri mhapachadh a 
sgrìobhadh no a leughadh gu soirbheachail às a dhèidh sin, thèid an luach seo a lùghdachadh agus cha dèid an 
earrann ath-mhapachadh. Cha dèanar ath-mhapachadh air an earrann ri linn mearachd leughaidh, cha dèid 
ath-mhapachadh ach an dèidh oidhirp sgrìobhaidh a dh’fhàillig."
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
@@ -545,11 +493,7 @@ msgid ""
 "The total number of uncorrectable errors when reading/writing a sector. A "
 "rise in the value of this attribute indicates defects of the disk surface "
 "and/or problems in the mechanical subsystem"
-msgstr ""
-"Àireamh iomlan nam mearachdan nach gabh a cheartachadh nuair a "
-"leughar/sgrìobhar earrann. Ma thèid an luach seo an àirde, tha seo a’ "
-"comharradh gu bheil rudeigin cearr air uachdar an diosga agus/no gu bheil "
-"duilgheadas san fho-shiostam mheacanaigeach"
+msgstr "Àireamh iomlan nam mearachdan nach gabh a cheartachadh nuair a leughar/sgrìobhar earrann. Ma thèid 
an luach seo an àirde, tha seo a’ comharradh gu bheil rudeigin cearr air uachdar an diosga agus/no gu bheil 
duilgheadas san fho-shiostam mheacanaigeach"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
@@ -573,9 +517,7 @@ msgstr "Reat nam mearachdan sgrìobhaidh"
 msgid ""
 "Number of errors while writing to disk (or) multi-zone error rate (or) "
 "flying-height"
-msgstr ""
-"Uiread a mhearachdan nuair a bhathar a’ sgrìobhadh air an diosga (no) reat "
-"nam mearachdan ioma-shònach (no) àirde na h-itealaich"
+msgstr "Uiread a mhearachdan nuair a bhathar a’ sgrìobhadh air an diosga (no) reat nam mearachdan 
ioma-shònach (no) àirde na h-itealaich"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
@@ -597,8 +539,7 @@ msgstr "Mearachdan Data Address Mark"
 
 #: src/disks/gduatasmartdialog.c:382
 msgid "Number of Data Address Mark (DAM) errors (or) vendor-specific"
-msgstr ""
-"Uiread nam mearachdan Data Address Mark (DAM) (no) a-rèir an reiceadair"
+msgstr "Uiread nam mearachdan Data Address Mark (DAM) (no) a-rèir an reiceadair"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
@@ -688,16 +629,12 @@ msgstr "Sioftaigeadh an diosga"
 msgid ""
 "Shift of disk is possible as a result of strong shock loading in the store, "
 "as a result of falling (or) temperature"
-msgstr ""
-"Tachraidh sioftaigeadh an diosga ri linn shock loading mòr san stòr mar "
-"thoradh air fàilligeadh (no) teas"
+msgstr "Tachraidh sioftaigeadh an diosga ri linn shock loading mòr san stòr mar thoradh air fàilligeadh (no) 
teas"
 
 #: src/disks/gduatasmartdialog.c:455
 msgid ""
 "Number of errors as a result of impact loads as detected by a shock sensor"
-msgstr ""
-"Uiread a mhearachdan mar thoradh air impact loads a mhothaich shock sensor "
-"dhaibh"
+msgstr "Uiread a mhearachdan mar thoradh air impact loads a mhothaich shock sensor dhaibh"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
@@ -721,9 +658,7 @@ msgstr "Cò mheud turas a dh’fheuchadh ri luchdadh/dì-luchdadh às ùr"
 msgid ""
 "Loading on drive caused by numerous recurrences of operations, like reading, "
 "recording, positioning of heads, etc"
-msgstr ""
-"Loading on drive a chaidh adhbharachadh ri linn ath-thachairt ghnìomhan "
-"iomadh turas mar leughadh, clàradh, suidheachadh nan ceann is msaa"
+msgstr "Loading on drive a chaidh adhbharachadh ri linn ath-thachairt ghnìomhan iomadh turas mar leughadh, 
clàradh, suidheachadh nan ceann is msaa"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
@@ -734,9 +669,7 @@ msgstr "Load Friction"
 
 #: src/disks/gduatasmartdialog.c:480
 msgid "Load on drive caused by friction in mechanical parts of the store"
-msgstr ""
-"Load on drive a chaidh adhbharachadh le lùth-suathaidh sna pìosan "
-"meacanaigeach dhen stòr"
+msgstr "Load on drive a chaidh adhbharachadh le lùth-suathaidh sna pìosan meacanaigeach dhen stòr"
 
 #: src/disks/gduatasmartdialog.c:488
 msgid "Total number of load cycles"
@@ -794,10 +727,7 @@ msgstr "Fulangas air fhàgail"
 msgid ""
 "Number of physical erase cycles completed on the drive as a percentage of "
 "the maximum physical erase cycles the drive supports"
-msgstr ""
-"Uiread a chuairtean suathaidh às fiosaigeach a chaidh a choileanadh air an "
-"draibh mar cheudad de chuairtean suathaidh às fiosaigeach as motha ris a "
-"chuir an draibh taic"
+msgstr "Uiread a chuairtean suathaidh às fiosaigeach a chaidh a choileanadh air an draibh mar cheudad de 
chuairtean suathaidh às fiosaigeach as motha ris a chuir an draibh taic"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
@@ -821,9 +751,7 @@ msgstr "Reat nan deagh-bhlocaichean"
 msgid ""
 "Number of available reserved blocks as a percentage of the total number of "
 "reserved blocks"
-msgstr ""
-"Àireamh de bhlocaichean glèidhte a tha ri làimh, mar cheudad dhe na "
-"blocaichean glèidhte air fad"
+msgstr "Àireamh de bhlocaichean glèidhte a tha ri làimh, mar cheudad dhe na blocaichean glèidhte air fad"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
@@ -1068,9 +996,7 @@ msgstr "Mearachd nuair a thòiseachadh air an fhèin-deuchainn SMART"
 
 #: src/disks/gduatasmartdialog.c:1432
 msgid "An error occurred when trying to toggle whether SMART is enabled"
-msgstr ""
-"Thachair mearachd nuair a dh’fheuch sinn ri toglachadh a bheil SMART an "
-"comas"
+msgstr "Thachair mearachd nuair a dh’fheuch sinn ri toglachadh a bheil SMART an comas"
 
 #. Translators: This string is used as the column title in the treeview for the Attribute ID (0-255)
 #: src/disks/gduatasmartdialog.c:1514
@@ -1104,6 +1030,7 @@ msgstr "As miosa"
 
 #. Translators: This string is used as the column title in the treeview for the type
 #: src/disks/gduatasmartdialog.c:1588
+#: src/disks/ui/create-filesystem-page.ui:105
 msgid "Type"
 msgstr "Seòrsa"
 
@@ -1192,89 +1119,89 @@ msgctxt "benchmark-access-time"
 msgid "%.2f msec"
 msgstr "%.2f msec"
 
-#: src/disks/gdubenchmarkdialog.c:1198
+#. Translators: Reason why suspend/logout is being inhibited
+#: src/disks/gdubenchmarkdialog.c:1180 src/disks/ui/benchmark-dialog.ui:7
+msgid "Benchmark"
+msgstr "Tomhas-measaidh"
+
+#: src/disks/gdubenchmarkdialog.c:1206
 #, c-format
 msgctxt "benchmarking"
 msgid "Error getting size of device: %m"
 msgstr "Mearachd a’ faighinn meud an uidheim: %m"
 
-#: src/disks/gdubenchmarkdialog.c:1208
+#: src/disks/gdubenchmarkdialog.c:1216
 #, c-format
 msgctxt "benchmarking"
 msgid "Error getting page size: %m\n"
 msgstr "Mearachd a’ faighinn meud na duilleige: %m\n"
 
-#: src/disks/gdubenchmarkdialog.c:1242 src/disks/gdubenchmarkdialog.c:1305
-#: src/disks/gdubenchmarkdialog.c:1324
+#: src/disks/gdubenchmarkdialog.c:1250 src/disks/gdubenchmarkdialog.c:1313
+#: src/disks/gdubenchmarkdialog.c:1332
 #, c-format
 msgctxt "benchmarking"
 msgid "Error seeking to offset %lld"
 msgstr "Mearachd a’ feuchainn ri offset a thoirt air %lld"
 
-#: src/disks/gdubenchmarkdialog.c:1253
+#: src/disks/gdubenchmarkdialog.c:1261
 #, c-format
 msgctxt "benchmarking"
 msgid "Error pre-reading %s from offset %s"
 msgstr "Mearachd a’ ro-leughadh %s on offset %s"
 
-#: src/disks/gdubenchmarkdialog.c:1265
+#: src/disks/gdubenchmarkdialog.c:1273
 #, c-format
 msgctxt "benchmarking"
 msgid "Error seeking to offset %s"
 msgstr "Mearachd a’ feuchainn ri offset a thoirt air %s"
 
-#: src/disks/gdubenchmarkdialog.c:1279
+#: src/disks/gdubenchmarkdialog.c:1287
 #, c-format
 msgctxt "benchmarking"
 msgid "Error reading %s from offset %s"
 msgstr "Mearachd a’ leughadh %s on offset %s"
 
-#: src/disks/gdubenchmarkdialog.c:1314
+#: src/disks/gdubenchmarkdialog.c:1322
 #, c-format
 msgctxt "benchmarking"
 msgid "Error pre-reading %lld bytes from offset %lld"
 msgstr "Mearachd a’ ro-leughadh %lld baidhtichean on offset %lld"
 
-#: src/disks/gdubenchmarkdialog.c:1335
+#: src/disks/gdubenchmarkdialog.c:1343
 #, c-format
 msgctxt "benchmarking"
 msgid "Error writing %lld bytes at offset %lld: %m"
 msgstr "Mearachd a’ sgrìobhadh %lld baidhtichean aig an offset %lld: %m"
 
-#: src/disks/gdubenchmarkdialog.c:1345
+#: src/disks/gdubenchmarkdialog.c:1353
 #, c-format
 msgctxt "benchmarking"
 msgid "Expected to write %lld bytes, only wrote %lld: %m"
-msgstr ""
-"Mearachd a’ sgrìobhadh %lld baidhtichean, cha deach ach %lld a sgrìobhadh: %"
-"m"
+msgstr "Mearachd a’ sgrìobhadh %lld baidhtichean, cha deach ach %lld a sgrìobhadh: %m"
 
-#: src/disks/gdubenchmarkdialog.c:1355
+#: src/disks/gdubenchmarkdialog.c:1363
 #, c-format
 msgctxt "benchmarking"
 msgid "Error syncing (at offset %lld): %m"
 msgstr "Mearachd a’ sioncronachadh (aig an offset %lld): %m"
 
-#: src/disks/gdubenchmarkdialog.c:1395
+#: src/disks/gdubenchmarkdialog.c:1403
 #, c-format
 msgctxt "benchmarking"
 msgid "Error seeking to offset %lld: %m"
 msgstr "Mearachd a’ feuchainn ri offset a thoirt air %lld: %m"
 
-#: src/disks/gdubenchmarkdialog.c:1407
+#: src/disks/gdubenchmarkdialog.c:1415
 #, c-format
 msgctxt "benchmarking"
 msgid "Error reading %lld bytes from offset %lld"
 msgstr "Mearachd a’ leughadh %lld baidhtichean on offset %lld"
 
 #: src/disks/gduchangepassphrasedialog.c:120
-#: src/disks/gducreatefilesystemwidget.c:236
-#| msgid "Enter passphrase to unlock"
 msgid "The passphrases do not match"
 msgstr "Chan eil an dà abairt-fhaire co-ionann"
 
 #: src/disks/gduchangepassphrasedialog.c:129
-#| msgid "The strength of the passphrase"
 msgid "The passphrase matches the existing passphrase"
 msgstr "Tha an abairt-fhaire co-ionnann ris an tè a tha ann"
 
@@ -1298,13 +1225,9 @@ msgstr "Tha dàta rèiteachaidh /etc/crypttab mì-dhligheach"
 msgid ""
 "Changing the passphrase for this device, will also update the passphrase "
 "referenced by the <i>/etc/crypttab</i> file"
-msgstr ""
-"Ma dh’atharraicheas tu an abairt-fhaire aig an uidheam seo, thèid an abairt-"
-"fhaire air a bheir am faidhle <i>/etc/crypttab</i> iomradh atharrachadh "
-"cuideachd"
+msgstr "Ma dh’atharraicheas tu an abairt-fhaire aig an uidheam seo, thèid an abairt-fhaire air a bheir am 
faidhle <i>/etc/crypttab</i> iomradh atharrachadh cuideachd"
 
 #: src/disks/gduchangepassphrasedialog.c:373
-#: src/disks/gducreatefilesystemwidget.c:552
 msgid "The strength of the passphrase"
 msgstr "Neart na h-abairt-fhaire"
 
@@ -1312,7 +1235,7 @@ msgstr "Neart na h-abairt-fhaire"
 #. *              The first %s is a name for the disk (e.g. 'sdb').
 #. *              The second %s is today's date and time, e.g. "March 2, 1976 6:25AM".
 #.
-#: src/disks/gducreatediskimagedialog.c:275
+#: src/disks/gducreatediskimagedialog.c:274
 #, c-format
 msgid "Disk Image of %s (%s).img"
 msgstr "Ìomhaigh diosga %s (%s).img"
@@ -1321,208 +1244,112 @@ msgstr "Ìomhaigh diosga %s (%s).img"
 #. * there's a read error that's being ignored, see
 #. * CA_PROP_EVENT_DESCRIPTION
 #.
-#: src/disks/gducreatediskimagedialog.c:308
+#: src/disks/gducreatediskimagedialog.c:307
 msgid "Disk image read error"
 msgstr "Mearachd a’ leughadh ìomhaigh diosga"
 
-#: src/disks/gducreatediskimagedialog.c:344
+#: src/disks/gducreatediskimagedialog.c:343
 msgid "Allocating Disk Image"
 msgstr "A’ riarachadh ìomhaigh diosga"
 
-#: src/disks/gducreatediskimagedialog.c:348
+#: src/disks/gducreatediskimagedialog.c:347
 msgid "Retrieving DVD keys"
 msgstr "A’ faighinn iuchraichean DVD"
 
 #. Translators: Shown when there are read errors and we skip some data.
 #. *              The first %s is the amount of unreadable data (ex. "512 kB").
 #.
-#: src/disks/gducreatediskimagedialog.c:357
+#: src/disks/gducreatediskimagedialog.c:356
 #, c-format
 msgid "%s unreadable (replaced with zeroes)"
 msgstr "Cha ghabh %s a leughadh (neoinithean ’na àite)"
 
 #. Translators: A descriptive string for the 'complete' sound, see CA_PROP_EVENT_DESCRIPTION
-#: src/disks/gducreatediskimagedialog.c:411
+#: src/disks/gducreatediskimagedialog.c:410
 #: src/disks/gdurestorediskimagedialog.c:613
 msgid "Disk image copying complete"
 msgstr "Chaidh lethbhreac a dhèanamh de dh’ìomhaigh an diosga"
 
-#: src/disks/gducreatediskimagedialog.c:440
+#: src/disks/gducreatediskimagedialog.c:439
 msgid "Error creating disk image"
 msgstr "Mearachd a’ cruthachadh ìomhaigh an diosga"
 
 #. Translators: Primary message in dialog shown if some data was unreadable while creating a disk image
-#: src/disks/gducreatediskimagedialog.c:481
+#: src/disks/gducreatediskimagedialog.c:480
 msgid "Unrecoverable read errors while creating disk image"
-msgstr ""
-"Mearachdan nach urrainn dhuinn càradh rè cruthachadh ìomhaigh an diosga"
+msgstr "Mearachdan nach urrainn dhuinn càradh rè cruthachadh ìomhaigh an diosga"
 
 #. Translators: Secondary message in dialog shown if some data was unreadable while creating a disk image.
 #. * The %f is the percentage of unreadable data (ex. 13.0).
 #. * The first %s is the amount of unreadable data (ex. "4.2 MB").
 #. * The second %s is the name of the device (ex "/dev/").
 #.
-#: src/disks/gducreatediskimagedialog.c:490
+#: src/disks/gducreatediskimagedialog.c:489
 #, c-format
 msgid ""
 "%2.1f%% (%s) of the data on the device “%s” was unreadable and replaced with "
 "zeroes in the created disk image file. This typically happens if the medium "
 "is scratched or if there is physical damage to the drive"
-msgstr ""
-"Bha %2.1f%% (%s) dhen dàta air an uidheam “%s” ann nach b’ urrainn dhuinn a "
-"leughadh agus chaidh neoinithean a chur ’na àite air faidhle ìomhaigh an "
-"diosga a chaidh a chruthachadh. Tachraidh seo ma bhios sgrìob air a’ "
-"mheadhan no ma chaidh an draibh fhèin a dhochainn."
+msgstr "Bha %2.1f%% (%s) dhen dàta air an uidheam “%s” ann nach b’ urrainn dhuinn a leughadh agus chaidh 
neoinithean a chur ’na àite air faidhle ìomhaigh an diosga a chaidh a chruthachadh. Tachraidh seo ma bhios 
sgrìob air a’ mheadhan no ma chaidh an draibh fhèin a dhochainn."
 
 #. Translators: Label of secondary button in dialog if some data was unreadable while creating a disk image
-#: src/disks/gducreatediskimagedialog.c:496
+#: src/disks/gducreatediskimagedialog.c:495
 msgid "_Delete Disk Image File"
 msgstr "Sguab às faidhle ìomhaigh an _diosga"
 
-#: src/disks/gducreatediskimagedialog.c:498
+#: src/disks/gducreatediskimagedialog.c:497
 msgid "_Close"
 msgstr "_Dùin"
 
-#: src/disks/gducreatediskimagedialog.c:723
-#: src/disks/gdurestorediskimagedialog.c:747
+#: src/disks/gducreatediskimagedialog.c:722
+#: src/disks/gdurestorediskimagedialog.c:731
 msgid "Error determining size of device: "
 msgstr "Mearachd a’ dearbhadh meud an uidheim: "
 
-#: src/disks/gducreatediskimagedialog.c:730
-#: src/disks/gdurestorediskimagedialog.c:754
+#: src/disks/gducreatediskimagedialog.c:729
+#: src/disks/gdurestorediskimagedialog.c:738
+#, c-format
 msgid "Device is size 0"
 msgstr "Tha meud an uidheam ’na 0"
 
-#: src/disks/gducreatediskimagedialog.c:764
+#: src/disks/gducreatediskimagedialog.c:763
 msgid "Error allocating space for disk image file: "
 msgstr "Mearachd a’ riarachadh an àite airson faidhle ìomhaigh an diosga: "
 
-#: src/disks/gducreatediskimagedialog.c:925
+#: src/disks/gducreatediskimagedialog.c:924
 #: src/disks/gdunewdiskimagedialog.c:324
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
-msgstr ""
-"Tha faidhle air a bheil “%s” ann mu thràth. A bheil thu airson am fear ùr a "
-"chur ’na àite?"
+msgstr "Tha faidhle air a bheil “%s” ann mu thràth. A bheil thu airson am fear ùr a chur ’na àite?"
 
-#: src/disks/gducreatediskimagedialog.c:928
+#: src/disks/gducreatediskimagedialog.c:927
 #: src/disks/gdunewdiskimagedialog.c:327
 #, c-format
 msgid ""
 "The file already exists in “%s”.  Replacing it will overwrite its contents."
-msgstr ""
-"Tha faidhle air a bheil “%s” ann mu thràth. Ma chuireas tu am fear ùr ’na "
-"àite, thèid sgrìobhadh thairis air an t-susbaint ann."
+msgstr "Tha faidhle air a bheil “%s” ann mu thràth. Ma chuireas tu am fear ùr ’na àite, thèid sgrìobhadh 
thairis air an t-susbaint ann."
 
-#: src/disks/gducreatediskimagedialog.c:931
+#: src/disks/gducreatediskimagedialog.c:930
 #: src/disks/gdunewdiskimagedialog.c:330
 msgid "_Replace"
 msgstr "_Cuir ’na àite"
 
-#: src/disks/gducreatediskimagedialog.c:981
+#: src/disks/gducreatediskimagedialog.c:980
 #: src/disks/gdunewdiskimagedialog.c:247
 msgid "Error opening file for writing"
 msgstr "Mearachd a’ fosgladh an fhaidhle airson sgrìobhadh"
 
 #. Translators: Reason why suspend/logout is being inhibited
-#: src/disks/gducreatediskimagedialog.c:997
+#: src/disks/gducreatediskimagedialog.c:996
 msgctxt "create-inhibit-message"
 msgid "Copying device to disk image"
 msgstr "A’ cur lethbhreac dhen uidheam gu ìomhaigh diosga"
 
 #. Translators: this is the description of the job
-#: src/disks/gducreatediskimagedialog.c:1003
+#: src/disks/gducreatediskimagedialog.c:1002
 msgid "Creating Disk Image"
 msgstr "A’ cruthachadh ìomhaigh diosga"
 
-#: src/disks/gducreatefilesystemwidget.c:393
-#: src/disks/gduformatdiskdialog.c:254
-msgid "Compatible with all systems and devices"
-msgstr "Co-chòrdail leis a h-uile siostam agus uidheam"
-
-#: src/disks/gducreatefilesystemwidget.c:394
-msgid "FAT"
-msgstr "FAT"
-
-#: src/disks/gducreatefilesystemwidget.c:399
-msgid "Compatible with most systems"
-msgstr "Co-chòrdail leis a’ mhòrchuid a shiostaman agus uidheaman"
-
-#: src/disks/gducreatefilesystemwidget.c:400
-msgid "NTFS"
-msgstr "NTFS"
-
-#: src/disks/gducreatefilesystemwidget.c:405
-msgid "Compatible with Linux systems"
-msgstr "Co-chòrdail le siostaman Linux"
-
-#: src/disks/gducreatefilesystemwidget.c:406
-msgid "Ext4"
-msgstr "Ext4"
-
-#: src/disks/gducreatefilesystemwidget.c:411
-msgid "Encrypted, compatible with Linux systems"
-msgstr "Crioptaichte, co-chòrdail le siostaman Linux"
-
-#: src/disks/gducreatefilesystemwidget.c:412
-msgid "LUKS + Ext4"
-msgstr "LUKS ⁊ Ext4"
-
-#: src/disks/gducreatefilesystemwidget.c:417
-msgid "Custom"
-msgstr "Gnàthaichte"
-
-#: src/disks/gducreatefilesystemwidget.c:418
-msgid "Enter filesystem type"
-msgstr "Cuir a-steach seòrsa an t-siostaim-fhaidhlichean"
-
-#: src/disks/gducreatefilesystemwidget.c:500
-#: src/disks/gduformatdiskdialog.c:151
-msgid "Don’t overwrite existing data"
-msgstr "Na sgrìobh thairis air dàta làithreach"
-
-#: src/disks/gducreatefilesystemwidget.c:501
-#: src/disks/gduformatdiskdialog.c:152
-msgid "Quick"
-msgstr "Luath"
-
-#: src/disks/gducreatefilesystemwidget.c:508
-#: src/disks/gduformatdiskdialog.c:162
-msgid "Overwrite existing data with zeroes"
-msgstr "Sgrìobh neonithean thairis air an dàta làithreach"
-
-#: src/disks/gducreatefilesystemwidget.c:509
-#: src/disks/gduformatdiskdialog.c:163
-msgid "Slow"
-msgstr "Slaodach"
-
-#: src/disks/gducreatepartitiondialog.c:231
-msgid "Error formatting partition"
-msgstr "Mearachd a’ fòrmatadh a’ phàirteachaidh"
-
-#: src/disks/gducreatepartitiondialog.c:260
-msgid "Error creating partition"
-msgstr "Mearachd a’ cruthachadh a’ phàirteachaidh"
-
-#: src/disks/gducreatepartitiondialog.c:351
-msgid "Extended partition"
-msgstr "Pàirteachadh leudaichte"
-
-#: src/disks/gducreatepartitiondialog.c:352
-msgid "For logical partitions"
-msgstr "Airson pàirteachaidhean loidigeach"
-
-#: src/disks/gducreatepartitiondialog.c:365
-msgid ""
-"Cannot create a new partition. There are already four primary partitions."
-msgstr ""
-"Cha ghabh pàirteachadh ùr a chruthachadh. Tha ceithir prìomh-"
-"phàirteachaidhean ann mu thràth."
-
-#: src/disks/gducreatepartitiondialog.c:369
-msgid "This is the last primary partition that can be created."
-msgstr "Seo am prìomh-phàirteachadh mu dheireadh a ghabhas a chruthachadh."
-
 #: src/disks/gducrypttabdialog.c:108 src/disks/gducrypttabdialog.c:128
 msgid "Will be created"
 msgstr "Thèid a chruthachadh"
@@ -1551,10 +1378,7 @@ msgstr "Mearachd ag ùrachadh an innteirt /etc/crypttab"
 msgid ""
 "Only the passphrase referenced by the <i>/etc/crypttab</i> file will be "
 "changed. To change the on-disk passphrase, use <i>Change Passphrase…</i>"
-msgstr ""
-"Cha dèid atharrachadh ach an abairt-fhaire ris an toir an fhaidhle <i>/etc/"
-"crypttab</i> iomradh. Cleachd <i>Atharraich an abairt-fhaire…</i> gus an "
-"abairt-fhaire air an diosg atharrachadh."
+msgstr "Cha dèid atharrachadh ach an abairt-fhaire ris an toir an fhaidhle <i>/etc/crypttab</i> iomradh. 
Cleachd <i>Atharraich an abairt-fhaire…</i> gus an abairt-fhaire air an diosg atharrachadh."
 
 #: src/disks/gdudevicetreemodel.c:496
 msgid "(None)"
@@ -1669,7 +1493,7 @@ msgstr "Mearachd a’ suidheachadh na leubail"
 
 #: src/disks/gdufilesystemdialog.c:128 src/disks/gduwindow.c:3206
 #: src/disks/gduwindow.c:3334 src/disks/gduwindow.c:3835
-#: src/libgdu/gduutils.c:1378
+#: src/libgdu/gduutils.c:1411
 msgid "Error unmounting filesystem"
 msgstr "Mearachd a’ dì-mhunntachadh an t-siostaim-fhaidhlichean"
 
@@ -1677,7 +1501,7 @@ msgstr "Mearachd a’ dì-mhunntachadh an t-siostaim-fhaidhlichean"
 #. * some specificed duration but may take longer. The %s is a
 #. * time duration e.g. "8 hours and 28 minutes"
 #.
-#: src/disks/gduformatdiskdialog.c:105
+#: src/disks/gduformatdiskdialog.c:104
 #, c-format
 msgid "At least %s"
 msgstr "Co-dhiù %s"
@@ -1686,77 +1510,89 @@ msgstr "Co-dhiù %s"
 #. * approximately some specificed duration. The %s is a time
 #. * duration e.g. "2 hours and 2 minutes"
 #.
-#: src/disks/gduformatdiskdialog.c:116
+#: src/disks/gduformatdiskdialog.c:115
 #, c-format
 msgid "Approximately %s"
 msgstr "Faisg air %s"
 
-#: src/disks/gduformatdiskdialog.c:195
+#: src/disks/gduformatdiskdialog.c:150
+msgid "Don’t overwrite existing data"
+msgstr "Na sgrìobh thairis air dàta làithreach"
+
+#: src/disks/gduformatdiskdialog.c:151
+msgid "Quick"
+msgstr "Luath"
+
+#: src/disks/gduformatdiskdialog.c:161
+msgid "Overwrite existing data with zeroes"
+msgstr "Sgrìobh neonithean thairis air an dàta làithreach"
+
+#: src/disks/gduformatdiskdialog.c:162
+msgid "Slow"
+msgstr "Slaodach"
+
+#: src/disks/gduformatdiskdialog.c:194
 msgid "ATA Secure Erase"
 msgstr "ATA Secure Erase"
 
-#: src/disks/gduformatdiskdialog.c:210
+#: src/disks/gduformatdiskdialog.c:209
 msgid "ATA Enhanced Secure Erase"
 msgstr "ATA Enhanced Secure Erase"
 
-#: src/disks/gduformatdiskdialog.c:255
+#: src/disks/gduformatdiskdialog.c:253
+msgid "Compatible with all systems and devices"
+msgstr "Co-chòrdail leis a h-uile siostam agus uidheam"
+
+#: src/disks/gduformatdiskdialog.c:254
 msgid "MBR / DOS"
 msgstr "MBR / DOS"
 
-#: src/disks/gduformatdiskdialog.c:265
+#: src/disks/gduformatdiskdialog.c:264
 msgid "Compatible with modern systems and hard disks > 2TB"
 msgstr "Co-chòrdail le siostaman ùra agus clàir-chruaidh > 2TB"
 
-#: src/disks/gduformatdiskdialog.c:266
+#: src/disks/gduformatdiskdialog.c:265
 msgid "GPT"
 msgstr "GPT"
 
-#: src/disks/gduformatdiskdialog.c:283
+#: src/disks/gduformatdiskdialog.c:282
 msgid "No partitioning"
 msgstr "Gun phàirteachadh"
 
-#: src/disks/gduformatdiskdialog.c:284
+#: src/disks/gduformatdiskdialog.c:283
 msgid "Empty"
 msgstr "Falamh"
 
-#: src/disks/gduformatdiskdialog.c:328
+#: src/disks/gduformatdiskdialog.c:327
 msgid "Error formatting disk"
 msgstr "Mearachd a’ fòrmatadh an diosga"
 
-#: src/disks/gduformatdiskdialog.c:418
+#: src/disks/gduformatdiskdialog.c:417
 msgid "Are you sure you want to format the disk?"
 msgstr "A bheil thu cinnteach gu bheil thu airson an diosga fhòrmatadh?"
 
 #. Translators: warning used for quick format
-#: src/disks/gduformatdiskdialog.c:422
+#: src/disks/gduformatdiskdialog.c:421
 msgid ""
 "All data on the disk will be lost but may still be recoverable by data "
 "recovery services"
-msgstr ""
-"Caillidh tu an dàta air fad air an diosga ach dh’fhaoidte gum faigh "
-"seirbheisean aiseag dàta greim air fhathast"
+msgstr "Caillidh tu an dàta air fad air an diosga ach dh’fhaoidte gum faigh seirbheisean aiseag dàta greim 
air fhathast"
 
-#: src/disks/gduformatdiskdialog.c:424 src/disks/gduformatvolumedialog.c:224
+#: src/disks/gduformatdiskdialog.c:423
 msgid ""
 "<b>Tip</b>: If you are planning to recycle, sell or give away your old "
 "computer or disk, you should use a more thorough erase type to keep your "
 "private information from falling into the wrong hands"
-msgstr ""
-"<b>Gliocas</b>: Ma tha thu an dùil an seann-choimpiutair no diosga agad a "
-"reic, a thoirt do chuideigin eile no ath-chuairteachadh, bu chòir dhut an "
-"dàta a shuathadh às air dòigh nas doimhne airson ’s nach fhaigh droch-"
-"shluagh greim air an dàta phrìobhaideach agad."
+msgstr "<b>Gliocas</b>: Ma tha thu an dùil an seann-choimpiutair no diosga agad a reic, a thoirt do 
chuideigin eile no ath-chuairteachadh, bu chòir dhut an dàta a shuathadh às air dòigh nas doimhne airson ’s 
nach fhaigh droch-shluagh greim air an dàta phrìobhaideach agad."
 
 #. Translators: warning used when overwriting data
-#: src/disks/gduformatdiskdialog.c:429
+#: src/disks/gduformatdiskdialog.c:428
 msgid ""
 "All data on the disk will be overwritten and will likely not be recoverable "
 "by data recovery services"
-msgstr ""
-"Thèid sgrìobhadh thairis air an dàta air fad air a’ chlàr agus chan eil "
-"teans gun urrainn do sheirbheisean aiseag dàta fhaighinn air ais"
+msgstr "Thèid sgrìobhadh thairis air an dàta air fad air a’ chlàr agus chan eil teans gun urrainn do 
sheirbheisean aiseag dàta fhaighinn air ais"
 
-#: src/disks/gduformatdiskdialog.c:437
+#: src/disks/gduformatdiskdialog.c:436
 msgid ""
 "<b>WARNING</b>: The Secure Erase command may take a very long time to "
 "complete, can’t be canceled and may not work properly with some hardware. In "
@@ -1764,44 +1600,130 @@ msgid ""
 "or lock up. Before proceeding, please read the article about <a "
 "href='https://ata.wiki.kernel.org/index.php/ATA_Secure_Erase'>ATA Secure "
 "Erase</a> and make sure you understand the risks"
-msgstr ""
-"<b>RABHADH</b>: Dh’fhaoidte gun toir an suathadh às tèarainte glè fhada agus "
-"chan urrainn dhut sgur dheth agus dh’fhaoidte nach obraich e mar bu chòir "
-"air cuid a bhathar-cruaidh. Air a’ char as miosa, dh’fhaoidte nach bi an "
-"draibh agad gu feum sam bith ri linn seo no gun tuislich an siostam agad no "
-"gun reòth e. Mus dèid thu air adhart, b’ fhiach e an t-artaigeal air <a "
-"href='https://ata.wiki.kernel.org/index.php/ATA_Secure_Erase'>ATA Secure "
-"Erase</a> a leughadh agus dèanamh cinnteach gun tuig thu an cunnart"
+msgstr "<b>RABHADH</b>: Dh’fhaoidte gun toir an suathadh às tèarainte glè fhada agus chan urrainn dhut sgur 
dheth agus dh’fhaoidte nach obraich e mar bu chòir air cuid a bhathar-cruaidh. Air a’ char as miosa, 
dh’fhaoidte nach bi an draibh agad gu feum sam bith ri linn seo no gun tuislich an siostam agad no gun reòth 
e. Mus dèid thu air adhart, b’ fhiach e an t-artaigeal air <a 
href='https://ata.wiki.kernel.org/index.php/ATA_Secure_Erase'>ATA Secure Erase</a> a leughadh agus dèanamh 
cinnteach gun tuig thu an cunnart"
 
-#: src/disks/gduformatdiskdialog.c:445 src/disks/gduformatvolumedialog.c:236
+#: src/disks/gduformatdiskdialog.c:444 src/disks/gducreateformatdialog.c:456
 msgid "_Format"
 msgstr "_Fòrmataich"
 
-#: src/disks/gduformatvolumedialog.c:92
+#: src/disks/gducreateformatdialog.c:175
+msgid "_Previous"
+msgstr "_Air ais"
+
+#: src/disks/gducreateformatdialog.c:181
+msgid "Cre_ate"
+msgstr "Cruth_aich"
+
+#: src/disks/gducreateformatdialog.c:187
+#| msgid "_Format"
+msgid "Form_at"
+msgstr "Fòrm_ataich"
+
+#: src/disks/gducreateformatdialog.c:194
+msgid "N_ext"
+msgstr "Ai_r adhart"
+
+#: src/disks/gducreateformatdialog.c:221
 msgid "Error formatting volume"
 msgstr "Mearachd a’ fòrmatadh an draibh"
 
-#: src/disks/gduformatvolumedialog.c:218
-msgid "Are you sure you want to format the volume?"
-msgstr "A bheil thu cinnteach gu bheil thu airson an draibh fhòrmatadh?"
+#: src/disks/gducreateformatdialog.c:288
+msgid "Error creating partition"
+msgstr "Mearachd a’ cruthachadh a’ phàirteachaidh"
 
-#. Translators: warning used for quick format of the volume
-#: src/disks/gduformatvolumedialog.c:222
-msgid ""
-"All data on the volume will be lost but may still be recoverable by data "
-"recovery services"
-msgstr ""
-"Caillidh tu an dàta air fad air an draibh ach dh’fhaoidte gum faigh "
-"seirbheisean aiseag dàta greim air fhathast"
+#: src/disks/gducreateformatdialog.c:435
+msgid "Create Partition"
+msgstr "Cruthaich pàirteachadh"
+
+#: src/disks/gducreateformatdialog.c:444
+msgid "Format Volume"
+msgstr "Fòrmataich an draibh"
 
-#. Translators: warning used when overwriting data of the volume
-#: src/disks/gduformatvolumedialog.c:229
+#: src/disks/gducreateformatdialog.c:447
+#| msgid "Custom"
+msgid "Custom Format"
+msgstr "Fòrmat gnàthaichte"
+
+#: src/disks/gducreateformatdialog.c:450
+msgid "Set Password"
+msgstr "Suidhich facal-faire"
+
+#: src/disks/gducreateformatdialog.c:453
+#| msgid "Confirm Repair"
+msgid "Confirm Details"
+msgstr "Dearbh am fiosrachadh"
+
+#: src/disks/gducreatepartitionpage.c:320
 msgid ""
-"All data on the volume will be overwritten and will likely not be "
-"recoverable by data recovery services"
-msgstr ""
-"Thèid sgrìobhadh thairis air an dàta air fad air an draibh agus chan eil "
-"teans gun urrainn do sheirbheisean aiseag dàta fhaighinn air ais"
+"Cannot create a new partition. There are already four primary partitions."
+msgstr "Cha ghabh pàirteachadh ùr a chruthachadh. Tha ceithir prìomh-phàirteachaidhean ann mu thràth."
+
+#: src/disks/gducreatepartitionpage.c:324
+msgid "This is the last primary partition that can be created."
+msgstr "Seo am prìomh-phàirteachadh mu dheireadh a ghabhas a chruthachadh."
+
+#: src/disks/gducreateotherpage.c:115
+msgid "XFS — Linux Filesystem"
+msgstr "XFS – siostam-fhaidhlichean Linux"
+
+#: src/disks/gducreateotherpage.c:117
+#| msgid "Edit Partition"
+msgid "Linux Swap Partition"
+msgstr "Pàirteachadh swap Linux"
+
+#: src/disks/gducreateotherpage.c:119
+msgid "Btrfs — Copy-on-write Linux Filesystem, for snapshots"
+msgstr "Btrfs – siostam-fhaidhlichean Linux a nì lethbhreac le sgrìobhadh, airson snapshots"
+
+#: src/disks/gducreateotherpage.c:121
+msgid "F2FS — Flash Storage Linux Filesystem"
+msgstr "F2FS – siostam-fhaidhlichean Linux airson stòras flash"
+
+#: src/disks/gducreateotherpage.c:123
+msgid "exFAT — Flash Storage Windows Filesystem, used on SDXC cards"
+msgstr "exFAT – siostam-fhaidhlichean Windows airson stòras flash, ’ga chleachdadh air cairtean SDXC"
+
+#: src/disks/gducreateotherpage.c:125
+msgid "UDF — Universal Disk Format, for removable devices on many systems"
+msgstr "UDF – siostam-fhaidhlichean uile-choitcheann airson diosgan, airson draibhean so-ghiùlan air iomadh 
siostam"
+
+#: src/disks/gducreateotherpage.c:127
+#| msgctxt "volume-grid"
+#| msgid "Filesystem"
+msgid "No Filesystem"
+msgstr "Gun shiostam-fhaidhlichean"
+
+#: src/disks/gducreateotherpage.c:207
+#,  c-format
+#| msgid "%d disk is missing"
+#| msgid_plural "%d disks are missing"
+msgid "The utility %s is missing."
+msgstr "Tha an goireas %s a dhìth."
+
+#: src/disks/gducreatepasswordpage.c:124
+#| msgid "The passphrases do not match"
+msgid "The passwords do not match"
+msgstr "Chan eil an dà fhacal-fhaire co-ionnann"
+
+#. Translators: In most cases this should not need translation unless the
+#. *              separation character '—' is not appropriate. The strings come
+#. *              from UDisks, first is description, second the name:
+#. *              "Partition 1 of 32 GB Flash Disk — /dev/sdb1".
+#.
+#: src/disks/gducreateconfirmpage.c:110
+#,  c-format
+#| msgctxt "volume-contents-combiner"
+#| msgid "%s — %s"
+msgid "%s — %s"
+msgstr "%s – %s"
+
+#. Translators: Disk usage in the format '3 GB (7%)', unit string comes from UDisks.
+#.
+#: src/disks/gducreateconfirmpage.c:128
+#,  c-format
+#| msgid "%s: %2.1f%%"
+msgid "%s (%.1f%%)"
+msgstr "%s (%.1f%%)"
 
 #: src/disks/gdufstabdialog.c:155
 #, c-format
@@ -1816,16 +1738,12 @@ msgstr "Maidsichidh seo diosga slàn an uidheim le prìomh-dhàta a’ bhathair"
 #, c-format
 msgid ""
 "Matches partition %u of any device connected at the given port or address"
-msgstr ""
-"Maidsichidh seo pàirteachadh %u de dh’uidheam ceangailte sam bith aig a’ "
-"phort no seòladh a tha ann"
+msgstr "Maidsichidh seo pàirteachadh %u de dh’uidheam ceangailte sam bith aig a’ phort no seòladh a tha ann"
 
 #: src/disks/gdufstabdialog.c:166
 msgid ""
 "Matches the whole disk of any device connected at the given port or address"
-msgstr ""
-"Maidsichidh seo diosga slàn de dh’uidheam ceangailte sam bith aig a’ phort "
-"no seòladh a tha ann"
+msgstr "Maidsichidh seo diosga slàn de dh’uidheam ceangailte sam bith aig a’ phort no seòladh a tha ann"
 
 #: src/disks/gdufstabdialog.c:170
 msgid "Matches any device with the given label"
@@ -1841,9 +1759,7 @@ msgstr "Maidsichidh seo an t-uidheam a tha ann"
 
 #: src/disks/gdufstabdialog.c:481
 msgid "The system may not work correctly if this entry is modified or removed."
-msgstr ""
-"Dh’fhaoidte nach obraich an siostam mar bu chòir ma thèid an t-innteart seo "
-"atharrachadh no a thoirt air falbh."
+msgstr "Dh’fhaoidte nach obraich an siostam mar bu chòir ma thèid an t-innteart seo atharrachadh no a thoirt 
air falbh."
 
 #: src/disks/gdufstabdialog.c:542
 msgid "Error removing old /etc/fstab entry"
@@ -1866,7 +1782,6 @@ msgid "Unnamed (%s).img"
 msgstr "Gun ainm (%s).img"
 
 #: src/disks/gdunewdiskimagedialog.c:267
-#| msgid "Error powering off drive"
 msgid "Error writing file"
 msgstr "Mearachd le sgrìobhadh an fhaidhle"
 
@@ -1903,34 +1818,28 @@ msgid "Strong"
 msgstr "Làidir"
 
 #: src/disks/gduresizedialog.c:188
-#| msgid "Chunk _Size"
 msgid "Current Size"
 msgstr "Am meud làithreach"
 
 #: src/disks/gduresizedialog.c:199
-#| msgid "Image Size"
 msgid "Minimal Size"
 msgstr "Am meud as lugha"
 
 #: src/disks/gduresizedialog.c:249
-#| msgid "_Restore"
 msgid "_Resize"
 msgstr "Ath-_mheudaich"
 
 #: src/disks/gduresizedialog.c:352 src/disks/gduresizedialog.c:431
-#: src/disks/gduresizedialog.c:548 src/disks/gduresizedialog.c:571
-#| msgid "Error mounting filesystem"
+#: src/disks/gduresizedialog.c:601 src/disks/gduresizedialog.c:624
 msgid "Error resizing filesystem"
 msgstr "Mearachd le ath-mheudachadh an t-siostaim-fhaidhlichean"
 
 #: src/disks/gduresizedialog.c:370 src/disks/gduresizedialog.c:493
-#: src/disks/gduresizedialog.c:525
-#| msgid "Error creating partition"
+#: src/disks/gduresizedialog.c:575
 msgid "Error resizing partition"
 msgstr "Mearachd le ath-mheudachadh a’ phàirteachaidh"
 
 #: src/disks/gduresizedialog.c:389 src/disks/gduresizedialog.c:413
-#| msgid "Error opening file for reading"
 msgid "Error repairing filesystem after resize"
 msgstr "Mearachd le càradh an t-siostaim-fhaidhlichean às dèidh ath-mheudachadh"
 
@@ -1939,32 +1848,34 @@ msgid "Resizing not ready"
 msgstr "Chan eil an t-ath-mheudachadh deiseil"
 
 #: src/disks/gduresizedialog.c:466
-#| msgid "Mount the filesystem"
 msgid "Waited too long for the filesystem"
 msgstr "Chaidh fuireach o fhada airson an t-siostaim-fhaidhlichean"
 
-#: src/disks/gduresizedialog.c:595
-#| msgid "Error mounting filesystem"
+#: src/disks/gduresizedialog.c:526 src/disks/gduresizedialog.c:648
 msgid "Error repairing filesystem"
 msgstr "Mearachd le càradh an t-siostaim-fhaidhlichean"
 
-#: src/disks/gduresizedialog.c:661
-#| msgid "Error unmounting filesystem"
+#: src/disks/gduresizedialog.c:551
+#| msgid "Error unmounting filesystem for resizing"
+msgid "Error unmounting filesystem for repairing"
+msgstr "Mearachd le dì-mhunntachadh an t-siostaim-fhaidhlichean a chum càraidh"
+
+#: src/disks/gduresizedialog.c:692
 msgid "Error unmounting filesystem for resizing"
-msgstr ""
-"Mearachd le dì-mhunntachadh an t-siostaim-fhaidhlichean a chum ath-"
-"mheudachaidh"
+msgstr "Mearachd le dì-mhunntachadh an t-siostaim-fhaidhlichean a chum ath-mheudachaidh"
+
+#: src/disks/gduresizedialog.c:760
+#| msgid "Error mounting filesystem"
+msgid "Error mounting the filesystem"
+msgstr "Mearachd a’ munntachadh an t-siostaim-fhaidhlichean"
 
-#: src/disks/gduresizedialog.c:703
+#: src/disks/gduresizedialog.c:802
 msgid "Fit to size"
 msgstr "Freagair ris a’ mheud"
 
-#: src/disks/gduresizedialog.c:738
-#| msgid "Error mounting filesystem"
+#: src/disks/gduresizedialog.c:837
 msgid "Error mounting filesystem to calculate minimum size"
-msgstr ""
-"Mearachd le munntachadh an t-siostaim-fhaidhlichean a chum àireamhachadh a’ "
-"mheud as lugha"
+msgstr "Mearachd le munntachadh an t-siostaim-fhaidhlichean a chum àireamhachadh a’ mheud as lugha"
 
 #: src/disks/gdurestorediskimagedialog.c:277
 msgid "File does not appear to be XZ compressed"
@@ -1996,36 +1907,34 @@ msgstr "Tha ìomhaigh a chlàir %s nas motha na an t-uidheam-targaide"
 msgid "Error restoring disk image"
 msgstr "Mearachd ag aiseag ìomhaigh an diosga"
 
-#: src/disks/gdurestorediskimagedialog.c:939
+#: src/disks/gdurestorediskimagedialog.c:923
 msgid "Error opening file for reading"
 msgstr "Mearachd a’ fosgladh an fhaidhle airson leughadh"
 
-#: src/disks/gdurestorediskimagedialog.c:954
+#: src/disks/gdurestorediskimagedialog.c:938
 msgid "Error determining size of file"
 msgstr "Mearachd a’ mothachadh do mheud an fhaidhle"
 
 #. Translators: Reason why suspend/logout is being inhibited
-#: src/disks/gdurestorediskimagedialog.c:982
+#: src/disks/gdurestorediskimagedialog.c:966
 msgctxt "restore-inhibit-message"
 msgid "Copying disk image to device"
 msgstr "A’ cur lethbhreac de dh’ìomhaigh diosga air an uidheam"
 
 #. Translators: this is the description of the job
-#: src/disks/gdurestorediskimagedialog.c:988
+#: src/disks/gdurestorediskimagedialog.c:972
 msgid "Restoring Disk Image"
 msgstr "Ag aiseag ìomhaigh diosga"
 
-#: src/disks/gdurestorediskimagedialog.c:1044
+#: src/disks/gdurestorediskimagedialog.c:1028
 msgid "Are you sure you want to write the disk image to the device?"
-msgstr ""
-"A bheil thu cinnteach gu bheil thu airson ìomhaigh an diosga a sgrìobhadh "
-"dhan uidheam?"
+msgstr "A bheil thu cinnteach gu bheil thu airson ìomhaigh an diosga a sgrìobhadh dhan uidheam?"
 
-#: src/disks/gdurestorediskimagedialog.c:1045
+#: src/disks/gdurestorediskimagedialog.c:1029
 msgid "All existing data will be lost"
 msgstr "Caillidh tu dàta làithreach sam bith"
 
-#: src/disks/gdurestorediskimagedialog.c:1046
+#: src/disks/gdurestorediskimagedialog.c:1030
 msgid "_Restore"
 msgstr "_Aisig"
 
@@ -2041,7 +1950,7 @@ msgstr "Chaidh an abairt-fhaire chrioptachaidh fhaighinn on dul-iuchrach"
 msgid "Volumes Grid"
 msgstr "Griod nan draibhean"
 
-#: src/disks/gduvolumegrid.c:566 src/disks/gduwindow.c:2185
+#: src/disks/gduvolumegrid.c:566 src/disks/gduwindow.c:2184
 msgid "No Media"
 msgstr "Chan eil meadhan ann"
 
@@ -2083,52 +1992,49 @@ msgctxt "volume-grid"
 msgid "Free Space"
 msgstr "Rum saor"
 
-#: src/disks/gduwindow.c:628
+#: src/disks/gduwindow.c:627
 msgid "Error deleting loop device"
 msgstr "Mearachd a’ sguabadh às an uidheim lùbaidh"
 
-#: src/disks/gduwindow.c:728 src/disks/gduwindow.c:771
+#: src/disks/gduwindow.c:727 src/disks/gduwindow.c:770
 msgid "Error attaching disk image"
 msgstr "Mearachd a’ ceangal ìomhaigh diosga ris"
 
-#: src/disks/gduwindow.c:801
+#: src/disks/gduwindow.c:800
 msgid "Select Disk Image to Attach"
 msgstr "Tagh ìomhaigh an diosga a tha thu airson ceangal ris"
 
-#: src/disks/gduwindow.c:805
+#: src/disks/gduwindow.c:804
 msgid "_Attach"
 msgstr "_Ceangail ris"
 
 #. set file types
 #. allow_compressed
 #. Add a RO check button that defaults to RO
-#: src/disks/gduwindow.c:812
+#: src/disks/gduwindow.c:811
 msgid "Set up _read-only loop device"
 msgstr "Suidhich uidheam lùbaidh a bhios ri _leughadh a-mhàin"
 
-#: src/disks/gduwindow.c:813
+#: src/disks/gduwindow.c:812
 msgid ""
 "If checked, the loop device will be read-only. This is useful if you don’t "
 "want the underlying file to be modified"
-msgstr ""
-"Ma chuireas tu cromag ris, bidh an t-uidheam lùbaidh ri leughadh a-mhàin. "
-"Tha seo feumail mur eil thu ag iarraidh gun dèid am faidhle air a bheil e "
-"stèidhichte atharrachadh."
+msgstr "Ma chuireas tu cromag ris, bidh an t-uidheam lùbaidh ri leughadh a-mhàin. Tha seo feumail mur eil 
thu ag iarraidh gun dèid am faidhle air a bheil e stèidhichte atharrachadh."
 
-#: src/disks/gduwindow.c:1011
+#: src/disks/gduwindow.c:1010
 msgid "Power off this disk"
 msgstr "Cuir dheth cumhachd an diosga"
 
-#: src/disks/gduwindow.c:1017
+#: src/disks/gduwindow.c:1016
 msgid "Eject this disk"
 msgstr "Gluais an diosga seo a-mach"
 
-#: src/disks/gduwindow.c:1023
+#: src/disks/gduwindow.c:1022
 msgid "Detach this loop device"
 msgstr "Dealaich an t-uidheam lùbaidh seo"
 
 #. Translators: This is the short-cut to open the disks/drive gear menu
-#: src/disks/gduwindow.c:1448
+#: src/disks/gduwindow.c:1447
 msgctxt "accelerator"
 msgid "F10"
 msgstr "F10"
@@ -2137,7 +2043,7 @@ msgstr "F10"
 #. *              The Ctrl modifier must not be translated or parsing will fail.
 #. *              You can however change to another English modifier (e.g. <Shift>).
 #.
-#: src/disks/gduwindow.c:1456
+#: src/disks/gduwindow.c:1455
 msgctxt "accelerator"
 msgid "<Ctrl>F"
 msgstr "<Ctrl>F"
@@ -2146,7 +2052,7 @@ msgstr "<Ctrl>F"
 #. *              The Ctrl modifier must not be translated or parsing will fail.
 #. *              You can however change to another English modifier (e.g. <Shift>).
 #.
-#: src/disks/gduwindow.c:1464
+#: src/disks/gduwindow.c:1463
 msgctxt "accelerator"
 msgid "<Ctrl>S"
 msgstr "<Ctrl>S"
@@ -2155,12 +2061,12 @@ msgstr "<Ctrl>S"
 #. *              The Ctrl modifier must not be translated or parsing will fail.
 #. *              You can however change to another English modifier (e.g. <Shift>).
 #.
-#: src/disks/gduwindow.c:1472
+#: src/disks/gduwindow.c:1471
 msgctxt "accelerator"
 msgid "<Ctrl>E"
 msgstr "<Ctrl>E"
 
-#: src/disks/gduwindow.c:1487
+#: src/disks/gduwindow.c:1486
 msgctxt "accelerator"
 msgid "<Shift>F10"
 msgstr "<Shift>F10"
@@ -2169,13 +2075,13 @@ msgstr "<Shift>F10"
 #. *              The Shift and Ctrl modifiers must not be translated or parsing will fail.
 #. *              You can however change to other English modifiers.
 #.
-#: src/disks/gduwindow.c:1497
+#: src/disks/gduwindow.c:1496
 msgctxt "accelerator"
 msgid "<Shift><Ctrl>F"
 msgstr "<Shift><Ctrl>F"
 
 #. Translators: Shown for a read-only device. The %s is the device file, e.g. /dev/sdb1
-#: src/disks/gduwindow.c:1827
+#: src/disks/gduwindow.c:1826
 #, c-format
 msgid "%s (Read-Only)"
 msgstr "%s (Ri leughadh a-mhàin)"
@@ -2184,7 +2090,7 @@ msgstr "%s (Ri leughadh a-mhàin)"
 #. *              The first %s is the estimated amount of time remaining (ex. "1 minute" or "5 minutes").
 #. *              The second %s is the average amount of bytes transfered per second (ex. "8.9 MB").
 #.
-#: src/disks/gduwindow.c:1865
+#: src/disks/gduwindow.c:1864
 #, c-format
 msgctxt "job-remaining-with-rate"
 msgid "%s remaining (%s/sec)"
@@ -2193,7 +2099,7 @@ msgstr "%s air fhàgail (%s/diog)"
 #. Translators: Used for job progress.
 #. *              The first %s is the estimated amount of time remaining (ex. "1 minute" or "5 minutes").
 #.
-#: src/disks/gduwindow.c:1873
+#: src/disks/gduwindow.c:1872
 #, c-format
 msgctxt "job-remaining"
 msgid "%s remaining"
@@ -2204,9 +2110,8 @@ msgstr "%s air fhàgail"
 #. *              The second %s is the total amount of bytes to process (ex. "8.5 GB").
 #. *              The third %s is the estimated amount of time remaining including speed (if known) (ex. "1 
minute remaining", "5 minutes remaining (42.3 MB/s)", "Less than a minute remaining").
 #.
-#: src/disks/gduwindow.c:1888
+#: src/disks/gduwindow.c:1887
 #, c-format
-#| msgid "%s of %s – %s"
 msgid "%s of %s — %s"
 msgstr "%s à %s – %s"
 
@@ -2214,17 +2119,17 @@ msgstr "%s à %s – %s"
 #. *              The %s is the job description (e.g. "Erasing Device").
 #. *              The %f is the completion percentage (between 0.0 and 100.0).
 #.
-#: src/disks/gduwindow.c:2013
+#: src/disks/gduwindow.c:2012
 #, c-format
 msgid "%s: %2.1f%%"
 msgstr "%s: %2.1f%%"
 
-#: src/disks/gduwindow.c:2093 src/disks/gduwindow.c:2497
+#: src/disks/gduwindow.c:2092 src/disks/gduwindow.c:2496
 msgid "Block device is empty"
 msgstr "Tha an t-uidheam bloca falamh"
 
 #. Translators: Shown for unknown partitioning type. The first %s is the low-level type.
-#: src/disks/gduwindow.c:2116
+#: src/disks/gduwindow.c:2115
 #, c-format
 msgctxt "partitioning"
 msgid "Unknown (%s)"
@@ -2233,11 +2138,11 @@ msgstr "Chan aithne dhuinn seo (%s)"
 #. Translators: Shown in "Location" when drive is connected to another seat than where
 #. * our application is running.
 #.
-#: src/disks/gduwindow.c:2286
+#: src/disks/gduwindow.c:2285
 msgid "Connected to another seat"
 msgstr "Ceangailte ri seata eile"
 
-#: src/disks/gduwindow.c:2433
+#: src/disks/gduwindow.c:2432
 msgid "Loop device is empty"
 msgstr "Tha an t-uidheam lùbaidh falamh"
 
@@ -2322,7 +2227,6 @@ msgid "Unallocated Space"
 msgstr "Àite gun riarachadh"
 
 #: src/disks/gduwindow.c:3144
-#| msgid "Error mounting filesystem"
 msgid "Error while repairing filesystem"
 msgstr "Mearachd le càradh an t-siostaim-fhaidhlichean"
 
@@ -2346,7 +2250,6 @@ msgid "Filesystem %s on %s could not be repaired."
 msgstr "Cha b’ urrainn dhuinn an siostam-fhaidhlichean %s air %s a càradh."
 
 #: src/disks/gduwindow.c:3242
-#| msgid "C_onfirm Passphrase"
 msgid "Confirm Repair"
 msgstr "Dearbh an càradh"
 
@@ -2355,22 +2258,17 @@ msgid ""
 "A filesystem repair is not always possible and can cause data loss. Consider "
 "backing it up first in order to use forensic recovery tools that retrieve "
 "lost files. Depending on the amount of data this operation takes longer time."
-msgstr ""
+msgstr "Cha ghabh siostam-fhaidhlichean a chàradh an-còmhnaidh is dh’fhaoidte gun dèid dàta air chall. Saoil 
an dèan thu lethbhreac-glèidhidh dheth an toiseach airson innealan aisig foireansach a chleachdadh a thilleas 
dhut faidhlichean a chaidh air chall? Bheir seo barrachd ùine a-rèir co mheud dàta a tha ann."
 
 #: src/disks/gduwindow.c:3273
-#| msgid "Error mounting filesystem"
 msgid "Error while checking filesystem"
 msgstr "Mearachd le dearbhadh an t-siostaim-fhaidhlichean"
 
 #: src/disks/gduwindow.c:3300
-#| msgctxt "volume-content-fs"
-#| msgid "Filesystem Root"
 msgid "Filesystem intact"
 msgstr "Tha an siostam-fhaidhlichean gun mhearachd"
 
 #: src/disks/gduwindow.c:3300
-#| msgctxt "volume-grid"
-#| msgid "Filesystem"
 msgid "Filesystem damaged"
 msgstr "Tha dochann air an t-siostam-fhaidhlichean"
 
@@ -2386,27 +2284,20 @@ msgid "Filesystem %s on %s needs repairing."
 msgstr "Tha an siostam-fhaidhlichean %s air %s feumach air càradh."
 
 #: src/disks/gduwindow.c:3369
-#| msgid "C_onfirm Passphrase"
 msgid "Confirm Check"
 msgstr "Dearbh an dearbhadh"
 
 #: src/disks/gduwindow.c:3372
 msgid "Depending on the amount of data the filesystem check takes longer time."
-msgstr ""
-"Dh’fhaoidte gun doir dearbhadh an t-siostaim-fhaidhlichean ùine mhòr a-rèir "
-"co mheud dàta a th’ air."
+msgstr "Dh’fhaoidte gun doir dearbhadh an t-siostaim-fhaidhlichean ùine mhòr a-rèir co mheud dàta a th’ air."
 
 #: src/disks/gduwindow.c:3572
 msgid "An error occurred when trying to put the drive into standby mode"
-msgstr ""
-"Thachair mearachd nuair a bha sinn a’ feuchainn ris an draibh a chur ’na "
-"fhuireachas"
+msgstr "Thachair mearachd nuair a bha sinn a’ feuchainn ris an draibh a chur ’na fhuireachas"
 
 #: src/disks/gduwindow.c:3618
 msgid "An error occurred when trying to wake up the drive from standby mode"
-msgstr ""
-"Thachair mearachd nuair a bha sinn a’ feuchainn ris an draibh a dhùsgadh à "
-"fuireachas"
+msgstr "Thachair mearachd nuair a bha sinn a’ feuchainn ris an draibh a dhùsgadh à fuireachas"
 
 #: src/disks/gduwindow.c:3663
 msgid "Error powering off drive"
@@ -2415,18 +2306,14 @@ msgstr "Mearachd a’ cur dheth cumhachd an draibh"
 #. Translators: Heading for powering off a device with multiple drives
 #: src/disks/gduwindow.c:3715
 msgid "Are you sure you want to power off the drives?"
-msgstr ""
-"A bheil thu cinnteach gu bheil thu airson cumhachd nan draibhean a chur "
-"dheth?"
+msgstr "A bheil thu cinnteach gu bheil thu airson cumhachd nan draibhean a chur dheth?"
 
 #. Translators: Message for powering off a device with multiple drives
 #: src/disks/gduwindow.c:3717
 msgid ""
 "This operation will prepare the system for the following drives to be "
 "powered down and removed."
-msgstr ""
-"Ullaichidh an gnìomh seo an siostam airson ’s gun gabh cumhachd nan "
-"draibhean a chur dheth agus an toirt air falbh."
+msgstr "Ullaichidh an gnìomh seo an siostam airson ’s gun gabh cumhachd nan draibhean a chur dheth agus an 
toirt air falbh."
 
 #: src/disks/gduwindow.c:3721
 msgid "_Power Off"
@@ -2436,44 +2323,43 @@ msgstr "Cuir a’ chu_mhachd dheth"
 msgid "Error mounting filesystem"
 msgstr "Mearachd a’ munntachadh an t-siostaim-fhaidhlichean"
 
-#: src/disks/gduwindow.c:3903
+#: src/disks/gduwindow.c:3907
 msgid "Error deleting partition"
 msgstr "Mearachd a’ sguabadh às a’ phàirteachaidh"
 
-#: src/disks/gduwindow.c:3940
+#: src/disks/gduwindow.c:3944
 msgid "Are you sure you want to delete the partition?"
-msgstr ""
-"A bheil thu cinnteach gu bheil thu airson am pàirteachadh seo a sguabadh às?"
+msgstr "A bheil thu cinnteach gu bheil thu airson am pàirteachadh seo a sguabadh às?"
 
-#: src/disks/gduwindow.c:3941
+#: src/disks/gduwindow.c:3945
 msgid "All data on the partition will be lost"
 msgstr "Caillidh tu an dàta air fad air a’ phàirteachadh"
 
-#: src/disks/gduwindow.c:3942
+#: src/disks/gduwindow.c:3946
 msgid "_Delete"
 msgstr "_Sguab às"
 
-#: src/disks/gduwindow.c:3973
+#: src/disks/gduwindow.c:3977
 msgid "Error ejecting media"
 msgstr "Mearachd a’ gluasad a’ mheadhain a-mach"
 
-#: src/disks/gduwindow.c:4038
+#: src/disks/gduwindow.c:4042
 msgid "Error locking encrypted device"
 msgstr "Mearachd a’ ghlasadh an uidheim chrioptaichte"
 
-#: src/disks/gduwindow.c:4074
+#: src/disks/gduwindow.c:4078
 msgid "Error starting swap"
 msgstr "Mearachd a’ tòiseachadh air suaip"
 
-#: src/disks/gduwindow.c:4111
+#: src/disks/gduwindow.c:4115
 msgid "Error stopping swap"
 msgstr "Mearachd a’ cur stad air suaip"
 
-#: src/disks/gduwindow.c:4153
+#: src/disks/gduwindow.c:4157
 msgid "Error setting autoclear flag"
 msgstr "Mearachd a’ suidheachadh bratach an fhèin-ghlanaidh"
 
-#: src/disks/gduwindow.c:4206 src/disks/gduwindow.c:4270
+#: src/disks/gduwindow.c:4210 src/disks/gduwindow.c:4274
 msgid "Error canceling job"
 msgstr "Mearachd a’ sgur dhen obair"
 
@@ -2486,6 +2372,7 @@ msgid "Not enough memory"
 msgstr "Chan eil cuimhne gu leòr ann"
 
 #: src/disks/gduxzdecompressor.c:136
+#, c-format
 msgid "Internal error"
 msgstr "Mearachd inntearnail"
 
@@ -2494,26 +2381,24 @@ msgid "Need more input"
 msgstr "Feum air barrachd ion-chuir"
 
 #: src/disks/ui/about-dialog.ui:12
+#| msgid ""
+#| "Copyright © 2008-2013 Red Hat, Inc.\n"
+#| "Copyright © 2008-2013 David Zeuthen"
 msgid ""
 "Copyright © 2008-2013 Red Hat, Inc.\n"
-"Copyright © 2008-2013 David Zeuthen"
-msgstr ""
-"Còir-lethbhreac © 2008-2013 Red Hat, Inc.\n"
-"Còir-lethbhreac © 2008-2013 David Zeuthen"
+"Copyright © 2008-2013 David Zeuthen\n"
+"Copyright © 2009-2017 The GNOME Project\n"
+msgstr "Còir-lethbhreac © 2008-2013 Red Hat, Inc.\nCòir-lethbhreac © 2008-2013 David 
Zeuthen\nCòir-lethbhreac © 2009-2017 The GNOME Project\n"
 
-#: src/disks/ui/about-dialog.ui:14
+#: src/disks/ui/about-dialog.ui:16
 msgid "View, modify and configure disks and media"
 msgstr "Seall, atharraich is rèitich diosgan agus meadhanan"
 
-#: src/disks/ui/about-dialog.ui:17
+#: src/disks/ui/about-dialog.ui:19
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Akerbeltz https://launchpad.net/~fios\n";
-"  alasdair caimbeul https://launchpad.net/~alexd-deactivatedaccount";
+msgstr "Launchpad Contributions:\n  Akerbeltz https://launchpad.net/~fios\n  alasdair caimbeul 
https://launchpad.net/~alexd-deactivatedaccount";
 
 #: src/disks/ui/app-menu.ui:6
-#| msgid "Create Disk Image…"
 msgid "_New Disk Image…"
 msgstr "Ìomhaigh _diosga ùr…"
 
@@ -2533,10 +2418,6 @@ msgstr "_Mu dèidhinn"
 msgid "_Quit"
 msgstr "_Fàg an-seo"
 
-#: src/disks/ui/benchmark-dialog.ui:7
-msgid "Benchmark"
-msgstr "Tomhas-measaidh"
-
 #: src/disks/ui/benchmark-dialog.ui:23
 msgid "_Start Benchmark…"
 msgstr "Tòi_sich air an tomhas-mheasaidh…"
@@ -2582,12 +2463,7 @@ msgid ""
 "Benchmarking involves measuring the transfer rate on various area of the "
 "device as well as measuring how long it takes to seek from one random area "
 "to another. Please back up important data before using the write benchmark."
-msgstr ""
-"Ma nì thu tomhas-measaidh, thèid astar nan tar-chur air diofar raointean an "
-"uidheam a thomhas agus dè cho fada ’s a bheir e ’s e a’ dol o àite air "
-"thuaiream gu àite eile air thuaiream. B’ fheairrde dhut lethbhreac-glèidhidh "
-"a dhèanamh de dhàta cudromach sam bith mus fheuch thu ri tomhas-measaidh an "
-"sgrìobhaidh."
+msgstr "Ma nì thu tomhas-measaidh, thèid astar nan tar-chur air diofar raointean an uidheam a thomhas agus 
dè cho fada ’s a bheir e ’s e a’ dol o àite air thuaiream gu àite eile air thuaiream. B’ fheairrde dhut 
lethbhreac-glèidhidh a dhèanamh de dhàta cudromach sam bith mus fheuch thu ri tomhas-measaidh an sgrìobhaidh."
 
 #: src/disks/ui/benchmark-dialog.ui:397
 msgid "Transfer Rate"
@@ -2615,34 +2491,20 @@ msgid ""
 "If not checked, the write-part of the benchmark will not be done but on the "
 "other hand exclusive access to the device is not needed (e.g. the disk or "
 "device can be in use)."
-msgstr ""
-"Ma tha thu airson tomhas-measaidh a dhèanamh air reat sgrìobhaidh diosga, "
-"bidh feum air inntrigeadh às-dùnach dhan diosga (tha sin a’ ciallachadh nach "
-"fhaod an diosga no gin dhe na pàirteachaidhean aige a bhith ’gan cleachdadh "
-"no air am munntachadh) agus bithear a’ leughadh dàta uaithe ’s ’ga "
-"sgrìobhaidh air ais ann. Ri linn sin, chan atharraich na tha air an diosga.\n"
-"\n"
-"Mur an cuir thu cromag ris, cha dèanar tomhas air an sgrìobhadh san tomhas-"
-"mheasaidh agus cha bhi feum air inntrigeadh às-dùnach dhan diosga (tha sin "
-"a’ ciallachadh gum faod an diosga no an t-uidheam a bhith ’ga chleachdadh)."
+msgstr "Ma tha thu airson tomhas-measaidh a dhèanamh air reat sgrìobhaidh diosga, bidh feum air inntrigeadh 
às-dùnach dhan diosga (tha sin a’ ciallachadh nach fhaod an diosga no gin dhe na pàirteachaidhean aige a 
bhith ’gan cleachdadh no air am munntachadh) agus bithear a’ leughadh dàta uaithe ’s ’ga sgrìobhaidh air ais 
ann. Ri linn sin, chan atharraich na tha air an diosga.\n\nMur an cuir thu cromag ris, cha dèanar tomhas air 
an sgrìobhadh san tomhas-mheasaidh agus cha bhi feum air inntrigeadh às-dùnach dhan diosga (tha sin a’ 
ciallachadh gum faod an diosga no an t-uidheam a bhith ’ga chleachdadh)."
 
 #: src/disks/ui/benchmark-dialog.ui:478
 msgid ""
 "Number of samples. Bigger number produces a more accurate picture of access "
 "time patterns but takes more time."
-msgstr ""
-"Co mheud sampall. Gheibh thu beachd nas fhearr air pàtranan nan amannan "
-"inntrigidh ma chleachdas tu barrachd shampall ach bheir e nas fhaide."
+msgstr "Co mheud sampall. Gheibh thu beachd nas fhearr air pàtranan nan amannan inntrigidh ma chleachdas tu 
barrachd shampall ach bheir e nas fhaide."
 
 #: src/disks/ui/benchmark-dialog.ui:495
 msgid ""
 "The number of MiB (1048576 bytes) to read/write for each sample. Big sample "
 "sizes tend to produce more accurate benchmarks at the cost of the benchmark "
 "taking more time."
-msgstr ""
-"Co mheud MiB (1048576 bytes) a thèid a leughadh/sgrìobhadh airson gach "
-"sampaill. Gheibh thu tomhas-measaidh nas fhearr ma chleachdas tu sampall mòr "
-"ach bheir an tomhas-measaidh nas fhaide."
+msgstr "Co mheud MiB (1048576 bytes) a thèid a leughadh/sgrìobhadh airson gach sampaill. Gheibh thu 
tomhas-measaidh nas fhearr ma chleachdas tu sampall mòr ach bheir an tomhas-measaidh nas fhaide."
 
 #: src/disks/ui/benchmark-dialog.ui:533
 msgid "Access Time"
@@ -2656,9 +2518,7 @@ msgstr "Àir_eamh nan sampall"
 msgid ""
 "Number of samples. Bigger number produces more smooth graphs but the "
 "benchmark will take more time."
-msgstr ""
-"Co mheud sampall. Gheibh thu graf nas rèidhe le barrachd dhiubh ach bheil e "
-"nas fhaide."
+msgstr "Co mheud sampall. Gheibh thu graf nas rèidhe le barrachd dhiubh ach bheil e nas fhaide."
 
 #: src/disks/ui/change-passphrase-dialog.ui:7
 msgid "Change Passphrase"
@@ -2682,21 +2542,18 @@ msgid "Enter current passphrase used to protect the data"
 msgstr "Cuir a-steach an abairt-fhaire làithreach a dhìonas an dàta"
 
 #: src/disks/ui/change-passphrase-dialog.ui:123
-#: src/disks/ui/filesystem-create.ui:189
 msgid "Sho_w Passphrases"
 msgstr "Seal_l na h-abairtean-fhaire"
 
 #: src/disks/ui/change-passphrase-dialog.ui:129
 #: src/disks/ui/change-passphrase-dialog.ui:130
-#: src/disks/ui/filesystem-create.ui:195 src/disks/ui/filesystem-create.ui:196
+#: src/disks/ui/create-password-page.ui:101
 msgid "Check this box to see the passphrases entered above"
-msgstr ""
-"Cuir cromag ris a’ bhogsa seo gus na h-abairtean-faire a chuir thu a-steach "
-"gu h-àrd a shealltainn."
+msgstr "Cuir cromag ris a’ bhogsa seo gus na h-abairtean-faire a chuir thu a-steach gu h-àrd a shealltainn."
 
 #: src/disks/ui/change-passphrase-dialog.ui:164
 #: src/disks/ui/change-passphrase-dialog.ui:165
-#: src/disks/ui/filesystem-create.ui:158 src/disks/ui/filesystem-create.ui:159
+#: src/disks/ui/create-password-page.ui:81
 msgid "Confirm passphrase entered above"
 msgstr "Dearbh an abairt-fhaire a chaidh a chur a-steach gu h-àrd"
 
@@ -2706,7 +2563,6 @@ msgid "Enter new passphrase used to protect the data"
 msgstr "Cuir a-steach abairt-fhaire a dhìonas an dàta"
 
 #: src/disks/ui/change-passphrase-dialog.ui:206
-#: src/disks/ui/filesystem-create.ui:117
 msgid "C_onfirm Passphrase"
 msgstr "_Dearbh an abairt-fhaire"
 
@@ -2714,6 +2570,33 @@ msgstr "_Dearbh an abairt-fhaire"
 msgid "New _Passphrase"
 msgstr "Abairt-_fhaire ùr"
 
+#: src/disks/ui/create-confirm-page.ui:17
+#| msgid "All data on the partition will be lost"
+msgid "Warning: all data on the volume will be lost"
+msgstr "Rabhadh: Caillidh tu an dàta air fad air an iom-dhraibh"
+
+#: src/disks/ui/create-confirm-page.ui:33
+msgid "Confirm the details of the current volume before proceeding."
+msgstr "Dearbh fiosrachadh an iom-dhraibh làithrich mus lean thu air adhart."
+
+#: src/disks/ui/create-confirm-page.ui:46 src/disks/ui/disks.ui:900
+msgid "Device"
+msgstr "Uidheam"
+
+#: src/disks/ui/create-confirm-page.ui:72
+#| msgid "_Volumes"
+msgid "Volume"
+msgstr "Iom-dhraibh"
+
+#: src/disks/ui/create-confirm-page.ui:98
+msgid "Used"
+msgstr "’Ga chleachdadh"
+
+#. The physical location of the drive, could be 'Connected to another seat'  or 'Bay 11 of Promise VTrak' or 
'USB connector II'
+#: src/disks/ui/create-confirm-page.ui:113 src/disks/ui/disks.ui:228
+msgid "Location"
+msgstr "Ionad"
+
 #: src/disks/ui/create-disk-image-dialog.ui:8
 msgid "Create Disk Image"
 msgstr "Cruthaich ìomhaigh an diosga"
@@ -2721,7 +2604,6 @@ msgstr "Cruthaich ìomhaigh an diosga"
 #: src/disks/ui/create-disk-image-dialog.ui:29
 #: src/disks/ui/edit-crypttab-dialog.ui:140
 #: src/disks/ui/edit-gpt-partition-dialog.ui:107
-#: src/disks/ui/filesystem-create.ui:37
 #: src/disks/ui/new-disk-image-dialog.ui:48
 msgid "_Name"
 msgstr "Ai_nm"
@@ -2744,94 +2626,173 @@ msgstr "Bun-tùs"
 msgid "_Start Creating…"
 msgstr "Tòi_sich air a chruthachadh…"
 
-#: src/disks/ui/create-partition-dialog.ui:12
-msgid "Create Partition"
-msgstr "Cruthaich pàirteachadh"
+#: src/disks/ui/create-filesystem-page.ui:19
+#| msgid "_Volumes"
+msgid "Volume _Name"
+msgstr "Ai_nm an iom-dhraibh"
+
+#: src/disks/ui/create-filesystem-page.ui:33
+#| msgid ""
+#| "The name to use for the filesystem. This is useful if you want to refer "
+#| "to the device via a symlink in the /dev/disk/by-label directory"
+msgid ""
+"The name to use for the filesystem. This is useful if you want to refer to "
+"the device via a symlink in the /dev/disk/by-label directory."
+msgstr "An t-ainm a bhios air an t-siostam-fhaidhlichean. Tha seo feumail ma tha airson iomradh a thoirt air 
an uidheam seo slighe ceangail shamhlachail sa phasgan /dev/disk/by-label."
+
+#: src/disks/ui/create-filesystem-page.ui:47
+#| msgid "For example, “My Files” or “Backup Data”"
+msgid "For example: “Angela’s Files” or “Backup”."
+msgstr "Mar eisimpleir: “Faidhlichean Oighrig” no “Lethbhreac-glèidhidh”."
 
-#: src/disks/ui/create-partition-dialog.ui:42
-msgid "C_reate"
-msgstr "C_ruthaich"
+#: src/disks/ui/create-filesystem-page.ui:74
+#: src/disks/ui/format-disk-dialog.ui:103
+msgid "_Erase"
+msgstr "_Suath às"
+
+#: src/disks/ui/create-filesystem-page.ui:89
+#| msgid "Overwrite existing data with zeroes"
+msgid "Overwrites existing data, but takes longer."
+msgstr "Sgrìobhaidh seo thairis air an dàta a tha ann ach bheir e barrachd ùine."
+
+#: src/disks/ui/create-filesystem-page.ui:115
+msgid "_Internal disk for use with Linux systems only (Ext4)"
+msgstr "Diosg _inntearnail airson cleachdadh le siostaman Linux a-mhàin (Ext4)"
+
+#: src/disks/ui/create-filesystem-page.ui:131
+#: src/disks/ui/create-other-page.ui:46
+msgid "_Password protect volume (LUKS)"
+msgstr "Iom-dhraibh fo dhìon _facail-fhaire (LUKS)"
+
+#: src/disks/ui/create-filesystem-page.ui:147
+msgid "For use with _Windows (NTFS)"
+msgstr "A chum cleachdaidh le _Windows (NTFS)"
+
+#: src/disks/ui/create-filesystem-page.ui:163
+#| msgid "Compatible with all systems and devices"
+msgid "For use with all _systems and devices (FAT)"
+msgstr "A chum cleachdaidh le _siostam no uidheam sam bith (FAT)"
+
+#: src/disks/ui/create-filesystem-page.ui:179
+msgid "_Other"
+msgstr "_Eile"
+
+#: src/disks/ui/create-other-page.ui:17
+msgid ""
+"In case that the default options do not fit your needs select one of the "
+"following filesystems. Be aware of the technical differences and do research "
+"about your use case."
+msgstr "Mur eil gin dhe na roghainnean bunasach a’ freagairt ris na feumalachdan agad, tagh fear dhe na 
shiostaman-fhaidhlichean a leanas. Thoir an aire air an diofar teicnigeach agus dèan rannsachadh air na 
dh’fheumas tu. "
 
-#: src/disks/ui/create-partition-dialog.ui:112 src/disks/ui/resize-dialog.ui:95
+#: src/disks/ui/create-partition-page.ui:79 src/disks/ui/resize-dialog.ui:95
 msgid "Partition _Size"
 msgstr "_Meud a’ phàirteachaidh"
 
-#: src/disks/ui/create-partition-dialog.ui:130
-#: src/disks/ui/resize-dialog.ui:109
-#| msgid "The size of the partition to create, in megabytes"
+#: src/disks/ui/create-partition-page.ui:93 src/disks/ui/resize-dialog.ui:109
 msgid "The size of the partition to create"
 msgstr "Meud a’ phàirteachaidh ri chruthachadh"
 
-#: src/disks/ui/create-partition-dialog.ui:151
+#: src/disks/ui/create-partition-page.ui:111
 #: src/disks/ui/new-disk-image-dialog.ui:140 src/disks/ui/resize-dialog.ui:127
 msgid "bytes"
 msgstr "baidhtichean"
 
-#: src/disks/ui/create-partition-dialog.ui:152
+#: src/disks/ui/create-partition-page.ui:112
 #: src/disks/ui/new-disk-image-dialog.ui:141 src/disks/ui/resize-dialog.ui:128
 msgid "kB"
 msgstr "kB"
 
-#: src/disks/ui/create-partition-dialog.ui:153
+#: src/disks/ui/create-partition-page.ui:113
 #: src/disks/ui/new-disk-image-dialog.ui:142 src/disks/ui/resize-dialog.ui:129
 msgid "MB"
 msgstr "MB"
 
-#: src/disks/ui/create-partition-dialog.ui:154
+#: src/disks/ui/create-partition-page.ui:114
 #: src/disks/ui/new-disk-image-dialog.ui:143 src/disks/ui/resize-dialog.ui:130
 msgid "GB"
 msgstr "GB"
 
-#: src/disks/ui/create-partition-dialog.ui:155
+#: src/disks/ui/create-partition-page.ui:115
 #: src/disks/ui/new-disk-image-dialog.ui:144 src/disks/ui/resize-dialog.ui:131
 msgid "TB"
 msgstr "TB"
 
-#: src/disks/ui/create-partition-dialog.ui:156
+#: src/disks/ui/create-partition-page.ui:116
 #: src/disks/ui/new-disk-image-dialog.ui:145 src/disks/ui/resize-dialog.ui:132
 msgid "PB"
 msgstr "PB"
 
-#: src/disks/ui/create-partition-dialog.ui:157
+#: src/disks/ui/create-partition-page.ui:117
 #: src/disks/ui/new-disk-image-dialog.ui:146 src/disks/ui/resize-dialog.ui:133
 msgid "KiB"
 msgstr "KiB"
 
-#: src/disks/ui/create-partition-dialog.ui:158
+#: src/disks/ui/create-partition-page.ui:118
 #: src/disks/ui/new-disk-image-dialog.ui:147 src/disks/ui/resize-dialog.ui:134
 msgid "MiB"
 msgstr "MiB"
 
-#: src/disks/ui/create-partition-dialog.ui:159
+#: src/disks/ui/create-partition-page.ui:119
 #: src/disks/ui/new-disk-image-dialog.ui:148 src/disks/ui/resize-dialog.ui:135
 msgid "GiB"
 msgstr "GiB"
 
-#: src/disks/ui/create-partition-dialog.ui:160
+#: src/disks/ui/create-partition-page.ui:120
 #: src/disks/ui/new-disk-image-dialog.ui:149 src/disks/ui/resize-dialog.ui:136
 msgid "TiB"
 msgstr "TiB"
 
-#: src/disks/ui/create-partition-dialog.ui:161
+#: src/disks/ui/create-partition-page.ui:121
 #: src/disks/ui/new-disk-image-dialog.ui:150 src/disks/ui/resize-dialog.ui:137
 msgid "PiB"
 msgstr "PiB"
 
-#: src/disks/ui/create-partition-dialog.ui:176
-#: src/disks/ui/resize-dialog.ui:151
+#: src/disks/ui/create-partition-page.ui:135 src/disks/ui/resize-dialog.ui:151
 msgid "Free Space _Following"
 msgstr "Rum saor ’na _dhèidh"
 
-#: src/disks/ui/create-partition-dialog.ui:194
-#: src/disks/ui/resize-dialog.ui:167
-#| msgid "The free space following the partition, in megabytes"
+#: src/disks/ui/create-partition-page.ui:148 src/disks/ui/resize-dialog.ui:168
 msgid "The free space following the partition"
 msgstr "An rum saor a bhios an dèidh a’ phàirteachaidh"
 
-#. The contents of the device, for example 'Unknown', 'FAT (32-bit version)', 'Ext4 (version 1.0)', 'Swap 
(version 2)'
-#: src/disks/ui/create-partition-dialog.ui:239 src/disks/ui/disks.ui:863
-msgid "Contents"
-msgstr "Susbaint"
+#: src/disks/ui/create-partition-page.ui:173
+#| msgctxt "volume-grid"
+#| msgid "Extended Partition"
+msgid "Extended Partition"
+msgstr "Pàirteachadh leudaichte"
+
+#: src/disks/ui/create-partition-page.ui:177
+msgid "Extended Partitions can contain Logical Partitions"
+msgstr "Faodaidh pàirteachaidhean loidsigeach a bhith am broinn pàirteachadh leudaichte"
+
+#: src/disks/ui/create-password-page.ui:18
+msgid ""
+"Data stored in the volume will only be accessible with the correct password. "
+"Be careful not to forget it."
+msgstr "Cha ghabh an dàta a thèid a stòradh san iom-dhraibh inntrigeadh ach leis an fhacal-fhaire cheart. 
Thoir an aire nach dìochuimhnich thu e."
+
+#: src/disks/ui/create-password-page.ui:34
+#| msgid "_Passphrase"
+msgid "_Password"
+msgstr "_Facal-faire"
+
+#: src/disks/ui/create-password-page.ui:48
+#| msgid "Confirm Check"
+msgid "_Confirm"
+msgstr "_Dearbh"
+
+#: src/disks/ui/create-password-page.ui:63
+msgid "Enter passphrase used to protect the data"
+msgstr "Cuir an abairt-fhaire a-steach a dhìonas an dàta"
+
+#: src/disks/ui/create-password-page.ui:95
+#| msgid "Sho_w Passphrases"
+msgid "Sh_ow Password"
+msgstr "_Seall am facal-faire"
+
+#: src/disks/ui/create-password-page.ui:134
+msgid "Mix uppercase and lowercase and try to use a number or two."
+msgstr "Cleachd litrichean mòra ’s beaga agus feuch an cleachd thu àireamh no dhà."
 
 #: src/disks/ui/disk-settings-dialog.ui:23
 msgid "Drive Settings"
@@ -2845,9 +2806,7 @@ msgstr "Cuir an sàs roghainnean crìoch-ùine an fhuireachais"
 msgid ""
 "Turn on to configure Standby Timeout at startup and when the disk is "
 "connected"
-msgstr ""
-"Cuir seo air gus crìoch-ùine an fhuireachais aig àm-tòiseachaidh agus nuair "
-"a thèid a diosga a cheangal ris a rèiteachadh"
+msgstr "Cuir seo air gus crìoch-ùine an fhuireachais aig àm-tòiseachaidh agus nuair a thèid a diosga a 
cheangal ris a rèiteachadh"
 
 #: src/disks/ui/disk-settings-dialog.ui:104
 msgid "Enter Standby After"
@@ -2863,9 +2822,7 @@ msgstr "Cuir an sàs roghainnean stiùireadh adhartach na cumhachd"
 
 #: src/disks/ui/disk-settings-dialog.ui:199
 msgid "Turn on to configure APM at startup and when the disk is connected"
-msgstr ""
-"Cuir seo air gus APM aig àm-tòiseachaidh agus nuair a thèid a diosga a "
-"cheangal ris a rèiteachadh"
+msgstr "Cuir seo air gus APM aig àm-tòiseachaidh agus nuair a thèid a diosga a cheangal ris a rèiteachadh"
 
 #: src/disks/ui/disk-settings-dialog.ui:232
 msgid "APM Level"
@@ -2875,10 +2832,7 @@ msgstr "Leibheil APM"
 msgid ""
 "Aggressive spin-down may wear out the drive faster than anticipated. Please "
 "check the “Start/Stop Count” SMART attribute from time to time"
-msgstr ""
-"Faodaidh gun teirig an draibh nas luaithe na bhiodh dùil ma nì thu "
-"aggressive spin-down. Thoir sùil air a’ bhuadh SMART “Àireamh an "
-"tòiseachaidh/stadaidh” o àm gu àm."
+msgstr "Faodaidh gun teirig an draibh nas luaithe na bhiodh dùil ma nì thu aggressive spin-down. Thoir sùil 
air a’ bhuadh SMART “Àireamh an tòiseachaidh/stadaidh” o àm gu àm."
 
 #: src/disks/ui/disk-settings-dialog.ui:308
 msgid "A_PM"
@@ -2890,9 +2844,7 @@ msgstr "Cuir an sàs roghainnean an Automatic Acoustic Management"
 
 #: src/disks/ui/disk-settings-dialog.ui:350
 msgid "Turn on to configure AAM at startup and when the disk is connected"
-msgstr ""
-"Cuir seo air gus AAM aig àm-tòiseachaidh agus nuair a thèid a diosga a "
-"cheangal ris a rèiteachadh"
+msgstr "Cuir seo air gus AAM aig àm-tòiseachaidh agus nuair a thèid a diosga a cheangal ris a rèiteachadh"
 
 #: src/disks/ui/disk-settings-dialog.ui:384
 msgid "Vendor Recommended"
@@ -2914,9 +2866,7 @@ msgstr "Cuir an sàs roghainnean sgrìobhadh an tasgadain"
 msgid ""
 "Turn on to configure Write Cache setting at startup and when the disk is "
 "connected"
-msgstr ""
-"Cuir seo air gus roghainnean sgrìobhadh an tasgadain aig àm-tòiseachaidh "
-"agus nuair a thèid a diosga a cheangal ris a rèiteachadh"
+msgstr "Cuir seo air gus roghainnean sgrìobhadh an tasgadain aig àm-tòiseachaidh agus nuair a thèid a diosga 
a cheangal ris a rèiteachadh"
 
 #: src/disks/ui/disk-settings-dialog.ui:549
 msgid "S_etting"
@@ -2934,9 +2884,7 @@ msgstr "Cuir sgrìobhadh an tasgadain à comas"
 msgid ""
 "Performance is increased by enabling write caching, but leaves the system "
 "susceptible to data loss in the event of a power failure"
-msgstr ""
-"Gheibhear dèanadas nas fhearr ma chuirear an comas sgrìobhadh an tasgadain "
-"ach dh’fhaoidte gun caill an siostam dàta ma thuislicheas a’ chumhachd"
+msgstr "Gheibhear dèanadas nas fhearr ma chuirear an comas sgrìobhadh an tasgadain ach dh’fhaoidte gun caill 
an siostam dàta ma thuislicheas a’ chumhachd"
 
 #: src/disks/ui/disk-settings-dialog.ui:622
 msgid "Wr_ite Cache"
@@ -2958,11 +2906,6 @@ msgstr "An àireamh shreathach"
 msgid "World Wide Name"
 msgstr "World Wide Name"
 
-#. The physical location of the drive, could be 'Connected to another seat'  or 'Bay 11 of Promise VTrak' or 
'USB connector II'
-#: src/disks/ui/disks.ui:228
-msgid "Location"
-msgstr "Ionad"
-
 #: src/disks/ui/disks.ui:265
 msgid "Media"
 msgstr "Meadhan"
@@ -2985,7 +2928,7 @@ msgstr "Fèin-ghlan"
 
 #: src/disks/ui/disks.ui:533
 msgid "Detach loop device after unmount action"
-msgstr ""
+msgstr "Dealaich uidheam lùib às dèidh an dì-mhunntachaidh"
 
 #. The filename or URI of the file that is used as backing store for the loop device.
 #: src/disks/ui/disks.ui:556
@@ -3036,9 +2979,10 @@ msgstr "Sguab às am pàirteachadh a thagh thu"
 msgid "Additional partition options"
 msgstr "Barrachd roghainnean a’ phàirteachaidh"
 
-#: src/disks/ui/disks.ui:900
-msgid "Device"
-msgstr "Uidheam"
+#. The contents of the device, for example 'Unknown', 'FAT (32-bit version)', 'Ext4 (version 1.0)', 'Swap 
(version 2)'
+#: src/disks/ui/disks.ui:863
+msgid "Contents"
+msgstr "Susbaint"
 
 #: src/disks/ui/disks.ui:937
 msgid "UUID"
@@ -3105,12 +3049,10 @@ msgid "Resize…"
 msgstr "Ath-mheudaich…"
 
 #: src/disks/ui/disks.ui:1311
-#| msgid "Edit Filesystem…"
 msgid "Check Filesystem…"
 msgstr "Dearbh an siostam-fhaidhlichean…"
 
 #: src/disks/ui/disks.ui:1319
-#| msgid "Edit Filesystem…"
 msgid "Repair Filesystem…"
 msgstr "Càraich an siostam-fhaidhlichean…"
 
@@ -3143,39 +3085,25 @@ msgid "Us_er Session Defaults"
 msgstr "Bun-roghainn_ean aig seisean a’ chleachdaiche"
 
 #: src/disks/ui/edit-crypttab-dialog.ui:112
-#| msgid ""
-#| "Switch off <i>Automatic Encryption Options</i> to manage encryption "
-#| "options and passphrase for the device. The options correspond to an entry "
-#| "in the <b>/etc/crypttab</b> file"
 msgid ""
 "Switch off <i>User Session Defaults</i> to manage encryption options and "
 "passphrase for the device. The options correspond to an entry in the <b>/etc/"
 "crypttab</b> file"
-msgstr ""
-"Cuir dheth <i>Bun-roghainnean aig seisean a’ chleachdaiche</i> gus "
-"roghainnean crioptachaidh agus abairt-fhaire an uidheim a stiùireadh. Tha na "
-"roghainnean seo a’ freagairt ri innteart san fhaidhle <b>/etc/crypttab</b>"
+msgstr "Cuir dheth <i>Bun-roghainnean aig seisean a’ chleachdaiche</i> gus roghainnean crioptachaidh agus 
abairt-fhaire an uidheim a stiùireadh. Tha na roghainnean seo a’ freagairt ri innteart san fhaidhle 
<b>/etc/crypttab</b>"
 
 #: src/disks/ui/edit-crypttab-dialog.ui:160
 msgid "Opt_ions"
 msgstr "Rogha_innean"
 
 #: src/disks/ui/edit-crypttab-dialog.ui:179
-#| msgid ""
-#| "The name to use for the unlocked device - the device is set up as the "
-#| "name prefixed with <b>/dev/mapper</b>/"
 msgid ""
 "The name to use for the unlocked device — the device is set up as the name "
 "prefixed with <b>/dev/mapper</b>/"
-msgstr ""
-"An t-ainm a bhios air an uidheam neo-ghlaiste – thèid an t-uidheam a "
-"shuidheachadh le <b>/dev/mapper</b>/ air beulaibh ainm"
+msgstr "An t-ainm a bhios air an uidheam neo-ghlaiste – thèid an t-uidheam a shuidheachadh le 
<b>/dev/mapper</b>/ air beulaibh ainm"
 
 #: src/disks/ui/edit-crypttab-dialog.ui:196
 msgid "Options to use when unlocking the device"
-msgstr ""
-"Na roghainnean a thèid a chleachdadh nuair a bheirear a’ ghlas far an "
-"uidheim"
+msgstr "Na roghainnean a thèid a chleachdadh nuair a bheirear a’ ghlas far an uidheim"
 
 #: src/disks/ui/edit-crypttab-dialog.ui:213
 msgid "Passphrase File"
@@ -3190,26 +3118,20 @@ msgstr "Sea_ll an abairt-fhaire"
 msgid ""
 "Passphrase of the device or empty to request from user when setting up the "
 "device"
-msgstr ""
-"Abairt-fhaire an uidheim no fàg bàn seo gus a h-iarraidh on chleachdaiche "
-"nuair a shuidhichear an t-uidheam"
+msgstr "Abairt-fhaire an uidheim no fàg bàn seo gus a h-iarraidh on chleachdaiche nuair a shuidhichear an 
t-uidheam"
 
 #: src/disks/ui/edit-crypttab-dialog.ui:282
-#: src/disks/ui/filesystem-create.ui:97 src/disks/ui/unlock-device-dialog.ui:43
+#: src/disks/ui/unlock-device-dialog.ui:43
 msgid "_Passphrase"
 msgstr "_Abairt-fhaire"
 
 #: src/disks/ui/edit-crypttab-dialog.ui:304
-#| msgid "_Unlock at startup"
 msgid "_Unlock at system startup"
 msgstr "_Thoir a’ ghlas dheth aig àm tòiseachadh an t-siostaim"
 
 #: src/disks/ui/edit-crypttab-dialog.ui:310
-#| msgid "If checked, the device will be unlocked at startup [!noauto]"
 msgid "If checked, the device will be unlocked at system startup [!noauto]"
-msgstr ""
-"Ma chuireas tu cromag ri seo, thèid a’ ghlas a thoirt far an uidheim aig àm "
-"tòiseachadh an t-siostaim [!noauto]"
+msgstr "Ma chuireas tu cromag ri seo, thèid a’ ghlas a thoirt far an uidheim aig àm tòiseachadh an 
t-siostaim [!noauto]"
 
 #: src/disks/ui/edit-crypttab-dialog.ui:325
 msgid "Require additional authori_zation to unlock"
@@ -3219,9 +3141,7 @@ msgstr "Iarr dearbhadh a _bharrachd gus a’ ghlas a thoirt dheth"
 msgid ""
 "If checked, additional authorization is required to unlock the device [x-"
 "udisks-auth]"
-msgstr ""
-"Ma chuireas tu cromag ri seo, thèid dearbhadh a bharrachd iarraidh mus dèid "
-"a’ ghlas a thoirt far an uidheim [x-udisks-auth]"
+msgstr "Ma chuireas tu cromag ri seo, thèid dearbhadh a bharrachd iarraidh mus dèid a’ ghlas a thoirt far an 
uidheim [x-udisks-auth]"
 
 #: src/disks/ui/edit-dos-partition-dialog.ui:7
 #: src/disks/ui/edit-gpt-partition-dialog.ui:8
@@ -3232,7 +3152,6 @@ msgstr "Deasaich am pàirteachadh"
 #: src/disks/ui/edit-dos-partition-dialog.ui:76
 #: src/disks/ui/edit-gpt-partition-dialog.ui:75
 #: src/disks/ui/edit-partition-dialog.ui:75
-#: src/disks/ui/filesystem-create.ui:17
 msgid "_Type"
 msgstr "_Seòrsa"
 
@@ -3249,10 +3168,7 @@ msgid ""
 "A flag used by the Platform bootloader to determine where the OS should be "
 "loaded from. Sometimes the partition with this flag set is referred to as "
 "the <i>active</i> partition"
-msgstr ""
-"Bratach a chleachdas bootloader an ùrlair nuair a cho-dhùineas e cò às a "
-"thèid an siostam-obrachaidh a luchdadh uaithe. Canar cuid ri pàirteachadh "
-"aig a bheil a’ bhratach seo gu bheil e <i>gnìomhach</i>."
+msgstr "Bratach a chleachdas bootloader an ùrlair nuair a cho-dhùineas e cò às a thèid an siostam-obrachaidh 
a luchdadh uaithe. Canar cuid ri pàirteachadh aig a bheil a’ bhratach seo gu bheil e <i>gnìomhach</i>."
 
 #: src/disks/ui/edit-filesystem-dialog.ui:7
 msgid "Change Filesystem Label"
@@ -3260,7 +3176,7 @@ msgstr "Atharraich leubail an t-siostaim-fhaidhlichean"
 
 #: src/disks/ui/edit-filesystem-dialog.ui:72
 msgid "This filesystem will be automatically unmounted prior to any changes."
-msgstr ""
+msgstr "Thèid an siostam-fhaidhlichean a dhì-mhunntachadh gu fèin-obrachail mus dèid dad atharrachadh."
 
 #: src/disks/ui/edit-filesystem-dialog.ui:92
 msgid "_Label"
@@ -3271,44 +3187,27 @@ msgid "Mount Options"
 msgstr "Roghainnean munntachaidh"
 
 #: src/disks/ui/edit-fstab-dialog.ui:64
-#| msgid ""
-#| "Switch off <i>Automatic Mount Options</i> to manage mount point and mount "
-#| "options for the device. The options correspond to an entry in the <b>/etc/"
-#| "fstab</b> file"
 msgid ""
 "Switch off <i>User Session Defaults</i> to manage mount point and mount "
 "options for the device. The options correspond to an entry in the <b>/etc/"
 "fstab</b> file"
-msgstr ""
-"Cuir dheth <i>Bun-roghainnean aig seisean a’ chleachdaiche</i> gus puing "
-"munntachadh agus roghainnean munntachadh an uidheim a stiùireadh. Tha na "
-"roghainnean seo a’ freagairt ri innteart san fhaidhle <b>/etc/fstab</b>."
+msgstr "Cuir dheth <i>Bun-roghainnean aig seisean a’ chleachdaiche</i> gus puing munntachadh agus 
roghainnean munntachadh an uidheim a stiùireadh. Tha na roghainnean seo a’ freagairt ri innteart san fhaidhle 
<b>/etc/fstab</b>."
 
 #: src/disks/ui/edit-fstab-dialog.ui:91
 msgid "I_dentify As"
 msgstr "A_ithnich mar"
 
 #: src/disks/ui/edit-fstab-dialog.ui:110
-#| msgid ""
-#| "The <b>special device file</b> - use symlinks in the <b>/dev/disk</b> "
-#| "hierarchy to control the scope of the entry"
 msgid ""
 "The <b>special device file</b> — use symlinks in the <b>/dev/disk</b> "
 "hierarchy to control the scope of the entry"
-msgstr ""
-"<b>Faidhle sònraichte an uidheim</b> – cleachd ceanglaichean samhlachail san "
-"rangachd <b>/dev/disk</b> gus smachd a chumail air sgòp an innteirt"
+msgstr "<b>Faidhle sònraichte an uidheim</b> – cleachd ceanglaichean samhlachail san rangachd 
<b>/dev/disk</b> gus smachd a chumail air sgòp an innteirt"
 
 #: src/disks/ui/edit-fstab-dialog.ui:111
-#| msgid ""
-#| "The special device file - use symlinks in the /dev/disk hierarchy to "
-#| "control the scope of the entry"
 msgid ""
 "The special device file — use symlinks in the /dev/disk hierarchy to control "
 "the scope of the entry"
-msgstr ""
-"Faidhle sònraichte an uidheim – cleachd ceanglaichean samhlachail san "
-"rangachd /dev/disk gus smachd a chumail air sgòp an innteirt"
+msgstr "Faidhle sònraichte an uidheim – cleachd ceanglaichean samhlachail san rangachd /dev/disk gus smachd 
a chumail air sgòp an innteirt"
 
 #: src/disks/ui/edit-fstab-dialog.ui:141
 msgid "Mount _Point"
@@ -3333,9 +3232,7 @@ msgstr "An t-_ainm-taisbeanaidh"
 #: src/disks/ui/edit-fstab-dialog.ui:238
 msgid ""
 "If set, the name to use for the device in the user interface [x-gvfs-name=]"
-msgstr ""
-"Ma chaidh seo a shuidheachadh, seo an t-ainm a bhios air an uidheam ann an "
-"eadar-aghaidh a’ chleachdaiche [x-gvfs-name=]"
+msgstr "Ma chaidh seo a shuidheachadh, seo an t-ainm a bhios air an uidheam ann an eadar-aghaidh a’ 
chleachdaiche [x-gvfs-name=]"
 
 #: src/disks/ui/edit-fstab-dialog.ui:255
 msgid "Icon Na_me"
@@ -3345,9 +3242,7 @@ msgstr "Ai_nm na h-ìomhaigheige"
 msgid ""
 "If set, the name of the icon to use in the device in the user interface [x-"
 "gvfs-icon=]"
-msgstr ""
-"Ma chaidh seo a shuidheachadh, seo an t-ainm a bhios air an ìomhaigheag aig "
-"an uidheam ann an eadar-aghaidh a’ chleachdaiche [x-gvfs-icon=]"
+msgstr "Ma chaidh seo a shuidheachadh, seo an t-ainm a bhios air an ìomhaigheag aig an uidheam ann an 
eadar-aghaidh a’ chleachdaiche [x-gvfs-icon=]"
 
 #: src/disks/ui/edit-fstab-dialog.ui:288
 msgid "Sho_w in user interface"
@@ -3357,10 +3252,7 @@ msgstr "Sea_ll ann an eadar-aghaidh a’ chleachdaiche"
 msgid ""
 "If checked, the device is always shown in the user interface no matter what "
 "its directory is [x-gvfs-show]"
-msgstr ""
-"Ma chuireas tu cromag ri seo, thèid an t-uidheam seo a shealltainn ann an "
-"eadar-aghaidh a’ chleachdaiche an-còmhnaidh, ge b’ e dè am pasgan aige [x"
-"-gvfs-show]"
+msgstr "Ma chuireas tu cromag ri seo, thèid an t-uidheam seo a shealltainn ann an eadar-aghaidh a’ 
chleachdaiche an-còmhnaidh, ge b’ e dè am pasgan aige [x-gvfs-show]"
 
 #: src/disks/ui/edit-fstab-dialog.ui:308
 msgid "Require additional authori_zation to mount"
@@ -3370,21 +3262,15 @@ msgstr "Iarr dearbhadh a _bharrachd mus gabh a mhunntachadh"
 msgid ""
 "If checked, additional authorization is required to mount the device [x-"
 "udisks-auth]"
-msgstr ""
-"Ma chuireas tu cromag ri seo, thèid dearbhadh a bharrachd iarraidh mus gabh "
-"an t-uidheam seo a mhunntachadh [x-udisks-auth]"
+msgstr "Ma chuireas tu cromag ri seo, thèid dearbhadh a bharrachd iarraidh mus gabh an t-uidheam seo a 
mhunntachadh [x-udisks-auth]"
 
 #: src/disks/ui/edit-fstab-dialog.ui:328
-#| msgid "Mount at _startup"
 msgid "Mount at system _startup"
 msgstr "Munntaich aig àm tòiseachadh an t-_siostaim"
 
 #: src/disks/ui/edit-fstab-dialog.ui:333
-#| msgid "If checked, the device will be mounted at startup [!noauto]"
 msgid "If checked, the device will be mounted at system startup [!noauto]"
-msgstr ""
-"Ma chuireas tu cromag ri seo, thèid an t-uidheam seo a mhunntachadh aig àm "
-"tòiseachadh an t-siostaim [!noauto]"
+msgstr "Ma chuireas tu cromag ri seo, thèid an t-uidheam seo a mhunntachadh aig àm tòiseachadh an t-siostaim 
[!noauto]"
 
 #: src/disks/ui/edit-fstab-dialog.ui:350
 msgid "S_ymbolic Icon Name"
@@ -3394,10 +3280,7 @@ msgstr "Ainm an ìo_mhaigh shamhlachail"
 msgid ""
 "If set, the name of the symbolic icon to use in the device in the user "
 "interface [x-gvfs-symbolic-icon=]"
-msgstr ""
-"Ma chaidh seo a shuidheachadh, seo an t-ainm a bhios air an ìomhaigheag "
-"shamhlachail aig an uidheam ann an eadar-aghaidh a’ chleachdaiche [x-gvfs-"
-"symbolic-icon=]"
+msgstr "Ma chaidh seo a shuidheachadh, seo an t-ainm a bhios air an ìomhaigheag shamhlachail aig an uidheam 
ann an eadar-aghaidh a’ chleachdaiche [x-gvfs-symbolic-icon=]"
 
 #: src/disks/ui/edit-fstab-dialog.ui:396
 msgid "Mount Opt_ions"
@@ -3405,9 +3288,7 @@ msgstr "Rogha_innean munntachaidh"
 
 #: src/disks/ui/edit-fstab-dialog.ui:415
 msgid "The mount options stored in the <b>/etc/fstab</b> file"
-msgstr ""
-"Na roghainnean munntachaidh a tha ’gan stòradh san fhaidhle "
-"<b>/etc/fstab</b>"
+msgstr "Na roghainnean munntachaidh a tha ’gan stòradh san fhaidhle <b>/etc/fstab</b>"
 
 #: src/disks/ui/edit-gpt-partition-dialog.ui:93
 msgid "The partition type represented as a 32-bit <i>GUID</i>"
@@ -3418,10 +3299,7 @@ msgid ""
 "The partition name (up to 36 unicode characters). This is useful if you want "
 "to refer to the device via a symlink in the <b>/dev/disk/by-partlabel</b> "
 "directory"
-msgstr ""
-"Ainm a’ phàirteachaidh (suas ri 36 caractar Unicode). Tha seo feumail ma tha "
-"thu airson iomradh a thoirt air an uidheam slighe ceangail shamhlachail sa "
-"phasgan <b>/dev/disk/by-partlabel</b>"
+msgstr "Ainm a’ phàirteachaidh (suas ri 36 caractar Unicode). Tha seo feumail ma tha thu airson iomradh a 
thoirt air an uidheam slighe ceangail shamhlachail sa phasgan <b>/dev/disk/by-partlabel</b>"
 
 #: src/disks/ui/edit-gpt-partition-dialog.ui:138
 msgid "_System Partition"
@@ -3432,24 +3310,21 @@ msgid ""
 "Used to indicate that the partition and its contents are required for the OS/"
 "Platform to function. Special care should be taken to not delete or "
 "overwrite the contents"
-msgstr ""
-"Comharraichidh seo gu bheil feum air a’ phàirteachadh agus an t-susbaint ann "
-"mus obraich an siostam-obrachaidh no an t-ùrlar. Bidh faiceallach ’s na "
-"sgrìobh thairis air an t-susbaint ann ’s na sguab às e."
+msgstr "Comharraichidh seo gu bheil feum air a’ phàirteachadh agus an t-susbaint ann mus obraich an 
siostam-obrachaidh no an t-ùrlar. Bidh faiceallach ’s na sgrìobh thairis air an t-susbaint ann ’s na sguab às 
e."
 
 #: src/disks/ui/edit-gpt-partition-dialog.ui:157
 msgid "Legacy BIOS _Bootable"
 msgstr "BIOS _Bootable dìleabach"
 
 #: src/disks/ui/edit-gpt-partition-dialog.ui:162
-#: src/disks/ui/edit-gpt-partition-dialog.ui:200
+#| msgid ""
+#| "Legacy BIOS Bootable. This is equivalent to Master Boot Record "
+#| "<i>bootable</i> flag. It is normally only used for GPT partitions on MBR "
+#| "systems"
 msgid ""
-"Legacy BIOS Bootable. This is equivalent to Master Boot Record <i>bootable</"
-"i> flag. It is normally only used for GPT partitions on MBR systems"
-msgstr ""
-"BIOS Bootable dìleabach. Tha seo co-ionnann ris a’ bhratach Master Boot "
-"Record <i>bootable</i>. Cha chleachdar seo mar as àbhaist ach airson "
-"pàirteachaidhean GPT air siostaman MBR."
+"This is equivalent to Master Boot Record <i>bootable</i> flag. It is "
+"normally only used for GPT partitions on MBR systems"
+msgstr "Tha seo co-ionnann ris a’ bhratach Master Boot Record <i>bootable</i>. Cha chleachdar seo mar as 
àbhaist ach airson pàirteachaidhean GPT air siostaman MBR"
 
 #: src/disks/ui/edit-gpt-partition-dialog.ui:179
 msgid "Flags"
@@ -3459,6 +3334,12 @@ msgstr "Brataich"
 msgid "Hide from _Firmware"
 msgstr "Falaich on _Firmware"
 
+#: src/disks/ui/edit-gpt-partition-dialog.ui:200
+msgid ""
+"Indicates that EFI firmware should ignore the content of the partition and "
+"not try to read from it"
+msgstr "Innsidh seo gum bu chòir do bhathar-an-sàs EFI susbaint a’ phàirteachaidh seo a leigeil seachad gun 
a bhith a’ fheuchainn ri leughadh uaithe"
+
 #: src/disks/ui/erase-multiple-disks-dialog.ui:7
 msgid "Erase Multiple Disks"
 msgstr "Suath às iomadh diosga"
@@ -3471,61 +3352,11 @@ msgstr "_Suath às…"
 msgid "Erase _Type"
 msgstr "Seòrsa an _t-suathaidh às"
 
-#: src/disks/ui/filesystem-create.ui:57
-msgid "F_ilesystem"
-msgstr "An siostam-fha_idhlichean"
-
-#: src/disks/ui/filesystem-create.ui:77
-msgid ""
-"The custom filesystem type to create e.g. <i>btrfs</i>, <i>xfs</i> or "
-"<i>swap</i>"
-msgstr ""
-"Seòrsa an t-siostaim-fhaidhlichean ghnàthaichte a thèid a chruthachadh, m.e. "
-"<i>btrfs</i>, <i>xfs</i> no <i>swap</i>"
-
-#: src/disks/ui/filesystem-create.ui:78
-msgid "The custom filesystem type to create e.g. btrfs, xfs or swap"
-msgstr ""
-"Seòrsa an t-siostaim-fhaidhlichean ghnàthaichte a thèid a chruthachadh, m.e. "
-"btrfs, xfs no swap"
-
-#: src/disks/ui/filesystem-create.ui:137 src/disks/ui/filesystem-create.ui:138
-msgid "Enter passphrase used to protect the data"
-msgstr "Cuir an abairt-fhaire a-steach a dhìonas an dàta"
-
-#: src/disks/ui/filesystem-create.ui:229 src/disks/ui/format-disk-dialog.ui:103
-msgid "_Erase"
-msgstr "_Suath às"
-
-#: src/disks/ui/filesystem-create.ui:267
-msgid ""
-"The name to use for the filesystem. This is useful if you want to refer to "
-"the device via a symlink in the <b>/dev/disk/by-label</b> directory"
-msgstr ""
-"An t-ainm a bhios air an t-siostam-fhaidhlichean. Tha seo feumail ma tha thu "
-"airson iomradh a thoirt air an uidheam seo slighe ceangail shamhlachail sa "
-"phasgan <b>/dev/disk/by-label</b>"
-
-#: src/disks/ui/filesystem-create.ui:268
-msgid ""
-"The name to use for the filesystem. This is useful if you want to refer to "
-"the device via a symlink in the /dev/disk/by-label directory"
-msgstr ""
-"An t-ainm a bhios air an t-siostam-fhaidhlichean. Tha seo feumail ma tha "
-"airson iomradh a thoirt air an uidheam seo slighe ceangail shamhlachail sa "
-"phasgan /dev/disk/by-label"
-
-#: src/disks/ui/filesystem-create.ui:285
-msgid "For example, “My Files” or “Backup Data”"
-msgstr ""
-"Mar eisimpleir, “Na faidhlichean agam” no “Lethbhreac-glèidhidh an dàta”"
-
 #: src/disks/ui/format-disk-dialog.ui:7
 msgid "Format Disk"
 msgstr "Fòrmataich an diosga"
 
 #: src/disks/ui/format-disk-dialog.ui:39
-#: src/disks/ui/format-volume-dialog.ui:39
 msgid "_Format…"
 msgstr "_Fòrmataich…"
 
@@ -3533,27 +3364,19 @@ msgstr "_Fòrmataich…"
 msgid "_Partitioning"
 msgstr "_Pàirteachadh"
 
-#: src/disks/ui/format-volume-dialog.ui:7
-msgid "Format Volume"
-msgstr "Fòrmataich an draibh"
-
 #: src/disks/ui/new-disk-image-dialog.ui:8
-#| msgid "Create Disk Image"
 msgid "New Disk Image"
 msgstr "Ìomhaigh diosga ùr"
 
 #: src/disks/ui/new-disk-image-dialog.ui:29
-#| msgid "Image Size"
 msgid "Image _Size"
 msgstr "_Meud na h-ìomhaighe"
 
 #: src/disks/ui/new-disk-image-dialog.ui:86
-#| msgid "The size of the partition to create, in megabytes"
 msgid "The size of the image to create"
 msgstr "Meud na h-ìomhaigheige ri cruthachadh"
 
 #: src/disks/ui/new-disk-image-dialog.ui:187
-#| msgid "Attach Disk _Image…"
 msgid "Attach new _Image…"
 msgstr "Ceangail ìomhaigh ùr r_is…"
 
@@ -3563,17 +3386,17 @@ msgstr "Ath-mheudaich an t-iom-dhraibh"
 
 #: src/disks/ui/resize-dialog.ui:53
 msgid ""
-"Resizing a filesystem can lead to data loss. You are adviced to backup your "
+"Resizing a filesystem can lead to data loss. You are advised to backup your "
 "data before. The resize operation will take longer if a lot of data has to "
 "be moved. The minimal size is calculated according to the current content. "
 "Keep additional free space for the filesystem to work fast and reliably."
-msgstr ""
+msgstr "Nuair a dh’atharraicheas tu meud an t-siostaim-fhaichlichean, dh’fhaoidte gun dèid dàta air chall. 
Mholamaid gun dèan thu lethbhreac-glèidhidh dhen dàta roimhe sin. Bheir obrachadh an ath-mheudachaidh nas 
fhaide ma bhios torr dàta feumach air gluasad. Thèid am meud as ìsle àireamhachadh a-rèir na susbainte 
làithrich. Cum àite saor a bharrachd ach am bi an siotam-fhaidhlichean luath is seasmhach."
 
-#: src/disks/ui/resize-dialog.ui:196
+#: src/disks/ui/resize-dialog.ui:197
 msgid "_Difference"
 msgstr "_Diofar"
 
-#: src/disks/ui/resize-dialog.ui:212
+#: src/disks/ui/resize-dialog.ui:214
 msgid "The difference to the previous partition size"
 msgstr "An diofar ris a’ mheud a bha air a’ phàirteachadh roimhe"
 
@@ -3627,14 +3450,11 @@ msgstr "Cuir _stad air an fhèin-deuchainn"
 
 #: src/disks/ui/smart-dialog.ui:44
 msgid "Click to stop the SMART self-test currently in progress"
-msgstr ""
-"Dèan briogadh gus crìoch a chur air an fhèin-deuchainn SMART a tha a’ dol "
-"air adhart"
+msgstr "Dèan briogadh gus crìoch a chur air an fhèin-deuchainn SMART a tha a’ dol air adhart"
 
 #: src/disks/ui/smart-dialog.ui:74
 msgid "Click to force re-reading SMART data from the hard disk"
-msgstr ""
-"Dèan briogadh gus ath-leughadh an dàta SMART èigneachadh on chlàr-chruaidh"
+msgstr "Dèan briogadh gus ath-leughadh an dàta SMART èigneachadh on chlàr-chruaidh"
 
 #: src/disks/ui/smart-dialog.ui:113
 msgid "Powered On"
@@ -3658,8 +3478,7 @@ msgstr "Am measadh san fharsaingeachd"
 
 #: src/disks/ui/smart-dialog.ui:317
 msgid "Click to toggle whether SMART is enabled for the hard disk"
-msgstr ""
-"Dèan briogadh gus toglachadh am bi SMART an comas airson a’ chlàir-chruaidh"
+msgstr "Dèan briogadh gus toglachadh am bi SMART an comas airson a’ chlàir-chruaidh"
 
 #: src/disks/ui/smart-dialog.ui:339
 msgid "SMART _Attributes"
@@ -3685,20 +3504,20 @@ msgstr "Cuir a-steach an abairt-fhaire gus a’ ghlas a thoirt dheth"
 msgid "_Unlock"
 msgstr "_Thoir a’ ghlas dheth"
 
-#: src/libgdu/gduutils.c:91
+#: src/libgdu/gduutils.c:111
 msgid "All Files"
 msgstr "A h-uile faidhle"
 
-#: src/libgdu/gduutils.c:96
+#: src/libgdu/gduutils.c:116
 msgid "Disk Images (*.img, *.img.xz, *.iso)"
 msgstr "Ìomhaighean diosga (*.img, *.img.xz, *.iso)"
 
-#: src/libgdu/gduutils.c:98
+#: src/libgdu/gduutils.c:118
 msgid "Disk Images (*.img, *.iso)"
 msgstr "Ìomhaighean diosga (*.img, *.iso)"
 
 #. Translators: Used for number of years
-#: src/libgdu/gduutils.c:427
+#: src/libgdu/gduutils.c:447
 #, c-format
 msgid "%d year"
 msgid_plural "%d years"
@@ -3708,7 +3527,7 @@ msgstr[2] "%d bliadhna"
 msgstr[3] "%d bliadhna"
 
 #. Translators: Used for number of months
-#: src/libgdu/gduutils.c:434
+#: src/libgdu/gduutils.c:454
 #, c-format
 msgid "%d month"
 msgid_plural "%d months"
@@ -3718,7 +3537,7 @@ msgstr[2] "%d mìosan"
 msgstr[3] "%d mìos"
 
 #. Translators: Used for number of days
-#: src/libgdu/gduutils.c:441
+#: src/libgdu/gduutils.c:461
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -3728,7 +3547,7 @@ msgstr[2] "%d làithean"
 msgstr[3] "%d latha"
 
 #. Translators: Used for number of hours
-#: src/libgdu/gduutils.c:448
+#: src/libgdu/gduutils.c:468
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -3738,7 +3557,7 @@ msgstr[2] "%d uairean a thìde"
 msgstr[3] "%d uair a thìde"
 
 #. Translators: Used for number of minutes
-#: src/libgdu/gduutils.c:455
+#: src/libgdu/gduutils.c:475
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -3748,7 +3567,7 @@ msgstr[2] "%d mionaidean"
 msgstr[3] "%d mionaid"
 
 #. Translators: Used for number of seconds
-#: src/libgdu/gduutils.c:462
+#: src/libgdu/gduutils.c:482
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -3758,7 +3577,7 @@ msgstr[2] "%d diogan"
 msgstr[3] "%d diog"
 
 #. Translators: Used for number of milli-seconds
-#: src/libgdu/gduutils.c:469
+#: src/libgdu/gduutils.c:489
 #, c-format
 msgid "%d milli-second"
 msgid_plural "%d milli-seconds"
@@ -3768,71 +3587,70 @@ msgstr[2] "%d mille-dhiogan"
 msgstr[3] "%d mille-dhiog"
 
 #. Translators: Used for duration greater than one year. First %s is number of years, second %s is months, 
third %s is days
-#: src/libgdu/gduutils.c:533
+#: src/libgdu/gduutils.c:553
 #, c-format
 msgctxt "duration-year-to-inf"
 msgid "%s, %s and %s"
 msgstr "%s, %s agus %s"
 
 #. Translators: Used for durations less than one year but greater than one month. First %s is number of 
months, second %s is days
-#: src/libgdu/gduutils.c:538
+#: src/libgdu/gduutils.c:558
 #, c-format
 msgctxt "duration-months-to-year"
 msgid "%s and %s"
 msgstr "%s agus %s"
 
 #. Translators: Used for durations less than one month but greater than one day. First %s is number of days, 
second %s is hours
-#: src/libgdu/gduutils.c:543
+#: src/libgdu/gduutils.c:563
 #, c-format
 msgctxt "duration-day-to-month"
 msgid "%s and %s"
 msgstr "%s agus %s"
 
 #. Translators: Used for durations less than one day but greater than one hour. First %s is number of hours, 
second %s is minutes
-#: src/libgdu/gduutils.c:548
+#: src/libgdu/gduutils.c:568
 #, c-format
 msgctxt "duration-hour-to-day"
 msgid "%s and %s"
 msgstr "%s agus %s"
 
 #. Translators: Used for durations less than one hour but greater than one minute. First %s is number of 
minutes, second %s is seconds
-#: src/libgdu/gduutils.c:559
+#: src/libgdu/gduutils.c:579
 #, c-format
 msgctxt "duration-minute-to-hour"
 msgid "%s and %s"
 msgstr "%s agus %s"
 
-#: src/libgdu/gduutils.c:568
+#: src/libgdu/gduutils.c:588
 msgctxt "duration"
 msgid "Less than a minute"
 msgstr "Nas lugha na mionaid"
 
 #. Translators: Used for durations less than one minute byte greater than one second. First %s is number of 
seconds
-#: src/libgdu/gduutils.c:573
+#: src/libgdu/gduutils.c:593
 #, c-format
 msgctxt "duration-second-to-minute"
 msgid "%s"
 msgstr "%s"
 
 #. Translators: Used for durations less than one second. First %s is number of milli-seconds
-#: src/libgdu/gduutils.c:579
+#: src/libgdu/gduutils.c:599
 #, c-format
 msgctxt "duration-zero-to-second"
 msgid "%s"
 msgstr "%s"
 
 #. Translators: Shown in confirmation dialogs with a list of devices that will be affected by the action
-#: src/libgdu/gduutils.c:815
+#: src/libgdu/gduutils.c:835
 msgctxt "confirmation-list-of-devices"
 msgid "Affected Devices"
 msgstr "Uidheaman air a bheil buaidh"
 
-#: src/libgdu/gduutils.c:1398
+#: src/libgdu/gduutils.c:1431
 msgid "Error locking device"
 msgstr "Mearachd a’ glasadh an uidheim"
 
-#: src/libgdu/gduutils.c:1419
-#| msgid "Error deleting loop device"
+#: src/libgdu/gduutils.c:1452
 msgid "Error disabling autoclear for loop device"
 msgstr "Mearachd a’ cur às comas autoclear airson an uidheim lùbte"
 
@@ -3854,6 +3672,82 @@ msgctxt "notify-smart"
 msgid "Examine"
 msgstr "Sgrùd"
 
+#~ msgid "FAT"
+#~ msgstr "FAT"
+
+#~ msgid "Compatible with most systems"
+#~ msgstr "Co-chòrdail leis a’ mhòrchuid a shiostaman agus uidheaman"
+
+#~ msgid "NTFS"
+#~ msgstr "NTFS"
+
+#~ msgid "Compatible with Linux systems"
+#~ msgstr "Co-chòrdail le siostaman Linux"
+
+#~ msgid "Ext4"
+#~ msgstr "Ext4"
+
+#~ msgid "Encrypted, compatible with Linux systems"
+#~ msgstr "Crioptaichte, co-chòrdail le siostaman Linux"
+
+#~ msgid "LUKS + Ext4"
+#~ msgstr "LUKS ⁊ Ext4"
+
+#~ msgid "Enter filesystem type"
+#~ msgstr "Cuir a-steach seòrsa an t-siostaim-fhaidhlichean"
+
+#~ msgid "Error formatting partition"
+#~ msgstr "Mearachd a’ fòrmatadh a’ phàirteachaidh"
+
+#~ msgid "Extended partition"
+#~ msgstr "Pàirteachadh leudaichte"
+
+#~ msgid "For logical partitions"
+#~ msgstr "Airson pàirteachaidhean loidigeach"
+
+#~ msgid "Are you sure you want to format the volume?"
+#~ msgstr "A bheil thu cinnteach gu bheil thu airson an draibh fhòrmatadh?"
+
+#~ msgid ""
+#~ "All data on the volume will be lost but may still be recoverable by data "
+#~ "recovery services"
+#~ msgstr ""
+#~ "Caillidh tu an dàta air fad air an draibh ach dh’fhaoidte gum faigh "
+#~ "seirbheisean aiseag dàta greim air fhathast"
+
+#~ msgid ""
+#~ "All data on the volume will be overwritten and will likely not be "
+#~ "recoverable by data recovery services"
+#~ msgstr ""
+#~ "Thèid sgrìobhadh thairis air an dàta air fad air an draibh agus chan eil "
+#~ "teans gun urrainn do sheirbheisean aiseag dàta fhaighinn air ais"
+
+#~ msgid "C_reate"
+#~ msgstr "C_ruthaich"
+
+#~ msgid "F_ilesystem"
+#~ msgstr "An siostam-fha_idhlichean"
+
+#~ msgid ""
+#~ "The custom filesystem type to create e.g. <i>btrfs</i>, <i>xfs</i> or "
+#~ "<i>swap</i>"
+#~ msgstr ""
+#~ "Seòrsa an t-siostaim-fhaidhlichean ghnàthaichte a thèid a chruthachadh, m."
+#~ "e. <i>btrfs</i>, <i>xfs</i> no <i>swap</i>"
+
+#~ msgid "The custom filesystem type to create e.g. btrfs, xfs or swap"
+#~ msgstr ""
+#~ "Seòrsa an t-siostaim-fhaidhlichean ghnàthaichte a thèid a chruthachadh, m."
+#~ "e. btrfs, xfs no swap"
+
+#~ msgid ""
+#~ "The name to use for the filesystem. This is useful if you want to refer "
+#~ "to the device via a symlink in the <b>/dev/disk/by-label</b> directory"
+#~ msgstr ""
+#~ "An t-ainm a bhios air an t-siostam-fhaidhlichean. Tha seo feumail ma tha "
+#~ "thu airson iomradh a thoirt air an uidheam seo slighe ceangail "
+#~ "shamhlachail sa phasgan <b>/dev/disk/by-label</b>"
+
 #~ msgid "Activation of this plugin"
 #~ msgstr "Gnìomhachadh a' phlugain seo"
 
@@ -4182,13 +4076,6 @@ msgstr "Sgrùd"
 #~ msgid "%s, %s"
 #~ msgstr "%s, %s"
 
-#~ msgid "%d disk is missing"
-#~ msgid_plural "%d disks are missing"
-#~ msgstr[0] "Tha %d diosga a dhìth"
-#~ msgstr[1] "Tha %d dhiosga a dhìth"
-#~ msgstr[2] "Tha %d diosgan a dhìth"
-#~ msgstr[3] "Tha %d diosga a dhìth"
-
 #~ msgctxt "mdraid"
 #~ msgid "ARRAY IS DEGRADED"
 #~ msgstr "THA AN ARRAIGH AIR CRÌONADH"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]