update translations for 6.2.0 rc1

and force-fix errors using pocheck

Change-Id: Iccf11f743d0aa5c3f7fd2f0fcc12dfe105d1c071

1 files changed, 321 insertions, 325 deletions

diff --git a/source/gd/cui/messages.po b/source/gd/cui/messages.po
index 1f7a5dfb514..90f3b762c63 100644
--- a/source/gd/cui/messages.po
+++ b/source/gd/cui/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2018-11-14 12:21+0100\n"
+"POT-Creation-Date: 2018-12-17 16:28+0100\n"
 "PO-Revision-Date: 2018-11-16 14:21+0000\n"
 "Last-Translator: Michael Bauer <fios@akerbeltz.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,9 +13,64 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n"
 "X-Accelerator-Marker: ~\n"
-"X-Generator: Pootle 2.8\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1542378102.000000\n"
 
+#: cui/inc/numcategories.hrc:17
+msgctxt "numberingformatpage|liststore1"
+msgid "All"
+msgstr "A h-uile"
+
+#: cui/inc/numcategories.hrc:18
+msgctxt "numberingformatpage|liststore1"
+msgid "User-defined"
+msgstr "Sònraichte le cleachdaiche"
+
+#: cui/inc/numcategories.hrc:19
+msgctxt "numberingformatpage|liststore1"
+msgid "Number"
+msgstr "Àireamh"
+
+#: cui/inc/numcategories.hrc:20
+msgctxt "numberingformatpage|liststore1"
+msgid "Percent"
+msgstr "Ceudad"
+
+#: cui/inc/numcategories.hrc:21
+msgctxt "numberingformatpage|liststore1"
+msgid "Currency"
+msgstr "Airgeadra"
+
+#: cui/inc/numcategories.hrc:22
+msgctxt "numberingformatpage|liststore1"
+msgid "Date"
+msgstr "Ceann-là"
+
+#: cui/inc/numcategories.hrc:23
+msgctxt "numberingformatpage|liststore1"
+msgid "Time"
+msgstr "Àm"
+
+#: cui/inc/numcategories.hrc:24
+msgctxt "numberingformatpage|liststore1"
+msgid "Scientific"
+msgstr "Saidheansail"
+
+#: cui/inc/numcategories.hrc:25
+msgctxt "numberingformatpage|liststore1"
+msgid "Fraction"
+msgstr "Bloigh"
+
+#: cui/inc/numcategories.hrc:26
+msgctxt "numberingformatpage|liststore1"
+msgid "Boolean Value"
+msgstr "Luach Boolean"
+
+#: cui/inc/numcategories.hrc:27
+msgctxt "numberingformatpage|liststore1"
+msgid "Text"
+msgstr "Teacsa"
+
 #: cui/inc/strings.hrc:24
 msgctxt "RID_SVXSTR_KEY_CONFIG_DIR"
 msgid "Configuration"
@@ -1509,185 +1564,186 @@ msgstr "Cuir an àite nan stoidhlean gnàthaichte"
 
 #: cui/inc/strings.hrc:355
 msgctxt "RID_SVXSTR_BULLET"
-msgid "Replace bullets with: "
-msgstr "Cuir na leanas an àite nam peilear: "
+msgid "Replace bullets with: %1"
+msgstr ""
 
-#: cui/inc/strings.hrc:356
+#. To translators: %1 will be replaced with a percentage, e.g. "10%"
+#: cui/inc/strings.hrc:357
 msgctxt "RID_SVXSTR_RIGHT_MARGIN"
-msgid "Combine single line paragraphs if length greater than"
-msgstr "Cuir còmhla paragrafan anns nach eil ach aon loidhne ma bhios iad nas fhaide na"
+msgid "Combine single line paragraphs if length greater than %1"
+msgstr ""
 
-#: cui/inc/strings.hrc:357
+#: cui/inc/strings.hrc:358
 msgctxt "RID_SVXSTR_NUM"
-msgid "Bulleted and numbered lists. Bullet symbol: "
-msgstr "Liostaichean peilearaichte ’s àireamhaichte. Comharra a’ pheileir: "
+msgid "Bulleted and numbered lists. Bullet symbol: %1"
+msgstr ""
 
-#: cui/inc/strings.hrc:358
+#: cui/inc/strings.hrc:359
 msgctxt "RID_SVXSTR_BORDER"
 msgid "Apply border"
 msgstr "Cuir an sàs iomall"
 
-#: cui/inc/strings.hrc:359
+#: cui/inc/strings.hrc:360
 msgctxt "RID_SVXSTR_CREATE_TABLE"
 msgid "Create table"
 msgstr "Cruthaich clàr"
 
-#: cui/inc/strings.hrc:360
+#: cui/inc/strings.hrc:361
 msgctxt "RID_SVXSTR_REPLACE_TEMPLATES"
 msgid "Apply Styles"
 msgstr "Cuir an sàs stoidhlean"
 
-#: cui/inc/strings.hrc:361
+#: cui/inc/strings.hrc:362
 msgctxt "RID_SVXSTR_DEL_SPACES_AT_STT_END"
 msgid "Delete spaces and tabs at beginning and end of paragraph"
 msgstr "Sguab às àitichean bàna is tabaichean aig toiseach is deireadh a’ pharagraf"
 
-#: cui/inc/strings.hrc:362
+#: cui/inc/strings.hrc:363
 msgctxt "RID_SVXSTR_DEL_SPACES_BETWEEN_LINES"
 msgid "Delete spaces and tabs at end and start of line"
 msgstr "Sguab às àitichean bàna is tabaichean aig toiseach is deireadh na loidhne"
 
-#: cui/inc/strings.hrc:363
+#: cui/inc/strings.hrc:364
 msgctxt "RID_SVXSTR_CONNECTOR"
 msgid "Connector"
 msgstr "Ceangladair"
 
-#: cui/inc/strings.hrc:364
+#: cui/inc/strings.hrc:365
 msgctxt "RID_SVXSTR_DIMENSION_LINE"
 msgid "Dimension line"
 msgstr "Loidhne meudachd"
 
-#: cui/inc/strings.hrc:365
+#: cui/inc/strings.hrc:366
 msgctxt "RID_SVXSTR_STARTQUOTE"
 msgid "Start Quote"
 msgstr "Comharra-labhairt toisich"
 
-#: cui/inc/strings.hrc:366
+#: cui/inc/strings.hrc:367
 msgctxt "RID_SVXSTR_ENDQUOTE"
 msgid "End Quote"
 msgstr "Comharra-labhairt deiridh"
 
-#: cui/inc/strings.hrc:368
+#: cui/inc/strings.hrc:369
 msgctxt "RID_SVXSTR_SELECTEDPERSONA"
 msgid "Selected Theme: "
 msgstr "An t-ùrlar a thagh thu: "
 
-#: cui/inc/strings.hrc:369
+#: cui/inc/strings.hrc:370
 msgctxt "RID_SVXSTR_SEARCHING"
 msgid "Searching, please wait..."
 msgstr "A' dèanamh lorg, fuirich ort..."
 
-#: cui/inc/strings.hrc:370
+#: cui/inc/strings.hrc:371
 msgctxt "RID_SVXSTR_SEARCHERROR"
 msgid "Cannot open %1, please try again later."
 msgstr "Cha b' urrainn dhuinn %1 fhosgladh, feuch ris a-rithist an ceann greis."
 
-#: cui/inc/strings.hrc:371
+#: cui/inc/strings.hrc:372
 msgctxt "RID_SVXSTR_NORESULTS"
 msgid "No results found."
 msgstr "Cha deach toradh sam bith a lorg."
 
-#: cui/inc/strings.hrc:372
+#: cui/inc/strings.hrc:373
 msgctxt "RID_SVXSTR_APPLYPERSONA"
 msgid "Applying Theme..."
 msgstr "A' cur an gnìomh an ùrlair..."
 
-#: cui/inc/strings.hrc:373
+#: cui/inc/strings.hrc:374
 msgctxt "RID_SVXSTR_INVALIDPERSONAURL"
 msgid "Please enter a valid theme address or a search term."
 msgstr "Cuir a-steach seòladh dligheach airson ùrlar no briathar-luirg."
 
-#: cui/inc/strings.hrc:375
+#: cui/inc/strings.hrc:376
 msgctxt "RID_SVXSTR_TABLE_PRESET_NONE"
 msgid "Set No Borders"
 msgstr "Na suidhich iomaill"
 
-#: cui/inc/strings.hrc:376
+#: cui/inc/strings.hrc:377
 msgctxt "RID_SVXSTR_TABLE_PRESET_ONLYOUTER"
 msgid "Set Outer Border Only"
 msgstr "Suidhich an t-iomall a-muigh a-mhàin"
 
-#: cui/inc/strings.hrc:377
+#: cui/inc/strings.hrc:378
 msgctxt "RID_SVXSTR_TABLE_PRESET_OUTERHORI"
 msgid "Set Outer Border and Horizontal Lines"
 msgstr "Suidhich an t-iomall a-muigh 's loidhnichean còmhnard"
 
-#: cui/inc/strings.hrc:378
+#: cui/inc/strings.hrc:379
 msgctxt "RID_SVXSTR_TABLE_PRESET_OUTERALL"
 msgid "Set Outer Border and All Inner Lines"
 msgstr "Suidhich an t-iomall a-muigh 's gach loidhne a-staigh"
 
-#: cui/inc/strings.hrc:379
+#: cui/inc/strings.hrc:380
 msgctxt "RID_SVXSTR_TABLE_PRESET_OUTERINNER"
 msgid "Set Outer Border Without Changing Inner Lines"
 msgstr "Suidhich an t-iomall a-muigh gun na loidhnichean a-staigh atharrachadh"
 
-#: cui/inc/strings.hrc:380
+#: cui/inc/strings.hrc:381
 msgctxt "RID_SVXSTR_PARA_PRESET_DIAGONAL"
 msgid "Set Diagonal Lines Only"
 msgstr "Suidhich loidhnichean trastanach a-mhàin"
 
-#: cui/inc/strings.hrc:381
+#: cui/inc/strings.hrc:382
 msgctxt "RID_SVXSTR_PARA_PRESET_ALL"
 msgid "Set All Four Borders"
 msgstr "Suidhich gach aon dhe na ceithir iomaill"
 
-#: cui/inc/strings.hrc:382
+#: cui/inc/strings.hrc:383
 msgctxt "RID_SVXSTR_PARA_PRESET_LEFTRIGHT"
 msgid "Set Left and Right Borders Only"
 msgstr "Suidhich an iomall deis is an t-iomall clì a-mhàin"
 
-#: cui/inc/strings.hrc:383
+#: cui/inc/strings.hrc:384
 msgctxt "RID_SVXSTR_PARA_PRESET_TOPBOTTOM"
 msgid "Set Top and Bottom Borders Only"
 msgstr "Suidhich an iomall aig a' bharr is an t-iomall aig a' bhonn a-mhàin"
 
-#: cui/inc/strings.hrc:384
+#: cui/inc/strings.hrc:385
 msgctxt "RID_SVXSTR_PARA_PRESET_ONLYLEFT"
 msgid "Set Left Border Only"
 msgstr "Suidhich an t-iomall clì a-mhàin"
 
-#: cui/inc/strings.hrc:385
+#: cui/inc/strings.hrc:386
 msgctxt "RID_SVXSTR_HOR_PRESET_ONLYHOR"
 msgid "Set Top and Bottom Borders, and All Inner Lines"
 msgstr "Suidhich na h-iomaill aig a' bharr 's aig a' bhonn agus gach loidhne a-staigh"
 
-#: cui/inc/strings.hrc:386
+#: cui/inc/strings.hrc:387
 msgctxt "RID_SVXSTR_VER_PRESET_ONLYVER"
 msgid "Set Left and Right Borders, and All Inner Lines"
 msgstr "Suidhich an t-iomall clì is an t-iomall deis agus gach loidhne a-staigh"
 
-#: cui/inc/strings.hrc:387
+#: cui/inc/strings.hrc:388
 msgctxt "RID_SVXSTR_SHADOW_STYLE_NONE"
 msgid "No Shadow"
 msgstr "Gun sgàil"
 
-#: cui/inc/strings.hrc:388
+#: cui/inc/strings.hrc:389
 msgctxt "RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT"
 msgid "Cast Shadow to Bottom Right"
 msgstr "Tilg sgàil gun bhonn air an làimh dheis"
 
-#: cui/inc/strings.hrc:389
+#: cui/inc/strings.hrc:390
 msgctxt "RID_SVXSTR_SHADOW_STYLE_TOPRIGHT"
 msgid "Cast Shadow to Top Right"
 msgstr "Tilg sgàil gun bharr air an làimh dheis"
 
-#: cui/inc/strings.hrc:390
+#: cui/inc/strings.hrc:391
 msgctxt "RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT"
 msgid "Cast Shadow to Bottom Left"
 msgstr "Tilg sgàil gun bhonn air an làimh chlì"
 
-#: cui/inc/strings.hrc:391
+#: cui/inc/strings.hrc:392
 msgctxt "RID_SVXSTR_SHADOW_STYLE_TOPLEFT"
 msgid "Cast Shadow to Top Left"
 msgstr "Tilg sgàil gun bharr air an làimh chlì"
 
-#: cui/inc/strings.hrc:392
+#: cui/inc/strings.hrc:393
 msgctxt "RID_SVXSTR_SIGNATURELINE_SIGNED_BY"
 msgid "Signed by: %1"
 msgstr "Air a shoidhneadh le: %1"
 
-#: cui/inc/strings.hrc:393
+#: cui/inc/strings.hrc:394
 msgctxt "RID_SVXSTR_OPENCL_RESTART"
 msgid "For the OpenCL changes to take effect, %PRODUCTNAME must be restarted."
 msgstr "Feumaidh tu %PRODUCTNAME ath-thòiseachadh mus bi buaidh aig na dh’atharraich thu ann an OpenCL."
@@ -2087,42 +2143,102 @@ msgctxt "SID_SB_STARBASEOPTIONS_RES"
 msgid "Databases"
 msgstr "Stòr-dàtannan"
 
+#: cui/inc/twolines.hrc:24
+msgctxt "twolinespage|liststore1"
+msgid "(None)"
+msgstr "(Chan eil gin)"
+
+#: cui/inc/twolines.hrc:25
+msgctxt "twolinespage|liststore1"
+msgid "("
+msgstr "("
+
+#: cui/inc/twolines.hrc:26
+msgctxt "twolinespage|liststore1"
+msgid "["
+msgstr "["
+
+#: cui/inc/twolines.hrc:27
+msgctxt "twolinespage|liststore1"
+msgid "<"
+msgstr "<"
+
+#: cui/inc/twolines.hrc:28
+msgctxt "twolinespage|liststore1"
+msgid "{"
+msgstr "{"
+
+#: cui/inc/twolines.hrc:29
+msgctxt "twolinespage|liststore1"
+msgid "Other Characters..."
+msgstr "Caractaran eile..."
+
+#: cui/inc/twolines.hrc:34
+msgctxt "twolinespage|liststore2"
+msgid "(None)"
+msgstr "(Chan eil gin)"
+
+#: cui/inc/twolines.hrc:35
+msgctxt "twolinespage|liststore2"
+msgid ")"
+msgstr ")"
+
+#: cui/inc/twolines.hrc:36
+msgctxt "twolinespage|liststore2"
+msgid "]"
+msgstr "]"
+
+#: cui/inc/twolines.hrc:37
+msgctxt "twolinespage|liststore2"
+msgid ">"
+msgstr ">"
+
+#: cui/inc/twolines.hrc:38
+msgctxt "twolinespage|liststore2"
+msgid "}"
+msgstr "}"
+
+#: cui/inc/twolines.hrc:39
+msgctxt "twolinespage|liststore2"
+msgid "Other Characters..."
+msgstr "Caractaran eile..."
+
 #: cui/uiconfig/ui/aboutconfigdialog.ui:9
 msgctxt "aboutconfigdialog|AboutConfig"
 msgid "Expert Configuration"
 msgstr "Rèiteachadh le sàr-eòlaich"
 
-#: cui/uiconfig/ui/aboutconfigdialog.ui:48
+#: cui/uiconfig/ui/aboutconfigdialog.ui:49
 msgctxt "aboutconfigdialog|searchButton"
 msgid "_Search"
 msgstr "_Lorg"
 
-#: cui/uiconfig/ui/aboutconfigdialog.ui:81
+#: cui/uiconfig/ui/aboutconfigdialog.ui:82
 msgctxt "aboutconfigdialog|preference"
 msgid "Preference Name"
 msgstr "Ainm an reifreans"
 
-#: cui/uiconfig/ui/aboutconfigdialog.ui:96
+#: cui/uiconfig/ui/aboutconfigdialog.ui:97
 msgctxt "aboutconfigdialog|property"
 msgid "Property"
 msgstr "Roghainn"
 
-#: cui/uiconfig/ui/aboutconfigdialog.ui:109
+#: cui/uiconfig/ui/aboutconfigdialog.ui:110
 msgctxt "aboutconfigdialog|type"
 msgid "Type"
 msgstr "Seòrsa"
 
-#: cui/uiconfig/ui/aboutconfigdialog.ui:122
+#: cui/uiconfig/ui/aboutconfigdialog.ui:123
 msgctxt "aboutconfigdialog|value"
 msgid "Value"
 msgstr "Luach"
 
-#: cui/uiconfig/ui/aboutconfigdialog.ui:169
+#: cui/uiconfig/ui/aboutconfigdialog.ui:170
 msgctxt "aboutconfigdialog|edit"
 msgid "Edit"
 msgstr "Deasaich"
 
-#: cui/uiconfig/ui/aboutconfigdialog.ui:182
+#: cui/uiconfig/ui/aboutconfigdialog.ui:183
 msgctxt "aboutconfigdialog|reset"
 msgid "Reset"
 msgstr "Ath-shuidhich"
@@ -2267,72 +2383,72 @@ msgctxt "accelconfigpage|label22"
 msgid "F_unctions"
 msgstr "_Foincseanan"
 
-#: cui/uiconfig/ui/acorexceptpage.ui:50
+#: cui/uiconfig/ui/acorexceptpage.ui:68
 msgctxt "acorexceptpage|autoabbrev"
 msgid "_AutoInclude"
 msgstr "_Gabh a-steach gu fèin-obrachail"
 
-#: cui/uiconfig/ui/acorexceptpage.ui:83
+#: cui/uiconfig/ui/acorexceptpage.ui:101
 msgctxt "acorexceptpage|newabbrev-atkobject"
 msgid "New abbreviations"
 msgstr "Ath-ghoiridean ùra"
 
-#: cui/uiconfig/ui/acorexceptpage.ui:95
+#: cui/uiconfig/ui/acorexceptpage.ui:113
 msgctxt "acorexceptpage|replace"
 msgid "_Replace"
 msgstr "Cui_r 'na àite"
 
-#: cui/uiconfig/ui/acorexceptpage.ui:119
+#: cui/uiconfig/ui/acorexceptpage.ui:137
 msgctxt "acorexceptpage|delabbrev-atkobject"
 msgid "Delete abbreviations"
 msgstr "Sguab às ath-ghoiridean"
 
-#: cui/uiconfig/ui/acorexceptpage.ui:167
+#: cui/uiconfig/ui/acorexceptpage.ui:206
 msgctxt "acorexceptpage|label1"
 msgid "Abbreviations (no Subsequent Capital)"
 msgstr "Giorrachaidhean (gun litir mhòr 'na dhèidh)"
 
-#: cui/uiconfig/ui/acorexceptpage.ui:220
+#: cui/uiconfig/ui/acorexceptpage.ui:259
 msgctxt "acorexceptpage|autodouble"
 msgid "A_utoInclude"
 msgstr "Gabh a-steach g_u fèin-obrachail"
 
-#: cui/uiconfig/ui/acorexceptpage.ui:253
+#: cui/uiconfig/ui/acorexceptpage.ui:292
 msgctxt "acorexceptpage|newdouble-atkobject"
 msgid "New words with two initial capitals"
 msgstr "Faclan ùra le dà litir mhòr aig an toiseach"
 
-#: cui/uiconfig/ui/acorexceptpage.ui:265
+#: cui/uiconfig/ui/acorexceptpage.ui:304
 msgctxt "acorexceptpage|replace1"
 msgid "_Replace"
 msgstr "Cui_r 'na àite"
 
-#: cui/uiconfig/ui/acorexceptpage.ui:289
+#: cui/uiconfig/ui/acorexceptpage.ui:328
 msgctxt "acorexceptpage|deldouble-atkobject"
 msgid "Delete words with two initial capitals"
 msgstr "Sguab às faclan le dà litir mhòr aig an toiseach"
 
-#: cui/uiconfig/ui/acorexceptpage.ui:337
+#: cui/uiconfig/ui/acorexceptpage.ui:397
 msgctxt "acorexceptpage|label2"
 msgid "Words With TWo INitial CApitals"
 msgstr "Faclan le DÀ LItir MHòr AIg AN TOiseach"
 
-#: cui/uiconfig/ui/acorreplacepage.ui:38
+#: cui/uiconfig/ui/acorreplacepage.ui:47
 msgctxt "acorreplacepage|replace"
 msgid "_Replace"
 msgstr "Cui_r 'na àite"
 
-#: cui/uiconfig/ui/acorreplacepage.ui:121
+#: cui/uiconfig/ui/acorreplacepage.ui:170
 msgctxt "acorreplacepage|label1"
 msgid "Repla_ce"
 msgstr "_Cuir 'na àite"
 
-#: cui/uiconfig/ui/acorreplacepage.ui:141
+#: cui/uiconfig/ui/acorreplacepage.ui:190
 msgctxt "acorreplacepage|label2"
 msgid "_With:"
 msgstr "_Le:"
 
-#: cui/uiconfig/ui/acorreplacepage.ui:154
+#: cui/uiconfig/ui/acorreplacepage.ui:203
 msgctxt "acorreplacepage|textonly"
 msgid "_Text only"
 msgstr "_Teacsa a-mhàin"
@@ -2352,137 +2468,137 @@ msgctxt "agingdialog|label1"
 msgid "Parameters"
 msgstr "Paramadairean"
 
-#: cui/uiconfig/ui/applyautofmtpage.ui:27
+#: cui/uiconfig/ui/applyautofmtpage.ui:39
 msgctxt "applyautofmtpage|edit"
 msgid "_Edit..."
 msgstr "D_easaich..."
 
-#: cui/uiconfig/ui/applyautofmtpage.ui:46
+#: cui/uiconfig/ui/applyautofmtpage.ui:57
 msgctxt "applyautofmtpage|label1"
 msgid "[M]: Replace while modifying existing text"
 msgstr "[M]: Cuir 'nan àite fhad 's a thathar a' deasachadh teacsa làithreach"
 
-#: cui/uiconfig/ui/applyautofmtpage.ui:60
+#: cui/uiconfig/ui/applyautofmtpage.ui:69
 msgctxt "applyautofmtpage|label2"
 msgid "[T]: AutoCorrect while typing"
 msgstr "[T]: Fèin-cheartaich fhad 's a thathar a' sgrìobhadh"
 
-#: cui/uiconfig/ui/applyautofmtpage.ui:88
+#: cui/uiconfig/ui/applyautofmtpage.ui:114
 msgctxt "applyautofmtpage|m"
 msgid "[M]"
 msgstr "[M]"
 
-#: cui/uiconfig/ui/applyautofmtpage.ui:101
+#: cui/uiconfig/ui/applyautofmtpage.ui:128
 msgctxt "applyautofmtpage|t"
 msgid "[T]"
 msgstr "[T]"
 
-#: cui/uiconfig/ui/applylocalizedpage.ui:30
+#: cui/uiconfig/ui/applylocalizedpage.ui:72
 msgctxt "applylocalizedpage|m"
 msgid "[M]"
 msgstr "[M]"
 
-#: cui/uiconfig/ui/applylocalizedpage.ui:43
+#: cui/uiconfig/ui/applylocalizedpage.ui:86
 msgctxt "applylocalizedpage|t"
 msgid "[T]"
 msgstr "[T]"
 
-#: cui/uiconfig/ui/applylocalizedpage.ui:118
+#: cui/uiconfig/ui/applylocalizedpage.ui:202
 msgctxt "applylocalizedpage|singlereplace"
 msgid "Repla_ce"
 msgstr "_Cuir 'na àite"
 
-#: cui/uiconfig/ui/applylocalizedpage.ui:138
+#: cui/uiconfig/ui/applylocalizedpage.ui:219
 msgctxt "applylocalizedpage|startquoteft"
 msgid "_Start quote:"
 msgstr "Comharra-labhairt toi_sich:"
 
-#: cui/uiconfig/ui/applylocalizedpage.ui:162
+#: cui/uiconfig/ui/applylocalizedpage.ui:242
 msgctxt "applylocalizedpage|startsingle-atkobject"
 msgid "Start quote of single quotes"
 msgstr "Comharra-labhairt toisich de chomharran-labhairt singilte"
 
-#: cui/uiconfig/ui/applylocalizedpage.ui:178
+#: cui/uiconfig/ui/applylocalizedpage.ui:255
 msgctxt "applylocalizedpage|singlestartex"
 msgid "Default"
 msgstr "Bun-roghainn"
 
-#: cui/uiconfig/ui/applylocalizedpage.ui:197
+#: cui/uiconfig/ui/applylocalizedpage.ui:271
 msgctxt "applylocalizedpage|defaultsingle"
 msgid "_Default"
 msgstr "_Bun-roghainn"
 
-#: cui/uiconfig/ui/applylocalizedpage.ui:205
+#: cui/uiconfig/ui/applylocalizedpage.ui:279
 msgctxt "applylocalizedpage|defaultsingle-atkobject"
 msgid "Single quotes default"
 msgstr "Comharran-labhairt singilte bunaiteach"
 
-#: cui/uiconfig/ui/applylocalizedpage.ui:221
+#: cui/uiconfig/ui/applylocalizedpage.ui:292
 msgctxt "applylocalizedpage|endquoteft"
 msgid "_End quote:"
 msgstr "Comharra-labhairt d_eiridh:"
 
-#: cui/uiconfig/ui/applylocalizedpage.ui:245
+#: cui/uiconfig/ui/applylocalizedpage.ui:315
 msgctxt "applylocalizedpage|endsingle-atkobject"
 msgid "End quote of single quotes"
 msgstr "Comharra-labhairt deiridh de chomharran-labhairt singilte"
 
-#: cui/uiconfig/ui/applylocalizedpage.ui:261
+#: cui/uiconfig/ui/applylocalizedpage.ui:328
 msgctxt "applylocalizedpage|singleendex"
 msgid "Default"
 msgstr "Bun-roghainn"
 
-#: cui/uiconfig/ui/applylocalizedpage.ui:286
+#: cui/uiconfig/ui/applylocalizedpage.ui:350
 msgctxt "applylocalizedpage|label1"
 msgid "Single Quotes"
 msgstr "Comharran-labhairt singilte"
 
-#: cui/uiconfig/ui/applylocalizedpage.ui:318
+#: cui/uiconfig/ui/applylocalizedpage.ui:380
 msgctxt "applylocalizedpage|doublereplace"
 msgid "Repla_ce"
 msgstr "_Cuir 'na àite"
 
-#: cui/uiconfig/ui/applylocalizedpage.ui:338
+#: cui/uiconfig/ui/applylocalizedpage.ui:397
 msgctxt "applylocalizedpage|label6"
 msgid "_Start quote:"
 msgstr "Comharra-labhairt toi_sich:"
 
-#: cui/uiconfig/ui/applylocalizedpage.ui:362
+#: cui/uiconfig/ui/applylocalizedpage.ui:420
 msgctxt "applylocalizedpage|startdouble-atkobject"
 msgid "Start quote of double quotes"
 msgstr "Comharra-labhairt toisich de chomharran-labhairt dùbailte"
 
-#: cui/uiconfig/ui/applylocalizedpage.ui:378
+#: cui/uiconfig/ui/applylocalizedpage.ui:433
 msgctxt "applylocalizedpage|doublestartex"
 msgid "Default"
 msgstr "Bun-roghainn"
 
-#: cui/uiconfig/ui/applylocalizedpage.ui:397
+#: cui/uiconfig/ui/applylocalizedpage.ui:449
 msgctxt "applylocalizedpage|defaultdouble"
 msgid "_Default"
 msgstr "_Bun-roghainn"
 
-#: cui/uiconfig/ui/applylocalizedpage.ui:405
+#: cui/uiconfig/ui/applylocalizedpage.ui:457
 msgctxt "applylocalizedpage|defaultdouble-atkobject"
 msgid "Double quotes default"
 msgstr "Comharran-labhairt dùbailte bunaiteach"
 
-#: cui/uiconfig/ui/applylocalizedpage.ui:421
+#: cui/uiconfig/ui/applylocalizedpage.ui:470
 msgctxt "applylocalizedpage|label8"
 msgid "_End quote:"
 msgstr "Comharra-labhairt d_eiridh:"
 
-#: cui/uiconfig/ui/applylocalizedpage.ui:445
+#: cui/uiconfig/ui/applylocalizedpage.ui:493
 msgctxt "applylocalizedpage|enddouble-atkobject"
 msgid "End quote of double quotes"
 msgstr "Comharra-labhairt deiridh de chomharran-labhairt dùbailte"
 
-#: cui/uiconfig/ui/applylocalizedpage.ui:461
+#: cui/uiconfig/ui/applylocalizedpage.ui:506
 msgctxt "applylocalizedpage|doubleendex"
 msgid "Default"
 msgstr "Bun-roghainn"
 
-#: cui/uiconfig/ui/applylocalizedpage.ui:486
+#: cui/uiconfig/ui/applylocalizedpage.ui:528
 msgctxt "applylocalizedpage|label10"
 msgid "Double Quotes"
 msgstr "Comharran-labhairt dùbailte"
@@ -2582,47 +2698,47 @@ msgctxt "assigncomponentdialog|label1"
 msgid "Component method name:"
 msgstr "Ainm a' mhodh chom-pàirte:"
 
-#: cui/uiconfig/ui/autocorrectdialog.ui:9
+#: cui/uiconfig/ui/autocorrectdialog.ui:8
 msgctxt "autocorrectdialog|AutoCorrectDialog"
 msgid "AutoCorrect"
 msgstr "Fèin-cheartaich"
 
-#: cui/uiconfig/ui/autocorrectdialog.ui:103
+#: cui/uiconfig/ui/autocorrectdialog.ui:108
 msgctxt "autocorrectdialog|label1"
 msgid "Replacements and exceptions for language:"
 msgstr "Ionadachadh ’s eisgeachdan a’ chànain a leanas:"
 
-#: cui/uiconfig/ui/autocorrectdialog.ui:151
+#: cui/uiconfig/ui/autocorrectdialog.ui:181
 msgctxt "autocorrectdialog|replace"
 msgid "Replace"
 msgstr "Cuir 'na àite"
 
-#: cui/uiconfig/ui/autocorrectdialog.ui:173
+#: cui/uiconfig/ui/autocorrectdialog.ui:227
 msgctxt "autocorrectdialog|exceptions"
 msgid "Exceptions"
 msgstr "Eisgeachdan"
 
-#: cui/uiconfig/ui/autocorrectdialog.ui:196
+#: cui/uiconfig/ui/autocorrectdialog.ui:274
 msgctxt "autocorrectdialog|options"
 msgid "Options"
 msgstr "Roghainnean"
 
-#: cui/uiconfig/ui/autocorrectdialog.ui:219
+#: cui/uiconfig/ui/autocorrectdialog.ui:321
 msgctxt "autocorrectdialog|apply"
 msgid "Options"
 msgstr "Roghainnean"
 
-#: cui/uiconfig/ui/autocorrectdialog.ui:242
+#: cui/uiconfig/ui/autocorrectdialog.ui:368
 msgctxt "autocorrectdialog|localized"
 msgid "Localized Options"
 msgstr "Roghainnean ionadailichte"
 
-#: cui/uiconfig/ui/autocorrectdialog.ui:265
+#: cui/uiconfig/ui/autocorrectdialog.ui:415
 msgctxt "autocorrectdialog|wordcompletion"
 msgid "Word Completion"
 msgstr "Slànachadh fhaclan"
 
-#: cui/uiconfig/ui/autocorrectdialog.ui:288
+#: cui/uiconfig/ui/autocorrectdialog.ui:462
 msgctxt "autocorrectdialog|smarttags"
 msgid "Smart Tags"
 msgstr "Tagaichean tapaidh"
@@ -4872,41 +4988,41 @@ msgctxt "eventassigndialog|EventAssignDialog"
 msgid "Assign Macro"
 msgstr "Iomruin macro"
 
-#: cui/uiconfig/ui/eventassignpage.ui:47
-msgctxt "eventassignpage|existingmacrosft"
-msgid "Existing Macros"
-msgstr "Macrothan a tha ann"
-
-#: cui/uiconfig/ui/eventassignpage.ui:97
-msgctxt "eventassignpage|macrotoft"
-msgid "Macro From"
-msgstr "Macro o"
-
-#: cui/uiconfig/ui/eventassignpage.ui:159
+#: cui/uiconfig/ui/eventassignpage.ui:84
 msgctxt "eventassignpage|eventft"
 msgid "Event"
 msgstr "Tachartas"
 
-#: cui/uiconfig/ui/eventassignpage.ui:172
+#: cui/uiconfig/ui/eventassignpage.ui:97
 msgctxt "eventassignpage|assignft"
 msgid "Assigned Action"
 msgstr "Gnìomh iomruinte"
 
-#: cui/uiconfig/ui/eventassignpage.ui:197
+#: cui/uiconfig/ui/eventassignpage.ui:116
 msgctxt "eventassignpage|libraryft1"
 msgid "Assignments"
 msgstr "Iomruineadh"
 
-#: cui/uiconfig/ui/eventassignpage.ui:220
+#: cui/uiconfig/ui/eventassignpage.ui:137
 msgctxt "eventassignpage|assign"
 msgid "Assign"
 msgstr "Iomruin"
 
-#: cui/uiconfig/ui/eventassignpage.ui:234
+#: cui/uiconfig/ui/eventassignpage.ui:152
 msgctxt "eventassignpage|delete"
 msgid "Remove"
 msgstr "Thoir air falbh"
 
+#: cui/uiconfig/ui/eventassignpage.ui:243
+msgctxt "eventassignpage|macrotoft"
+msgid "Macro From"
+msgstr "Macro o"
+
+#: cui/uiconfig/ui/eventassignpage.ui:319
+msgctxt "eventassignpage|existingmacrosft"
+msgid "Existing Macros"
+msgstr "Macrothan a tha ann"
+
 #: cui/uiconfig/ui/eventsconfigpage.ui:31
 msgctxt "eventsconfigpage|label1"
 msgid "Assign:"
@@ -5112,37 +5228,37 @@ msgctxt "galleryapplyprogress|GalleryApplyProgress"
 msgid "Apply"
 msgstr "Cuir an sàs"
 
-#: cui/uiconfig/ui/galleryapplyprogress.ui:73
+#: cui/uiconfig/ui/galleryapplyprogress.ui:77
 msgctxt "galleryapplyprogress|label2"
 msgid "File"
 msgstr "Faidhle"
 
-#: cui/uiconfig/ui/galleryfilespage.ui:30
+#: cui/uiconfig/ui/galleryfilespage.ui:37
 msgctxt "galleryfilespage|label1"
 msgid "_File type:"
 msgstr "S_eòrsa an fhaidhle:"
 
-#: cui/uiconfig/ui/galleryfilespage.ui:77
+#: cui/uiconfig/ui/galleryfilespage.ui:107
 msgctxt "galleryfilespage|files-atkobject"
 msgid "Files Found"
 msgstr "Faidhlichean a chaidh a lorg"
 
-#: cui/uiconfig/ui/galleryfilespage.ui:104
+#: cui/uiconfig/ui/galleryfilespage.ui:136
 msgctxt "galleryfilespage|preview"
 msgid "Pr_eview"
 msgstr "Ro-sh_ealladh"
 
-#: cui/uiconfig/ui/galleryfilespage.ui:125
+#: cui/uiconfig/ui/galleryfilespage.ui:166
 msgctxt "galleryfilespage|image-atkobject"
 msgid "Preview"
 msgstr "Ro-shealladh"
 
-#: cui/uiconfig/ui/galleryfilespage.ui:149
+#: cui/uiconfig/ui/galleryfilespage.ui:194
 msgctxt "galleryfilespage|findfiles"
 msgid "_Find Files..."
 msgstr "Lorg _faidhlichean..."
 
-#: cui/uiconfig/ui/galleryfilespage.ui:177
+#: cui/uiconfig/ui/galleryfilespage.ui:222
 msgctxt "galleryfilespage|addall"
 msgid "A_dd All"
 msgstr "Cuir a _h-uile ris"
@@ -5177,12 +5293,12 @@ msgctxt "gallerysearchprogress|GallerySearchProgress"
 msgid "Find"
 msgstr "Lorg"
 
-#: cui/uiconfig/ui/gallerysearchprogress.ui:78
+#: cui/uiconfig/ui/gallerysearchprogress.ui:82
 msgctxt "gallerysearchprogress|label1"
 msgid "File Type"
 msgstr "Seòrsa an fhaidhle"
 
-#: cui/uiconfig/ui/gallerysearchprogress.ui:115
+#: cui/uiconfig/ui/gallerysearchprogress.ui:119
 msgctxt "gallerysearchprogress|label2"
 msgid "Directory"
 msgstr "Pasgan"
@@ -5353,12 +5469,12 @@ msgctxt "hangulhanjaadddialog|HangulHanjaAddDialog"
 msgid "New Dictionary"
 msgstr "Faclair ùr"
 
-#: cui/uiconfig/ui/hangulhanjaadddialog.ui:100
+#: cui/uiconfig/ui/hangulhanjaadddialog.ui:99
 msgctxt "hangulhanjaadddialog|label2"
 msgid "_Name:"
 msgstr "_Ainm:"
 
-#: cui/uiconfig/ui/hangulhanjaadddialog.ui:131
+#: cui/uiconfig/ui/hangulhanjaadddialog.ui:130
 msgctxt "hangulhanjaadddialog|label1"
 msgid "Dictionary"
 msgstr "Faclair"
@@ -5863,37 +5979,37 @@ msgctxt "hyperlinknewdocpage|types_label"
 msgid "File _type:"
 msgstr "Seòrsa an fhai_dhle:"
 
-#: cui/uiconfig/ui/hyperlinknewdocpage.ui:168
+#: cui/uiconfig/ui/hyperlinknewdocpage.ui:169
 msgctxt "hyperlinknewdocpage|label2"
 msgid "New Document"
 msgstr "Sgrìobhainn ùr"
 
-#: cui/uiconfig/ui/hyperlinknewdocpage.ui:207
+#: cui/uiconfig/ui/hyperlinknewdocpage.ui:208
 msgctxt "hyperlinknewdocpage|frame_label"
 msgid "F_rame:"
 msgstr "F_rèama:"
 
-#: cui/uiconfig/ui/hyperlinknewdocpage.ui:222
+#: cui/uiconfig/ui/hyperlinknewdocpage.ui:223
 msgctxt "hyperlinknewdocpage|indication_label"
 msgid "Te_xt:"
 msgstr "Tea_csa:"
 
-#: cui/uiconfig/ui/hyperlinknewdocpage.ui:237
+#: cui/uiconfig/ui/hyperlinknewdocpage.ui:238
 msgctxt "hyperlinknewdocpage|name_label"
 msgid "N_ame:"
 msgstr "_Ainm:"
 
-#: cui/uiconfig/ui/hyperlinknewdocpage.ui:277
+#: cui/uiconfig/ui/hyperlinknewdocpage.ui:278
 msgctxt "hyperlinknewdocpage|form_label"
 msgid "F_orm:"
 msgstr "F_oirm:"
 
-#: cui/uiconfig/ui/hyperlinknewdocpage.ui:302
+#: cui/uiconfig/ui/hyperlinknewdocpage.ui:303
 msgctxt "hyperlinknewdocpage|script|tooltip_text"
 msgid "Events"
 msgstr "Tachartasan"
 
-#: cui/uiconfig/ui/hyperlinknewdocpage.ui:340
+#: cui/uiconfig/ui/hyperlinknewdocpage.ui:341
 msgctxt "hyperlinknewdocpage|label1"
 msgid "Further Settings"
 msgstr "Roghainnean a bharrachd"
@@ -6860,142 +6976,87 @@ msgctxt "newtoolbardialog|label2"
 msgid "_Save in:"
 msgstr "_Sàbhail ann an:"
 
-#: cui/uiconfig/ui/numberingformatpage.ui:42
-msgctxt "numberingformatpage|liststore1"
-msgid "All"
-msgstr "A h-uile"
-
-#: cui/uiconfig/ui/numberingformatpage.ui:45
-msgctxt "numberingformatpage|liststore1"
-msgid "User-defined"
-msgstr "Sònraichte le cleachdaiche"
-
-#: cui/uiconfig/ui/numberingformatpage.ui:48
-msgctxt "numberingformatpage|liststore1"
-msgid "Number"
-msgstr "Àireamh"
-
-#: cui/uiconfig/ui/numberingformatpage.ui:51
-msgctxt "numberingformatpage|liststore1"
-msgid "Percent"
-msgstr "Ceudad"
-
-#: cui/uiconfig/ui/numberingformatpage.ui:54
-msgctxt "numberingformatpage|liststore1"
-msgid "Currency"
-msgstr "Airgeadra"
-
-#: cui/uiconfig/ui/numberingformatpage.ui:57
-msgctxt "numberingformatpage|liststore1"
-msgid "Date"
-msgstr "Ceann-là"
-
-#: cui/uiconfig/ui/numberingformatpage.ui:60
-msgctxt "numberingformatpage|liststore1"
-msgid "Time"
-msgstr "Àm"
-
-#: cui/uiconfig/ui/numberingformatpage.ui:63
-msgctxt "numberingformatpage|liststore1"
-msgid "Scientific"
-msgstr "Saidheansail"
-
-#: cui/uiconfig/ui/numberingformatpage.ui:66
-msgctxt "numberingformatpage|liststore1"
-msgid "Fraction"
-msgstr "Bloigh"
-
-#: cui/uiconfig/ui/numberingformatpage.ui:69
-msgctxt "numberingformatpage|liststore1"
-msgid "Boolean Value"
-msgstr "Luach Boolean"
-
-#: cui/uiconfig/ui/numberingformatpage.ui:72
-msgctxt "numberingformatpage|liststore1"
-msgid "Text"
-msgstr "Teacsa"
-
-#: cui/uiconfig/ui/numberingformatpage.ui:134
+#: cui/uiconfig/ui/numberingformatpage.ui:97
 msgctxt "numberingformatpage|add|tooltip_text"
 msgid "Add"
 msgstr "Cuir ris"
 
-#: cui/uiconfig/ui/numberingformatpage.ui:149
+#: cui/uiconfig/ui/numberingformatpage.ui:112
 msgctxt "numberingformatpage|edit|tooltip_text"
 msgid "Edit Comment"
 msgstr "Deasaich am beachd"
 
-#: cui/uiconfig/ui/numberingformatpage.ui:164
+#: cui/uiconfig/ui/numberingformatpage.ui:127
 msgctxt "numberingformatpage|delete|tooltip_text"
 msgid "Remove"
 msgstr "Thoir air falbh"
 
-#: cui/uiconfig/ui/numberingformatpage.ui:189
+#: cui/uiconfig/ui/numberingformatpage.ui:152
 msgctxt "numberingformatpage|commented|tooltip_text"
 msgid "Comment"
 msgstr "Beachd"
 
-#: cui/uiconfig/ui/numberingformatpage.ui:205
+#: cui/uiconfig/ui/numberingformatpage.ui:168
 msgctxt "numberingformatpage|formatf"
 msgid "_Format code"
 msgstr "_Fòrmataich an còd"
 
-#: cui/uiconfig/ui/numberingformatpage.ui:296
+#: cui/uiconfig/ui/numberingformatpage.ui:259
 msgctxt "numberingformatpage|denominatorft"
 msgid "Den_ominator places:"
 msgstr "I_onadan an t-seòrsaiche:"
 
-#: cui/uiconfig/ui/numberingformatpage.ui:311
+#: cui/uiconfig/ui/numberingformatpage.ui:274
 msgctxt "numberingformatpage|decimalsft"
 msgid "_Decimal places:"
 msgstr "Àitichean _deicheach:"
 
-#: cui/uiconfig/ui/numberingformatpage.ui:332
+#: cui/uiconfig/ui/numberingformatpage.ui:295
 msgctxt "numberingformatpage|leadzerosft"
 msgid "Leading _zeroes:"
 msgstr "_Neoinithean aig an toiseach:"
 
-#: cui/uiconfig/ui/numberingformatpage.ui:344
+#: cui/uiconfig/ui/numberingformatpage.ui:307
 msgctxt "numberingformatpage|negnumred"
 msgid "_Negative numbers red"
 msgstr "Àirea_mhan àicheil ann an dearg"
 
-#: cui/uiconfig/ui/numberingformatpage.ui:366
+#: cui/uiconfig/ui/numberingformatpage.ui:329
 msgctxt "numberingformatpage|engineering"
 msgid "_Engineering notation"
 msgstr "Sgrìobhadh _einnseanaireachd"
 
-#: cui/uiconfig/ui/numberingformatpage.ui:381
+#: cui/uiconfig/ui/numberingformatpage.ui:344
 msgctxt "numberingformatpage|thousands"
 msgid "_Thousands separator"
 msgstr "_Sgaradair nam mìltean"
 
-#: cui/uiconfig/ui/numberingformatpage.ui:409
+#: cui/uiconfig/ui/numberingformatpage.ui:372
 msgctxt "numberingformatpage|optionsft"
 msgid "Options"
 msgstr "Roghainnean"
 
-#: cui/uiconfig/ui/numberingformatpage.ui:482
+#: cui/uiconfig/ui/numberingformatpage.ui:445
 msgctxt "numberingformatpage|categoryft"
 msgid "C_ategory"
 msgstr "_Roinn-seòrsa"
 
-#: cui/uiconfig/ui/numberingformatpage.ui:526
+#: cui/uiconfig/ui/numberingformatpage.ui:489
 msgctxt "numberingformatpage|liststore2"
 msgid "Automatically"
 msgstr "Gu fèin-obrachail"
 
-#: cui/uiconfig/ui/numberingformatpage.ui:580
+#: cui/uiconfig/ui/numberingformatpage.ui:543
 msgctxt "numberingformatpage|formatft"
 msgid "Fo_rmat"
 msgstr "Fòrma_t"
 
-#: cui/uiconfig/ui/numberingformatpage.ui:626
+#: cui/uiconfig/ui/numberingformatpage.ui:589
 msgctxt "numberingformatpage|sourceformat"
 msgid "So_urce format"
 msgstr "Tùs-_fhòrmat"
 
-#: cui/uiconfig/ui/numberingformatpage.ui:673
+#: cui/uiconfig/ui/numberingformatpage.ui:636
 msgctxt "numberingformatpage|languageft"
 msgid "_Language"
 msgstr "Cà_nan"
@@ -7549,17 +7610,17 @@ msgctxt "optbasicidepage|label3"
 msgid "Language Features"
 msgstr "Gleusan cànain"
 
-#: cui/uiconfig/ui/optchartcolorspage.ui:42
+#: cui/uiconfig/ui/optchartcolorspage.ui:43
 msgctxt "optchartcolorspage|label20"
 msgid "Chart Colors"
 msgstr "Datha na cairt"
 
-#: cui/uiconfig/ui/optchartcolorspage.ui:128
+#: cui/uiconfig/ui/optchartcolorspage.ui:129
 msgctxt "optchartcolorspage|default"
 msgid "_Default"
 msgstr "_Bun-roghainn"
 
-#: cui/uiconfig/ui/optchartcolorspage.ui:156
+#: cui/uiconfig/ui/optchartcolorspage.ui:157
 msgctxt "optchartcolorspage|label1"
 msgid "Color Table"
 msgstr "Clàr nan dathan"
@@ -9782,7 +9843,7 @@ msgctxt "personalization_tab|extensions_label"
 msgid "Or, select from the Themes installed via extensions:"
 msgstr "No tagh ùrlar am measg na feadhainn a chaidh a stàladh slighe leudachain:"
 
-#: cui/uiconfig/ui/personalization_tab.ui:294
+#: cui/uiconfig/ui/personalization_tab.ui:295
 msgctxt "personalization_tab|personas_label"
 msgid "Firefox Themes"
 msgstr "Ùrlaran Firefox"
@@ -10417,102 +10478,97 @@ msgctxt "select_persona_dialog|SelectPersonaDialog"
 msgid "Select Firefox Theme"
 msgstr "Tagh ùrlar Firefox"
 
-#: cui/uiconfig/ui/select_persona_dialog.ui:130
-msgctxt "select_persona_dialog|search_personas"
-msgid "_Go"
-msgstr "_Siuthad"
+#: cui/uiconfig/ui/select_persona_dialog.ui:103
+msgctxt "select_persona_dialog|search_term"
+msgid "Search term or address"
+msgstr ""
 
-#: cui/uiconfig/ui/select_persona_dialog.ui:160
-msgctxt "select_persona_dialog|label1"
-msgid "Search Term or Firefox Theme URL"
-msgstr "Briathar-luirg no URL an ùrlair Firefox"
+#: cui/uiconfig/ui/select_persona_dialog.ui:145
+msgctxt "select_persona_dialog|categories_label"
+msgid "Ca_tegory:"
+msgstr ""
 
-#: cui/uiconfig/ui/select_persona_dialog.ui:196
+#: cui/uiconfig/ui/select_persona_dialog.ui:160
 msgctxt "select_persona_dialog|categoriesCB"
 msgid "Abstract"
 msgstr "Gearr-chunntas"
 
-#: cui/uiconfig/ui/select_persona_dialog.ui:197
+#: cui/uiconfig/ui/select_persona_dialog.ui:161
 msgctxt "select_persona_dialog|categoriesCB"
 msgid "Causes"
 msgstr "Adhbharan"
 
-#: cui/uiconfig/ui/select_persona_dialog.ui:198
+#: cui/uiconfig/ui/select_persona_dialog.ui:162
 msgctxt "select_persona_dialog|categoriesCB"
 msgid "Fashion"
 msgstr "Fasan"
 
-#: cui/uiconfig/ui/select_persona_dialog.ui:199
+#: cui/uiconfig/ui/select_persona_dialog.ui:163
 msgctxt "select_persona_dialog|categoriesCB"
 msgid "Film and TV"
 msgstr "Film is Tbh"
 
-#: cui/uiconfig/ui/select_persona_dialog.ui:200
+#: cui/uiconfig/ui/select_persona_dialog.ui:164
 msgctxt "select_persona_dialog|categoriesCB"
 msgid "Firefox"
 msgstr "Firefox"
 
 #. https://addons.mozilla.org/en-US/firefox/themes/
-#: cui/uiconfig/ui/select_persona_dialog.ui:201
+#: cui/uiconfig/ui/select_persona_dialog.ui:165
 msgctxt "select_persona_dialog|categoriesCB"
 msgid "Foxkeh"
 msgstr "Foxkeh"
 
-#: cui/uiconfig/ui/select_persona_dialog.ui:202
+#: cui/uiconfig/ui/select_persona_dialog.ui:166
 msgctxt "select_persona_dialog|categoriesCB"
 msgid "Holiday"
 msgstr "Saor-làithean"
 
-#: cui/uiconfig/ui/select_persona_dialog.ui:203
+#: cui/uiconfig/ui/select_persona_dialog.ui:167
 msgctxt "select_persona_dialog|categoriesCB"
 msgid "Music"
 msgstr "Ceòl"
 
-#: cui/uiconfig/ui/select_persona_dialog.ui:204
+#: cui/uiconfig/ui/select_persona_dialog.ui:168
 msgctxt "select_persona_dialog|categoriesCB"
 msgid "Nature"
 msgstr "Nàdar"
 
-#: cui/uiconfig/ui/select_persona_dialog.ui:205
+#: cui/uiconfig/ui/select_persona_dialog.ui:169
 msgctxt "select_persona_dialog|categoriesCB"
 msgid "Other"
 msgstr "Eile"
 
-#: cui/uiconfig/ui/select_persona_dialog.ui:206
+#: cui/uiconfig/ui/select_persona_dialog.ui:170
 msgctxt "select_persona_dialog|categoriesCB"
 msgid "Scenery"
 msgstr "Cruth-tìre"
 
-#: cui/uiconfig/ui/select_persona_dialog.ui:207
+#: cui/uiconfig/ui/select_persona_dialog.ui:171
 msgctxt "select_persona_dialog|categoriesCB"
 msgid "Seasonal"
 msgstr "Ràitheil"
 
-#: cui/uiconfig/ui/select_persona_dialog.ui:208
+#: cui/uiconfig/ui/select_persona_dialog.ui:172
 msgctxt "select_persona_dialog|categoriesCB"
 msgid "Solid"
 msgstr "Soladach"
 
-#: cui/uiconfig/ui/select_persona_dialog.ui:209
+#: cui/uiconfig/ui/select_persona_dialog.ui:173
 msgctxt "select_persona_dialog|categoriesCB"
 msgid "Sports"
 msgstr "Spòrs"
 
-#: cui/uiconfig/ui/select_persona_dialog.ui:210
+#: cui/uiconfig/ui/select_persona_dialog.ui:174
 msgctxt "select_persona_dialog|categoriesCB"
 msgid "Websites"
 msgstr "Làraichean-lìn"
 
-#: cui/uiconfig/ui/select_persona_dialog.ui:211
+#: cui/uiconfig/ui/select_persona_dialog.ui:175
 msgctxt "select_persona_dialog|categoriesCB"
 msgid "Featured"
 msgstr "Brosnaichte"
 
-#: cui/uiconfig/ui/select_persona_dialog.ui:231
-msgctxt "select_persona_dialog|label6"
-msgid "Categories"
-msgstr "Roinnean-seòrsa"
-
 #: cui/uiconfig/ui/selectpathdialog.ui:16
 msgctxt "selectpathdialog|SelectPathDialog"
 msgid "Select Paths"
@@ -10779,17 +10835,17 @@ msgctxt "slantcornertabpage|label8"
 msgid "Control Point 2"
 msgstr "Puing-smachd 2"
 
-#: cui/uiconfig/ui/smarttagoptionspage.ui:21
+#: cui/uiconfig/ui/smarttagoptionspage.ui:30
 msgctxt "smarttagoptionspage|main"
 msgid "Label text with smart tags"
 msgstr "Cuir tagaichean tapaidh ris an teacsa"
 
-#: cui/uiconfig/ui/smarttagoptionspage.ui:61
+#: cui/uiconfig/ui/smarttagoptionspage.ui:70
 msgctxt "smarttagoptionspage|properties"
 msgid "Properties..."
 msgstr "Roghainnean..."
 
-#: cui/uiconfig/ui/smarttagoptionspage.ui:100
+#: cui/uiconfig/ui/smarttagoptionspage.ui:148
 msgctxt "smarttagoptionspage|label1"
 msgid "Currently Installed Smart Tags"
 msgstr "Tagaichean tapaidh a tha air an stàladh an-dràsta"
@@ -10954,32 +11010,32 @@ msgctxt "spellingdialog|alttitleft"
 msgid "Spelling: $LANGUAGE ($LOCATION)"
 msgstr "Litreachadh: $LANGUAGE ($LOCATION)"
 
-#: cui/uiconfig/ui/spellingdialog.ui:319
+#: cui/uiconfig/ui/spellingdialog.ui:320
 msgctxt "spellingdialog|add"
 msgid "_Add to Dictionary"
 msgstr "Cuir ris an _fhaclair"
 
-#: cui/uiconfig/ui/spellingdialog.ui:333
+#: cui/uiconfig/ui/spellingdialog.ui:334
 msgctxt "spellingdialog|addmb"
 msgid "_Add to Dictionary"
 msgstr "Cuir ris _an fhaclair"
 
-#: cui/uiconfig/ui/spellingdialog.ui:349
+#: cui/uiconfig/ui/spellingdialog.ui:350
 msgctxt "spellingdialog|suggestionsft"
 msgid "_Suggestions"
 msgstr "M_olaidhean"
 
-#: cui/uiconfig/ui/spellingdialog.ui:365
+#: cui/uiconfig/ui/spellingdialog.ui:366
 msgctxt "spellingdialog|notindictft"
 msgid "_Not in dictionary"
 msgstr "Cha_n eil seo san fhaclair"
 
-#: cui/uiconfig/ui/spellingdialog.ui:386
+#: cui/uiconfig/ui/spellingdialog.ui:387
 msgctxt "spellingdialog|paste"
 msgid "Paste"
 msgstr "Cuir ann"
 
-#: cui/uiconfig/ui/spellingdialog.ui:400
+#: cui/uiconfig/ui/spellingdialog.ui:401
 msgctxt "spellingdialog|insert"
 msgid "Special Character"
 msgstr "Caractar sònraichte"
@@ -11629,147 +11685,87 @@ msgctxt "tsaurldialog|label2"
 msgid "Add or delete Time Stamp Authority URLs"
 msgstr "Cuir ris no sguab às URLaichean aig Time Stamp Authorities"
 
-#: cui/uiconfig/ui/tsaurldialog.ui:167
+#: cui/uiconfig/ui/tsaurldialog.ui:168
 msgctxt "tsaurldialog|enteraurl"
 msgid "Enter a Time Stamp Authority URL"
 msgstr "Cuir URL aig Time Stamp Authority ann"
 
-#: cui/uiconfig/ui/tsaurldialog.ui:197
+#: cui/uiconfig/ui/tsaurldialog.ui:198
 msgctxt "tsaurldialog|label1"
 msgid "TSA URL"
 msgstr "URL TSA"
 
-#: cui/uiconfig/ui/twolinespage.ui:14
-msgctxt "twolinespage|liststore1"
-msgid "(None)"
-msgstr "(Chan eil gin)"
-
-#: cui/uiconfig/ui/twolinespage.ui:18
-msgctxt "twolinespage|liststore1"
-msgid "("
-msgstr "("
-
-#: cui/uiconfig/ui/twolinespage.ui:22
-msgctxt "twolinespage|liststore1"
-msgid "["
-msgstr "["
-
-#: cui/uiconfig/ui/twolinespage.ui:26
-msgctxt "twolinespage|liststore1"
-msgid "<"
-msgstr "<"
-
-#: cui/uiconfig/ui/twolinespage.ui:30
-msgctxt "twolinespage|liststore1"
-msgid "{"
-msgstr "{"
-
-#: cui/uiconfig/ui/twolinespage.ui:34
-msgctxt "twolinespage|liststore1"
-msgid "Other Characters..."
-msgstr "Caractaran eile..."
-
-#: cui/uiconfig/ui/twolinespage.ui:48
-msgctxt "twolinespage|liststore2"
-msgid "(None)"
-msgstr "(Chan eil gin)"
-
-#: cui/uiconfig/ui/twolinespage.ui:52
-msgctxt "twolinespage|liststore2"
-msgid ")"
-msgstr ")"
-
-#: cui/uiconfig/ui/twolinespage.ui:56
-msgctxt "twolinespage|liststore2"
-msgid "]"
-msgstr "]"
-
-#: cui/uiconfig/ui/twolinespage.ui:60
-msgctxt "twolinespage|liststore2"
-msgid ">"
-msgstr ">"
-
-#: cui/uiconfig/ui/twolinespage.ui:64
-msgctxt "twolinespage|liststore2"
-msgid "}"
-msgstr "}"
-
-#: cui/uiconfig/ui/twolinespage.ui:68
-msgctxt "twolinespage|liststore2"
-msgid "Other Characters..."
-msgstr "Caractaran eile..."
-
-#: cui/uiconfig/ui/twolinespage.ui:93
+#: cui/uiconfig/ui/twolinespage.ui:41
 msgctxt "twolinespage|twolines"
 msgid "Write in double lines"
 msgstr "Sgrìobh ann an loidhnichean dùbailte"
 
-#: cui/uiconfig/ui/twolinespage.ui:108
+#: cui/uiconfig/ui/twolinespage.ui:56
 msgctxt "twolinespage|label2"
 msgid "Double-lined"
 msgstr "Le loidhnichean dùbailte"
 
-#: cui/uiconfig/ui/twolinespage.ui:143
+#: cui/uiconfig/ui/twolinespage.ui:91
 msgctxt "twolinespage|label29"
 msgid "Initial character"
 msgstr "Caractar tòiseachaidh"
 
-#: cui/uiconfig/ui/twolinespage.ui:154
+#: cui/uiconfig/ui/twolinespage.ui:102
 msgctxt "twolinespage|label30"
 msgid "Final character"
 msgstr "Caractar deiridh"
 
-#: cui/uiconfig/ui/twolinespage.ui:247
+#: cui/uiconfig/ui/twolinespage.ui:195
 msgctxt "twolinespage|label28"
 msgid "Enclosing Character"
 msgstr "Caractar cuairteachaidh"
 
-#: cui/uiconfig/ui/twolinespage.ui:285
+#: cui/uiconfig/ui/twolinespage.ui:233
 msgctxt "twolinespage|preview-atkobject"
 msgid "Preview"
 msgstr "Ro-shealladh"
 
-#: cui/uiconfig/ui/wordcompletionpage.ui:43
+#: cui/uiconfig/ui/wordcompletionpage.ui:50
 msgctxt "wordcompletionpage|delete"
 msgid "_Delete Entry"
 msgstr "Sgua_b às an t-innteart"
 
-#: cui/uiconfig/ui/wordcompletionpage.ui:87
+#: cui/uiconfig/ui/wordcompletionpage.ui:122
 msgctxt "wordcompletionpage|label1"
 msgid "_Max. entries:"
 msgstr "Àireamh as _motha de dh'innteartan:"
 
-#: cui/uiconfig/ui/wordcompletionpage.ui:126
+#: cui/uiconfig/ui/wordcompletionpage.ui:161
 msgctxt "wordcompletionpage|label2"
 msgid "Mi_n. word length:"
 msgstr "Fad as lugha fhacla_n:"
 
-#: cui/uiconfig/ui/wordcompletionpage.ui:172
+#: cui/uiconfig/ui/wordcompletionpage.ui:208
 msgctxt "wordcompletionpage|appendspace"
 msgid "_Append space"
 msgstr "Cuir àite bàn ris _an deireadh"
 
-#: cui/uiconfig/ui/wordcompletionpage.ui:187
+#: cui/uiconfig/ui/wordcompletionpage.ui:223
 msgctxt "wordcompletionpage|showastip"
 msgid "_Show as tip"
 msgstr "_Seall mar ghliocas"
 
-#: cui/uiconfig/ui/wordcompletionpage.ui:210
+#: cui/uiconfig/ui/wordcompletionpage.ui:246
 msgctxt "wordcompletionpage|enablewordcomplete"
 msgid "Enable word _completion"
 msgstr "_Cuir an comas slànachadh fhaclan"
 
-#: cui/uiconfig/ui/wordcompletionpage.ui:246
+#: cui/uiconfig/ui/wordcompletionpage.ui:282
 msgctxt "wordcompletionpage|whenclosing"
 msgid "_When closing a document, remove the words collected from it from the list"
 msgstr "_Nuair a dhùinear sgrìobhainn, thoir air falbh na faclan a chaidh a chruinneachadh on liosta"
 
-#: cui/uiconfig/ui/wordcompletionpage.ui:269
+#: cui/uiconfig/ui/wordcompletionpage.ui:305
 msgctxt "wordcompletionpage|collectwords"
 msgid "C_ollect words"
 msgstr "Cr_uinnich faclan"
 
-#: cui/uiconfig/ui/wordcompletionpage.ui:299
+#: cui/uiconfig/ui/wordcompletionpage.ui:333
 msgctxt "wordcompletionpage|label3"
 msgid "Acc_ept with:"
 msgstr "Gabh ris l_e:"