initial import of LibreOffice 4.0 translations

Change-Id: I577494b6b4189ed19723af4b5e273ea4da85e708

13 files changed, 5993 insertions, 1548 deletions

diff --git a/source/gd/dbaccess/source/core/resource.po b/source/gd/dbaccess/source/core/resource.po
index f61e8774d27..8fb2ec95ceb 100644
--- a/source/gd/dbaccess/source/core/resource.po
+++ b/source/gd/dbaccess/source/core/resource.po
@@ -1,10 +1,10 @@
-#. extracted from dbaccess/source/core/resource.oo
+#. extracted from dbaccess/source/core/resource
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+dbaccess%2Fsource%2Fcore%2Fresource.oo&subcomponent=ui\n"
-"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2011-10-10 20:48+0200\n"
+"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
+"POT-Creation-Date: 2012-11-17 19:02+0200\n"
+"PO-Revision-Date: 2012-08-24 12:53+0200\n"
 "Last-Translator: Michael <fios@akerbeltz.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: gd\n"
@@ -12,50 +12,105 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "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-Generator: Translate Toolkit 1.9.0\n"
+"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
 
-#: strings.src#RID_STR_TRIED_OPEN_TABLE.string.text
+#. /lSI
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_TRIED_OPEN_TABLE\n"
+"string.text"
 msgid "Tried to open the table $name$."
 msgstr "Chaidh oidhirp a dhèanamh an clàr $name$ fhosgladh."
 
-#: strings.src#RID_STR_CONNECTION_INVALID.string.text
+#. tr!y
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_CONNECTION_INVALID\n"
+"string.text"
 msgid "No connection could be established."
 msgstr "Cha do ghabh ceangal a dhèanamh."
 
-#: strings.src#RID_STR_TABLE_IS_FILTERED.string.text
+#. E/=,
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_TABLE_IS_FILTERED\n"
+"string.text"
 msgid "The table $name$ already exists. It is not visible because it has been filtered out."
 msgstr "Tha an clàr $name$ ann mu thràth. Chan fhaic thu e a chionn 's gun deach a chriathradh a-mach."
 
-#: strings.src#RID_STR_NEED_CONFIG_WRITE_ACCESS.string.text
+#. p,*w
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NEED_CONFIG_WRITE_ACCESS\n"
+"string.text"
 msgid "You have no write access to the configuration data the object is based on."
 msgstr "Chan eil cead sgrìobhaidh agad dhan dàta rèiteachaidh a tha an t-oibseact stèidhichte air."
 
-#: strings.src#RID_STR_COULDNOTCONNECT_UNSPECIFIED.string.text
+#. Jr@6
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_COULDNOTCONNECT_UNSPECIFIED\n"
+"string.text"
 msgid "The connection to the external data source could not be established. An unknown error occurred. The driver is probably defective."
 msgstr "Cha do ghabh ceangal a dhèanamh ris an tùs-dàta air an taobh a-muigh. Thachair mearachd neo-aithnichte. 'S mathaid gu bheil an draibhear lochdach."
 
-#: strings.src#RID_STR_COULDNOTCONNECT_NODRIVER.string.text
+#. f,gU
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_COULDNOTCONNECT_NODRIVER\n"
+"string.text"
 msgid "The connection to the external data source could not be established. No SDBC driver was found for the given URL."
 msgstr "Cha do ghabh ceangal a dhèanamh ris an tùs-dàta air an taobh a-muigh. Cha deach draibhear SDBC a lorg airson an URL a shònraich thu."
 
-#: strings.src#RID_STR_COULDNOTLOAD_MANAGER.string.text
+#. %rB^
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_COULDNOTLOAD_MANAGER\n"
+"string.text"
 msgid "The connection to the external data source could not be established. The SDBC driver manager could not be loaded."
 msgstr "Cha do ghabh ceangal a dhèanamh ris an tùs-dàta air an taobh a-muigh. Cha do ghabh manaidsear nan draibhear SDBC a luchdadh."
 
-#: strings.src#RID_STR_FORM.string.text
+#. C0.?
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_FORM\n"
+"string.text"
 msgid "Form"
 msgstr "Foirm"
 
-#: strings.src#RID_STR_REPORT.string.text
+#. 8u\$
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_REPORT\n"
+"string.text"
 msgid "Report"
 msgstr "Aithisg"
 
-#: strings.src#RID_STR_DATASOURCE_NOT_STORED.string.text
+#. ILO.
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_DATASOURCE_NOT_STORED\n"
+"string.text"
 msgid "The data source was not saved. Please use the interface XStorable to save the data source."
 msgstr "Cha deach an tùs-dàta a shàbhaladh. Cleachd an eadar-aghaidh XStorable gus an tùs-dàta a shàbhaladh."
 
-#: strings.src#RID_STR_ONLY_QUERY.string.text
+#. B3.M
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_ONLY_QUERY\n"
+"string.text"
 msgid ""
 "The given command is not a SELECT statement.\n"
 "Only queries are allowed."
@@ -63,119 +118,264 @@ msgstr ""
 "Chan e aithris SELECT a tha san àithne a thagh thu.\n"
 "Chan eil ceadaichte ach iarrtasan."
 
-#: strings.src#RID_STR_NO_VALUE_CHANGED.string.text
+#. gkPZ
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NO_VALUE_CHANGED\n"
+"string.text"
 msgid "No values were modified."
 msgstr "Cha deach luach sam bith atharrachadh."
 
-#: strings.src#RID_STR_NO_XROWUPDATE.string.text
+#. 10Eg
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NO_XROWUPDATE\n"
+"string.text"
 msgid "Values could not be inserted. The XRowUpdate interface is not supported by ResultSet."
 msgstr "Cha do ghabh na luachan a chur ann. Chan eil ResultSet a' cur taic ris an eadar-aghaidh XRowUpdate."
 
-#: strings.src#RID_STR_NO_XRESULTSETUPDATE.string.text
+#. =V{\
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NO_XRESULTSETUPDATE\n"
+"string.text"
 msgid "Values could not be inserted. The XResultSetUpdate interface is not supported by ResultSet."
 msgstr "Cha do ghabh na luachan a chur ann. Chan eil ResultSet a' cur taic ris an eadar-aghaidh XResultSetUpdate."
 
-#: strings.src#RID_STR_NO_UPDATE_MISSING_CONDITION.string.text
+#. J+0E
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NO_UPDATE_MISSING_CONDITION\n"
+"string.text"
 msgid "Values could not be modified, due to a missing condition statement."
 msgstr "Cha do ghabh na luachan atharrachadh air sgàth aithris chumhach a tha a dhìth."
 
-#: strings.src#RID_STR_NO_COLUMN_ADD.string.text
+#. dJMS
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NO_COLUMN_ADD\n"
+"string.text"
 msgid "The adding of columns is not supported."
 msgstr "Chan eil taic ann do chur ris colbhan."
 
-#: strings.src#RID_STR_NO_COLUMN_DROP.string.text
+#. `dr(
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NO_COLUMN_DROP\n"
+"string.text"
 msgid "The dropping of columns is not supported."
-msgstr "Chan eil taic ann do leigeal mu làr colbhan."
-
-#: strings.src#RID_STR_NO_CONDITION_FOR_PK.string.text
+msgstr "Chan eil taic ann do leagail mu làr colbhan."
+
+#. !\c+
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NO_CONDITION_FOR_PK\n"
+"string.text"
 msgid "The WHERE condition could not be created for the primary key."
 msgstr "Cha do ghabh an cumha WHERE a chruthachadh airson na prìomh-iuchrach."
 
-#: strings.src#RID_STR_COLUMN_UNKNOWN_PROP.string.text
+#. DmYo
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_COLUMN_UNKNOWN_PROP\n"
+"string.text"
 msgid "The column does not support the property '%value'."
 msgstr "Chan eil an colbh a' cur taic ris an roghainn '%value'."
 
-#: strings.src#RID_STR_COLUMN_NOT_SEARCHABLE.string.text
+#. hROM
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_COLUMN_NOT_SEARCHABLE\n"
+"string.text"
 msgid "The column is not searchable!"
 msgstr "Cha ghabh an colbh seo a lorg!"
 
-#: strings.src#RID_STR_NOT_SEQUENCE_INT8.string.text
+#. T^=x
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NOT_SEQUENCE_INT8\n"
+"string.text"
 msgid "The value of the columns is not of the type Sequence<sal_Int8>."
 msgstr "Chan eil luach nan colbhan dhen t-seòrsa Sequence<sal_Int8>."
 
-#: strings.src#RID_STR_COLUMN_NOT_VALID.string.text
+#. dmJ^
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_COLUMN_NOT_VALID\n"
+"string.text"
 msgid "The column is not valid."
 msgstr "Chan e colbh dligheach a tha ann."
 
-#: strings.src#RID_STR_COLUMN_MUST_VISIBLE.string.text
+#. GKQn
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_COLUMN_MUST_VISIBLE\n"
+"string.text"
 msgid "The column '%name' must be visible as a column."
 msgstr "Feumaidh an colbh '%name' a bhith ri fhaicinn mar cholbh."
 
-#: strings.src#RID_STR_NO_XQUERIESSUPPLIER.string.text
+#. ChFg
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NO_XQUERIESSUPPLIER\n"
+"string.text"
 msgid "The interface XQueriesSupplier is not available."
 msgstr "Chan eil an eadar-aghaidh XQueriesSupplier ri làimh."
 
-#: strings.src#RID_STR_NOT_SUPPORTED_BY_DRIVER.string.text
+#. `Vl,
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NOT_SUPPORTED_BY_DRIVER\n"
+"string.text"
 msgid "The driver does not support this function."
 msgstr "Chan eil an draibhear a' cur taic ris an fhoincsean seo."
 
-#: strings.src#RID_STR_NO_ABS_ZERO.string.text
+#. b9mq
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NO_ABS_ZERO\n"
+"string.text"
 msgid "An 'absolute(0)' call is not allowed."
 msgstr "Chan eil glaodh 'absolute(0)' ceadaichte."
 
-#: strings.src#RID_STR_NO_RELATIVE.string.text
+#. #7.J
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NO_RELATIVE\n"
+"string.text"
 msgid "Relative positioning is not allowed in this state."
 msgstr "Chan eil suidheachadh dàimheach ceadaichte san staid seo."
 
-#: strings.src#RID_STR_NO_REFESH_AFTERLAST.string.text
+#. J~{Z
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NO_REFESH_AFTERLAST\n"
+"string.text"
 msgid "A row cannot be refreshed when the ResultSet is positioned after the last row."
-msgstr "Cha ghabh ràgh ùrachadh ma thig an ResultSet an dèidh an ràigh mu dheireadh."
-
-#: strings.src#RID_STR_NO_MOVETOINSERTROW_CALLED.string.text
+msgstr "Cha ghabh ràgh ath-nuadhachadh ma thig an ResultSet an dèidh an ràigh mu dheireadh."
+
+#. b1[?
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NO_MOVETOINSERTROW_CALLED\n"
+"string.text"
 msgid "A new row cannot be inserted when the ResultSet is not first moved to the insert row."
 msgstr "Cha ghabh ràgh ùr a chur a-steach mura dèid an ResultSet a ghluasad dhan ràgh a-steach an toiseach."
 
-#: strings.src#RID_STR_NO_UPDATEROW.string.text
+#. w:c%
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NO_UPDATEROW\n"
+"string.text"
 msgid "A row cannot be modified in this state"
 msgstr "Cha ghabh ràgh atharrachadh sa staid seo"
 
-#: strings.src#RID_STR_NO_DELETEROW.string.text
+#. 2.*I
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NO_DELETEROW\n"
+"string.text"
 msgid "A row cannot be deleted in this state."
 msgstr "Cha ghabh ràgh a sguabadh às sa staid seo."
 
-#: strings.src#RID_STR_NO_TABLE_RENAME.string.text
+#. E(eo
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NO_TABLE_RENAME\n"
+"string.text"
 msgid "The driver does not support table renaming."
 msgstr "Chan eil an draibhear a' cur taic ri ath-ainmeachadh clàir."
 
-#: strings.src#RID_STR_NO_ALTER_COLUMN_DEF.string.text
+#. s7Q2
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NO_ALTER_COLUMN_DEF\n"
+"string.text"
 msgid "The driver does not support the modification of column descriptions."
 msgstr "Chan eil an draibhear a' cur taic ri atharrachadh tuairisgeulan nan colbh."
 
-#: strings.src#RID_STR_COLUMN_ALTER_BY_NAME.string.text
+#. #kM]
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_COLUMN_ALTER_BY_NAME\n"
+"string.text"
 msgid "The driver does not support the modification of column descriptions by changing the name."
 msgstr "Chan eil an draibhear a' cur taic ri atharrachadh tuairisgeulan nan colbh le bhith ag atharrachadh an aim."
 
-#: strings.src#RID_STR_COLUMN_ALTER_BY_INDEX.string.text
+#. UDA3
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_COLUMN_ALTER_BY_INDEX\n"
+"string.text"
 msgid "The driver does not support the modification of column descriptions by changing the index."
 msgstr "Chan eil an draibhear a' cur taic ri atharrachadh tuairisgeulan nan colbh le bhith ag atharrachadh a' chlàir-amais."
 
-#: strings.src#RID_STR_FILE_DOES_NOT_EXIST.string.text
+#. dSi`
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_FILE_DOES_NOT_EXIST\n"
+"string.text"
 msgid "The file \"$file$\" does not exist."
 msgstr "Chan eil am faidhle \"$file$\" ann."
 
-#: strings.src#RID_STR_TABLE_DOES_NOT_EXIST.string.text
+#. fMB5
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_TABLE_DOES_NOT_EXIST\n"
+"string.text"
 msgid "There exists no table named \"$table$\"."
 msgstr "Chan eil clàr ann air a bheil \"$table$\"."
 
-#: strings.src#RID_STR_QUERY_DOES_NOT_EXIST.string.text
+#. x6hr
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_QUERY_DOES_NOT_EXIST\n"
+"string.text"
 msgid "There exists no query named \"$table$\"."
 msgstr "Chan eil clàr ann air a bheil \"$table$\"."
 
-#: strings.src#RID_STR_CONFLICTING_NAMES.string.text
+#. 6*vj
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_CONFLICTING_NAMES\n"
+"string.text"
 msgid "There are tables in the database whose names conflict with the names of existing queries. To make full use of all queries and tables, make sure they have distinct names."
 msgstr "Tha clàir san stòr-dàta a tha an ainmean ann an còmhstri le ainmean de dh'iarrtasan làithreach. Dèan cinnteach gu bheil ainmean eadar-dhealaichte orra uile gus iarrtasan is clàr a chur gu làn-fheum."
 
-#: strings.src#RID_STR_COMMAND_LEADING_TO_ERROR.string.text
+#. +2_)
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_COMMAND_LEADING_TO_ERROR\n"
+"string.text"
 msgid ""
 "The SQL command leading to this error is:\n"
 "\n"
@@ -185,35 +385,75 @@ msgstr ""
 "\n"
 "$command$"
 
-#: strings.src#RID_STR_STATEMENT_WITHOUT_RESULT_SET.string.text
+#. sLLi
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_STATEMENT_WITHOUT_RESULT_SET\n"
+"string.text"
 msgid "The SQL command does not describe a result set."
 msgstr "Chan eil an àithne SQL a' mìneachadh seata thoraidhean."
 
-#: strings.src#RID_STR_NAME_MUST_NOT_BE_EMPTY.string.text
+#. 1um:
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NAME_MUST_NOT_BE_EMPTY\n"
+"string.text"
 msgid "The name must not be empty."
 msgstr "Chan urrainn do dh'ainm a bhith falamh."
 
-#: strings.src#RID_STR_NO_NULL_OBJECTS_IN_CONTAINER.string.text
+#. aW[i
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NO_NULL_OBJECTS_IN_CONTAINER\n"
+"string.text"
 msgid "The container cannot contain NULL objects."
 msgstr "Chan urrainn do dh'oibseactan NULL a bhith san t-soitheach."
 
-#: strings.src#RID_STR_NAME_ALREADY_USED.string.text
+#. aG.\
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NAME_ALREADY_USED\n"
+"string.text"
 msgid "There already is an object with the given name."
 msgstr "Tha oibseact ann mu thràth air a bheil an ainm seo."
 
-#: strings.src#RID_STR_OBJECT_CONTAINER_MISMATCH.string.text
+#. WVfc
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_OBJECT_CONTAINER_MISMATCH\n"
+"string.text"
 msgid "This object cannot be part of this container."
 msgstr "Chan urrainn dhan oibseact seo a bhith 'na phàirt dhen t-soitheach."
 
-#: strings.src#RID_STR_OBJECT_ALREADY_CONTAINED.string.text
+#. $n`c
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_OBJECT_ALREADY_CONTAINED\n"
+"string.text"
 msgid "The object already is, with a different name, part of the container."
 msgstr "Tha an t-oibseact, fo ainm eile, 'na phàirt dhen t-soitheach."
 
-#: strings.src#RID_STR_NAME_NOT_FOUND.string.text
+#. L^Ws
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NAME_NOT_FOUND\n"
+"string.text"
 msgid "Unable to find the document '$name$'."
 msgstr "Cha ghabh an sgrìobhainn '$name$' a lorg."
 
-#: strings.src#RID_STR_ERROR_WHILE_SAVING.string.text
+#. UTT6
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_ERROR_WHILE_SAVING\n"
+"string.text"
 msgid ""
 "Could not save the document to $location$:\n"
 "$message$"
@@ -221,7 +461,12 @@ msgstr ""
 "Cha do ghabh an sgrìobhainn a shàbhaladh ann an $location$:\n"
 "$message$"
 
-#: strings.src#RID_NO_SUCH_DATA_SOURCE.string.text
+#. WcZo
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_NO_SUCH_DATA_SOURCE\n"
+"string.text"
 msgid ""
 "Error accessing data source '$name$':\n"
 "$error$"
@@ -229,78 +474,173 @@ msgstr ""
 "Thachair mearachd rè inntrigeadh dhan tùs-dàta '$name$':\n"
 "$error$"
 
-#: strings.src#RID_STR_NO_SUB_FOLDER.string.text
+#. c/c)
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NO_SUB_FOLDER\n"
+"string.text"
 msgid "There exists no folder named \"$folder$\"."
 msgstr "Chan eil pasgan ann air a bheil \"$folder$\"."
 
-#: strings.src#RID_STR_NO_DELETE_BEFORE_AFTER.string.text
+#. p6+_
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NO_DELETE_BEFORE_AFTER\n"
+"string.text"
 msgid "Cannot delete the before-first or after-last row."
 msgstr "Cha ghabh an ràgh ron chiad fhear no as dèidh an fhir mu dheireadh a sguabadh às."
 
-#: strings.src#RID_STR_NO_DELETE_INSERT_ROW.string.text
+#. 3S;+
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NO_DELETE_INSERT_ROW\n"
+"string.text"
 msgid "Cannot delete the insert-row."
 msgstr "Cha ghabh an ràgh a-steach a sguabadh às."
 
-#: strings.src#RID_STR_RESULT_IS_READONLY.string.text
+#. ncD}
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_RESULT_IS_READONLY\n"
+"string.text"
 msgid "Result set is read only."
 msgstr "Tha seata nan toraidhean ri leughadh a-mhàin."
 
-#: strings.src#RID_STR_NO_DELETE_PRIVILEGE.string.text
+#. {d*:
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NO_DELETE_PRIVILEGE\n"
+"string.text"
 msgid "DELETE privilege not available."
 msgstr "Chan eil a' phribhleid DELETE ri làimh."
 
-#: strings.src#RID_STR_ROW_ALREADY_DELETED.string.text
+#. AaXP
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_ROW_ALREADY_DELETED\n"
+"string.text"
 msgid "Current row is already deleted."
 msgstr "Chaidh an ràgh làithreach a sguabadh às mu thràth."
 
-#: strings.src#RID_STR_UPDATE_FAILED.string.text
+#. T}{9
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_UPDATE_FAILED\n"
+"string.text"
 msgid "Current row could not be updated."
 msgstr "Cha do ghabh an ràgh làithreach ùrachadh."
 
-#: strings.src#RID_STR_NO_INSERT_PRIVILEGE.string.text
+#. p--J
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NO_INSERT_PRIVILEGE\n"
+"string.text"
 msgid "INSERT privilege not available."
 msgstr "Chan eil a' phribhleid INSERT ri làimh."
 
-#: strings.src#RID_STR_INTERNAL_ERROR.string.text
+#. IbfB
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_INTERNAL_ERROR\n"
+"string.text"
 msgid "Internal error: no statement object provided by the database driver."
 msgstr "Mearachd inntearnail: cha deach oibseact aithrise a sholar le draibhear an stòir-dhàta."
 
-#: strings.src#RID_STR_EXPRESSION1.string.text
+#. YpbE
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_EXPRESSION1\n"
+"string.text"
 msgid "Expression1"
 msgstr "Easpreisean1"
 
-#: strings.src#RID_STR_NO_SQL_COMMAND.string.text
+#. ~6oS
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NO_SQL_COMMAND\n"
+"string.text"
 msgid "No SQL command was provided."
 msgstr "Cha deach àithne SQL a sholar."
 
-#: strings.src#RID_STR_INVALID_INDEX.string.text
+#. ,*fj
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_INVALID_INDEX\n"
+"string.text"
 msgid "Invalid column index."
 msgstr "Clàr-amas mì-dhligheach a' chuilbh."
 
-#: strings.src#RID_STR_INVALID_CURSOR_STATE.string.text
+#. */,\
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_INVALID_CURSOR_STATE\n"
+"string.text"
 msgid "Invalid cursor state."
 msgstr "Staid mhì-dhligheach a' chùrsair."
 
-#: strings.src#RID_STR_CURSOR_BEFORE_OR_AFTER.string.text
+#. xfeZ
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_CURSOR_BEFORE_OR_AFTER\n"
+"string.text"
 msgid "The cursor points to before the first or after the last row."
 msgstr "Tha an cùrsair ron chiad ràgh no as dèidh an ràigh mu dheireadh."
 
-#: strings.src#RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER.string.text
+#. /|WO
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER\n"
+"string.text"
 msgid "The rows before the first and after the last row don't have a bookmark."
 msgstr "Chan eil comharra-leabhair anns na ràghan ron chiad ràdh agus as dèidh an ràigh mu dheireadh."
 
-#: strings.src#RID_STR_NO_BOOKMARK_DELETED.string.text
+#. nl.%
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NO_BOOKMARK_DELETED\n"
+"string.text"
 msgid "The current row is deleted, and thus doesn't have a bookmark."
 msgstr "Chaidh an ràgh làithreach a sguabadh às agus chan eil comharra-leabhair ann air sgàth sin."
 
-#: strings.src#RID_STR_NO_EMBEDDING.string.text
+#. st[S
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_NO_EMBEDDING\n"
+"string.text"
 msgid "Embedding of database documents is not supported."
 msgstr "Chan eil taic ann do leabachadh de sgrìobhainnean stòir-dhàta."
 
-#: strings.src#RID_STR_CONNECTION_REQUEST.string.text
+#. D257
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_CONNECTION_REQUEST\n"
+"string.text"
 msgid "A connection for the following URL was requested \"$name$\"."
 msgstr "Chaidh ceangal iarraidh airson an URL a leanas: \"$name$\"."
 
-#: strings.src#RID_STR_MISSING_EXTENSION.string.text
+#. UZxP
+#: strings.src
+msgctxt ""
+"strings.src\n"
+"RID_STR_MISSING_EXTENSION\n"
+"string.text"
 msgid "The extension is not installed."
 msgstr "Chan eil an leudachan air a stàladh."
diff --git a/source/gd/dbaccess/source/ext/macromigration.po b/source/gd/dbaccess/source/ext/macromigration.po
index 96c93d105f7..a9e6e8a1056 100644
--- a/source/gd/dbaccess/source/ext/macromigration.po
+++ b/source/gd/dbaccess/source/ext/macromigration.po
@@ -1,9 +1,9 @@
-#. extracted from dbaccess/source/ext/macromigration.oo
+#. extracted from dbaccess/source/ext/macromigration
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+dbaccess%2Fsource%2Fext%2Fmacromigration.oo&subcomponent=ui\n"
-"POT-Creation-Date: 2012-07-04 16:39+0200\n"
+"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
+"POT-Creation-Date: 2012-11-17 19:02+0200\n"
 "PO-Revision-Date: 2011-12-23 03:28+0200\n"
 "Last-Translator: Michael <fios@akerbeltz.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,35 +12,75 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "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-Generator: Translate Toolkit 1.9.0\n"
+"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
 
-#: macromigration.src#DLG_MACRO_MIGRATION.STR_STATE_CLOSE_SUB_DOCS.string.text
+#. /*XT
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"DLG_MACRO_MIGRATION\n"
+"STR_STATE_CLOSE_SUB_DOCS\n"
+"string.text"
 msgid "Prepare"
 msgstr "Ullaich"
 
-#: macromigration.src#DLG_MACRO_MIGRATION.STR_STATE_BACKUP_DBDOC.string.text
+#. ;GCY
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"DLG_MACRO_MIGRATION\n"
+"STR_STATE_BACKUP_DBDOC\n"
+"string.text"
 msgid "Backup Document"
 msgstr "Lethbhreac-glèidhidh"
 
-#: macromigration.src#DLG_MACRO_MIGRATION.STR_STATE_MIGRATE.string.text
+#. wO:K
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"DLG_MACRO_MIGRATION\n"
+"STR_STATE_MIGRATE\n"
+"string.text"
 msgid "Migrate"
 msgstr "Imrich"
 
-#: macromigration.src#DLG_MACRO_MIGRATION.STR_STATE_SUMMARY.string.text
-msgctxt "macromigration.src#DLG_MACRO_MIGRATION.STR_STATE_SUMMARY.string.text"
+#. x3s]
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"DLG_MACRO_MIGRATION\n"
+"STR_STATE_SUMMARY\n"
+"string.text"
 msgid "Summary"
 msgstr "Gearr-chunntas"
 
-#: macromigration.src#DLG_MACRO_MIGRATION.modaldialog.text
+#. O8E~
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"DLG_MACRO_MIGRATION\n"
+"modaldialog.text"
 msgid "Database Document Macro Migration"
 msgstr "Imrich macro airson sgrìobhainn an stòir-dhàta"
 
-#: macromigration.src#TP_PREPARE.FT_HEADER.fixedtext.text
+#. URJi
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"TP_PREPARE\n"
+"FT_HEADER\n"
+"fixedtext.text"
 msgid "Welcome to the Database Macro Migration Wizard"
 msgstr "Fàilte gu draoidh imrich macro stòir-dhàta"
 
-#: macromigration.src#TP_PREPARE.FT_INTRODUCTION.fixedtext.text
+#. rNob
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"TP_PREPARE\n"
+"FT_INTRODUCTION\n"
+"fixedtext.text"
 msgid ""
 "This wizard will guide you through the task of migrating your macros.\n"
 "\n"
@@ -58,155 +98,353 @@ msgstr ""
 "\n"
 "Mus urrainn dhut tòiseachadh air an imrich, feumaidh tu gach foirm, aithisg, iarrtas is clàr aig an sgrìobhainn a dhùnadh. Briog air 'Air adhart' gus seo a dhèanamh."
 
-#: macromigration.src#TP_PREPARE.FT_CLOSE_DOC_ERROR.fixedtext.text
+#. [*kI
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"TP_PREPARE\n"
+"FT_CLOSE_DOC_ERROR\n"
+"fixedtext.text"
 msgid "Not all objects could be closed. Please close them manually, and re-start the wizard."
 msgstr "Cha deach gach oibseact a dhùnadh. Dùin iad a làimh agus tòisich an draoidh a-rithist an uairsin."
 
-#: macromigration.src#TP_SAVE_DBDOC_AS.FT_HEADER.fixedtext.text
+#. ys;s
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"TP_SAVE_DBDOC_AS\n"
+"FT_HEADER\n"
+"fixedtext.text"
 msgid "Backup your Document"
 msgstr "Dèan lethbhreac-glèidhidh dhen sgrìobhainn agad"
 
-#: macromigration.src#TP_SAVE_DBDOC_AS.FT_EXPLANATION.fixedtext.text
+#. l.o/
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"TP_SAVE_DBDOC_AS\n"
+"FT_EXPLANATION\n"
+"fixedtext.text"
 msgid "To allow you to go back to the state before the migration, the database document will be backed up to a location of your choice. Every change done by the wizard will be made to the original document, the backup will stay untouched."
 msgstr "Thèid lethbhreac-glèidhidh dhen sgrìobhainn stòir-dhàta agad a chur àite sam bith a thogras tu gun urrainn dhut tilleadh dhan t-suidheachadh mar a bha e mus do thòisich thu air an imrich. Chan atharraich an draoidh ach an sgrìobhainn thùsail, cha bhean e ris an lethbhreac-ghlèidhidh agad."
 
-#: macromigration.src#TP_SAVE_DBDOC_AS.FT_SAVE_AS_LABEL.fixedtext.text
+#. /T7e
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"TP_SAVE_DBDOC_AS\n"
+"FT_SAVE_AS_LABEL\n"
+"fixedtext.text"
 msgid "Save To:"
 msgstr "Sàbhail ann an:"
 
-#: macromigration.src#TP_SAVE_DBDOC_AS.PB_BROWSE_SAVE_AS_LOCATION.pushbutton.text
+#. k[Sg
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"TP_SAVE_DBDOC_AS\n"
+"PB_BROWSE_SAVE_AS_LOCATION\n"
+"pushbutton.text"
 msgid "Browse ..."
 msgstr "Brabhsaich..."
 
-#: macromigration.src#TP_SAVE_DBDOC_AS.FT_START_MIGRATION.fixedtext.text
+#. sT2J
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"TP_SAVE_DBDOC_AS\n"
+"FT_START_MIGRATION\n"
+"fixedtext.text"
 msgid "Press 'Next' to save a copy of your document, and to begin the migration."
 msgstr "Briog air 'Air adhart' gus lethbhreac dhen sgrìobhainn agad a shàbhaladh is tòiseachadh air an imrich."
 
-#: macromigration.src#TP_MIGRATE.FT_HEADER.fixedtext.text
+#. BCGi
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"TP_MIGRATE\n"
+"FT_HEADER\n"
+"fixedtext.text"
 msgid "Migration Progress"
 msgstr "Adhartas na h-imriche"
 
-#: macromigration.src#TP_MIGRATE.FT_OBJECT_COUNT.fixedtext.text
+#. g[FI
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"TP_MIGRATE\n"
+"FT_OBJECT_COUNT\n"
+"fixedtext.text"
 msgid "The database document contains $forms$ form(s) and $reports$ report(s), which are currently being processed:"
 msgstr "Tha $forms$ f(h)oirm(ean) agus $reports$ aithisg(ean) san sgrìobhainn stòir-dhàta seo a tha 'gan làimhseachadh an-dràsta fhèin:"
 
-#: macromigration.src#TP_MIGRATE.FT_CURRENT_OBJECT_LABEL.fixedtext.text
+#. Tp]j
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"TP_MIGRATE\n"
+"FT_CURRENT_OBJECT_LABEL\n"
+"fixedtext.text"
 msgid "Current object:"
 msgstr "An t-oibseact làithreach:"
 
-#: macromigration.src#TP_MIGRATE.FT_CURRENT_PROGRESS_LABEL.fixedtext.text
+#. P5HM
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"TP_MIGRATE\n"
+"FT_CURRENT_PROGRESS_LABEL\n"
+"fixedtext.text"
 msgid "Current progress:"
 msgstr "Adhartas làithreach:"
 
-#: macromigration.src#TP_MIGRATE.FT_ALL_PROGRESS_LABEL.fixedtext.text
+#. zf(u
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"TP_MIGRATE\n"
+"FT_ALL_PROGRESS_LABEL\n"
+"fixedtext.text"
 msgid "Overall progress:"
 msgstr "Adhartas san fharsaingeachd:"
 
-#: macromigration.src#TP_MIGRATE.FT_OBJECT_COUNT_PROGRESS.fixedtext.text
-msgctxt "macromigration.src#TP_MIGRATE.FT_OBJECT_COUNT_PROGRESS.fixedtext.text"
+#. =+\*
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"TP_MIGRATE\n"
+"FT_OBJECT_COUNT_PROGRESS\n"
+"fixedtext.text"
 msgid "document $current$ of $overall$"
 msgstr "sgrìobhainn $current$ a-mach à $overall$"
 
-#: macromigration.src#TP_MIGRATE.FT_MIGRATION_DONE.fixedtext.text
+#. OWE0
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"TP_MIGRATE\n"
+"FT_MIGRATION_DONE\n"
+"fixedtext.text"
 msgid "All forms and reports have been successfully processed. Press 'Next' to show a detailed summary."
 msgstr "Chaidh gach foirm is aithisg a phròiseasadh gu soirbheachail. Briog air 'Air adhart' airson cunntas mionaideach fhaicinn."
 
-#: macromigration.src#TP_SUMMARY.FT_HEADER.fixedtext.text
-msgctxt "macromigration.src#TP_SUMMARY.FT_HEADER.fixedtext.text"
+#. IGos
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"TP_SUMMARY\n"
+"FT_HEADER\n"
+"fixedtext.text"
 msgid "Summary"
 msgstr "Cunntas"
 
-#: macromigration.src#TP_SUMMARY.STR_SUCCESSFUL.string.text
+#. f%B9
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"TP_SUMMARY\n"
+"STR_SUCCESSFUL\n"
+"string.text"
 msgid "The migration was successful. Below is a log of the actions which have been taken to your document."
 msgstr "Shoirbhich leat leis an imrich. Chì thu loga na chaidh a dhèanamh air an sgrìobhainn agad gu h-ìosal."
 
-#: macromigration.src#TP_SUMMARY.STR_UNSUCCESSFUL.string.text
+#. UOYO
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"TP_SUMMARY\n"
+"STR_UNSUCCESSFUL\n"
+"string.text"
 msgid "The migration was not successful. Examine the migration log below for details."
 msgstr "Cha do shoirbhich leat leis an imrich. Cuir sùil air loga na h-imriche gu h-ìosal airson mion-fhiosrachadh."
 
 #. This refers to a form document inside a database document.
-#: macromigration.src#STR_FORM.string.text
+#. ,!c1
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"STR_FORM\n"
+"string.text"
 msgid "Form '$name$'"
 msgstr "Foirm '$name$'"
 
 #. This refers to a report document inside a database document.
-#: macromigration.src#STR_REPORT.string.text
+#. _dZ#
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"STR_REPORT\n"
+"string.text"
 msgid "Report '$name$'"
 msgstr "Aithisg '$name$'"
 
-#: macromigration.src#STR_OVERALL_PROGRESS.string.text
-msgctxt "macromigration.src#STR_OVERALL_PROGRESS.string.text"
+#. adV]
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"STR_OVERALL_PROGRESS\n"
+"string.text"
 msgid "document $current$ of $overall$"
 msgstr "sgrìobhainn $current$ a-mach à $overall$"
 
-#: macromigration.src#STR_DATABASE_DOCUMENT.string.text
+#. dS]Q
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"STR_DATABASE_DOCUMENT\n"
+"string.text"
 msgid "Database Document"
 msgstr "Sgrìobhainn stòir-dhàta"
 
-#: macromigration.src#STR_SAVED_COPY_TO.string.text
+#. x,#Z
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"STR_SAVED_COPY_TO\n"
+"string.text"
 msgid "saved copy to $location$"
 msgstr "chaidh letbhreac dheth a shàbhaladh ann an $location$"
 
-#: macromigration.src#STR_MOVED_LIBRARY.string.text
+#. ONwp
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"STR_MOVED_LIBRARY\n"
+"string.text"
 msgid "migrated $type$ library '$old$' to '$new$'"
 msgstr "chaidh an leabhar-lann $type$ '$old$' imrich gu '$new$'"
 
-#: macromigration.src#STR_LIBRARY_TYPE_AND_NAME.string.text
+#. (x0u
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"STR_LIBRARY_TYPE_AND_NAME\n"
+"string.text"
 msgid "$type$ library '$library$'"
 msgstr "leabhar-lann $type$ '$library$'"
 
-#: macromigration.src#STR_MIGRATING_LIBS.string.text
+#. ro*Q
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"STR_MIGRATING_LIBS\n"
+"string.text"
 msgid "migrating libraries ..."
 msgstr "ag imrich nan leabhar-lannan..."
 
-#: macromigration.src#STR_OOO_BASIC.string.text
+#. MH9T
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"STR_OOO_BASIC\n"
+"string.text"
 msgid "%PRODUCTNAME Basic"
 msgstr "%PRODUCTNAME Basic"
 
-#: macromigration.src#STR_JAVA_SCRIPT.string.text
+#. L95~
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"STR_JAVA_SCRIPT\n"
+"string.text"
 msgid "JavaScript"
 msgstr "JavaScript"
 
-#: macromigration.src#STR_BEAN_SHELL.string.text
+#. K_(k
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"STR_BEAN_SHELL\n"
+"string.text"
 msgid "BeanShell"
 msgstr "BeanShell"
 
-#: macromigration.src#STR_JAVA.string.text
+#. z5Zc
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"STR_JAVA\n"
+"string.text"
 msgid "Java"
 msgstr "Java"
 
-#: macromigration.src#STR_PYTHON.string.text
+#. g~Jm
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"STR_PYTHON\n"
+"string.text"
 msgid "Python"
 msgstr "Python"
 
-#: macromigration.src#STR_DIALOG.string.text
+#. JK8L
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"STR_DIALOG\n"
+"string.text"
 msgid "dialog"
 msgstr "còmhradh"
 
-#: macromigration.src#STR_ERRORS.string.text
+#. {huM
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"STR_ERRORS\n"
+"string.text"
 msgid "Error(s)"
 msgstr "Mearachd(an)"
 
-#: macromigration.src#STR_WARNINGS.string.text
+#. lP[k
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"STR_WARNINGS\n"
+"string.text"
 msgid "Warnings"
 msgstr "Rabhaidhean"
 
-#: macromigration.src#STR_EXCEPTION.string.text
+#. RJnt
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"STR_EXCEPTION\n"
+"string.text"
 msgid "caught exception:"
 msgstr "fhuaras eisgeachd:"
 
-#: macromigration.src#ERR_INVALID_BACKUP_LOCATION.errorbox.text
+#. JmHf
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"ERR_INVALID_BACKUP_LOCATION\n"
+"errorbox.text"
 msgid "You need to choose a backup location other than the document location itself."
 msgstr "Chan urrainn dhut an lethbhreac-glèidhidh a chur san dearbh àite 's a tha an sgrìobhainn fhèin."
 
-#: macromigration.src#STR_INVALID_NUMBER_ARGS.string.text
+#. `o=?
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"STR_INVALID_NUMBER_ARGS\n"
+"string.text"
 msgid "Invalid number of initialization arguments. Expected 1."
 msgstr "Àireamh mhì-dhligheach de dh'argamaidean tòiseachaidh. Bha dùil ri 1."
 
-#: macromigration.src#STR_NO_DATABASE.string.text
+#. Q7eK
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"STR_NO_DATABASE\n"
+"string.text"
 msgid "No database document found in the initialization arguments."
 msgstr "Cha deach sgrìobhainn stòir-dhàta a lorg sna h-argamaidean tòiseachaidh."
 
-#: macromigration.src#STR_NOT_READONLY.string.text
+#. SZ+3
+#: macromigration.src
+msgctxt ""
+"macromigration.src\n"
+"STR_NOT_READONLY\n"
+"string.text"
 msgid "Not applicable to read-only documents."
 msgstr "Chan eil sgrìobhainnean a tha ri leughadh a-mhàin buailteach dha seo."
diff --git a/source/gd/dbaccess/source/sdbtools/resource.po b/source/gd/dbaccess/source/sdbtools/resource.po
index 1b2eac3f062..76aa162be00 100644
--- a/source/gd/dbaccess/source/sdbtools/resource.po
+++ b/source/gd/dbaccess/source/sdbtools/resource.po
@@ -1,9 +1,9 @@
-#. extracted from dbaccess/source/sdbtools/resource.oo
+#. extracted from dbaccess/source/sdbtools/resource
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+dbaccess%2Fsource%2Fsdbtools%2Fresource.oo&subcomponent=ui\n"
-"POT-Creation-Date: 2012-07-04 16:39+0200\n"
+"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
+"POT-Creation-Date: 2012-11-17 19:02+0200\n"
 "PO-Revision-Date: 2011-10-01 22:46+0200\n"
 "Last-Translator: Michael <fios@akerbeltz.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,33 +12,68 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "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-Generator: Translate Toolkit 1.9.0\n"
+"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
 
-#: sdbt_strings.src#STR_QUERY_AND_TABLE_DISTINCT_NAMES.string.text
+#. 4W,4
+#: sdbt_strings.src
+msgctxt ""
+"sdbt_strings.src\n"
+"STR_QUERY_AND_TABLE_DISTINCT_NAMES\n"
+"string.text"
 msgid "You cannot give a table and a query the same name. Please use a name which is not yet used by a query or table."
 msgstr "Chan urrainn dhut an dearbh-ainm a chur air clàr agus iarrtas. Cleachd ainm nach eil 'ga chleachdadh le iarrtas no clàr eile."
 
-#: sdbt_strings.src#STR_BASENAME_TABLE.string.text
+#. gyh%
+#: sdbt_strings.src
+msgctxt ""
+"sdbt_strings.src\n"
+"STR_BASENAME_TABLE\n"
+"string.text"
 msgid "Table"
 msgstr "Clàr"
 
-#: sdbt_strings.src#STR_BASENAME_QUERY.string.text
+#. /LI:
+#: sdbt_strings.src
+msgctxt ""
+"sdbt_strings.src\n"
+"STR_BASENAME_QUERY\n"
+"string.text"
 msgid "Query"
 msgstr "Iarrtas"
 
-#: sdbt_strings.src#STR_CONN_WITHOUT_QUERIES_OR_TABLES.string.text
+#. 7qKO
+#: sdbt_strings.src
+msgctxt ""
+"sdbt_strings.src\n"
+"STR_CONN_WITHOUT_QUERIES_OR_TABLES\n"
+"string.text"
 msgid "The given connection is no valid query and/or tables supplier."
 msgstr "Chan e iarrtas dligheach agus/no solaraiche clàir dligheach a tha sa cheangal a shònraich thu."
 
-#: sdbt_strings.src#STR_NO_TABLE_OBJECT.string.text
+#. mGK#
+#: sdbt_strings.src
+msgctxt ""
+"sdbt_strings.src\n"
+"STR_NO_TABLE_OBJECT\n"
+"string.text"
 msgid "The given object is no table object."
 msgstr "Chan e oibseact clàir a tha san oibseact a chaidh a shònrachadh."
 
-#: sdbt_strings.src#STR_INVALID_COMPOSITION_TYPE.string.text
+#. LIUa
+#: sdbt_strings.src
+msgctxt ""
+"sdbt_strings.src\n"
+"STR_INVALID_COMPOSITION_TYPE\n"
+"string.text"
 msgid "Invalid composition type - need a value from com.sun.star.sdb.tools.CompositionType."
 msgstr "Seòrsa co-dhèantachd mì-dhligheach - tha feum air luach o com.sun.star.sdb.tools.CompositionType."
 
-#: sdbt_strings.src#STR_INVALID_COMMAND_TYPE.string.text
+#. _8X^
+#: sdbt_strings.src
+msgctxt ""
+"sdbt_strings.src\n"
+"STR_INVALID_COMMAND_TYPE\n"
+"string.text"
 msgid "Invalid command type - only TABLE and QUERY from com.sun.star.sdb.CommandType are allowed."
 msgstr "Seòrsa àithne mì-dhligheach - chan eil ach TABLE agus QUERY ceadaichte o com.sun.star.sdb.tools.CompositionType."
diff --git a/source/gd/dbaccess/source/ui/app.po b/source/gd/dbaccess/source/ui/app.po
index 3b7502db162..78f52a51519 100644
--- a/source/gd/dbaccess/source/ui/app.po
+++ b/source/gd/dbaccess/source/ui/app.po
@@ -1,9 +1,9 @@
-#. extracted from dbaccess/source/ui/app.oo
+#. extracted from dbaccess/source/ui/app
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+dbaccess%2Fsource%2Fui%2Fapp.oo&subcomponent=ui\n"
-"POT-Creation-Date: 2012-07-04 16:39+0200\n"
+"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
+"POT-Creation-Date: 2012-11-17 19:02+0200\n"
 "PO-Revision-Date: 2011-11-10 04:18+0200\n"
 "Last-Translator: Michael <fios@akerbeltz.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,204 +12,465 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "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-Generator: Translate Toolkit 1.9.0\n"
+"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
 
-#: app.src#RID_STR_NEW_FORM.string.text
+#. M8+u
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_NEW_FORM\n"
+"string.text"
 msgid "Create Form in Design View..."
 msgstr "Cruthaich foirm san sealladh cho-dhealbhachd..."
 
-#: app.src#RID_STR_NEW_FORM_AUTO.string.text
+#. 5}mf
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_NEW_FORM_AUTO\n"
+"string.text"
 msgid "Use Wizard to Create Form..."
 msgstr "Cleachd an draoidh gus foirm a chruthachadh..."
 
-#: app.src#RID_STR_NEW_REPORT_AUTO.string.text
+#. ^I:2
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_NEW_REPORT_AUTO\n"
+"string.text"
 msgid "Use Wizard to Create Report..."
 msgstr "Cleachd an draoidh gus aithisg a chruthachadh..."
 
-#: app.src#RID_STR_NEW_REPORT.string.text
+#. 5%!)
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_NEW_REPORT\n"
+"string.text"
 msgid "Create Report in Design View..."
 msgstr "Cruthaich an aithisg san t-sealladh dealbhaidh..."
 
-#: app.src#RID_STR_NEW_QUERY.string.text
+#. QMc.
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_NEW_QUERY\n"
+"string.text"
 msgid "Create Query in Design View..."
 msgstr "Cruthaich a' cheist san t-sealladh dealbhaidh..."
 
-#: app.src#RID_STR_NEW_QUERY_SQL.string.text
+#. wQLG
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_NEW_QUERY_SQL\n"
+"string.text"
 msgid "Create Query in SQL View..."
 msgstr "Cruthaich a' cheist san t-sealladh SQL..."
 
-#: app.src#RID_STR_NEW_QUERY_AUTO.string.text
+#. 0j=5
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_NEW_QUERY_AUTO\n"
+"string.text"
 msgid "Use Wizard to Create Query..."
 msgstr "Cleachd an draoidh gus ceist a chruthachadh..."
 
-#: app.src#RID_STR_NEW_TABLE.string.text
+#. c+m^
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_NEW_TABLE\n"
+"string.text"
 msgid "Create Table in Design View..."
 msgstr "Cruthaich an clàr san t-sealladh dealbhaidh..."
 
-#: app.src#RID_STR_NEW_TABLE_AUTO.string.text
+#. 8_x!
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_NEW_TABLE_AUTO\n"
+"string.text"
 msgid "Use Wizard to Create Table..."
 msgstr "Cleachd an draoidh gus clàr a chruthachadh..."
 
-#: app.src#RID_STR_NEW_VIEW.string.text
+#. U-|Y
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_NEW_VIEW\n"
+"string.text"
 msgid "Create View..."
 msgstr "Cruthaich sealladh..."
 
-#: app.src#RID_STR_FORMS_CONTAINER.string.text
+#. 52Z[
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_FORMS_CONTAINER\n"
+"string.text"
 msgid "Forms"
 msgstr "Foirmean"
 
-#: app.src#RID_STR_REPORTS_CONTAINER.string.text
+#. il@k
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_REPORTS_CONTAINER\n"
+"string.text"
 msgid "Reports"
 msgstr "Aithisgean"
 
-#: app.src#RID_MENU_APP_NEW.SID_APP_NEW_FORM.menuitem.text
+#. gSSQ
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_MENU_APP_NEW\n"
+"SID_APP_NEW_FORM\n"
+"menuitem.text"
 msgid "Form..."
 msgstr "Foirm..."
 
-#: app.src#RID_MENU_APP_NEW.SID_APP_NEW_REPORT.menuitem.text
-msgctxt "app.src#RID_MENU_APP_NEW.SID_APP_NEW_REPORT.menuitem.text"
+#. #,}Q
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_MENU_APP_NEW\n"
+"SID_APP_NEW_REPORT\n"
+"menuitem.text"
 msgid "Report..."
 msgstr "Aithisg..."
 
-#: app.src#RID_MENU_APP_NEW.SID_DB_NEW_VIEW_SQL.menuitem.text
+#. ]kPd
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_MENU_APP_NEW\n"
+"SID_DB_NEW_VIEW_SQL\n"
+"menuitem.text"
 msgid "View (Simple)..."
 msgstr "Sealladh (Simplidh)..."
 
-#: app.src#RID_MENU_APP_EDIT.SID_DB_APP_PASTE_SPECIAL.menuitem.text
+#. =nyK
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_MENU_APP_EDIT\n"
+"SID_DB_APP_PASTE_SPECIAL\n"
+"menuitem.text"
 msgid "Paste Special..."
 msgstr "Cuir ann air dòigh shònraichte..."
 
-#: app.src#RID_MENU_APP_EDIT.SID_DB_APP_DELETE.menuitem.text
+#. qc.B
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_MENU_APP_EDIT\n"
+"SID_DB_APP_DELETE\n"
+"menuitem.text"
 msgid "Delete"
 msgstr "Sguab às"
 
-#: app.src#RID_MENU_APP_EDIT.SID_DB_APP_RENAME.menuitem.text
+#. TJf$
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_MENU_APP_EDIT\n"
+"SID_DB_APP_RENAME\n"
+"menuitem.text"
 msgid "Rename"
 msgstr "Cuir ainm ùr air"
 
-#: app.src#RID_MENU_APP_EDIT.SID_DB_APP_EDIT.menuitem.text
+#. M[`t
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_MENU_APP_EDIT\n"
+"SID_DB_APP_EDIT\n"
+"menuitem.text"
 msgid "Edit"
 msgstr "Deasaich"
 
-#: app.src#RID_MENU_APP_EDIT.SID_DB_APP_EDIT_SQL_VIEW.menuitem.text
+#. Dxkr
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_MENU_APP_EDIT\n"
+"SID_DB_APP_EDIT_SQL_VIEW\n"
+"menuitem.text"
 msgid "Edit in SQL View..."
 msgstr "Deasaich san t-sealladh SQL..."
 
-#: app.src#RID_MENU_APP_EDIT.SID_DB_APP_OPEN.menuitem.text
+#. O)+e
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_MENU_APP_EDIT\n"
+"SID_DB_APP_OPEN\n"
+"menuitem.text"
 msgid "Open"
 msgstr "Fosgail"
 
-#: app.src#RID_MENU_APP_EDIT.SID_DB_APP_CONVERTTOVIEW.menuitem.text
+#. p;88
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_MENU_APP_EDIT\n"
+"SID_DB_APP_CONVERTTOVIEW\n"
+"menuitem.text"
 msgid "Create as View"
 msgstr "Cruthaich mar shealladh"
 
-#: app.src#RID_MENU_APP_EDIT.SID_FORM_CREATE_REPWIZ_PRE_SEL.menuitem.text
+#. Ci\=
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_MENU_APP_EDIT\n"
+"SID_FORM_CREATE_REPWIZ_PRE_SEL\n"
+"menuitem.text"
 msgid "Form Wizard..."
 msgstr "Draoidh nam foirm..."
 
-#: app.src#RID_MENU_APP_EDIT.SID_APP_NEW_REPORT_PRE_SEL.menuitem.text
-msgctxt "app.src#RID_MENU_APP_EDIT.SID_APP_NEW_REPORT_PRE_SEL.menuitem.text"
+#. 5qX\
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_MENU_APP_EDIT\n"
+"SID_APP_NEW_REPORT_PRE_SEL\n"
+"menuitem.text"
 msgid "Report..."
 msgstr "Aithisg..."
 
-#: app.src#RID_MENU_APP_EDIT.SID_REPORT_CREATE_REPWIZ_PRE_SEL.menuitem.text
+#. iu:i
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_MENU_APP_EDIT\n"
+"SID_REPORT_CREATE_REPWIZ_PRE_SEL\n"
+"menuitem.text"
 msgid "Report Wizard..."
 msgstr "Draoidh nan aithisg..."
 
-#: app.src#RID_MENU_APP_EDIT.SID_SELECTALL.menuitem.text
+#. 0Q3,
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_MENU_APP_EDIT\n"
+"SID_SELECTALL\n"
+"menuitem.text"
 msgid "Select All"
 msgstr "Tagh a h-uile"
 
-#: app.src#RID_MENU_APP_EDIT.MN_PROPS.SID_DB_APP_DSPROPS.menuitem.text
+#. #W3E
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_MENU_APP_EDIT.MN_PROPS\n"
+"SID_DB_APP_DSPROPS\n"
+"menuitem.text"
 msgid "Properties..."
 msgstr "Buadhan..."
 
-#: app.src#RID_MENU_APP_EDIT.MN_PROPS.SID_DB_APP_DSCONNECTION_TYPE.menuitem.text
+#. l*B:
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_MENU_APP_EDIT.MN_PROPS\n"
+"SID_DB_APP_DSCONNECTION_TYPE\n"
+"menuitem.text"
 msgid "Connection Type..."
 msgstr "Seòrsa a' cheangail..."
 
-#: app.src#RID_MENU_APP_EDIT.MN_PROPS.SID_DB_APP_DSADVANCED_SETTINGS.menuitem.text
+#. 1Avo
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_MENU_APP_EDIT.MN_PROPS\n"
+"SID_DB_APP_DSADVANCED_SETTINGS\n"
+"menuitem.text"
 msgid "Advanced Settings..."
 msgstr "Roghainnean adhartach..."
 
-#: app.src#RID_MENU_APP_EDIT.MN_PROPS.menuitem.text
+#. i3v)
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_MENU_APP_EDIT\n"
+"MN_PROPS\n"
+"menuitem.text"
 msgid "~Database"
 msgstr "Stòr-~dàta"
 
-#: app.src#STR_QUERY_DELETE_DATASOURCE.string.text
+#. /bmi
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_QUERY_DELETE_DATASOURCE\n"
+"string.text"
 msgid "Do you want to delete the data source '%1'?"
 msgstr "A bheil thu airson an tùs-dàta '%1' a sguabadh às?"
 
-#: app.src#STR_APP_TITLE.string.text
+#. #e4D
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_APP_TITLE\n"
+"string.text"
 msgid " - %PRODUCTNAME Base"
 msgstr " - %PRODUCTNAME Base"
 
-#: app.src#RID_STR_REPORTS_HELP_TEXT_WIZARD.string.text
+#. Y@N!
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_REPORTS_HELP_TEXT_WIZARD\n"
+"string.text"
 msgid "The wizard will guide you through the steps necessary to create a report."
 msgstr "Treòraichidh an draoidh seo thu tro na ceuman riatanach gus aithisg a chruthachadh."
 
-#: app.src#RID_STR_FORMS_HELP_TEXT.string.text
+#. R:%2
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_FORMS_HELP_TEXT\n"
+"string.text"
 msgid "Create a form by specifying the record source, controls, and control properties."
 msgstr "Cruthaichidh tu foirm le bhith a' sònrachadh tùs an reacoird, na h-innealan-smachd agus roghainnean an smachd."
 
-#: app.src#RID_STR_REPORT_HELP_TEXT.string.text
+#. /eW?
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_REPORT_HELP_TEXT\n"
+"string.text"
 msgid "Create a report by specifying the record source, controls, and control properties."
 msgstr "Cruthaichidh tu aithisg le bhith a' sònrachadh tùs an reacoird, na h-innealan-smachd agus roghainnean an smachd."
 
-#: app.src#RID_STR_FORMS_HELP_TEXT_WIZARD.string.text
+#. /#er
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_FORMS_HELP_TEXT_WIZARD\n"
+"string.text"
 msgid "The wizard will guide you through the steps necessary to create a form."
 msgstr "Treòraichidh an draoidh seo thu tro na ceuman riatanach gus foirm a chruthachadh."
 
-#: app.src#RID_STR_QUERIES_HELP_TEXT.string.text
+#. #+2[
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_QUERIES_HELP_TEXT\n"
+"string.text"
 msgid "Create a query by specifying the filters, input tables, field names, and properties for sorting or grouping."
 msgstr "Cruthaich ceist le bhith a' sònrachadh criathragan, clàir steach-chuir, ainmean raointean is roghainnean a chum seòrsachadh no buidhneachadh."
 
-#: app.src#RID_STR_QUERIES_HELP_TEXT_SQL.string.text
+#. `P.h
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_QUERIES_HELP_TEXT_SQL\n"
+"string.text"
 msgid "Create a query entering an SQL statement directly."
 msgstr "Cruthaich ceist le bhith a' cur aithris SQL ann."
 
-#: app.src#RID_STR_QUERIES_HELP_TEXT_WIZARD.string.text
+#. x`M;
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_QUERIES_HELP_TEXT_WIZARD\n"
+"string.text"
 msgid "The wizard will guide you through the steps necessary to create a query."
 msgstr "Treòraichidh an draoidh seo thu tro na ceuman riatanach gus ceist a chruthachadh."
 
-#: app.src#RID_STR_TABLES_HELP_TEXT_DESIGN.string.text
+#. muUk
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_TABLES_HELP_TEXT_DESIGN\n"
+"string.text"
 msgid "Create a table by specifying the field names and properties, as well as the data types."
 msgstr "Cruthaich clàr le bhith a' sònrachadh ainmean is roghainnean nan raointean agus seòrsa an dàta."
 
-#: app.src#RID_STR_TABLES_HELP_TEXT_WIZARD.string.text
+#. ,A)/
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_TABLES_HELP_TEXT_WIZARD\n"
+"string.text"
 msgid "Choose from a selection of business and personal table samples, which you customize to create a table."
 msgstr "Tagh o roghainn de bhuill-shampaill de chlàir phearsanta is clàir gnìomhachais as urrainn dhut gnàthachadh gus clàr a chruthachadh."
 
-#: app.src#RID_STR_VIEWS_HELP_TEXT_DESIGN.string.text
+#. 1}hB
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_VIEWS_HELP_TEXT_DESIGN\n"
+"string.text"
 msgid "Create a view by specifying the tables and field names you would like to have visible."
 msgstr "Cruthaich sealladh le bhith a' sònrachadh nan clàr is ainmean nan raointean a bu toigh leat fhaicinn."
 
-#: app.src#RID_STR_VIEWS_HELP_TEXT_WIZARD.string.text
+#. uecI
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_VIEWS_HELP_TEXT_WIZARD\n"
+"string.text"
 msgid "Opens the view wizard"
 msgstr "Fosglaidh seo draoidh nan sealladh"
 
-#: app.src#STR_DATABASE.string.text
+#. 8!I9
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_DATABASE\n"
+"string.text"
 msgid "Database"
 msgstr "Stòr-dàta"
 
-#: app.src#STR_TASKS.string.text
+#. +oK?
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_TASKS\n"
+"string.text"
 msgid "Tasks"
 msgstr "Saothraichean"
 
-#: app.src#STR_DESCRIPTION.string.text
+#. ]#8r
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_DESCRIPTION\n"
+"string.text"
 msgid "Description"
 msgstr "Tuairisgeul"
 
-#: app.src#STR_PREVIEW.string.text
+#. QP~x
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_PREVIEW\n"
+"string.text"
 msgid "Preview"
 msgstr "Ro-shealladh"
 
-#: app.src#STR_DISABLEPREVIEW.string.text
+#. 4Q8\
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_DISABLEPREVIEW\n"
+"string.text"
 msgid "Disable Preview"
 msgstr "Cuir an ro-shealladh à comas"
 
-#: app.src#APP_SAVEMODIFIED.querybox.text
+#. IV?f
+#: app.src
+msgctxt ""
+"app.src\n"
+"APP_SAVEMODIFIED\n"
+"querybox.text"
 msgid ""
 "The database has been modified.\n"
 "Do you want to save the changes?"
@@ -217,7 +478,12 @@ msgstr ""
 "Chaidh an stòr-dàta atharrachadh.\n"
 "A bheil thu airson na dh'atharrachaidhean a shàbhaladh?"
 
-#: app.src#APP_CLOSEDOCUMENTS.querybox.text
+#. E6t=
+#: app.src
+msgctxt ""
+"app.src\n"
+"APP_CLOSEDOCUMENTS\n"
+"querybox.text"
 msgid ""
 "The connection type has been altered.\n"
 "For the changes to take effect, all forms, reports, queries and tables must be closed.\n"
@@ -229,43 +495,96 @@ msgstr ""
 "\n"
 "A bheil thu airson gach sgrìobhainn a dhùnadh an-dràsta?"
 
-#: app.src#RID_MENU_APP_PREVIEW.SID_DB_APP_DISABLE_PREVIEW.menuitem.text
+#. -xWK
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_MENU_APP_PREVIEW\n"
+"SID_DB_APP_DISABLE_PREVIEW\n"
+"menuitem.text"
 msgid "None"
 msgstr "Chan eil gin"
 
-#: app.src#RID_MENU_APP_PREVIEW.SID_DB_APP_VIEW_DOCINFO_PREVIEW.menuitem.text
+#. r.2f
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_MENU_APP_PREVIEW\n"
+"SID_DB_APP_VIEW_DOCINFO_PREVIEW\n"
+"menuitem.text"
 msgid "Document Information"
 msgstr "Fiosrachadh na sgrìobhainne"
 
-#: app.src#RID_MENU_APP_PREVIEW.SID_DB_APP_VIEW_DOC_PREVIEW.menuitem.text
+#. 8rn:
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_MENU_APP_PREVIEW\n"
+"SID_DB_APP_VIEW_DOC_PREVIEW\n"
+"menuitem.text"
 msgid "Document"
 msgstr "Sgrìobhainn"
 
-#: app.src#RID_STR_FORM.string.text
+#. \5_4
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_FORM\n"
+"string.text"
 msgid "Form"
 msgstr "Foirm"
 
-#: app.src#RID_STR_REPORT.string.text
+#. Bc1t
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_REPORT\n"
+"string.text"
 msgid "Report"
 msgstr "Aithisg"
 
-#: app.src#STR_FRM_LABEL.string.text
+#. .j2e
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_FRM_LABEL\n"
+"string.text"
 msgid "F~orm name"
 msgstr "Ainm an fh~oirm"
 
-#: app.src#STR_RPT_LABEL.string.text
+#. ,lje
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_RPT_LABEL\n"
+"string.text"
 msgid "~Report name"
 msgstr "Ainm na ~h-aithisge"
 
-#: app.src#STR_FOLDER_LABEL.string.text
+#. g:.c
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_FOLDER_LABEL\n"
+"string.text"
 msgid "F~older name"
 msgstr "Ainm a' ~phasgain"
 
-#: app.src#STR_SUB_DOCS_WITH_SCRIPTS.string.text
+#. LM}N
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_SUB_DOCS_WITH_SCRIPTS\n"
+"string.text"
 msgid "The document contains forms or reports with embedded macros."
 msgstr "Tha foirmean no aithisgean san sgrìobhainn seo anns a bheil macrothan leabaichte."
 
-#: app.src#STR_SUB_DOCS_WITH_SCRIPTS_DETAIL.string.text
+#. *a0E
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_SUB_DOCS_WITH_SCRIPTS_DETAIL\n"
+"string.text"
 msgid ""
 "Macros should be embedded into the database document itself.\n"
 "\n"
@@ -279,14 +598,29 @@ msgstr ""
 "\n"
 "Thoir an aire nach urrainn dhut macrothan a leabachadh san sgrìobhainn stòir-dhàta fhèin mus bi thu air an imrich. "
 
-#: app.src#RID_STR_EMBEDDED_DATABASE.string.text
+#. IG;w
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_EMBEDDED_DATABASE\n"
+"string.text"
 msgid "Embedded database"
 msgstr "Stòr-dàta leabaichte"
 
-#: app.src#RID_STR_NO_DIFF_CAT.string.text
+#. 9PgD
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_NO_DIFF_CAT\n"
+"string.text"
 msgid "You cannot select different categories."
 msgstr "Chan urrainn dhut diofar roinnean-seòrsa a thaghadh."
 
-#: app.src#RID_STR_UNSUPPORTED_OBJECT_TYPE.string.text
+#. !1~2
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_UNSUPPORTED_OBJECT_TYPE\n"
+"string.text"
 msgid "Unsupported object type found ($type$)."
 msgstr "Chaidh seòrsa oibseict a lorg nach eil taic ann dha ($type$)."
diff --git a/source/gd/dbaccess/source/ui/browser.po b/source/gd/dbaccess/source/ui/browser.po
index 5e0bb3d3278..2baedcf1e45 100644
--- a/source/gd/dbaccess/source/ui/browser.po
+++ b/source/gd/dbaccess/source/ui/browser.po
@@ -1,9 +1,9 @@
-#. extracted from dbaccess/source/ui/browser.oo
+#. extracted from dbaccess/source/ui/browser
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+dbaccess%2Fsource%2Fui%2Fbrowser.oo&subcomponent=ui\n"
-"POT-Creation-Date: 2012-07-04 16:39+0200\n"
+"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
+"POT-Creation-Date: 2012-11-17 19:02+0200\n"
 "PO-Revision-Date: 2011-10-27 21:45+0200\n"
 "Last-Translator: Michael <fios@akerbeltz.org>\n"
 "Language-Team: Akerbeltz\n"
@@ -12,73 +12,147 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "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-Generator: Translate Toolkit 1.9.0\n"
+"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
 "X-Project-Style: openoffice\n"
 
-#: bcommon.src#RID_STR_TBL_TITLE.string.text
-msgctxt "bcommon.src#RID_STR_TBL_TITLE.string.text"
-msgid "Table #"
-msgstr "Clàr #"
-
-#: sbagrid.src#RID_SBA_GRID_COLCTXMENU.ID_BROWSER_COLATTRSET.menuitem.text
+#. Yg61
+#: sbagrid.src
+msgctxt ""
+"sbagrid.src\n"
+"RID_SBA_GRID_COLCTXMENU\n"
+"ID_BROWSER_COLATTRSET\n"
+"menuitem.text"
 msgid "Column ~Format..."
 msgstr "~Fòrmat a' chuilbh..."
 
-#: sbagrid.src#RID_SBA_GRID_COLCTXMENU.ID_BROWSER_COLUMNINFO.menuitem.text
+#. S*3^
+#: sbagrid.src
+msgctxt ""
+"sbagrid.src\n"
+"RID_SBA_GRID_COLCTXMENU\n"
+"ID_BROWSER_COLUMNINFO\n"
+"menuitem.text"
 msgid "Copy Column D~escription"
 msgstr "Dèan l~ethbhreac de thuairisgeul a' chuilbh"
 
-#: sbagrid.src#RID_SBA_GRID_ROWCTXMENU.ID_BROWSER_TABLEATTR.menuitem.text
+#. OrWW
+#: sbagrid.src
+msgctxt ""
+"sbagrid.src\n"
+"RID_SBA_GRID_ROWCTXMENU\n"
+"ID_BROWSER_TABLEATTR\n"
+"menuitem.text"
 msgid "Table Format..."
 msgstr "Fòrmat a' chlàir..."
 
-#: sbagrid.src#RID_SBA_GRID_ROWCTXMENU.ID_BROWSER_ROWHEIGHT.menuitem.text
+#. _*Kp
+#: sbagrid.src
+msgctxt ""
+"sbagrid.src\n"
+"RID_SBA_GRID_ROWCTXMENU\n"
+"ID_BROWSER_ROWHEIGHT\n"
+"menuitem.text"
 msgid "Row Height..."
 msgstr "Àirde an ràigh..."
 
-#: sbagrid.src#RID_STR_UNDO_MODIFY_RECORD.string.text
+#. tU(+
+#: sbagrid.src
+msgctxt ""
+"sbagrid.src\n"
+"RID_STR_UNDO_MODIFY_RECORD\n"
+"string.text"
 msgid "Undo: Data Input"
 msgstr "Neo-dhèan: Innteart dàta"
 
-#: sbagrid.src#RID_STR_SAVE_CURRENT_RECORD.string.text
+#. -/O(
+#: sbagrid.src
+msgctxt ""
+"sbagrid.src\n"
+"RID_STR_SAVE_CURRENT_RECORD\n"
+"string.text"
 msgid "Save current record"
 msgstr "Sàbhail an reacord làithreach"
 
-#: sbagrid.src#STR_QRY_TITLE.string.text
+#. P*@v
+#: sbagrid.src
+msgctxt ""
+"sbagrid.src\n"
+"STR_QRY_TITLE\n"
+"string.text"
 msgid "Query #"
 msgstr "Ceist #"
 
-#: sbagrid.src#STR_TBL_TITLE.string.text
-msgctxt "sbagrid.src#STR_TBL_TITLE.string.text"
+#. 0*?p
+#: sbagrid.src
+#, fuzzy
+msgctxt ""
+"sbagrid.src\n"
+"STR_TBL_TITLE\n"
+"string.text"
 msgid "Table #"
 msgstr "Clàir #"
 
-#: sbagrid.src#STR_VIEW_TITLE.string.text
+#. }ltF
+#: sbagrid.src
+msgctxt ""
+"sbagrid.src\n"
+"STR_VIEW_TITLE\n"
+"string.text"
 msgid "View #"
 msgstr "Seall #"
 
-#: sbagrid.src#STR_NAME_ALREADY_EXISTS.string.text
+#. G~7/
+#: sbagrid.src
+msgctxt ""
+"sbagrid.src\n"
+"STR_NAME_ALREADY_EXISTS\n"
+"string.text"
 msgid "The name \"#\" already exists."
 msgstr "Tha an t-ainm \"#\" ann mu thràth."
 
-#: sbagrid.src#STR_NO_COLUMNNAME_MATCHING.string.text
+#. 9=7^
+#: sbagrid.src
+msgctxt ""
+"sbagrid.src\n"
+"STR_NO_COLUMNNAME_MATCHING\n"
+"string.text"
 msgid "No matching column names were found."
 msgstr "Cha deach ainm cuilbh a lorg a fhreagair ri dad."
 
-#: sbagrid.src#STR_ERROR_OCCURRED_WHILE_COPYING.string.text
+#. bg|4
+#: sbagrid.src
+msgctxt ""
+"sbagrid.src\n"
+"STR_ERROR_OCCURRED_WHILE_COPYING\n"
+"string.text"
 msgid "An error occurred. Do you want to continue copying?"
 msgstr "Thachair mearachd. A bheil thu airson leantainn air adhart leis a lethbhreac?"
 
-#: sbagrid.src#STR_DATASOURCE_GRIDCONTROL_NAME.string.text
+#. jJ/o
+#: sbagrid.src
+msgctxt ""
+"sbagrid.src\n"
+"STR_DATASOURCE_GRIDCONTROL_NAME\n"
+"string.text"
 msgid "Data source table view"
 msgstr "Sealladh clàir dhen tùs-dàta"
 
-#: sbagrid.src#STR_DATASOURCE_GRIDCONTROL_DESC.string.text
+#. ^TTF
+#: sbagrid.src
+msgctxt ""
+"sbagrid.src\n"
+"STR_DATASOURCE_GRIDCONTROL_DESC\n"
+"string.text"
 msgid "Shows the selected table or query."
 msgstr "Seallaidh seo an clàr no a' cheist a thagh thu."
 
-#: sbabrw.src#QUERY_BRW_SAVEMODIFIED.querybox.text
+#. Y2P,
+#: sbabrw.src
+msgctxt ""
+"sbabrw.src\n"
+"QUERY_BRW_SAVEMODIFIED\n"
+"querybox.text"
 msgid ""
 "The current record has been changed.\n"
 "Do you want to save the changes?"
@@ -86,90 +160,201 @@ msgstr ""
 "Chaidh an reacord làithreach atharrachadh.\n"
 "A bheil thu airson na dh'atharraich thu a shàbhaladh?"
 
-#: sbabrw.src#QUERY_BRW_DELETE_ROWS.querybox.text
+#. kn*1
+#: sbabrw.src
+msgctxt ""
+"sbabrw.src\n"
+"QUERY_BRW_DELETE_ROWS\n"
+"querybox.text"
 msgid "Do you want to delete the selected data?"
 msgstr "A bheil thu airson an dàta a thagh thu a sguabadh às?"
 
-#: sbabrw.src#RID_STR_DATABROWSER_FILTERED.string.text
+#. =Rsz
+#: sbabrw.src
+msgctxt ""
+"sbabrw.src\n"
+"RID_STR_DATABROWSER_FILTERED\n"
+"string.text"
 msgid "(filtered)"
 msgstr "(air a chriathradh)"
 
-#: sbabrw.src#SBA_BROWSER_SETTING_ORDER.string.text
+#. rB\v
+#: sbabrw.src
+msgctxt ""
+"sbabrw.src\n"
+"SBA_BROWSER_SETTING_ORDER\n"
+"string.text"
 msgid "Error setting the sort criteria"
 msgstr "Mearachd a' socrachadh cuspair-deuchainnean an t-seòrsachaidh"
 
-#: sbabrw.src#SBA_BROWSER_SETTING_FILTER.string.text
+#. Pp/v
+#: sbabrw.src
+msgctxt ""
+"sbabrw.src\n"
+"SBA_BROWSER_SETTING_FILTER\n"
+"string.text"
 msgid "Error setting the filter criteria"
 msgstr "Mearachd a' socrachadh cuspair-deuchainnean a' chriathraidh"
 
-#: sbabrw.src#RID_STR_CONNECTION_LOST.string.text
+#. rQ1R
+#: sbabrw.src
+msgctxt ""
+"sbabrw.src\n"
+"RID_STR_CONNECTION_LOST\n"
+"string.text"
 msgid "Connection lost"
 msgstr "Chaidh an ceangal a chall"
 
-#: sbabrw.src#RID_STR_QUERIES_CONTAINER.string.text
+#. H6bx
+#: sbabrw.src
+msgctxt ""
+"sbabrw.src\n"
+"RID_STR_QUERIES_CONTAINER\n"
+"string.text"
 msgid "Queries"
 msgstr "Ceistean"
 
-#: sbabrw.src#RID_STR_TABLES_CONTAINER.string.text
+#. MA(8
+#: sbabrw.src
+msgctxt ""
+"sbabrw.src\n"
+"RID_STR_TABLES_CONTAINER\n"
+"string.text"
 msgid "Tables"
 msgstr "Clàir"
 
-#: sbabrw.src#MID_EDIT_DATABASE.#define.text
+#. =r`]
+#: sbabrw.src
+msgctxt ""
+"sbabrw.src\n"
+"MID_EDIT_DATABASE\n"
+"#define.text"
 msgid "Edit ~Database File..."
 msgstr "~Deasaich faidhle an stòir-dhàta..."
 
-#: sbabrw.src#MID_ADMINISTRATE.#define.text
+#. REP(
+#: sbabrw.src
+msgctxt ""
+"sbabrw.src\n"
+"MID_ADMINISTRATE\n"
+"#define.text"
 msgid "Registered databases ..."
 msgstr "Stòir-dhàta a chaidh a chlàradh ..."
 
-#: sbabrw.src#MID_CLOSECONN.#define.text
+#. HoF`
+#: sbabrw.src
+msgctxt ""
+"sbabrw.src\n"
+"MID_CLOSECONN\n"
+"#define.text"
 msgid "Disco~nnect"
 msgstr "Dì-chea~ngail"
 
-#: sbabrw.src#STR_TITLE_CONFIRM_DELETION.string.text
+#. )aE+
+#: sbabrw.src
+msgctxt ""
+"sbabrw.src\n"
+"STR_TITLE_CONFIRM_DELETION\n"
+"string.text"
 msgid "Confirm Deletion"
 msgstr "Dearbhaich an sguabadh às"
 
-#: sbabrw.src#STR_QUERY_DELETE_TABLE.string.text
+#. T!@5
+#: sbabrw.src
+msgctxt ""
+"sbabrw.src\n"
+"STR_QUERY_DELETE_TABLE\n"
+"string.text"
 msgid "Do you want to delete the table '%1'?"
 msgstr "A bheil thu airson an clàr '%1' a sguabadh às?"
 
-#: sbabrw.src#QUERY_BRW_DELETE_QUERY_CONFIRM.querybox.text
+#. Cu)A
+#: sbabrw.src
+msgctxt ""
+"sbabrw.src\n"
+"QUERY_BRW_DELETE_QUERY_CONFIRM\n"
+"querybox.text"
 msgid "The query already exists. Do you want to delete it?"
 msgstr "Tha a' cheist seo ann mu thràth. A bheil thu airson a sguabadh às?"
 
-#: sbabrw.src#QUERY_CONNECTION_LOST.querybox.text
+#. Bmq=
+#: sbabrw.src
+msgctxt ""
+"sbabrw.src\n"
+"QUERY_CONNECTION_LOST\n"
+"querybox.text"
 msgid "The connection to the database has been lost. Do you want to reconnect?"
 msgstr "Chaidh an ceangal ris an stòr-dàta a chall. A bheil thu airson ceangal ris a-rithist?"
 
-#: sbabrw.src#STR_OPENTABLES_WARNINGS.string.text
+#. huTN
+#: sbabrw.src
+msgctxt ""
+"sbabrw.src\n"
+"STR_OPENTABLES_WARNINGS\n"
+"string.text"
 msgid "Warnings encountered"
 msgstr "Nochd rabhaibhean"
 
-#: sbabrw.src#STR_OPENTABLES_WARNINGS_DETAILS.string.text
+#. 6w9[
+#: sbabrw.src
+msgctxt ""
+"sbabrw.src\n"
+"STR_OPENTABLES_WARNINGS_DETAILS\n"
+"string.text"
 msgid "While retrieving the tables, warnings were reported by the database connection."
 msgstr "Nochd an ceangal ris an stòr-dàta rabhaibhean rè faighinn nan clàr."
 
-#: sbabrw.src#STR_CONNECTING_DATASOURCE.string.text
+#. ,R(F
+#: sbabrw.src
+msgctxt ""
+"sbabrw.src\n"
+"STR_CONNECTING_DATASOURCE\n"
+"string.text"
 msgid "Connecting to \"$name$\" ..."
 msgstr "A' ceangal ri \"$name$\" ..."
 
-#: sbabrw.src#STR_LOADING_QUERY.string.text
+#. VeAp
+#: sbabrw.src
+msgctxt ""
+"sbabrw.src\n"
+"STR_LOADING_QUERY\n"
+"string.text"
 msgid "Loading query $name$ ..."
 msgstr "A' luchdadh na ceiste $name$ ..."
 
-#: sbabrw.src#STR_LOADING_TABLE.string.text
+#. %?6?
+#: sbabrw.src
+msgctxt ""
+"sbabrw.src\n"
+"STR_LOADING_TABLE\n"
+"string.text"
 msgid "Loading table $name$ ..."
 msgstr "A' luchdadh a' chlàir $name$ ..."
 
-#: sbabrw.src#STR_NO_TABLE_FORMAT_INSIDE.string.text
+#. J,jS
+#: sbabrw.src
+msgctxt ""
+"sbabrw.src\n"
+"STR_NO_TABLE_FORMAT_INSIDE\n"
+"string.text"
 msgid "No table format could be found."
 msgstr "Cha deach fòrmat clàir a lorg."
 
-#: sbabrw.src#STR_COULDNOTCONNECT_DATASOURCE.string.text
+#. W=|$
+#: sbabrw.src
+msgctxt ""
+"sbabrw.src\n"
+"STR_COULDNOTCONNECT_DATASOURCE\n"
+"string.text"
 msgid "The connection to the data source \"$name$\" could not be established."
 msgstr "Cha do ghabh ceangal a stèidheachadh ris an tùs-dàta \"$name$\"."
 
-#: sbabrw.src#RID_MENU_REFRESH_DATA.ID_BROWSER_REFRESH_REBUILD.menuitem.text
+#. 3J7q
+#: sbabrw.src
+msgctxt ""
+"sbabrw.src\n"
+"RID_MENU_REFRESH_DATA\n"
+"ID_BROWSER_REFRESH_REBUILD\n"
+"menuitem.text"
 msgid "Rebuild"
 msgstr "Ath-thog"
diff --git a/source/gd/dbaccess/source/ui/control.po b/source/gd/dbaccess/source/ui/control.po
index 57f2c513a3a..97641e932ff 100644
--- a/source/gd/dbaccess/source/ui/control.po
+++ b/source/gd/dbaccess/source/ui/control.po
@@ -1,10 +1,10 @@
-#. extracted from dbaccess/source/ui/control.oo
+#. extracted from dbaccess/source/ui/control
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+dbaccess%2Fsource%2Fui%2Fcontrol.oo&subcomponent=ui\n"
-"POT-Creation-Date: 2012-07-04 16:40+0200\n"
-"PO-Revision-Date: 2012-05-31 19:34+0200\n"
+"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
+"POT-Creation-Date: 2012-11-17 19:02+0200\n"
+"PO-Revision-Date: 2012-08-22 19:40+0200\n"
 "Last-Translator: Michael <fios@akerbeltz.org>\n"
 "Language-Team: Akerbeltz\n"
 "Language: gd\n"
@@ -12,82 +12,179 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "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-Generator: Translate Toolkit 1.9.0\n"
+"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
 "X-Project-Style: openoffice\n"
 
-#: undosqledit.src#STR_QUERY_UNDO_MODIFYSQLEDIT.string.text
-msgid "Modify SQL statement(s)"
-msgstr "Atharraich aithris(ean) SQL"
-
-#: TableGrantCtrl.src#STR_TABLE_PRIV_NAME.string.text
+#. 8ex9
+#: TableGrantCtrl.src
+msgctxt ""
+"TableGrantCtrl.src\n"
+"STR_TABLE_PRIV_NAME\n"
+"string.text"
 msgid "Table name"
 msgstr "Ainm a' chlàir"
 
-#: TableGrantCtrl.src#STR_TABLE_PRIV_INSERT.string.text
+#. NWcr
+#: TableGrantCtrl.src
+msgctxt ""
+"TableGrantCtrl.src\n"
+"STR_TABLE_PRIV_INSERT\n"
+"string.text"
 msgid "Insert data"
 msgstr "Cuir a-steach dàta"
 
-#: TableGrantCtrl.src#STR_TABLE_PRIV_DELETE.string.text
+#. #X=!
+#: TableGrantCtrl.src
+msgctxt ""
+"TableGrantCtrl.src\n"
+"STR_TABLE_PRIV_DELETE\n"
+"string.text"
 msgid "Delete data"
 msgstr "Sguab às an dàta"
 
-#: TableGrantCtrl.src#STR_TABLE_PRIV_UPDATE.string.text
+#. Eu.9
+#: TableGrantCtrl.src
+msgctxt ""
+"TableGrantCtrl.src\n"
+"STR_TABLE_PRIV_UPDATE\n"
+"string.text"
 msgid "Modify data"
 msgstr "Atharraich an dàta"
 
-#: TableGrantCtrl.src#STR_TABLE_PRIV_ALTER.string.text
+#. 4KTe
+#: TableGrantCtrl.src
+msgctxt ""
+"TableGrantCtrl.src\n"
+"STR_TABLE_PRIV_ALTER\n"
+"string.text"
 msgid "Alter structure"
 msgstr "Atharraich an structar"
 
-#: TableGrantCtrl.src#STR_TABLE_PRIV_SELECT.string.text
+#. 0L=`
+#: TableGrantCtrl.src
+msgctxt ""
+"TableGrantCtrl.src\n"
+"STR_TABLE_PRIV_SELECT\n"
+"string.text"
 msgid "Read data"
 msgstr "Leugh an dàta"
 
-#: TableGrantCtrl.src#STR_TABLE_PRIV_REFERENCE.string.text
+#. IwWY
+#: TableGrantCtrl.src
+msgctxt ""
+"TableGrantCtrl.src\n"
+"STR_TABLE_PRIV_REFERENCE\n"
+"string.text"
 msgid "Modify references"
 msgstr "Atharraich na co-chomharran"
 
-#: TableGrantCtrl.src#STR_TABLE_PRIV_DROP.string.text
+#. %!#X
+#: TableGrantCtrl.src
+msgctxt ""
+"TableGrantCtrl.src\n"
+"STR_TABLE_PRIV_DROP\n"
+"string.text"
 msgid "Drop structure"
-msgstr "Leig an structar"
-
-#: tabletree.src#MENU_TABLETREE_POPUP.MID_SORT_ASCENDING.menuitem.text
+msgstr "Leag an structar"
+
+#. ^[If
+#: tabletree.src
+msgctxt ""
+"tabletree.src\n"
+"MENU_TABLETREE_POPUP\n"
+"MID_SORT_ASCENDING\n"
+"menuitem.text"
 msgid "Sort Ascending"
 msgstr "Seòrsaich a' dìreadh"
 
-#: tabletree.src#MENU_TABLETREE_POPUP.MID_SORT_DECENDING.menuitem.text
+#. rER,
+#: tabletree.src
+msgctxt ""
+"tabletree.src\n"
+"MENU_TABLETREE_POPUP\n"
+"MID_SORT_DECENDING\n"
+"menuitem.text"
 msgid "Sort Descending"
 msgstr "Seòrsaich a' teàrnadh"
 
-#: tabletree.src#STR_COULDNOTCREATE_DRIVERMANAGER.string.text
+#. P!#:
+#: tabletree.src
+msgctxt ""
+"tabletree.src\n"
+"STR_COULDNOTCREATE_DRIVERMANAGER\n"
+"string.text"
 msgid "Cannot connect to the SDBC driver manager (#servicename#)."
 msgstr "Cha ghabh ceangal a stèidheachadh ri manaidsear an draibheir SDBC (#servicename#)."
 
-#: tabletree.src#STR_NOREGISTEREDDRIVER.string.text
+#. !+g!
+#: tabletree.src
+msgctxt ""
+"tabletree.src\n"
+"STR_NOREGISTEREDDRIVER\n"
+"string.text"
 msgid "A driver is not registered for the URL #connurl#."
 msgstr "Cha deach draibhear a chlàradh airson an URL #connurl#."
 
-#: tabletree.src#STR_COULDNOTCONNECT.string.text
+#. qbiS
+#: tabletree.src
+msgctxt ""
+"tabletree.src\n"
+"STR_COULDNOTCONNECT\n"
+"string.text"
 msgid "No connection could be established for the URL #connurl#."
 msgstr "Cha ghabh ceangal a stèidheachadh airson an URL #connurl#."
 
-#: tabletree.src#STR_COULDNOTCONNECT_PLEASECHECK.string.text
+#. _5\K
+#: tabletree.src
+msgctxt ""
+"tabletree.src\n"
+"STR_COULDNOTCONNECT_PLEASECHECK\n"
+"string.text"
 msgid "Please check the current settings, for example user name and password."
 msgstr "Thoir sùil air na roghainnean agad, mar eisimpleir ainm a' chleachdaiche is am facal-faire."
 
-#: tabletree.src#STR_NOTABLEINFO.string.text
+#. Y5.=
+#: tabletree.src
+msgctxt ""
+"tabletree.src\n"
+"STR_NOTABLEINFO\n"
+"string.text"
 msgid "Successfully connected, but information about database tables is not available."
 msgstr "Cha ceangal a stèidheachadh ach chan eil fiosrachadh ri fhaighinn mu chlàir an stòir-dhàta."
 
-#: tabletree.src#STR_ALL_TABLES.string.text
+#. GZ_O
+#: tabletree.src
+msgctxt ""
+"tabletree.src\n"
+"STR_ALL_TABLES\n"
+"string.text"
 msgid "All tables"
 msgstr "Gach clàr"
 
-#: tabletree.src#STR_ALL_VIEWS.string.text
+#. :hM%
+#: tabletree.src
+msgctxt ""
+"tabletree.src\n"
+"STR_ALL_VIEWS\n"
+"string.text"
 msgid "All views"
 msgstr "Gach sealladh"
 
-#: tabletree.src#STR_ALL_TABLES_AND_VIEWS.string.text
+#. bYB*
+#: tabletree.src
+msgctxt ""
+"tabletree.src\n"
+"STR_ALL_TABLES_AND_VIEWS\n"
+"string.text"
 msgid "All tables and views"
 msgstr "Gach clàr is sealladh"
+
+#. W[Ho
+#: undosqledit.src
+msgctxt ""
+"undosqledit.src\n"
+"STR_QUERY_UNDO_MODIFYSQLEDIT\n"
+"string.text"
+msgid "Modify SQL statement(s)"
+msgstr "Atharraich aithris(ean) SQL"
diff --git a/source/gd/dbaccess/source/ui/dlg.po b/source/gd/dbaccess/source/ui/dlg.po
index ac284d16678..a04c467d0cd 100644
--- a/source/gd/dbaccess/source/ui/dlg.po
+++ b/source/gd/dbaccess/source/ui/dlg.po
@@ -1,9 +1,9 @@
-#. extracted from dbaccess/source/ui/dlg.oo
+#. extracted from dbaccess/source/ui/dlg
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+dbaccess%2Fsource%2Fui%2Fdlg.oo&subcomponent=ui\n"
-"POT-Creation-Date: 2012-07-04 16:39+0200\n"
+"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
+"POT-Creation-Date: 2012-11-17 19:03+0200\n"
 "PO-Revision-Date: 2012-08-15 13:43+0200\n"
 "Last-Translator: Michael <fios@akerbeltz.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,379 +12,376 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "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-Generator: Pootle 2.1.6\n"
+"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
 
-#: textconnectionsettings.src#DLG_TEXT_CONNECTION_SETTINGS.modaldialog.text
-msgid "Text Connection Settings"
-msgstr "Roghainnean ceangal teacsa"
-
-#: indexdialog.src#DLG_INDEXDESIGN.TLB_ACTIONS.ID_INDEX_NEW.toolboxitem.text
-msgid "New Index"
-msgstr "Clàr-amais ùr"
-
-#: indexdialog.src#DLG_INDEXDESIGN.TLB_ACTIONS.ID_INDEX_DROP.toolboxitem.text
-msgid "Delete Current Index"
-msgstr "Sguab às an clàr-amais làithreach"
-
-#: indexdialog.src#DLG_INDEXDESIGN.TLB_ACTIONS.ID_INDEX_RENAME.toolboxitem.text
-msgid "Rename Current Index"
-msgstr "Cuir ainm ùr air a' chlàr-amais làithreach"
-
-#: indexdialog.src#DLG_INDEXDESIGN.TLB_ACTIONS.ID_INDEX_SAVE.toolboxitem.text
-msgid "Save Current Index"
-msgstr "Sàbhail an clàr-amais làithreach"
-
-#: indexdialog.src#DLG_INDEXDESIGN.TLB_ACTIONS.ID_INDEX_RESET.toolboxitem.text
-msgid "Reset Current Index"
-msgstr "Ath-shuidhich an clàr-amais làithreach"
-
-#: indexdialog.src#DLG_INDEXDESIGN.FL_INDEXDETAILS.fixedline.text
-msgid "Index details"
-msgstr "Mion-fhiosrachadh a' chlàir-amais"
-
-#: indexdialog.src#DLG_INDEXDESIGN.FT_DESC_LABEL.fixedtext.text
-msgid "Index identifier:"
-msgstr "Aithnichear a' chlàir-amais:"
-
-#: indexdialog.src#DLG_INDEXDESIGN.CB_UNIQUE.checkbox.text
-msgid "~Unique"
-msgstr "À~raid"
-
-#: indexdialog.src#DLG_INDEXDESIGN.FT_FIELDS.fixedtext.text
-msgid "Fields"
-msgstr "Raointean"
-
-#: indexdialog.src#DLG_INDEXDESIGN.PB_CLOSE.pushbutton.text
-msgctxt "indexdialog.src#DLG_INDEXDESIGN.PB_CLOSE.pushbutton.text"
-msgid "~Close"
-msgstr "~Dùin"
-
-#: indexdialog.src#DLG_INDEXDESIGN.modaldialog.text
-msgctxt "indexdialog.src#DLG_INDEXDESIGN.modaldialog.text"
-msgid "Indexes"
-msgstr "Clàir-amais"
-
-#: indexdialog.src#STR_TAB_INDEX_SORTORDER.string.text
-msgctxt "indexdialog.src#STR_TAB_INDEX_SORTORDER.string.text"
-msgid "Sort order"
-msgstr "Òrdugh seòrsachaidh"
-
-#: indexdialog.src#STR_TAB_INDEX_FIELD.string.text
-msgid "Index field"
-msgstr "Raon a' clàir-amais"
-
-#: indexdialog.src#STR_ORDER_ASCENDING.string.text
-msgid "Ascending"
-msgstr "A' dìreadh"
-
-#: indexdialog.src#STR_ORDER_DESCENDING.string.text
-msgid "Descending"
-msgstr "A' teàrnadh"
-
-#: indexdialog.src#STR_CONFIRM_DROP_INDEX.string.text
-msgid "Do you really want to delete the index '$name$'?"
-msgstr "A bheil thu cinnteach gu bheil thu airson an clàr-amais '$name$' a sguabadh às?"
-
-#: indexdialog.src#STR_LOGICAL_INDEX_NAME.string.text
-msgid "index"
-msgstr "clàr-amais"
-
-#: indexdialog.src#ERR_NEED_INDEX_FIELDS.errorbox.text
-msgid "The index must contain at least one field."
-msgstr "Feumaidh aon raon a bhith sa chlàr-amais air a' char a lugha."
-
-#: indexdialog.src#ERR_NEED_INDEX_FIELDS.errorbox.title
-msgid "Save Index"
-msgstr "Sàbhail an clàr-amais"
-
-#: indexdialog.src#QUERY_SAVE_CURRENT_INDEX.querybox.text
-msgid "Do you want to save the changes made to the current index?"
-msgstr "A bheil thu cinnteach gu bheil thu airson na dh'atharraich thu sa chlàr-amais làithreach a shàbhaladh?"
-
-#: indexdialog.src#QUERY_SAVE_CURRENT_INDEX.querybox.title
-msgid "Exit Index Design"
-msgstr "Fàg dealbhadh a chlàir-amais"
-
-#: indexdialog.src#STR_INDEX_NAME_ALREADY_USED.string.text
-msgid "There is already another index named \"$name$\"."
-msgstr "Tha clàr-amais ann mu thràth air a bheil \"$name$\"."
-
-#: indexdialog.src#STR_INDEXDESIGN_DOUBLE_COLUMN_NAME.string.text
-msgid "In an index definition, no table column may occur more than once. However, you have entered column \"$name$\" twice."
-msgstr "Chan fhaod colbh clàir nochdadh ach aon turas ann an deifinisean clàir-amais. Chuir thusa a-steach an colbh '$name$' dà thuras."
-
-#: dlgattr.src#DLG_ATTR.1.pushbutton.text
-msgid "Bac~k"
-msgstr "Air ai~s"
-
-#: dlgattr.src#DLG_ATTR.TP_ATTR_CHAR.string.text
-msgid "Font"
-msgstr "Cruth-clò"
-
-#: dlgattr.src#DLG_ATTR.TP_ATTR_NUMBER.string.text
-msgid "Format"
-msgstr "Fòrmat"
-
-#: dlgattr.src#DLG_ATTR.TP_ATTR_ALIGN.string.text
-msgid "Alignment"
-msgstr "Co-thaobhadh"
-
-#: dlgattr.src#DLG_ATTR.ST_ROW.string.text
-msgid "Table Format"
-msgstr "Fòrmat a' chlàir"
-
-#: dlgattr.src#DLG_ATTR.tabdialog.text
-msgid "Field Format"
-msgstr "Fòrmat an raoin"
-
-#: adtabdlg.src#DLG_JOIN_TABADD.RB_CASE_TABLES.radiobutton.text
-msgid "Tables"
-msgstr "Clàir"
-
-#: adtabdlg.src#DLG_JOIN_TABADD.RB_CASE_QUERIES.radiobutton.text
-msgid "Queries"
-msgstr "Ceistean"
-
-#: adtabdlg.src#DLG_JOIN_TABADD.PB_ADDTABLE.pushbutton.text
-msgid "~Add"
-msgstr "~Cuir ris"
-
-#: adtabdlg.src#DLG_JOIN_TABADD.PB_CLOSE.cancelbutton.text
-msgctxt "adtabdlg.src#DLG_JOIN_TABADD.PB_CLOSE.cancelbutton.text"
-msgid "~Close"
-msgstr "~Dùin"
-
-#: adtabdlg.src#DLG_JOIN_TABADD.STR_ADD_TABLES.string.text
-msgid "Add Tables"
-msgstr "Cuir clàir ris"
-
-#: adtabdlg.src#DLG_JOIN_TABADD.STR_ADD_TABLE_OR_QUERY.string.text
-msgid "Add Table or Query"
-msgstr "Cuir clàr no ceist ris"
-
-#: paramdialog.src#DLG_PARAMETERS.FL_PARAMS.fixedline.text
-msgid "~Parameters"
-msgstr "~Paramadairean"
-
-#: paramdialog.src#DLG_PARAMETERS.FT_VALUE.fixedtext.text
-msgid "~Value"
-msgstr "~Luach"
-
-#: paramdialog.src#DLG_PARAMETERS.BT_TRAVELNEXT.pushbutton.text
-msgid "~Next"
-msgstr "~Air adhart"
-
-#: paramdialog.src#DLG_PARAMETERS.STR_COULD_NOT_CONVERT_PARAM.string.text
-msgid "The entry could not be converted to a valid value for the \"$name$\"column"
-msgstr "Cha do ghabh an reacord iompachadh 'na luach dligheach airson a' chuilbh \"$name$\""
-
-#: paramdialog.src#DLG_PARAMETERS.modaldialog.text
-msgid "Parameter Input"
-msgstr "Cur a-steach a' pharamadair"
-
-#: dlgsave.src#DLG_SAVE_AS.FT_DESCRIPTION.fixedtext.text
-msgid "Please enter a name for the object to be created:"
-msgstr "Cuir a-steach ainm airson an oibseict a thèid a chruthachadh:"
-
-#: dlgsave.src#DLG_SAVE_AS.FT_CATALOG.fixedtext.text
-msgid "~Catalog"
-msgstr "~Catalog"
-
-#: dlgsave.src#DLG_SAVE_AS.FT_SCHEMA.fixedtext.text
-msgid "~Schema"
-msgstr "~Sgeama"
-
-#: dlgsave.src#DLG_SAVE_AS.STR_TBL_LABEL.string.text
-msgid "~Table Name"
-msgstr "Ainm a' ~chlàir"
-
-#: dlgsave.src#DLG_SAVE_AS.STR_VW_LABEL.string.text
-msgid "~Name of table view"
-msgstr "Ainm ~sealladh a' chlàir"
-
-#: dlgsave.src#DLG_SAVE_AS.STR_QRY_LABEL.string.text
-msgid "~Query name"
-msgstr "Ainm ~na ceiste"
-
-#: dlgsave.src#DLG_SAVE_AS.STR_TITLE_RENAME.string.text
-msgid "Rename to"
-msgstr "Cuir ainm ùr air"
-
-#: dlgsave.src#DLG_SAVE_AS.STR_TITLE_PASTE_AS.string.text
-msgid "Insert as"
-msgstr "Cuir a-steach mar"
-
-#: dlgsave.src#DLG_SAVE_AS.modaldialog.text
-msgid "Save As"
-msgstr "Sàbhail mar"
-
-#: sqlmessage.src#DLG_SQLEXCEPTIONCHAIN.FL_DETAILS.fixedline.text
-msgctxt "sqlmessage.src#DLG_SQLEXCEPTIONCHAIN.FL_DETAILS.fixedline.text"
-msgid "Details"
-msgstr "Mion-fhiosrachadh"
-
-#: sqlmessage.src#DLG_SQLEXCEPTIONCHAIN.FT_ERRORLIST.fixedtext.text
-msgid "Error ~list:"
-msgstr "~Liosta nam mearachd:"
-
-#: sqlmessage.src#DLG_SQLEXCEPTIONCHAIN.FT_DESCRIPTION.fixedtext.text
-msgid "~Description:"
-msgstr "T~uairisgeul:"
-
-#: sqlmessage.src#DLG_SQLEXCEPTIONCHAIN.STR_EXCEPTION_STATUS.string.text
-msgid "SQL Status"
-msgstr "Cor SQL"
-
-#: sqlmessage.src#DLG_SQLEXCEPTIONCHAIN.STR_EXCEPTION_ERRORCODE.string.text
-msgid "Error code"
-msgstr "Còd na mearachd"
-
-#: sqlmessage.src#DLG_SQLEXCEPTIONCHAIN.modaldialog.text
-msgid "%PRODUCTNAME Base"
-msgstr "%PRODUCTNAME Base"
-
-#: sqlmessage.src#STR_EXPLAN_STRINGCONVERSION_ERROR.string.text
-msgid "A frequent reason for this error is an inappropriate character set setting for the language of your database. Check the setting by choosing Edit - Database - Properties."
-msgstr "Tachraidh a' mhearachd seo gu tric ma chaidh seata mì-fhreagarrach de charactairean a thaghadh airson cànan an stòir-dhàta. Tagh an roghainn ann an Deasaich - Stòr-dàta - Roghainnean."
-
-#: sqlmessage.src#STR_EXCEPTION_ERROR.string.text
-msgid "Error"
-msgstr "Mearachd"
-
-#: sqlmessage.src#STR_EXCEPTION_WARNING.string.text
-msgid "Warning"
-msgstr "Rabhadh"
-
-#: sqlmessage.src#STR_EXCEPTION_INFO.string.text
-msgid "Information"
-msgstr "Fiosrachadh"
-
-#: sqlmessage.src#STR_EXCEPTION_DETAILS.string.text
-msgctxt "sqlmessage.src#STR_EXCEPTION_DETAILS.string.text"
-msgid "Details"
-msgstr "Mion-fhiosrachadh"
-
-#: CollectionView.src#DLG_COLLECTION_VIEW.BTN_EXPLORERFILE_NEWFOLDER.imagebutton.text
-msgctxt "CollectionView.src#DLG_COLLECTION_VIEW.BTN_EXPLORERFILE_NEWFOLDER.imagebutton.text"
+#. ffSl
+#: CollectionView.src
+msgctxt ""
+"CollectionView.src\n"
+"DLG_COLLECTION_VIEW\n"
+"BTN_EXPLORERFILE_NEWFOLDER\n"
+"imagebutton.text"
 msgid "-"
 msgstr "-"
 
-#: CollectionView.src#DLG_COLLECTION_VIEW.BTN_EXPLORERFILE_NEWFOLDER.imagebutton.quickhelptext
+#. A5*3
+#: CollectionView.src
+msgctxt ""
+"CollectionView.src\n"
+"DLG_COLLECTION_VIEW\n"
+"BTN_EXPLORERFILE_NEWFOLDER\n"
+"imagebutton.quickhelptext"
 msgid "Create New Directory"
 msgstr "Cruthaich eòlaire ùr"
 
-#: CollectionView.src#DLG_COLLECTION_VIEW.BTN_EXPLORERFILE_UP.imagebutton.text
-msgctxt "CollectionView.src#DLG_COLLECTION_VIEW.BTN_EXPLORERFILE_UP.imagebutton.text"
+#. |r[Z
+#: CollectionView.src
+msgctxt ""
+"CollectionView.src\n"
+"DLG_COLLECTION_VIEW\n"
+"BTN_EXPLORERFILE_UP\n"
+"imagebutton.text"
 msgid "-"
 msgstr "-"
 
-#: CollectionView.src#DLG_COLLECTION_VIEW.BTN_EXPLORERFILE_UP.imagebutton.quickhelptext
+#. U?Au
+#: CollectionView.src
+msgctxt ""
+"CollectionView.src\n"
+"DLG_COLLECTION_VIEW\n"
+"BTN_EXPLORERFILE_UP\n"
+"imagebutton.quickhelptext"
 msgid "Up One Level"
 msgstr "Suas aon leibheil"
 
-#: CollectionView.src#DLG_COLLECTION_VIEW.FT_EXPLORERFILE_FILENAME.fixedtext.text
+#. ^CAh
+#: CollectionView.src
+msgctxt ""
+"CollectionView.src\n"
+"DLG_COLLECTION_VIEW\n"
+"FT_EXPLORERFILE_FILENAME\n"
+"fixedtext.text"
 msgid "File ~name:"
 msgstr "Ai~nm an fhaidhle:"
 
-#: CollectionView.src#DLG_COLLECTION_VIEW.BTN_EXPLORERFILE_SAVE.pushbutton.text
-msgctxt "CollectionView.src#DLG_COLLECTION_VIEW.BTN_EXPLORERFILE_SAVE.pushbutton.text"
+#. j)yZ
+#: CollectionView.src
+msgctxt ""
+"CollectionView.src\n"
+"DLG_COLLECTION_VIEW\n"
+"BTN_EXPLORERFILE_SAVE\n"
+"pushbutton.text"
 msgid "Save"
 msgstr "Sàbhail"
 
-#: CollectionView.src#DLG_COLLECTION_VIEW.STR_PATHNAME.string.text
+#. dLcd
+#: CollectionView.src
+msgctxt ""
+"CollectionView.src\n"
+"DLG_COLLECTION_VIEW\n"
+"STR_PATHNAME\n"
+"string.text"
 msgid "~Path:"
 msgstr "Sli~ghe:"
 
-#: CollectionView.src#DLG_COLLECTION_VIEW.modaldialog.text
-msgctxt "CollectionView.src#DLG_COLLECTION_VIEW.modaldialog.text"
+#. lEAb
+#: CollectionView.src
+msgctxt ""
+"CollectionView.src\n"
+"DLG_COLLECTION_VIEW\n"
+"modaldialog.text"
 msgid "Save"
 msgstr "Sàbhail"
 
-#: CollectionView.src#STR_NEW_FOLDER.string.text
+#. fSV0
+#: CollectionView.src
+msgctxt ""
+"CollectionView.src\n"
+"STR_NEW_FOLDER\n"
+"string.text"
 msgid "Folder"
 msgstr "Pasgan"
 
-#: CollectionView.src#STR_ALREADYEXISTOVERWRITE.string.text
+#. c4eo
+#: CollectionView.src
+msgctxt ""
+"CollectionView.src\n"
+"STR_ALREADYEXISTOVERWRITE\n"
+"string.text"
 msgid "The file already exists. Overwrite?"
 msgstr "Tha am faidhle ann mu thràth. A bheil thu airson sgrìobhadh thairis air?"
 
-#: dbadminsetup.src#DLG_DATABASE_WIZARD.STR_DBWIZARDTITLE.string.text
-msgctxt "dbadminsetup.src#DLG_DATABASE_WIZARD.STR_DBWIZARDTITLE.string.text"
+#. .O;!
+#: dbadmin2.src
+msgctxt ""
+"dbadmin2.src\n"
+"STR_ENTER_CONNECTION_PASSWORD\n"
+"string.text"
+msgid "A password is needed to connect to the data source \"$name$\"."
+msgstr "Tha feum air facal-faire gus ceangal a dhèanamh ris an tùs-dàta \"$name$\"."
+
+#. RD7L
+#: dbadmin2.src
+msgctxt ""
+"dbadmin2.src\n"
+"STR_ASK_FOR_DIRECTORY_CREATION\n"
+"string.text"
+msgid ""
+"The directory\n"
+"\n"
+"$path$\n"
+"\n"
+"does not exist. Should it be created?"
+msgstr ""
+"Chan eil an t-eòlaire ann an\n"
+"\n"
+"$path$\n"
+"\n"
+"ann. A bheil thu airson a chruthachadh?"
+
+#. m0z/
+#: dbadmin2.src
+msgctxt ""
+"dbadmin2.src\n"
+"STR_COULD_NOT_CREATE_DIRECTORY\n"
+"string.text"
+msgid "The directory $name$ could not be created."
+msgstr "Cha do ghabh an t-eòlaire $name$ a chruthachadh."
+
+#. ?SeD
+#: dbadmin2.src
+msgctxt ""
+"dbadmin2.src\n"
+"DLG_DOMAINPASSWORD\n"
+"FT_PASSWORD\n"
+"fixedline.text"
+msgid "Please enter the ~password for the user 'DOMAIN'."
+msgstr "Cuir a-steach am ~facal-faire aig a' chleachdaiche 'DOMAIN'."
+
+#. b~o^
+#: dbadmin2.src
+msgctxt ""
+"dbadmin2.src\n"
+"DLG_DOMAINPASSWORD\n"
+"modaldialog.text"
+msgid "Convert Database"
+msgstr "Iompaich an stòr-dàta"
+
+#. :ieU
+#: dbadmin2.src
+msgctxt ""
+"dbadmin2.src\n"
+"PAGE_TABLESUBSCRIPTION\n"
+"FL_SEPARATOR1\n"
+"fixedline.text"
+msgid "Tables and table filter"
+msgstr "Clàir is criathragan clàir"
+
+#. X-?g
+#: dbadmin2.src
+msgctxt ""
+"dbadmin2.src\n"
+"PAGE_TABLESUBSCRIPTION\n"
+"FT_FILTER_EXPLANATION\n"
+"fixedtext.text"
+msgid "Mark the tables that should be visible for the applications."
+msgstr "Comharradh."
+
+#. \!,2
+#: dbadmin2.src
+msgctxt ""
+"dbadmin2.src\n"
+"PAGE_TABLESUBSCRIPTION\n"
+"tabpage.text"
+msgid "Tables Filter"
+msgstr "Criathrag nan clàr"
+
+#. ;m0#
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"DLG_DATABASE_WIZARD\n"
+"STR_DBWIZARDTITLE\n"
+"string.text"
 msgid "Database Wizard"
 msgstr "Draoidh nan stòr-dàta"
 
-#: dbadminsetup.src#DLG_DATABASE_WIZARD.STR_PAGETITLE_INTROPAGE.string.text
+#. RNn.
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"DLG_DATABASE_WIZARD\n"
+"STR_PAGETITLE_INTROPAGE\n"
+"string.text"
 msgid "Select database"
 msgstr "Tagh stòr-dàta"
 
-#: dbadminsetup.src#DLG_DATABASE_WIZARD.STR_PAGETITLE_DBASE.string.text
+#. PC[R
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"DLG_DATABASE_WIZARD\n"
+"STR_PAGETITLE_DBASE\n"
+"string.text"
 msgid "Set up dBASE connection"
 msgstr "Suidhich ceangal dBASE"
 
-#: dbadminsetup.src#DLG_DATABASE_WIZARD.STR_PAGETITLE_TEXT.string.text
-msgctxt "dbadminsetup.src#DLG_DATABASE_WIZARD.STR_PAGETITLE_TEXT.string.text"
+#. =#2V
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"DLG_DATABASE_WIZARD\n"
+"STR_PAGETITLE_TEXT\n"
+"string.text"
 msgid "Set up a connection to text files"
 msgstr "Suidhich ceangal ri faidhlichean teacsa"
 
-#: dbadminsetup.src#DLG_DATABASE_WIZARD.STR_PAGETITLE_MSACCESS.string.text
+#. C:B\
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"DLG_DATABASE_WIZARD\n"
+"STR_PAGETITLE_MSACCESS\n"
+"string.text"
 msgid "Set up Microsoft Access connection"
 msgstr "Suidhich ceangal Microsoft Access"
 
-#: dbadminsetup.src#DLG_DATABASE_WIZARD.STR_PAGETITLE_LDAP.string.text
+#. 8]3W
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"DLG_DATABASE_WIZARD\n"
+"STR_PAGETITLE_LDAP\n"
+"string.text"
 msgid "Set up LDAP connection"
 msgstr "Suidhich ceangal LDAP"
 
-#: dbadminsetup.src#DLG_DATABASE_WIZARD.STR_PAGETITLE_ADO.string.text
+#. ton+
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"DLG_DATABASE_WIZARD\n"
+"STR_PAGETITLE_ADO\n"
+"string.text"
 msgid "Set up ADO connection"
 msgstr "Suidhich ceangal ADO"
 
-#: dbadminsetup.src#DLG_DATABASE_WIZARD.STR_PAGETITLE_JDBC.string.text
+#. l:9b
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"DLG_DATABASE_WIZARD\n"
+"STR_PAGETITLE_JDBC\n"
+"string.text"
 msgid "Set up JDBC connection"
 msgstr "Suidhich ceangal JDBC"
 
-#: dbadminsetup.src#DLG_DATABASE_WIZARD.STR_PAGETITLE_ORACLE.string.text
+#. 4SO_
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"DLG_DATABASE_WIZARD\n"
+"STR_PAGETITLE_ORACLE\n"
+"string.text"
 msgid "Set up Oracle database connection"
 msgstr "Suidhich ceangal ri stòr-dàta Oracle"
 
-#: dbadminsetup.src#DLG_DATABASE_WIZARD.STR_PAGETITLE_MYSQL.string.text
+#. Z9!@
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"DLG_DATABASE_WIZARD\n"
+"STR_PAGETITLE_MYSQL\n"
+"string.text"
 msgid "Set up MySQL connection"
 msgstr "Suidhich ceangal MySQL"
 
-#: dbadminsetup.src#DLG_DATABASE_WIZARD.STR_PAGETITLE_ODBC.string.text
+#. /EEM
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"DLG_DATABASE_WIZARD\n"
+"STR_PAGETITLE_ODBC\n"
+"string.text"
 msgid "Set up ODBC connection"
 msgstr "Suidhich ceangal ODBC"
 
-#: dbadminsetup.src#DLG_DATABASE_WIZARD.STR_PAGETITLE_SPREADSHEET.string.text
+#. ^H)z
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"DLG_DATABASE_WIZARD\n"
+"STR_PAGETITLE_SPREADSHEET\n"
+"string.text"
 msgid "Set up Spreadsheet connection"
 msgstr "Suidhich ceangal cliath-dhuilleige"
 
-#: dbadminsetup.src#DLG_DATABASE_WIZARD.STR_PAGETITLE_AUTHENTIFICATION.string.text
+#. I(,a
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"DLG_DATABASE_WIZARD\n"
+"STR_PAGETITLE_AUTHENTIFICATION\n"
+"string.text"
 msgid "Set up user authentication"
 msgstr "Suidhich dearbhadh cleachdaiche"
 
-#: dbadminsetup.src#DLG_DATABASE_WIZARD.STR_PAGETITLE_MYSQL_NATIVE.string.text
+#. 4)zw
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"DLG_DATABASE_WIZARD\n"
+"STR_PAGETITLE_MYSQL_NATIVE\n"
+"string.text"
 msgid "Set up MySQL server data"
 msgstr "Suidhich dàta frithealaiche MySQL"
 
-#: dbadminsetup.src#DLG_DATABASE_WIZARD.STR_PAGETITLE_FINAL.string.text
+#. lQF(
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"DLG_DATABASE_WIZARD\n"
+"STR_PAGETITLE_FINAL\n"
+"string.text"
 msgid "Save and proceed"
 msgstr "Sàbhail is lean air adhart"
 
-#: dbadminsetup.src#DLG_DATABASE_WIZARD.modaldialog.text
-msgctxt "dbadminsetup.src#DLG_DATABASE_WIZARD.modaldialog.text"
+#. RFmE
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"DLG_DATABASE_WIZARD\n"
+"modaldialog.text"
 msgid "Database Wizard"
 msgstr "Draoidh nan stòr-dàta"
 
-#: dbadminsetup.src#STR_DATABASEDEFAULTNAME.string.text
+#. .5,A
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"STR_DATABASEDEFAULTNAME\n"
+"string.text"
 msgid "New Database"
 msgstr "Stòr-dàta ùr"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_MYSQL_INTRO.FT_MYSQL_HEADERTEXT.fixedtext.text
+#. 13CT
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_MYSQL_INTRO\n"
+"FT_MYSQL_HEADERTEXT\n"
+"fixedtext.text"
 msgid "Set up a connection to a MySQL database"
 msgstr "Suidhich ceangal ri stòr-dàta MySQL"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_MYSQL_INTRO.FT_MYSQL_HELPTEXT.fixedtext.text
+#. HRD[
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_MYSQL_INTRO\n"
+"FT_MYSQL_HELPTEXT\n"
+"fixedtext.text"
 msgid ""
 "You can connect to a MySQL database using either ODBC or JDBC.\n"
 "Please contact your system administrator if you are unsure about the following settings."
@@ -392,80 +389,193 @@ msgstr ""
 "'S urrainn dhut ceangal a dhèanamh ri stòr-dàta MySQL le ODBC no JDBC.\n"
 "Bruidhinn ri rianaire an t-siostam agad mur eil thu cinnteach mu ghin dhe na roghainnean a leanas."
 
-#: dbadminsetup.src#PAGE_DBWIZARD_MYSQL_INTRO.FT_MYSQLCONNECTIONMODE.fixedtext.text
+#. [4^C
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_MYSQL_INTRO\n"
+"FT_MYSQLCONNECTIONMODE\n"
+"fixedtext.text"
 msgid "How do you want to connect to your MySQL database?"
 msgstr "Ciamar a bu toigh leat ceangal a dhèanamh ris an stòr-dàta MySQL agad?"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_MYSQL_INTRO.RB_CONNECTVIAODBC.radiobutton.text
+#. K6aj
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_MYSQL_INTRO\n"
+"RB_CONNECTVIAODBC\n"
+"radiobutton.text"
 msgid "Connect using ODBC (Open Database Connectivity)"
 msgstr "Dèan ceangal le ODBC (Open Database Connectivity)"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_MYSQL_INTRO.RB_CONNECTVIAJDBC.radiobutton.text
+#. %NHc
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_MYSQL_INTRO\n"
+"RB_CONNECTVIAJDBC\n"
+"radiobutton.text"
 msgid "Connect using JDBC (Java Database Connectivity)"
 msgstr "Dèan ceangal le JDBC (Java Database Connectivity)"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_MYSQL_INTRO.RB_CONNECTVIANATIVE.radiobutton.text
+#. ,#aB
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_MYSQL_INTRO\n"
+"RB_CONNECTVIANATIVE\n"
+"radiobutton.text"
 msgid "Connect directly"
 msgstr "Dèan ceangal dìreach"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_AUTHENTIFICATION.FT_AUTHENTIFICATIONHEADERTEXT.fixedtext.text
+#. MflO
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_AUTHENTIFICATION\n"
+"FT_AUTHENTIFICATIONHEADERTEXT\n"
+"fixedtext.text"
 msgid "Set up the user authentication"
 msgstr "Suidhich an dearbhadh cleachdaiche"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_AUTHENTIFICATION.FT_AUTHENTIFICATIONHELPTEXT.fixedtext.text
+#. b~Fi
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_AUTHENTIFICATION\n"
+"FT_AUTHENTIFICATIONHELPTEXT\n"
+"fixedtext.text"
 msgid "Some databases require you to enter a user name."
 msgstr "Bidh feum aig cuid dhe na stòir-dhàta air ainm cleachdaiche."
 
-#: dbadminsetup.src#PAGE_DBWIZARD_AUTHENTIFICATION.FT_GENERALUSERNAME.fixedtext.text
-msgctxt "dbadminsetup.src#PAGE_DBWIZARD_AUTHENTIFICATION.FT_GENERALUSERNAME.fixedtext.text"
+#. CvQU
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_AUTHENTIFICATION\n"
+"FT_GENERALUSERNAME\n"
+"fixedtext.text"
 msgid "~User name"
 msgstr "~Ainm cleachdaiche"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_AUTHENTIFICATION.CB_GENERALPASSWORDREQUIRED.checkbox.text
+#. wx1d
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_AUTHENTIFICATION\n"
+"CB_GENERALPASSWORDREQUIRED\n"
+"checkbox.text"
 msgid "Password re~quired"
 msgstr "Tha ~feum air facal-faire"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_AUTHENTIFICATION.PB_TESTCONNECTION.pushbutton.text
+#. =y9*
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_AUTHENTIFICATION\n"
+"PB_TESTCONNECTION\n"
+"pushbutton.text"
 msgid "~Test Connection"
 msgstr "Ceangal ~deuchainne"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_FINAL.FT_FINALHEADER.fixedtext.text
+#. _WJF
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_FINAL\n"
+"FT_FINALHEADER\n"
+"fixedtext.text"
 msgid "Decide how to proceed after saving the database"
 msgstr "Cuir romhad dè thachras as dèidh sàbhaladh an stòir-dhàta"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_FINAL.FT_FINALHELPTEXT.fixedtext.text
+#. $34|
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_FINAL\n"
+"FT_FINALHELPTEXT\n"
+"fixedtext.text"
 msgid "Do you want the wizard to register the database in %PRODUCTNAME?"
 msgstr "A bheil thu airson 's gun clàraich an draoidh an stòr-dàta ann an %PRODUCTNAME?"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_FINAL.RB_REGISTERDATASOURCE.radiobutton.text
+#. 5BE]
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_FINAL\n"
+"RB_REGISTERDATASOURCE\n"
+"radiobutton.text"
 msgid "~Yes, register the database for me"
 msgstr "~Tha, clàraich an stòr-dàta air mo shon"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_FINAL.RB_DONTREGISTERDATASOURCE.radiobutton.text
+#. .nMS
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_FINAL\n"
+"RB_DONTREGISTERDATASOURCE\n"
+"radiobutton.text"
 msgid "N~o, do not register the database"
 msgstr "~Chan eil, na clàraich an stòr-dàta"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_FINAL.FT_ADDITIONALSETTINGS.fixedtext.text
+#. ?(A\
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_FINAL\n"
+"FT_ADDITIONALSETTINGS\n"
+"fixedtext.text"
 msgid "After the database file has been saved, what do you want to do?"
 msgstr "Dè nithear as dèidh sàbhaladh an stòir-dhàta?"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_FINAL.CB_OPENAFTERWARDS.checkbox.text
+#. ?P6L
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_FINAL\n"
+"CB_OPENAFTERWARDS\n"
+"checkbox.text"
 msgid "Open the database for editing"
 msgstr "Fosgail an stòr-dàta a chum deasachaidh"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_FINAL.CB_STARTTABLEWIZARD.checkbox.text
+#. ni)v
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_FINAL\n"
+"CB_STARTTABLEWIZARD\n"
+"checkbox.text"
 msgid "Create tables using the table wizard"
 msgstr "Cruthaich clàir le draoidh nan clàr"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_FINAL.FT_FINALTEXT.fixedtext.text
+#. UJ/7
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_FINAL\n"
+"FT_FINALTEXT\n"
+"fixedtext.text"
 msgid "Click 'Finish' to save the database."
 msgstr "Briog air 'Crìochnaich' gus an stòr-dàta a shàbhaladh."
 
-#: dbadminsetup.src#PAGE_DBWIZARD_MYSQL_JDBC.STR_MYSQLJDBC_HEADERTEXT.string.text
+#. [%Ae
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_MYSQL_JDBC\n"
+"STR_MYSQLJDBC_HEADERTEXT\n"
+"string.text"
 msgid "Set up connection to a MySQL database using JDBC"
 msgstr "Suidhich ceangal ri stòr-dàta MySQL le JDBC"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_MYSQL_JDBC.STR_MYSQLJDBC_HELPTEXT.string.text
+#. dL?|
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_MYSQL_JDBC\n"
+"STR_MYSQLJDBC_HELPTEXT\n"
+"string.text"
 msgid ""
 "Please enter the required information to connect to a MySQL database using JDBC. Note that a JDBC driver class must be installed on your system and registered with %PRODUCTNAME.\n"
 "Please contact your system administrator if you are unsure about the following settings."
@@ -473,57 +583,133 @@ msgstr ""
 "Cuir a-steach am fiosrachadh air a bheil feum gus ceangal a dhèanamh ri stòr-dàta MySQL le JDBC. Thoir an aire gum bi feum air clas draibhear JDBC air a stàladh agad is air a chlàradh le %PRODUCTNAME air an t-siostam agad.\n"
 "Bruidhinn ri rianaire an t-siostaim agad mur eil thu cinnteach mu ghin dhe na roghainnean a leanas."
 
-#: dbadminsetup.src#PAGE_DBWIZARD_MYSQL_JDBC.STR_MYSQL_DRIVERCLASSTEXT.string.text
+#. Oq2=
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_MYSQL_JDBC\n"
+"STR_MYSQL_DRIVERCLASSTEXT\n"
+"string.text"
 msgid "MySQL JDBC d~river class:"
 msgstr "Clas d~raibhear MySQL JDBC:"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_MYSQL_JDBC.STR_MYSQL_DEFAULT.string.text
-msgctxt "dbadminsetup.src#PAGE_DBWIZARD_MYSQL_JDBC.STR_MYSQL_DEFAULT.string.text"
+#. 4O*+
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_MYSQL_JDBC\n"
+"STR_MYSQL_DEFAULT\n"
+"string.text"
 msgid "Default: 3306"
 msgstr "Roghainn bhunaiteach: 3306"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_MYSQL_NATIVE.FT_SETUP_WIZARD_HEADER.fixedtext.text
+#. b|Hj
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_MYSQL_NATIVE\n"
+"FT_SETUP_WIZARD_HEADER\n"
+"fixedtext.text"
 msgid "Set up connection to a MySQL database"
 msgstr "Suidhich ceangal ri stòr-dàta MySQL"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_MYSQL_NATIVE.FT_SETUP_WIZARD_HELP.fixedtext.text
+#. bc+h
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_MYSQL_NATIVE\n"
+"FT_SETUP_WIZARD_HELP\n"
+"fixedtext.text"
 msgid "Please enter the required information to connect to a MySQL database."
 msgstr "Cuir a-steach am fiosrachadh air a bheil feum gus ceangal a dhèanamh ri stòr-dàta MySQL."
 
-#: dbadminsetup.src#PAGE_DBWIZARD_DBASE.STR_DBASE_HEADERTEXT.string.text
+#. 8Lf+
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_DBASE\n"
+"STR_DBASE_HEADERTEXT\n"
+"string.text"
 msgid "Set up a connection to dBASE files"
 msgstr "Suidhich ceangal ri faidhlichean dBASE"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_DBASE.STR_DBASE_HELPTEXT.string.text
+#. *K-H
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_DBASE\n"
+"STR_DBASE_HELPTEXT\n"
+"string.text"
 msgid "Select the folder where the dBASE files are stored."
 msgstr "Tagh am pasgan far a bheil na faidhlichean dBASE."
 
-#: dbadminsetup.src#PAGE_DBWIZARD_TEXT.STR_TEXT_HEADERTEXT.string.text
-msgctxt "dbadminsetup.src#PAGE_DBWIZARD_TEXT.STR_TEXT_HEADERTEXT.string.text"
+#. ZP#(
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_TEXT\n"
+"STR_TEXT_HEADERTEXT\n"
+"string.text"
 msgid "Set up a connection to text files"
 msgstr "Suidhich ceangal ri faidhlichean teacsa"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_TEXT.STR_TEXT_HELPTEXT.string.text
+#. w]t#
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_TEXT\n"
+"STR_TEXT_HELPTEXT\n"
+"string.text"
 msgid "Select the folder where the CSV (Comma Separated Values) text files are stored. %PRODUCTNAME Base will open these files in read-only mode."
 msgstr "Tagh am pasgan far a bheil na faidhlichean teacsa CSV (Comma Separated Values). Fosglaidh %PRODUCTNAME Base na faidhlichean seo sa mhodh leughaidh a-mhàin."
 
-#: dbadminsetup.src#PAGE_DBWIZARD_TEXT.STR_TEXT_PATH_OR_FILE.string.text
+#. (G{Q
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_TEXT\n"
+"STR_TEXT_PATH_OR_FILE\n"
+"string.text"
 msgid "Path to text files"
 msgstr "An t-slighe gu na faidhlichean teacsa"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_MSACCESS.STR_MSACCESS_HEADERTEXT.string.text
+#. f(p8
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_MSACCESS\n"
+"STR_MSACCESS_HEADERTEXT\n"
+"string.text"
 msgid "Set up a connection to a Microsoft Access database"
 msgstr "Suidhich ceangal ri stòr-dàta Microsoft Access"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_MSACCESS.STR_MSACCESS_HELPTEXT.string.text
+#. Ci:K
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_MSACCESS\n"
+"STR_MSACCESS_HELPTEXT\n"
+"string.text"
 msgid "Please select the Microsoft Access file you want to access."
 msgstr "Tagh am faidhle Microsoft Access a bu toigh leat inntrigeadh."
 
-#: dbadminsetup.src#PAGE_DBWIZARD_LDAP.FT_LDAP_HEADERTEXT.fixedtext.text
+#. =EPv
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_LDAP\n"
+"FT_LDAP_HEADERTEXT\n"
+"fixedtext.text"
 msgid "Set up a connection to an LDAP directory"
 msgstr "Suidhich ceangal ri eòlaire LDAP"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_LDAP.FT_LDAP_HELPTEXT.fixedtext.text
+#. =iWu
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_LDAP\n"
+"FT_LDAP_HELPTEXT\n"
+"fixedtext.text"
 msgid ""
 "Please enter the required information to connect to an LDAP directory.\n"
 "Please contact your system administrator if you are unsure about the following settings."
@@ -531,19 +717,43 @@ msgstr ""
 "Cuir a-steach am fiosrachadh air a bheil feum gus ceangal a dhèanamh ri eòlaire LDAP.\n"
 "Bruidhinn ri rianaire an t-siostaim agad mur eil thu cinnteach mu ghin dhe na roghainnean a leanas."
 
-#: dbadminsetup.src#PAGE_DBWIZARD_LDAP.STR_LDAP_DEFAULT.string.text
+#. \,ib
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_LDAP\n"
+"STR_LDAP_DEFAULT\n"
+"string.text"
 msgid "Default: 389"
 msgstr "Roghainn bhunaiteach: 389"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_LDAP.CB_WIZ_USESSL.checkbox.text
+#. `5LH
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_LDAP\n"
+"CB_WIZ_USESSL\n"
+"checkbox.text"
 msgid "Use ~secure connection (SSL)"
 msgstr "Cleachd ~ceangal tèarainte (SSL)"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_ADO.STR_ADO_HEADERTEXT.string.text
+#. AqsX
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_ADO\n"
+"STR_ADO_HEADERTEXT\n"
+"string.text"
 msgid "Set up a connection to an ADO database"
 msgstr "Suidhich ceangal ri stòr-dàta ADO"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_ADO.STR_ADO_HELPTEXT.string.text
+#. rC+d
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_ADO\n"
+"STR_ADO_HELPTEXT\n"
+"string.text"
 msgid ""
 "Please enter the URL of the ADO data source you want to connect to.\n"
 "Click 'Browse' to configure provider-specific settings.\n"
@@ -553,11 +763,23 @@ msgstr ""
 "Briog air \"Brabhsaich\" gus roghainnean an t-solaraiche a rèiteachadh.\n"
 "Bruidhinn ri rianaire an t-siostaim agad mur eil thu cinnteach mu ghin dhe na roghainnean a leanas."
 
-#: dbadminsetup.src#PAGE_DBWIZARD_ODBC.STR_ODBC_HEADERTEXT.string.text
+#. dXJ_
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_ODBC\n"
+"STR_ODBC_HEADERTEXT\n"
+"string.text"
 msgid "Set up a connection to an ODBC database"
 msgstr "Suidhich ceangal ri stòr-dàta ODBC"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_ODBC.STR_ODBC_HELPTEXT.string.text
+#. J6(6
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_ODBC\n"
+"STR_ODBC_HELPTEXT\n"
+"string.text"
 msgid ""
 "Enter the name of the ODBC database you want to connect to.\n"
 "Click 'Browse...' to select an ODBC database that is already registered in %PRODUCTNAME.\n"
@@ -567,11 +789,23 @@ msgstr ""
 "Briog air 'Brabhsaich...' gus stòr-dàta ODBC a thaghadh a tha air a chlàradh ann an %PRODUCTNAME mu thràth.\n"
 "Bruidhinn ri rianaire an t-siostaim agad mur eil thu cinnteach mu ghin dhe na roghainnean a leanas."
 
-#: dbadminsetup.src#PAGE_DBWIZARD_JDBC.STR_JDBC_HEADERTEXT.string.text
+#. `jQA
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_JDBC\n"
+"STR_JDBC_HEADERTEXT\n"
+"string.text"
 msgid "Set up a connection to a JDBC database"
 msgstr "Suidhich ceangal ri stòr-dàta JDBC"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_JDBC.STR_JDBC_HELPTEXT.string.text
+#. sv51
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_JDBC\n"
+"STR_JDBC_HELPTEXT\n"
+"string.text"
 msgid ""
 "Please enter the required information to connect to a JDBC database.\n"
 "Please contact your system administrator if you are unsure about the following settings."
@@ -579,19 +813,43 @@ msgstr ""
 "Cuir a-steach am fiosrachadh air a bheil feum gus ceangal ri stòr-dàta JDBC.\n"
 "Bruidhinn ri rianaire an t-siostaim agad mur eil thu cinnteach mu ghin dhe na roghainnean a leanas."
 
-#: dbadminsetup.src#PAGE_DBWIZARD_ORACLE.STR_ORACLE_HEADERTEXT.string.text
+#. ~Z0B
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_ORACLE\n"
+"STR_ORACLE_HEADERTEXT\n"
+"string.text"
 msgid "Set up a connection to an Oracle database"
 msgstr "Suidhich ceangal ri stòr-dàta Oracle"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_ORACLE.STR_ORACLE_DEFAULT.string.text
+#. bQ#G
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_ORACLE\n"
+"STR_ORACLE_DEFAULT\n"
+"string.text"
 msgid "Default: 1521"
 msgstr "Roghainn bhunaiteach: 1521"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_ORACLE.STR_ORACLE_DRIVERCLASSTEXT.string.text
+#. uMc*
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_ORACLE\n"
+"STR_ORACLE_DRIVERCLASSTEXT\n"
+"string.text"
 msgid "Oracle JDBC ~driver class"
 msgstr "Clas ~draibhear Oracle JDBC"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_ORACLE.STR_ORACLE_HELPTEXT.string.text
+#. gRsG
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_ORACLE\n"
+"STR_ORACLE_HELPTEXT\n"
+"string.text"
 msgid ""
 "Please enter the required information to connect to an Oracle database.Note that a JDBC Driver Class must be installed on your system and registered with %PRODUCTNAME.\n"
 "Please contact your system administrator if you are unsure about the following settings."
@@ -599,11 +857,23 @@ msgstr ""
 "Cuir a-steach am fiosrachadh air a bheil feum gus ceangal ri stòr-dàta Oracle. Thoir an aire gum bi feum air clas draibhear JDBC air a stàladh air an t-siostam agad agus air a chlàradh aig %PRODUCTNAME.\n"
 "Bruidhinn ri rianaire an t-siostaim agad mur eil thu cinnteach mu ghin dhe na roghainnean a leanas."
 
-#: dbadminsetup.src#PAGE_DBWIZARD_SPREADSHEET.STR_SPREADSHEET_HEADERTEXT.string.text
+#. ?lvf
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_SPREADSHEET\n"
+"STR_SPREADSHEET_HEADERTEXT\n"
+"string.text"
 msgid "Set up a connection to spreadsheets"
 msgstr "Suidhich ceangal ri cliath-dhuilleagan"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_SPREADSHEET.STR_SPREADSHEET_HELPTEXT.string.text
+#. Lg{}
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_SPREADSHEET\n"
+"STR_SPREADSHEET_HELPTEXT\n"
+"string.text"
 msgid ""
 "Click 'Browse...' to select a %PRODUCTNAME spreadsheet or Microsoft Excel workbook.\n"
 "%PRODUCTNAME will open this file in read-only mode."
@@ -611,862 +881,2409 @@ msgstr ""
 "Briog air 'Brabhsaich...' gus cliath-dhuilleag %PRODUCTNAME no leabhar-obrach Microsoft Excel a thaghadh.\n"
 "Fosglaidh %PRODUCTNAME am faidhle seo sa mhodh leughaidh a-mhàin."
 
-#: dbadminsetup.src#PAGE_DBWIZARD_SPREADSHEET.STR_SPREADSHEETPATH.string.text
+#. (oKh
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_SPREADSHEET\n"
+"STR_SPREADSHEETPATH\n"
+"string.text"
 msgid "~Location and file name"
 msgstr "Ionad is ainm an f~haidhle"
 
-#: dbadminsetup.src#PAGE_DBWIZARD_SPREADSHEET.CB_SPREADSHEETPASSWORDREQUIRED.checkbox.text
+#. ;#lG
+#: dbadminsetup.src
+msgctxt ""
+"dbadminsetup.src\n"
+"PAGE_DBWIZARD_SPREADSHEET\n"
+"CB_SPREADSHEETPASSWORDREQUIRED\n"
+"checkbox.text"
 msgid "~Password required"
 msgstr "Tha feum air ~facal-faire"
 
-#: directsql.src#DLG_DIRECTSQL.FL_SQL.fixedline.text
-msgid "SQL command"
-msgstr "Àithne SQL"
+#. _^lO
+#: admincontrols.src
+msgctxt ""
+"admincontrols.src\n"
+"RID_MYSQL_NATIVE_SETTINGS\n"
+"FT_MYSQL_DATABASE_NAME\n"
+"fixedtext.text"
+msgid "~Database name"
+msgstr "Ainm an stòir-~dhàta"
 
-#: directsql.src#DLG_DIRECTSQL.FT_SQL.fixedtext.text
-msgid "Command to execute"
-msgstr "An àithne gus a ruith"
+#. ;U^I
+#: admincontrols.src
+msgctxt ""
+"admincontrols.src\n"
+"RID_MYSQL_NATIVE_SETTINGS\n"
+"RB_MYSQL_HOST_PORT\n"
+"radiobutton.text"
+msgid "Se~rver / Port"
+msgstr "F~rithealaiche / Port"
 
-#: directsql.src#DLG_DIRECTSQL.PB_EXECUTE.pushbutton.text
-msgid "Execute"
-msgstr "Ruith"
+#. 4Z}n
+#: admincontrols.src
+msgctxt ""
+"admincontrols.src\n"
+"RID_MYSQL_NATIVE_SETTINGS\n"
+"FT_COMMON_HOST_NAME\n"
+"fixedtext.text"
+msgid "~Server"
+msgstr "~Frithealaiche"
 
-#: directsql.src#DLG_DIRECTSQL.FT_HISTORY.fixedtext.text
-msgid "Previous commands"
-msgstr "Àitheantan roimhe seo"
+#. w|ti
+#: admincontrols.src
+msgctxt ""
+"admincontrols.src\n"
+"RID_MYSQL_NATIVE_SETTINGS\n"
+"FT_COMMON_PORT\n"
+"fixedtext.text"
+msgid "~Port"
+msgstr "~Port"
 
-#: directsql.src#DLG_DIRECTSQL.FL_STATUS.fixedline.text
-msgid "Status"
-msgstr "Cor"
+#. $ae)
+#: admincontrols.src
+msgctxt ""
+"admincontrols.src\n"
+"RID_MYSQL_NATIVE_SETTINGS\n"
+"FT_COMMON_PORT_DEFAULT\n"
+"fixedtext.text"
+msgid "Default: 3306"
+msgstr "Bunaiteach: 3306"
 
-#: directsql.src#DLG_DIRECTSQL.PB_CLOSE.pushbutton.text
-msgid "Close"
-msgstr "Dùin"
+#. e38~
+#: admincontrols.src
+msgctxt ""
+"admincontrols.src\n"
+"RID_MYSQL_NATIVE_SETTINGS\n"
+"RB_MYSQL_SOCKET\n"
+"radiobutton.text"
+msgid "So~cket"
+msgstr "So~caid"
 
-#: directsql.src#DLG_DIRECTSQL.modaldialog.text
-msgid "Execute SQL Statement"
-msgstr "Ruith an aithris SQL"
+#. S`c+
+#: admincontrols.src
+msgctxt ""
+"admincontrols.src\n"
+"RID_MYSQL_NATIVE_SETTINGS\n"
+"RB_MYSQL_NAMED_PIPE\n"
+"radiobutton.text"
+msgid "Named p~ipe"
+msgstr "Pìob a~inmichte"
 
-#: directsql.src#STR_COMMAND_EXECUTED_SUCCESSFULLY.string.text
-msgid "Command successfully executed."
-msgstr "Chaidh an àithne a ruith gu soirbheachail."
+#. :-A#
+#: AutoControls_tmpl.hrc
+msgctxt ""
+"AutoControls_tmpl.hrc\n"
+"AUTO_BROWSECONTROLGROUP( AUTO_X, AUTO_Y, AUTOPAGE_X, AUTO_HID, AUTO_HID2)\n"
+"PB_AUTOBROWSEURL\n"
+"pushbutton.text"
+msgid "Browse"
+msgstr "Brabhsaich"
 
-#: directsql.src#STR_DIRECTSQL_CONNECTIONLOST.string.text
-msgid "The connection to the database has been lost. This dialog will be closed."
-msgstr "Chaidh an ceangal ris an stòr-dàta air chall. Thèid an còmhradh seo a dhùnadh."
+#. 6x\s
+#: AutoControls_tmpl.hrc
+msgctxt ""
+"AutoControls_tmpl.hrc\n"
+"AUTO_NAMECONTROLGROUP(AUTO_Y, AUTO_HID)\n"
+"FT_AUTODATABASENAME\n"
+"fixedtext.text"
+msgid "Database name"
+msgstr "Ainm an stòir-dhàta"
 
-#: queryorder.src#DLG_ORDERCRIT.LB_ORDERVALUE1.1.stringlist.text
-msgctxt "queryorder.src#DLG_ORDERCRIT.LB_ORDERVALUE1.1.stringlist.text"
-msgid "ascending"
-msgstr "a' dìreadh"
+#. HgJa
+#: AutoControls_tmpl.hrc
+msgctxt ""
+"AutoControls_tmpl.hrc\n"
+"AUTO_HOSTCONTROLGROUP(AUTO_Y, AUTO_HID)\n"
+"FT_AUTOHOSTNAME\n"
+"fixedtext.text"
+msgid "Server"
+msgstr "Frithealaiche"
 
-#: queryorder.src#DLG_ORDERCRIT.LB_ORDERVALUE1.2.stringlist.text
-msgctxt "queryorder.src#DLG_ORDERCRIT.LB_ORDERVALUE1.2.stringlist.text"
-msgid "descending"
-msgstr "a' dìreadh"
+#. p6EL
+#: AutoControls_tmpl.hrc
+msgctxt ""
+"AutoControls_tmpl.hrc\n"
+"AUTO_BASEDNCONTROLGROUP(AUTO_Y, AUTO_HID)\n"
+"FT_AUTOBASEDN\n"
+"fixedtext.text"
+msgid "Base ~DN"
+msgstr "~DN bunasach"
 
-#: queryorder.src#DLG_ORDERCRIT.LB_ORDERVALUE2.1.stringlist.text
-msgctxt "queryorder.src#DLG_ORDERCRIT.LB_ORDERVALUE2.1.stringlist.text"
-msgid "ascending"
-msgstr "a' dìreadh"
+#. A%st
+#: AutoControls_tmpl.hrc
+msgctxt ""
+"AutoControls_tmpl.hrc\n"
+"AUTO_PORTCONTROLGROUP(AUTO_Y, AUTO_HID)\n"
+"FT_AUTOPORTNUMBER\n"
+"fixedtext.text"
+msgid "~Port number"
+msgstr "Àireamh a' ~phuirt"
 
-#: queryorder.src#DLG_ORDERCRIT.LB_ORDERVALUE2.2.stringlist.text
-msgctxt "queryorder.src#DLG_ORDERCRIT.LB_ORDERVALUE2.2.stringlist.text"
-msgid "descending"
-msgstr "a' teàrnadh"
+#. gm+d
+#: AutoControls_tmpl.hrc
+msgctxt ""
+"AutoControls_tmpl.hrc\n"
+"AUTO_CHARSET( AUTO_Y, AUTOPAGE_X )\n"
+"FL_DATACONVERT\n"
+"fixedline.text"
+msgid "Data conversion"
+msgstr "Iompachadh dàta"
 
-#: queryorder.src#DLG_ORDERCRIT.LB_ORDERVALUE3.1.stringlist.text
-msgctxt "queryorder.src#DLG_ORDERCRIT.LB_ORDERVALUE3.1.stringlist.text"
-msgid "ascending"
-msgstr "a' teàrnadh"
+#. ~bs:
+#: AutoControls_tmpl.hrc
+msgctxt ""
+"AutoControls_tmpl.hrc\n"
+"AUTO_CHARSET( AUTO_Y, AUTOPAGE_X )\n"
+"FT_CHARSET\n"
+"fixedtext.text"
+msgid "~Character set"
+msgstr "Seata ~charactairean"
 
-#: queryorder.src#DLG_ORDERCRIT.LB_ORDERVALUE3.2.stringlist.text
-msgctxt "queryorder.src#DLG_ORDERCRIT.LB_ORDERVALUE3.2.stringlist.text"
-msgid "descending"
-msgstr "a' teàrnadh"
+#. `H!z
+#: AutoControls_tmpl.hrc
+msgctxt ""
+"AutoControls_tmpl.hrc\n"
+"AUTO_SEPARATORCONTROLGROUP(AUTO_Y,AUTOPAGE_X)\n"
+"FT_AUTOEXTENSIONHEADER\n"
+"fixedtext.text"
+msgid "Specify the type of files you want to access"
+msgstr "Sònraich an seòrsa dh'fhaidhlichean a bu toigh leat inntrigeadh"
 
-#: queryorder.src#DLG_ORDERCRIT.FT_ORDERFIELD.fixedtext.text
-msgctxt "queryorder.src#DLG_ORDERCRIT.FT_ORDERFIELD.fixedtext.text"
-msgid "Field name"
-msgstr "Ainm an raoin"
+#. xRp+
+#: AutoControls_tmpl.hrc
+msgctxt ""
+"AutoControls_tmpl.hrc\n"
+"AUTO_SEPARATORCONTROLGROUP(AUTO_Y,AUTOPAGE_X)\n"
+"RB_AUTOACCESSCTEXTFILES\n"
+"radiobutton.text"
+msgid "Plain text files (*.txt)"
+msgstr "Faidhlichean teacsa luim (*.txt)"
 
-#: queryorder.src#DLG_ORDERCRIT.FT_ORDERAFTER1.fixedtext.text
-msgctxt "queryorder.src#DLG_ORDERCRIT.FT_ORDERAFTER1.fixedtext.text"
-msgid "and then"
-msgstr "agus an uairsin"
+#. CWPo
+#: AutoControls_tmpl.hrc
+msgctxt ""
+"AutoControls_tmpl.hrc\n"
+"AUTO_SEPARATORCONTROLGROUP(AUTO_Y,AUTOPAGE_X)\n"
+"RB_AUTOACCESSCCSVFILES\n"
+"radiobutton.text"
+msgid "'Comma separated value' files (*.csv)"
+msgstr "Faidhlichean 'gan sgaradh le cromagan (*.csv)"
 
-#: queryorder.src#DLG_ORDERCRIT.FT_ORDERAFTER2.fixedtext.text
-msgctxt "queryorder.src#DLG_ORDERCRIT.FT_ORDERAFTER2.fixedtext.text"
-msgid "and then"
-msgstr "agus an uairsin"
+#. 1C2B
+#: AutoControls_tmpl.hrc
+msgctxt ""
+"AutoControls_tmpl.hrc\n"
+"AUTO_SEPARATORCONTROLGROUP(AUTO_Y,AUTOPAGE_X)\n"
+"RB_AUTOACCESSOTHERS\n"
+"radiobutton.text"
+msgid "Custom:"
+msgstr "Roghainn ghnàthaichte:"
 
-#: queryorder.src#DLG_ORDERCRIT.FT_ORDEROPER.fixedtext.text
-msgctxt "queryorder.src#DLG_ORDERCRIT.FT_ORDEROPER.fixedtext.text"
-msgid "Operator"
-msgstr "Gnìomharaiche"
+#. 1STv
+#: AutoControls_tmpl.hrc
+msgctxt ""
+"AutoControls_tmpl.hrc\n"
+"AUTO_SEPARATORCONTROLGROUP(AUTO_Y,AUTOPAGE_X)\n"
+"FT_AUTOOWNEXTENSIONAPPENDIX\n"
+"fixedtext.text"
+msgid "Custom: *.abc"
+msgstr "Roghainn ghnàthaichte: *.abc"
 
-#: queryorder.src#DLG_ORDERCRIT.FT_ORDERDIR.fixedtext.text
-msgid "Order"
-msgstr "Òrdugh"
+#. \?;M
+#: AutoControls_tmpl.hrc
+msgctxt ""
+"AutoControls_tmpl.hrc\n"
+"AUTO_SEPARATORCONTROLGROUP(AUTO_Y,AUTOPAGE_X)\n"
+"FL_AUTOSEPARATOR2\n"
+"fixedline.text"
+msgid "Row Format"
+msgstr "Fòrmat an ràigh"
 
-#: queryorder.src#DLG_ORDERCRIT.FL_ORDER.fixedline.text
-msgctxt "queryorder.src#DLG_ORDERCRIT.FL_ORDER.fixedline.text"
-msgid "Sort order"
-msgstr "Òrdugh an t-seòrsachaidh"
+#. [9b?
+#: AutoControls_tmpl.hrc
+msgctxt ""
+"AutoControls_tmpl.hrc\n"
+"AUTO_SEPARATORCONTROLGROUP(AUTO_Y,AUTOPAGE_X)\n"
+"FT_AUTOFIELDSEPARATOR\n"
+"fixedtext.text"
+msgid "Field separator"
+msgstr "Sgaradair raoin"
 
-#: queryorder.src#DLG_ORDERCRIT.STR_NOENTRY.string.text
-msgid "<none>"
-msgstr "<chan eil gin>"
+#. +,P3
+#: AutoControls_tmpl.hrc
+msgctxt ""
+"AutoControls_tmpl.hrc\n"
+"AUTO_SEPARATORCONTROLGROUP(AUTO_Y,AUTOPAGE_X)\n"
+"FT_AUTOTEXTSEPARATOR\n"
+"fixedtext.text"
+msgid "Text separator"
+msgstr "Sgaradair teacsa"
 
-#: queryorder.src#DLG_ORDERCRIT.modaldialog.text
-msgid "Sort Order"
-msgstr "Òrdugh an t-seòrsachaidh"
+#. ^yUz
+#: AutoControls_tmpl.hrc
+msgctxt ""
+"AutoControls_tmpl.hrc\n"
+"AUTO_SEPARATORCONTROLGROUP(AUTO_Y,AUTOPAGE_X)\n"
+"FT_AUTODECIMALSEPARATOR\n"
+"fixedtext.text"
+msgid "Decimal separator"
+msgstr "Sgaradair deicheach"
+
+#. XGXf
+#: AutoControls_tmpl.hrc
+msgctxt ""
+"AutoControls_tmpl.hrc\n"
+"FT_AUTOTHOUSANDSSEPARATOR\n"
+"fixedtext.text"
+msgid "Thousands separator"
+msgstr "Sgaradair mhìltean"
+
+#. 1oA.
+#: AutoControls_tmpl.hrc
+msgctxt ""
+"AutoControls_tmpl.hrc\n"
+"CB_AUTOHEADER\n"
+"checkbox.text"
+msgid "~Text contains headers"
+msgstr "~Tha teacsa sna bannan-cinn"
+
+#. J~Fh
+#: AutoControls_tmpl.hrc
+msgctxt ""
+"AutoControls_tmpl.hrc\n"
+"STR_AUTOTEXT_FIELD_SEP_NONE\n"
+"string.text"
+msgid "{None}"
+msgstr "{Chan eil gin}"
+
+#. EM Dec 2002: \'Space\' refers to what you get when you hit the space bar on your keyboard.
+#. =nL2
+#: AutoControls_tmpl.hrc
+msgctxt ""
+"AutoControls_tmpl.hrc\n"
+"STR_AUTOFIELDSEPARATORLIST\n"
+"string.text"
+msgid ";\t59\t,\t44\t:\t58\t{Tab}\t9\t{Space}\t32"
+msgstr ";\t 59\t ,\t 44\t :\t 58\t {Tab}\t 9\t {Space}\t 32"
+
+#. 3m#(
+#: AutoControls_tmpl.hrc
+msgctxt ""
+"AutoControls_tmpl.hrc\n"
+"STR_AUTODELIMITER_MISSING\n"
+"string.text"
+msgid "#1 must be set."
+msgstr "Feumaidh tu #1 a shocrachadh."
+
+#. +We1
+#: AutoControls_tmpl.hrc
+msgctxt ""
+"AutoControls_tmpl.hrc\n"
+"STR_AUTODELIMITER_MUST_DIFFER\n"
+"string.text"
+msgid "#1 and #2 must be different."
+msgstr "Feumaidh #1 is #2 a bhith eadar-dhealaichte."
+
+#. {1mo
+#: AutoControls_tmpl.hrc
+msgctxt ""
+"AutoControls_tmpl.hrc\n"
+"STR_AUTONO_WILDCARDS\n"
+"string.text"
+msgid "Wildcards such as ?,* are not allowed in #1."
+msgstr "Chan eil saoragan leithid ?,* ceadaichte ann an #1."
+
+#. jeZ\
+#: AutoControls_tmpl.hrc
+msgctxt ""
+"AutoControls_tmpl.hrc\n"
+"AUTO_JDBCDRIVERCLASSGROUP(AUTO_Y, AUTO_HID, AUTO_HID2)\n"
+"FT_AUTOJDBCDRIVERCLASS\n"
+"fixedtext.text"
+msgid "JDBC d~river class"
+msgstr "Clas d~raibhear JDBC"
+
+#. LceU
+#: AutoControls_tmpl.hrc
+msgctxt ""
+"AutoControls_tmpl.hrc\n"
+"AUTO_JDBCDRIVERCLASSGROUP(AUTO_Y, AUTO_HID, AUTO_HID2)\n"
+"PB_AUTOTESTDRIVERCLASS\n"
+"pushbutton.text"
+msgid "Test class"
+msgstr "Clas deuchainn"
+
+#. sA+g
+#: AutoControls_tmpl.hrc
+msgctxt ""
+"AutoControls_tmpl.hrc\n"
+"AUTO_SOCKETCONTROLGROUP(AUTO_Y)\n"
+"FT_SOCKET\n"
+"fixedtext.text"
+msgid "Socket"
+msgstr "Socaid"
+
+#. YDRn
+#: adtabdlg.src
+msgctxt ""
+"adtabdlg.src\n"
+"DLG_JOIN_TABADD\n"
+"RB_CASE_TABLES\n"
+"radiobutton.text"
+msgid "Tables"
+msgstr "Clàir"
+
+#. T9F\
+#: adtabdlg.src
+msgctxt ""
+"adtabdlg.src\n"
+"DLG_JOIN_TABADD\n"
+"RB_CASE_QUERIES\n"
+"radiobutton.text"
+msgid "Queries"
+msgstr "Ceistean"
+
+#. ;GDK
+#: adtabdlg.src
+msgctxt ""
+"adtabdlg.src\n"
+"DLG_JOIN_TABADD\n"
+"PB_ADDTABLE\n"
+"pushbutton.text"
+msgid "~Add"
+msgstr "~Cuir ris"
+
+#. }OFr
+#: adtabdlg.src
+msgctxt ""
+"adtabdlg.src\n"
+"DLG_JOIN_TABADD\n"
+"PB_CLOSE\n"
+"cancelbutton.text"
+msgid "~Close"
+msgstr "~Dùin"
+
+#. :@gb
+#: adtabdlg.src
+msgctxt ""
+"adtabdlg.src\n"
+"DLG_JOIN_TABADD\n"
+"STR_ADD_TABLES\n"
+"string.text"
+msgid "Add Tables"
+msgstr "Cuir clàir ris"
 
-#: ConnectionPage.src#PAGE_CONNECTION.FL_SEPARATOR1.fixedline.text
-msgctxt "ConnectionPage.src#PAGE_CONNECTION.FL_SEPARATOR1.fixedline.text"
+#. MQVE
+#: adtabdlg.src
+msgctxt ""
+"adtabdlg.src\n"
+"DLG_JOIN_TABADD\n"
+"STR_ADD_TABLE_OR_QUERY\n"
+"string.text"
+msgid "Add Table or Query"
+msgstr "Cuir clàr no ceist ris"
+
+#. ;2;l
+#: UserAdmin.src
+msgctxt ""
+"UserAdmin.src\n"
+"TAB_PAGE_USERADMIN\n"
+"FL_USER\n"
+"fixedline.text"
+msgid "User selection"
+msgstr "Taghadh a' chleachdaiche"
+
+#. 7F_B
+#: UserAdmin.src
+msgctxt ""
+"UserAdmin.src\n"
+"TAB_PAGE_USERADMIN\n"
+"FT_USER\n"
+"fixedtext.text"
+msgid "Us~er:"
+msgstr "Cl~eachdaiche:"
+
+#. bvaS
+#: UserAdmin.src
+msgctxt ""
+"UserAdmin.src\n"
+"TAB_PAGE_USERADMIN\n"
+"PB_NEWUSER\n"
+"pushbutton.text"
+msgid "~Add User..."
+msgstr "Cuir cle~achdaiche ris..."
+
+#. 0p(6
+#: UserAdmin.src
+msgctxt ""
+"UserAdmin.src\n"
+"TAB_PAGE_USERADMIN\n"
+"PB_CHANGEPWD\n"
+"pushbutton.text"
+msgid "Change ~Password..."
+msgstr "Atharraich am ~facal-faire..."
+
+#. ET(d
+#: UserAdmin.src
+msgctxt ""
+"UserAdmin.src\n"
+"TAB_PAGE_USERADMIN\n"
+"PB_DELETEUSER\n"
+"pushbutton.text"
+msgid "~Delete User..."
+msgstr "Sgua~b às an cleachdaiche..."
+
+#. .fB!
+#: UserAdmin.src
+msgctxt ""
+"UserAdmin.src\n"
+"TAB_PAGE_USERADMIN\n"
+"FL_TABLE_GRANTS\n"
+"fixedline.text"
+msgid "Access rights for selected user"
+msgstr "Còraichean inntrigidh a' chleachdaiche a thagh thu"
+
+#. -JJP
+#: UserAdmin.src
+msgctxt ""
+"UserAdmin.src\n"
+"QUERY_USERADMIN_DELETE_USER\n"
+"querybox.text"
+msgid "Do you really want to delete the user?"
+msgstr "A bheil thu cinnteach gu bheil thu airson an cleachdaiche seo a sguabadh às?"
+
+#. UN`:
+#: UserAdmin.src
+msgctxt ""
+"UserAdmin.src\n"
+"STR_USERADMIN_NOT_AVAILABLE\n"
+"string.text"
+msgid "The database does not support user administration."
+msgstr "Chan eil an stòr-dàta a' cur taic ri rianachd chleachdaichean."
+
+#. pamf
+#: UserAdmin.src
+msgctxt ""
+"UserAdmin.src\n"
+"DLG_PASSWORD\n"
+"FL_USER\n"
+"fixedline.text"
+msgid "User \"$name$:  $\""
+msgstr "An cleachdaiche \"$name$:  $\""
+
+#. fD9T
+#: UserAdmin.src
+msgctxt ""
+"UserAdmin.src\n"
+"DLG_PASSWORD\n"
+"FT_OLDPASSWORD\n"
+"fixedtext.text"
+msgid "Old p~assword"
+msgstr "Se~ann-fhacal-faire"
+
+#. SinN
+#: UserAdmin.src
+msgctxt ""
+"UserAdmin.src\n"
+"DLG_PASSWORD\n"
+"FT_PASSWORD\n"
+"fixedtext.text"
+msgid "~Password"
+msgstr "~Facal-faire"
+
+#. Qj;-
+#: UserAdmin.src
+msgctxt ""
+"UserAdmin.src\n"
+"DLG_PASSWORD\n"
+"FT_PASSWORD_REPEAT\n"
+"fixedtext.text"
+msgid "~Confirm password"
+msgstr "Dearbhai~ch am facal-faire"
+
+#. irnY
+#: UserAdmin.src
+msgctxt ""
+"UserAdmin.src\n"
+"DLG_PASSWORD\n"
+"modaldialog.text"
+msgid "Change Password"
+msgstr "Atharraich am facal-faire"
+
+#. ]7nT
+#: UserAdmin.src
+msgctxt ""
+"UserAdmin.src\n"
+"STR_ERROR_PASSWORDS_NOT_IDENTICAL\n"
+"string.text"
+msgid "The passwords do not match. Please enter the password again."
+msgstr "Chan eil an dà fhacal-faire a' freagairt ri chèile. Cuir a-steach e a-rithist."
+
+#. @`Wp
+#: ConnectionPage.src
+msgctxt ""
+"ConnectionPage.src\n"
+"PAGE_CONNECTION\n"
+"FL_SEPARATOR1\n"
+"fixedline.text"
 msgid "General"
 msgstr "Coitcheann"
 
-#: ConnectionPage.src#PAGE_CONNECTION.FT_HOSTNAME.fixedtext.text
-msgctxt "ConnectionPage.src#PAGE_CONNECTION.FT_HOSTNAME.fixedtext.text"
+#. 5BSd
+#: ConnectionPage.src
+msgctxt ""
+"ConnectionPage.src\n"
+"PAGE_CONNECTION\n"
+"FT_HOSTNAME\n"
+"fixedtext.text"
 msgid "~Host name"
 msgstr "Ainm an ò~stair"
 
-#: ConnectionPage.src#PAGE_CONNECTION.FL_SEPARATOR2.fixedline.text
-msgctxt "ConnectionPage.src#PAGE_CONNECTION.FL_SEPARATOR2.fixedline.text"
+#. O?pb
+#: ConnectionPage.src
+msgctxt ""
+"ConnectionPage.src\n"
+"PAGE_CONNECTION\n"
+"FL_SEPARATOR2\n"
+"fixedline.text"
 msgid "User authentication"
 msgstr "Dearbhadh cleachdaiche"
 
-#: ConnectionPage.src#PAGE_CONNECTION.FT_USERNAME.fixedtext.text
-msgctxt "ConnectionPage.src#PAGE_CONNECTION.FT_USERNAME.fixedtext.text"
+#. 8n{0
+#: ConnectionPage.src
+msgctxt ""
+"ConnectionPage.src\n"
+"PAGE_CONNECTION\n"
+"FT_USERNAME\n"
+"fixedtext.text"
 msgid "~User name"
 msgstr "Ainm ~cleachdaiche"
 
-#: ConnectionPage.src#PAGE_CONNECTION.CB_PASSWORD_REQUIRED.checkbox.text
-msgctxt "ConnectionPage.src#PAGE_CONNECTION.CB_PASSWORD_REQUIRED.checkbox.text"
+#. d)K?
+#: ConnectionPage.src
+msgctxt ""
+"ConnectionPage.src\n"
+"PAGE_CONNECTION\n"
+"CB_PASSWORD_REQUIRED\n"
+"checkbox.text"
 msgid "Password required"
 msgstr "Tha feum air facal-faire"
 
-#: ConnectionPage.src#PAGE_CONNECTION.FL_SEPARATOR3.fixedline.text
+#. w6dh
+#: ConnectionPage.src
+msgctxt ""
+"ConnectionPage.src\n"
+"PAGE_CONNECTION\n"
+"FL_SEPARATOR3\n"
+"fixedline.text"
 msgid "JDBC properties"
 msgstr "Roghainnean JDBC"
 
-#: ConnectionPage.src#PAGE_CONNECTION.FT_JDBCDRIVERCLASS.fixedtext.text
+#. d=^3
+#: ConnectionPage.src
+msgctxt ""
+"ConnectionPage.src\n"
+"PAGE_CONNECTION\n"
+"FT_JDBCDRIVERCLASS\n"
+"fixedtext.text"
 msgid "~JDBC driver class"
 msgstr "Clas draibhear ~JDBC"
 
-#: ConnectionPage.src#PAGE_CONNECTION.PB_TESTDRIVERCLASS.pushbutton.text
+#. oO(K
+#: ConnectionPage.src
+msgctxt ""
+"ConnectionPage.src\n"
+"PAGE_CONNECTION\n"
+"PB_TESTDRIVERCLASS\n"
+"pushbutton.text"
 msgid "Test Class"
 msgstr "Clas deuchainne"
 
-#: ConnectionPage.src#PAGE_CONNECTION.PB_TESTCONNECTION.pushbutton.text
+#. @#%8
+#: ConnectionPage.src
+msgctxt ""
+"ConnectionPage.src\n"
+"PAGE_CONNECTION\n"
+"PB_TESTCONNECTION\n"
+"pushbutton.text"
 msgid "Test Connection"
 msgstr "Ceangal deuchainne"
 
-#: ConnectionPage.src#STR_CONNECTION_TEST.string.text
+#. Vc?;
+#: ConnectionPage.src
+msgctxt ""
+"ConnectionPage.src\n"
+"STR_CONNECTION_TEST\n"
+"string.text"
 msgid "Connection Test"
 msgstr "Deuchainn a' cheangail"
 
-#: ConnectionPage.src#STR_CONNECTION_SUCCESS.string.text
+#. IL]+
+#: ConnectionPage.src
+msgctxt ""
+"ConnectionPage.src\n"
+"STR_CONNECTION_SUCCESS\n"
+"string.text"
 msgid "The connection was established successfully."
 msgstr "Chaidh an ceangal a stèidheachadh gu soirbheachail."
 
-#: ConnectionPage.src#STR_CONNECTION_NO_SUCCESS.string.text
+#. \tud
+#: ConnectionPage.src
+msgctxt ""
+"ConnectionPage.src\n"
+"STR_CONNECTION_NO_SUCCESS\n"
+"string.text"
 msgid "The connection could not be established."
 msgstr "Cha do ghabh an ceangal a stèidheachadh."
 
-#: ConnectionPage.src#STR_JDBCDRIVER_SUCCESS.string.text
+#. Az|t
+#: ConnectionPage.src
+msgctxt ""
+"ConnectionPage.src\n"
+"STR_JDBCDRIVER_SUCCESS\n"
+"string.text"
 msgid "The JDBC driver was loaded successfully."
 msgstr "Chaidh an draibhear JDBC a luchdadh gu soirbheachail."
 
-#: ConnectionPage.src#STR_JDBCDRIVER_NO_SUCCESS.string.text
+#. iPjC
+#: ConnectionPage.src
+msgctxt ""
+"ConnectionPage.src\n"
+"STR_JDBCDRIVER_NO_SUCCESS\n"
+"string.text"
 msgid "The JDBC driver could not be loaded."
 msgstr "Cha do ghabh an draibhear JDBC a luchdadh."
 
-#: ConnectionPage.src#STR_MSACCESS_FILTERNAME.string.text
+#. /-LM
+#: ConnectionPage.src
+msgctxt ""
+"ConnectionPage.src\n"
+"STR_MSACCESS_FILTERNAME\n"
+"string.text"
 msgid "MS Access file"
 msgstr "Faidhle MS Access"
 
-#: ConnectionPage.src#STR_MSACCESS_2007_FILTERNAME.string.text
+#. ZbpT
+#: ConnectionPage.src
+msgctxt ""
+"ConnectionPage.src\n"
+"STR_MSACCESS_2007_FILTERNAME\n"
+"string.text"
 msgid "MS Access 2007 file"
 msgstr "Faidhle MS Access 2007"
 
-#: UserAdminDlg.src#DLG_DATABASE_USERADMIN.STR_PAGETITLE_USERADMIN.string.text
+#. D36C
+#: indexdialog.src
+msgctxt ""
+"indexdialog.src\n"
+"DLG_INDEXDESIGN.TLB_ACTIONS\n"
+"ID_INDEX_NEW\n"
+"toolboxitem.text"
+msgid "New Index"
+msgstr "Clàr-amais ùr"
+
+#. 8l#U
+#: indexdialog.src
+msgctxt ""
+"indexdialog.src\n"
+"DLG_INDEXDESIGN.TLB_ACTIONS\n"
+"ID_INDEX_DROP\n"
+"toolboxitem.text"
+msgid "Delete Current Index"
+msgstr "Sguab às an clàr-amais làithreach"
+
+#. 9MlT
+#: indexdialog.src
+msgctxt ""
+"indexdialog.src\n"
+"DLG_INDEXDESIGN.TLB_ACTIONS\n"
+"ID_INDEX_RENAME\n"
+"toolboxitem.text"
+msgid "Rename Current Index"
+msgstr "Cuir ainm ùr air a' chlàr-amais làithreach"
+
+#. R6,[
+#: indexdialog.src
+msgctxt ""
+"indexdialog.src\n"
+"DLG_INDEXDESIGN.TLB_ACTIONS\n"
+"ID_INDEX_SAVE\n"
+"toolboxitem.text"
+msgid "Save Current Index"
+msgstr "Sàbhail an clàr-amais làithreach"
+
+#. iUa]
+#: indexdialog.src
+msgctxt ""
+"indexdialog.src\n"
+"DLG_INDEXDESIGN.TLB_ACTIONS\n"
+"ID_INDEX_RESET\n"
+"toolboxitem.text"
+msgid "Reset Current Index"
+msgstr "Ath-shuidhich an clàr-amais làithreach"
+
+#. 7RS/
+#: indexdialog.src
+msgctxt ""
+"indexdialog.src\n"
+"DLG_INDEXDESIGN\n"
+"FL_INDEXDETAILS\n"
+"fixedline.text"
+msgid "Index details"
+msgstr "Mion-fhiosrachadh a' chlàir-amais"
+
+#. w$KI
+#: indexdialog.src
+msgctxt ""
+"indexdialog.src\n"
+"DLG_INDEXDESIGN\n"
+"FT_DESC_LABEL\n"
+"fixedtext.text"
+msgid "Index identifier:"
+msgstr "Aithnichear a' chlàir-amais:"
+
+#. ZQl)
+#: indexdialog.src
+msgctxt ""
+"indexdialog.src\n"
+"DLG_INDEXDESIGN\n"
+"CB_UNIQUE\n"
+"checkbox.text"
+msgid "~Unique"
+msgstr "À~raid"
+
+#. /.[`
+#: indexdialog.src
+msgctxt ""
+"indexdialog.src\n"
+"DLG_INDEXDESIGN\n"
+"FT_FIELDS\n"
+"fixedtext.text"
+msgid "Fields"
+msgstr "Raointean"
+
+#. rvRK
+#: indexdialog.src
+msgctxt ""
+"indexdialog.src\n"
+"DLG_INDEXDESIGN\n"
+"PB_CLOSE\n"
+"pushbutton.text"
+msgid "~Close"
+msgstr "~Dùin"
+
+#. SSe{
+#: indexdialog.src
+msgctxt ""
+"indexdialog.src\n"
+"DLG_INDEXDESIGN\n"
+"modaldialog.text"
+msgid "Indexes"
+msgstr "Clàir-amais"
+
+#. @J((
+#: indexdialog.src
+msgctxt ""
+"indexdialog.src\n"
+"STR_TAB_INDEX_SORTORDER\n"
+"string.text"
+msgid "Sort order"
+msgstr "Òrdugh seòrsachaidh"
+
+#. +20R
+#: indexdialog.src
+msgctxt ""
+"indexdialog.src\n"
+"STR_TAB_INDEX_FIELD\n"
+"string.text"
+msgid "Index field"
+msgstr "Raon a' clàir-amais"
+
+#. 2[30
+#: indexdialog.src
+msgctxt ""
+"indexdialog.src\n"
+"STR_ORDER_ASCENDING\n"
+"string.text"
+msgid "Ascending"
+msgstr "A' dìreadh"
+
+#. ;o^d
+#: indexdialog.src
+msgctxt ""
+"indexdialog.src\n"
+"STR_ORDER_DESCENDING\n"
+"string.text"
+msgid "Descending"
+msgstr "A' teàrnadh"
+
+#. 3*]#
+#: indexdialog.src
+msgctxt ""
+"indexdialog.src\n"
+"STR_CONFIRM_DROP_INDEX\n"
+"string.text"
+msgid "Do you really want to delete the index '$name$'?"
+msgstr "A bheil thu cinnteach gu bheil thu airson an clàr-amais '$name$' a sguabadh às?"
+
+#. yAOm
+#: indexdialog.src
+msgctxt ""
+"indexdialog.src\n"
+"STR_LOGICAL_INDEX_NAME\n"
+"string.text"
+msgid "index"
+msgstr "clàr-amais"
+
+#. ^shB
+#: indexdialog.src
+msgctxt ""
+"indexdialog.src\n"
+"ERR_NEED_INDEX_FIELDS\n"
+"errorbox.text"
+msgid "The index must contain at least one field."
+msgstr "Feumaidh aon raon a bhith sa chlàr-amais air a' char a lugha."
+
+#. rLRc
+#: indexdialog.src
+msgctxt ""
+"indexdialog.src\n"
+"ERR_NEED_INDEX_FIELDS\n"
+"errorbox.title"
+msgid "Save Index"
+msgstr "Sàbhail an clàr-amais"
+
+#. SgJ^
+#: indexdialog.src
+msgctxt ""
+"indexdialog.src\n"
+"QUERY_SAVE_CURRENT_INDEX\n"
+"querybox.text"
+msgid "Do you want to save the changes made to the current index?"
+msgstr "A bheil thu cinnteach gu bheil thu airson na dh'atharraich thu sa chlàr-amais làithreach a shàbhaladh?"
+
+#. WPnm
+#: indexdialog.src
+msgctxt ""
+"indexdialog.src\n"
+"QUERY_SAVE_CURRENT_INDEX\n"
+"querybox.title"
+msgid "Exit Index Design"
+msgstr "Fàg dealbhadh a chlàir-amais"
+
+#. T/54
+#: indexdialog.src
+msgctxt ""
+"indexdialog.src\n"
+"STR_INDEX_NAME_ALREADY_USED\n"
+"string.text"
+msgid "There is already another index named \"$name$\"."
+msgstr "Tha clàr-amais ann mu thràth air a bheil \"$name$\"."
+
+#. 4,G}
+#: indexdialog.src
+msgctxt ""
+"indexdialog.src\n"
+"STR_INDEXDESIGN_DOUBLE_COLUMN_NAME\n"
+"string.text"
+msgid "In an index definition, no table column may occur more than once. However, you have entered column \"$name$\" twice."
+msgstr "Chan fhaod colbh clàir nochdadh ach aon turas ann an deifinisean clàir-amais. Chuir thusa a-steach an colbh '$name$' dà thuras."
+
+#. YvCP
+#: RelationDlg.src
+msgctxt ""
+"RelationDlg.src\n"
+"DLG_REL_PROPERTIES.WND_CONTROL\n"
+"FL_INVOLVED_TABLES\n"
+"fixedline.text"
+msgid "Tables involved"
+msgstr "Clàir a tha an sàs ann"
+
+#. !kk6
+#: RelationDlg.src
+msgctxt ""
+"RelationDlg.src\n"
+"DLG_REL_PROPERTIES.WND_CONTROL\n"
+"FL_INVOLVED_FIELDS\n"
+"fixedline.text"
+msgid "Fields involved"
+msgstr "Raointean a tha an sàs ann"
+
+#. $5V0
+#: RelationDlg.src
+msgctxt ""
+"RelationDlg.src\n"
+"DLG_REL_PROPERTIES\n"
+"FL_CASC_UPD\n"
+"fixedline.text"
+msgid "Update options"
+msgstr "Ùraich na roghainnean"
+
+#. hWIU
+#: RelationDlg.src
+msgctxt ""
+"RelationDlg.src\n"
+"DLG_REL_PROPERTIES\n"
+"RB_NO_CASC_UPD\n"
+"radiobutton.text"
+msgid "~No action"
+msgstr "Gu~n ghnìomh"
+
+#. 1%#_
+#: RelationDlg.src
+msgctxt ""
+"RelationDlg.src\n"
+"DLG_REL_PROPERTIES\n"
+"RB_CASC_UPD\n"
+"radiobutton.text"
+msgid "~Update cascade"
+msgstr "Ùraich ~an t-eas"
+
+#. FA!m
+#: RelationDlg.src
+msgctxt ""
+"RelationDlg.src\n"
+"DLG_REL_PROPERTIES\n"
+"RB_CASC_UPD_NULL\n"
+"radiobutton.text"
+msgid "~Set null"
+msgstr "~Suidhich mar neoini"
+
+#. TL$:
+#: RelationDlg.src
+msgctxt ""
+"RelationDlg.src\n"
+"DLG_REL_PROPERTIES\n"
+"RB_CASC_UPD_DEFAULT\n"
+"radiobutton.text"
+msgid "Set ~default"
+msgstr "Sui~dhich mar roghainn bhunaiteach"
+
+#. P/w[
+#: RelationDlg.src
+msgctxt ""
+"RelationDlg.src\n"
+"DLG_REL_PROPERTIES\n"
+"FL_CASC_DEL\n"
+"fixedline.text"
+msgid "Delete options"
+msgstr "Sguab às na roghainnean"
+
+#. VVn6
+#: RelationDlg.src
+msgctxt ""
+"RelationDlg.src\n"
+"DLG_REL_PROPERTIES\n"
+"RB_NO_CASC_DEL\n"
+"radiobutton.text"
+msgid "~No action"
+msgstr "~Na dèan dad"
+
+#. CRXV
+#: RelationDlg.src
+msgctxt ""
+"RelationDlg.src\n"
+"DLG_REL_PROPERTIES\n"
+"RB_CASC_DEL\n"
+"radiobutton.text"
+msgid "Delete ~cascade"
+msgstr "Sgua~b às an t-eas"
+
+#. k,W^
+#: RelationDlg.src
+msgctxt ""
+"RelationDlg.src\n"
+"DLG_REL_PROPERTIES\n"
+"RB_CASC_DEL_NULL\n"
+"radiobutton.text"
+msgid "~Set null"
+msgstr "~Suidhich mar neoini"
+
+#. $ewE
+#: RelationDlg.src
+msgctxt ""
+"RelationDlg.src\n"
+"DLG_REL_PROPERTIES\n"
+"RB_CASC_DEL_DEFAULT\n"
+"radiobutton.text"
+msgid "Set ~default"
+msgstr "Sui~dhich mar roghainn bhunaiteach"
+
+#. C+##
+#: RelationDlg.src
+msgctxt ""
+"RelationDlg.src\n"
+"DLG_REL_PROPERTIES\n"
+"modaldialog.text"
+msgid "Relations"
+msgstr "Càirdean"
+
+#. WM_x
+#: dsselect.src
+msgctxt ""
+"dsselect.src\n"
+"DLG_DATASOURCE_SELECTION\n"
+"FT_DESCRIPTION\n"
+"fixedtext.text"
+msgid "Choose a data source:"
+msgstr "Tagh an tùs-dàta:"
+
+#. %K`o
+#: dsselect.src
+msgctxt ""
+"dsselect.src\n"
+"DLG_DATASOURCE_SELECTION\n"
+"PB_MANAGE\n"
+"pushbutton.text"
+msgid "Organize..."
+msgstr "Eagraich..."
+
+#. LmJ3
+#: dsselect.src
+msgctxt ""
+"dsselect.src\n"
+"DLG_DATASOURCE_SELECTION\n"
+"PB_CREATE\n"
+"pushbutton.text"
+msgid "Create..."
+msgstr "Cruthaich..."
+
+#. g59A
+#: dsselect.src
+msgctxt ""
+"dsselect.src\n"
+"DLG_DATASOURCE_SELECTION\n"
+"STR_LOCAL_DATASOURCES\n"
+"string.text"
+msgid "Local Databases"
+msgstr "Stòir-dhàta ionadail"
+
+#. EOo,
+#: dsselect.src
+msgctxt ""
+"dsselect.src\n"
+"DLG_DATASOURCE_SELECTION\n"
+"STR_DESCRIPTION2\n"
+"string.text"
+msgid "Choose a database"
+msgstr "Tagh stòr-dàta"
+
+#. |,ZV
+#: dsselect.src
+msgctxt ""
+"dsselect.src\n"
+"DLG_DATASOURCE_SELECTION\n"
+"modaldialog.text"
+msgid "Data Source"
+msgstr "Tùs-dàta"
+
+#. /kst
+#: paramdialog.src
+msgctxt ""
+"paramdialog.src\n"
+"DLG_PARAMETERS\n"
+"FL_PARAMS\n"
+"fixedline.text"
+msgid "~Parameters"
+msgstr "~Paramadairean"
+
+#. pRnb
+#: paramdialog.src
+msgctxt ""
+"paramdialog.src\n"
+"DLG_PARAMETERS\n"
+"FT_VALUE\n"
+"fixedtext.text"
+msgid "~Value"
+msgstr "~Luach"
+
+#. NA%L
+#: paramdialog.src
+msgctxt ""
+"paramdialog.src\n"
+"DLG_PARAMETERS\n"
+"BT_TRAVELNEXT\n"
+"pushbutton.text"
+msgid "~Next"
+msgstr "~Air adhart"
+
+#. qDEP
+#: paramdialog.src
+msgctxt ""
+"paramdialog.src\n"
+"DLG_PARAMETERS\n"
+"STR_COULD_NOT_CONVERT_PARAM\n"
+"string.text"
+msgid "The entry could not be converted to a valid value for the \"$name$\"column"
+msgstr "Cha do ghabh an reacord iompachadh 'na luach dligheach airson a' chuilbh \"$name$\""
+
+#. B}3N
+#: paramdialog.src
+msgctxt ""
+"paramdialog.src\n"
+"DLG_PARAMETERS\n"
+"modaldialog.text"
+msgid "Parameter Input"
+msgstr "Cur a-steach a' pharamadair"
+
+#. ;zAN
+#: dlgsize.src
+msgctxt ""
+"dlgsize.src\n"
+"DLG_ROWHEIGHT\n"
+"FT_VALUE\n"
+"fixedtext.text"
+msgid "~Height"
+msgstr "Àir~de"
+
+#. -y\s
+#: dlgsize.src
+msgctxt ""
+"dlgsize.src\n"
+"DLG_ROWHEIGHT\n"
+"CB_STANDARD\n"
+"checkbox.text"
+msgid "~Automatic"
+msgstr "~Fèin-obrachail"
+
+#. %^F0
+#: dlgsize.src
+msgctxt ""
+"dlgsize.src\n"
+"DLG_ROWHEIGHT\n"
+"modaldialog.text"
+msgid "Row Height"
+msgstr "Àirde an ràigh"
+
+#. ?GHK
+#: dlgsize.src
+msgctxt ""
+"dlgsize.src\n"
+"DLG_COLWIDTH\n"
+"FT_VALUE\n"
+"fixedtext.text"
+msgid "~Width"
+msgstr "Le~ud"
+
+#. VE;(
+#: dlgsize.src
+msgctxt ""
+"dlgsize.src\n"
+"DLG_COLWIDTH\n"
+"CB_STANDARD\n"
+"checkbox.text"
+msgid "~Automatic"
+msgstr "~Fèin-obrachail"
+
+#. U3F2
+#: dlgsize.src
+msgctxt ""
+"dlgsize.src\n"
+"DLG_COLWIDTH\n"
+"modaldialog.text"
+msgid "Column Width"
+msgstr "Leud a' chuilbh"
+
+#. %@Zj
+#: UserAdminDlg.src
+msgctxt ""
+"UserAdminDlg.src\n"
+"DLG_DATABASE_USERADMIN\n"
+"STR_PAGETITLE_USERADMIN\n"
+"string.text"
 msgid "User Settings"
 msgstr "Roghainnean cleachdaiche"
 
-#: UserAdminDlg.src#DLG_DATABASE_USERADMIN.tabdialog.text
+#. [n;|
+#: UserAdminDlg.src
+msgctxt ""
+"UserAdminDlg.src\n"
+"DLG_DATABASE_USERADMIN\n"
+"tabdialog.text"
 msgid "User administration"
 msgstr "Rianachd nan cleachdaichean"
 
-#: queryfilter.src#DLG_FILTERCRIT.LB_WHERECOND2.1.stringlist.text
-msgctxt "queryfilter.src#DLG_FILTERCRIT.LB_WHERECOND2.1.stringlist.text"
+#. ,IC5
+#: queryfilter.src
+msgctxt ""
+"queryfilter.src\n"
+"DLG_FILTERCRIT.LB_WHERECOND2\n"
+"1\n"
+"stringlist.text"
 msgid "AND"
 msgstr "AND"
 
-#: queryfilter.src#DLG_FILTERCRIT.LB_WHERECOND2.2.stringlist.text
-msgctxt "queryfilter.src#DLG_FILTERCRIT.LB_WHERECOND2.2.stringlist.text"
+#. A8/!
+#: queryfilter.src
+msgctxt ""
+"queryfilter.src\n"
+"DLG_FILTERCRIT.LB_WHERECOND2\n"
+"2\n"
+"stringlist.text"
 msgid "OR"
 msgstr "OR"
 
-#: queryfilter.src#DLG_FILTERCRIT.LB_WHERECOND3.1.stringlist.text
-msgctxt "queryfilter.src#DLG_FILTERCRIT.LB_WHERECOND3.1.stringlist.text"
+#. nm[J
+#: queryfilter.src
+msgctxt ""
+"queryfilter.src\n"
+"DLG_FILTERCRIT.LB_WHERECOND3\n"
+"1\n"
+"stringlist.text"
 msgid "AND"
 msgstr "AND"
 
-#: queryfilter.src#DLG_FILTERCRIT.LB_WHERECOND3.2.stringlist.text
-msgctxt "queryfilter.src#DLG_FILTERCRIT.LB_WHERECOND3.2.stringlist.text"
+#. Rd28
+#: queryfilter.src
+msgctxt ""
+"queryfilter.src\n"
+"DLG_FILTERCRIT.LB_WHERECOND3\n"
+"2\n"
+"stringlist.text"
 msgid "OR"
 msgstr "OR"
 
-#: queryfilter.src#DLG_FILTERCRIT.FT_WHEREFIELD.fixedtext.text
-msgctxt "queryfilter.src#DLG_FILTERCRIT.FT_WHEREFIELD.fixedtext.text"
+#. (k^l
+#: queryfilter.src
+msgctxt ""
+"queryfilter.src\n"
+"DLG_FILTERCRIT\n"
+"FT_WHEREFIELD\n"
+"fixedtext.text"
 msgid "Field name"
 msgstr "Ainm an raoin"
 
-#: queryfilter.src#DLG_FILTERCRIT.FT_WHERECOMP.fixedtext.text
+#. yu4j
+#: queryfilter.src
+msgctxt ""
+"queryfilter.src\n"
+"DLG_FILTERCRIT\n"
+"FT_WHERECOMP\n"
+"fixedtext.text"
 msgid "Condition"
 msgstr "Coingheall"
 
-#: queryfilter.src#DLG_FILTERCRIT.FT_WHEREVALUE.fixedtext.text
+#. hI8?
+#: queryfilter.src
+msgctxt ""
+"queryfilter.src\n"
+"DLG_FILTERCRIT\n"
+"FT_WHEREVALUE\n"
+"fixedtext.text"
 msgid "Value"
 msgstr "Luach"
 
-#: queryfilter.src#DLG_FILTERCRIT.FT_WHEREOPER.fixedtext.text
-msgctxt "queryfilter.src#DLG_FILTERCRIT.FT_WHEREOPER.fixedtext.text"
+#. WE?/
+#: queryfilter.src
+msgctxt ""
+"queryfilter.src\n"
+"DLG_FILTERCRIT\n"
+"FT_WHEREOPER\n"
+"fixedtext.text"
 msgid "Operator"
 msgstr "Gnìomharaiche"
 
-#: queryfilter.src#DLG_FILTERCRIT.FL_FIELDS.fixedline.text
+#. +,T)
+#: queryfilter.src
+msgctxt ""
+"queryfilter.src\n"
+"DLG_FILTERCRIT\n"
+"FL_FIELDS\n"
+"fixedline.text"
 msgid "Criteria"
 msgstr "Cuspair-deuchainn"
 
-#: queryfilter.src#DLG_FILTERCRIT.STR_NOENTRY.string.text
+#. =p+m
+#: queryfilter.src
+msgctxt ""
+"queryfilter.src\n"
+"DLG_FILTERCRIT\n"
+"STR_NOENTRY\n"
+"string.text"
 msgid "- none -"
 msgstr "- chan eil gin -"
 
-#: queryfilter.src#DLG_FILTERCRIT.STR_COMPARE_OPERATORS.string.text
+#. FQ8-
+#: queryfilter.src
+msgctxt ""
+"queryfilter.src\n"
+"DLG_FILTERCRIT\n"
+"STR_COMPARE_OPERATORS\n"
+"string.text"
 msgid "=;<>;<;<=;>;>=;like;not like;null;not null"
 msgstr "=;<>;<;<=;>;>=;like;not like;null;not null"
 
-#: queryfilter.src#DLG_FILTERCRIT.modaldialog.text
+#. wMcy
+#: queryfilter.src
+msgctxt ""
+"queryfilter.src\n"
+"DLG_FILTERCRIT\n"
+"modaldialog.text"
 msgid "Standard Filter"
 msgstr "Criathrag bhunaiteach"
 
-#: dlgsize.src#DLG_ROWHEIGHT.FT_VALUE.fixedtext.text
-msgid "~Height"
-msgstr "Àir~de"
-
-#: dlgsize.src#DLG_ROWHEIGHT.CB_STANDARD.checkbox.text
-msgctxt "dlgsize.src#DLG_ROWHEIGHT.CB_STANDARD.checkbox.text"
-msgid "~Automatic"
-msgstr "~Fèin-obrachail"
-
-#: dlgsize.src#DLG_ROWHEIGHT.modaldialog.text
-msgid "Row Height"
-msgstr "Àirde an ràigh"
-
-#: dlgsize.src#DLG_COLWIDTH.FT_VALUE.fixedtext.text
-msgid "~Width"
-msgstr "Le~ud"
-
-#: dlgsize.src#DLG_COLWIDTH.CB_STANDARD.checkbox.text
-msgctxt "dlgsize.src#DLG_COLWIDTH.CB_STANDARD.checkbox.text"
-msgid "~Automatic"
-msgstr "~Fèin-obrachail"
-
-#: dlgsize.src#DLG_COLWIDTH.modaldialog.text
-msgid "Column Width"
-msgstr "Leud a' chuilbh"
-
-#: dbfindex.src#DLG_DBASE_INDEXES.FT_TABLES.fixedtext.text
-msgid "~Table"
-msgstr "~Clàr"
-
-#: dbfindex.src#DLG_DBASE_INDEXES.FL_INDEXES.fixedline.text
-msgid "Assignment"
-msgstr "Iomruineadh"
-
-#: dbfindex.src#DLG_DBASE_INDEXES.FT_TABLEINDEXES.fixedtext.text
-msgid "T~able indexes"
-msgstr "Clàr-~amais nan clàr"
-
-#: dbfindex.src#DLG_DBASE_INDEXES.FT_ALLINDEXES.fixedtext.text
-msgid "~Free indexes"
-msgstr "Leig ~mu sgaoil na clàir-amais"
-
-#: dbfindex.src#DLG_DBASE_INDEXES.modaldialog.text
-msgctxt "dbfindex.src#DLG_DBASE_INDEXES.modaldialog.text"
-msgid "Indexes"
-msgstr "Clàir-amais"
-
-#: advancedsettings.src#AUTO_DATAHANDLING_AUTO_Y_.FL_DATAHANDLING.fixedline.text
+#. ~R+m
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"AUTO_DATAHANDLING(AUTO_Y)\n"
+"FL_DATAHANDLING\n"
+"fixedline.text"
 msgid "Options"
 msgstr "Roghainnean"
 
-#: advancedsettings.src#AUTO_SQL92CHECK_AUTO_Y_.CB_SQL92CHECK.checkbox.text
+#. B{1#
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"AUTO_SQL92CHECK(AUTO_Y)\n"
+"CB_SQL92CHECK\n"
+"checkbox.text"
 msgid "Use SQL92 naming constraints"
 msgstr "Cleachd cuingeachaidhean ainmeachaidh SQL92"
 
-#: advancedsettings.src#AUTO_APPENDTABLEALIAS_AUTO_Y_.CB_APPENDTABLEALIAS.checkbox.text
+#. j77S
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"AUTO_APPENDTABLEALIAS(AUTO_Y)\n"
+"CB_APPENDTABLEALIAS\n"
+"checkbox.text"
 msgid "Append the table alias name on SELECT statements"
 msgstr "Cuir ris ainm-brèige a' chlàir air aithrisean SELECT"
 
-#: advancedsettings.src#AUTO_AS_BEFORE_CORR_NAME_AUTO_Y_.CB_AS_BEFORE_CORR_NAME.checkbox.text
+#. %-b#
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"AUTO_AS_BEFORE_CORR_NAME(AUTO_Y)\n"
+"CB_AS_BEFORE_CORR_NAME\n"
+"checkbox.text"
 msgid "Use keyword AS before table alias names"
 msgstr "Cleachd am facal-luirg AS ro ainmean-brèige de chlàr"
 
-#: advancedsettings.src#AUTO_ENABLEOUTERJOIN_AUTO_Y_.CB_ENABLEOUTERJOIN.checkbox.text
+#. g*$x
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"AUTO_ENABLEOUTERJOIN(AUTO_Y)\n"
+"CB_ENABLEOUTERJOIN\n"
+"checkbox.text"
 msgid "Use Outer Join syntax '{OJ }'"
 msgstr "Cleachd co-chàradh Outer Join '{OJ }'"
 
-#: advancedsettings.src#AUTO_IGNOREDRIVER_PRIV_AUTO_Y_.CB_IGNOREDRIVER_PRIV.checkbox.text
+#. 6AM.
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"AUTO_IGNOREDRIVER_PRIV(AUTO_Y)\n"
+"CB_IGNOREDRIVER_PRIV\n"
+"checkbox.text"
 msgid "Ignore the privileges from the database driver"
 msgstr "Leig seachad na pribhleidean o dhraibhear an stòir-dhàta"
 
-#: advancedsettings.src#AUTO_PARAMETERNAMESUBST_AUTO_Y_.CB_PARAMETERNAMESUBST.checkbox.text
+#. 3u}1
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"AUTO_PARAMETERNAMESUBST(AUTO_Y)\n"
+"CB_PARAMETERNAMESUBST\n"
+"checkbox.text"
 msgid "Replace named parameters with '?'"
 msgstr "Cuir '?' an àite nam paramadairean ainmichte"
 
-#: advancedsettings.src#AUTO_SUPPRESVERSIONCOLUMN_AUTO_Y_.CB_SUPPRESVERSIONCL.checkbox.text
+#. 5d?c
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"AUTO_SUPPRESVERSIONCOLUMN(AUTO_Y)\n"
+"CB_SUPPRESVERSIONCL\n"
+"checkbox.text"
 msgid "Display version columns (when available)"
 msgstr "Seall colbhan nan tionndaidhean (nuair a bhios iad ri làimh)"
 
-#: advancedsettings.src#AUTO_CATALOG_AUTO_Y_.CB_CATALOG.checkbox.text
+#. {~yG
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"AUTO_CATALOG(AUTO_Y)\n"
+"CB_CATALOG\n"
+"checkbox.text"
 msgid "Use catalog name in SELECT statements"
 msgstr "Cleachd ainm a' chatalog ann an aithrisean SELECT"
 
-#: advancedsettings.src#AUTO_SCHEMA_AUTO_Y_.CB_SCHEMA.checkbox.text
+#. aF\2
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"AUTO_SCHEMA(AUTO_Y)\n"
+"CB_SCHEMA\n"
+"checkbox.text"
 msgid "Use schema name in SELECT statements"
 msgstr "Cleachd ainm an sgeama ann an aithrisean SELECT"
 
-#: advancedsettings.src#AUTO_IGNOREINDEXAPPENDIX_AUTO_Y_.CB_IGNOREINDEXAPPENDIX.checkbox.text
+#. hQP1
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"AUTO_IGNOREINDEXAPPENDIX(AUTO_Y)\n"
+"CB_IGNOREINDEXAPPENDIX\n"
+"checkbox.text"
 msgid "Create index with ASC or DESC statement"
 msgstr "Cruthaich clàr-amais le aithris ASC no DESC"
 
-#: advancedsettings.src#AUTO_DOSLINEENDS_AUTO_Y_.CB_DOSLINEENDS.checkbox.text
+#. }Li9
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"AUTO_DOSLINEENDS(AUTO_Y)\n"
+"CB_DOSLINEENDS\n"
+"checkbox.text"
 msgid "End text lines with CR+LF"
 msgstr "Crìochnaich loidhnichean teacsa le CR+LF"
 
-#: advancedsettings.src#AUTO_IGNORECURRENCY_AUTO_Y_.CB_IGNORECURRENCY.checkbox.text
+#. \h1o
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"AUTO_IGNORECURRENCY(AUTO_Y)\n"
+"CB_IGNORECURRENCY\n"
+"checkbox.text"
 msgid "Ignore currency field information"
 msgstr "Leig seachad fiosrachadh raon an airgeadra"
 
-#: advancedsettings.src#AUTO_CHECKREQUIRED_AUTO_Y_.CB_CHECK_REQUIRED.checkbox.text
+#. xb9,
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"AUTO_CHECKREQUIRED(AUTO_Y)\n"
+"CB_CHECK_REQUIRED\n"
+"checkbox.text"
 msgid "Form data input checks for required fields"
 msgstr "Nì ion-chur dàta ann am foirm sgrùdadh airson raointean air a bheil feum"
 
-#: advancedsettings.src#AUTO_ESCAPE_DATETIME_AUTO_Y_.CB_ESCAPE_DATETIME.checkbox.text
+#. ^L^J
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"AUTO_ESCAPE_DATETIME(AUTO_Y)\n"
+"CB_ESCAPE_DATETIME\n"
+"checkbox.text"
 msgid "Use ODBC conformant date/time literals"
 msgstr "Cleachd Literals cinn-là/ama a tha a-rèir ODBC"
 
-#: advancedsettings.src#AUTO_PRIMARY_KEY_SUPPORT_AUTO_Y_.CB_PRIMARY_KEY_SUPPORT.checkbox.text
+#. rH;A
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"AUTO_PRIMARY_KEY_SUPPORT(AUTO_Y)\n"
+"CB_PRIMARY_KEY_SUPPORT\n"
+"checkbox.text"
 msgid "Supports primary keys"
 msgstr "Thoir taic do phrìomh-iuchraichean"
 
-#: advancedsettings.src#AUTO_RESPECTRESULTSETTYPE_AUTO_Y_.CB_RESPECTRESULTSETTYPE.checkbox.text
+#. el(|
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"AUTO_RESPECTRESULTSETTYPE(AUTO_Y)\n"
+"CB_RESPECTRESULTSETTYPE\n"
+"checkbox.text"
 msgid "Respect the result set type from the database driver"
 msgstr "Gabh ri seòrsa an toraidh o dhraibhear an stòir-dhàta"
 
-#: advancedsettings.src#WORKAROUND.1.stringlist.text
+#. RaMX
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"WORKAROUND\n"
+"1\n"
+"stringlist.text"
 msgid "Default"
 msgstr "Roghainn bhunaiteach"
 
-#: advancedsettings.src#WORKAROUND.2.stringlist.text
+#. j(P5
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"WORKAROUND\n"
+"2\n"
+"stringlist.text"
 msgid "SQL"
 msgstr "SQL"
 
-#: advancedsettings.src#WORKAROUND.3.stringlist.text
+#. E[lr
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"WORKAROUND\n"
+"3\n"
+"stringlist.text"
 msgid "Mixed"
 msgstr "Measgaichte"
 
-#: advancedsettings.src#WORKAROUND.4.stringlist.text
+#. ;-|W
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"WORKAROUND\n"
+"4\n"
+"stringlist.text"
 msgid "MS Access"
 msgstr "MS Access"
 
-#: advancedsettings.src#AUTO_BOOLEANCOMPARISON_AUTO_Y_.FT_BOOLEANCOMPARISON.fixedtext.text
+#. V%%y
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"AUTO_BOOLEANCOMPARISON(AUTO_Y)\n"
+"FT_BOOLEANCOMPARISON\n"
+"fixedtext.text"
 msgid "Comparison of Boolean values"
 msgstr "Coimeas eadar luachan Boole"
 
-#: advancedsettings.src#AUTO_MAXROWSCAN_AUTO_Y_.FT_MAXROWSCAN.fixedtext.text
+#. .4_P
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"AUTO_MAXROWSCAN(AUTO_Y)\n"
+"FT_MAXROWSCAN\n"
+"fixedtext.text"
 msgid "Rows to scan column types"
 msgstr "Nì ràghan sganadh air seòrsaichean nan colbh"
 
-#: advancedsettings.src#PAGE_GENERATED_VALUES.FL_SEPARATORAUTO.fixedline.text
+#. Hgyf
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"PAGE_GENERATED_VALUES\n"
+"FL_SEPARATORAUTO\n"
+"fixedline.text"
 msgid "Settings"
 msgstr "Roghainnean"
 
-#: advancedsettings.src#PAGE_GENERATED_VALUES.CB_RETRIEVE_AUTO.checkbox.text
+#. V.?p
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"PAGE_GENERATED_VALUES\n"
+"CB_RETRIEVE_AUTO\n"
+"checkbox.text"
 msgid "Re~trieve generated values"
 msgstr "~Faigh na luachan a chaidh a ghintinn"
 
-#: advancedsettings.src#PAGE_GENERATED_VALUES.FT_AUTOINCREMENTVALUE.fixedtext.text
+#. ?q57
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"PAGE_GENERATED_VALUES\n"
+"FT_AUTOINCREMENTVALUE\n"
+"fixedtext.text"
 msgid "~Auto-increment statement"
 msgstr "~Aithris fèin-ioncramaididh"
 
-#: advancedsettings.src#PAGE_GENERATED_VALUES.FT_RETRIEVE_AUTO.fixedtext.text
+#. jUJD
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"PAGE_GENERATED_VALUES\n"
+"FT_RETRIEVE_AUTO\n"
+"fixedtext.text"
 msgid "~Query of generated values"
 msgstr "~Ceist do luachan a chaidh a ghintinn"
 
-#: advancedsettings.src#DLG_DATABASE_ADVANCED.STR_GENERATED_VALUE.string.text
+#. L`U^
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"DLG_DATABASE_ADVANCED\n"
+"STR_GENERATED_VALUE\n"
+"string.text"
 msgid "Generated Values"
 msgstr "Luachan a chaidh a ghintinn"
 
-#: advancedsettings.src#DLG_DATABASE_ADVANCED.STR_DS_BEHAVIOUR.string.text
+#. _B5}
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"DLG_DATABASE_ADVANCED\n"
+"STR_DS_BEHAVIOUR\n"
+"string.text"
 msgid "Special Settings"
 msgstr "Roghainnean sònraichte"
 
-#: advancedsettings.src#DLG_DATABASE_ADVANCED.tabdialog.text
+#. 2D^.
+#: advancedsettings.src
+msgctxt ""
+"advancedsettings.src\n"
+"DLG_DATABASE_ADVANCED\n"
+"tabdialog.text"
 msgid "Advanced Settings"
 msgstr "Roghainnean adhartach"
 
-#: UserAdmin.src#TAB_PAGE_USERADMIN.FL_USER.fixedline.text
-msgid "User selection"
-msgstr "Taghadh a' chleachdaiche"
-
-#: UserAdmin.src#TAB_PAGE_USERADMIN.FT_USER.fixedtext.text
-msgid "Us~er:"
-msgstr "Cl~eachdaiche:"
-
-#: UserAdmin.src#TAB_PAGE_USERADMIN.PB_NEWUSER.pushbutton.text
-msgid "~Add User..."
-msgstr "Cuir cle~achdaiche ris..."
-
-#: UserAdmin.src#TAB_PAGE_USERADMIN.PB_CHANGEPWD.pushbutton.text
-msgid "Change ~Password..."
-msgstr "Atharraich am ~facal-faire..."
-
-#: UserAdmin.src#TAB_PAGE_USERADMIN.PB_DELETEUSER.pushbutton.text
-msgid "~Delete User..."
-msgstr "Sgua~b às an cleachdaiche..."
-
-#: UserAdmin.src#TAB_PAGE_USERADMIN.FL_TABLE_GRANTS.fixedline.text
-msgid "Access rights for selected user"
-msgstr "Còraichean inntrigidh a' chleachdaiche a thagh thu"
-
-#: UserAdmin.src#QUERY_USERADMIN_DELETE_USER.querybox.text
-msgid "Do you really want to delete the user?"
-msgstr "A bheil thu cinnteach gu bheil thu airson an cleachdaiche seo a sguabadh às?"
-
-#: UserAdmin.src#STR_USERADMIN_NOT_AVAILABLE.string.text
-msgid "The database does not support user administration."
-msgstr "Chan eil an stòr-dàta a' cur taic ri rianachd chleachdaichean."
-
-#: UserAdmin.src#DLG_PASSWORD.FL_USER.fixedline.text
-msgid "User \"$name$:  $\""
-msgstr "An cleachdaiche \"$name$:  $\""
-
-#: UserAdmin.src#DLG_PASSWORD.FT_OLDPASSWORD.fixedtext.text
-msgid "Old p~assword"
-msgstr "Se~ann-fhacal-faire"
-
-#: UserAdmin.src#DLG_PASSWORD.FT_PASSWORD.fixedtext.text
-msgid "~Password"
-msgstr "~Facal-faire"
-
-#: UserAdmin.src#DLG_PASSWORD.FT_PASSWORD_REPEAT.fixedtext.text
-msgid "~Confirm password"
-msgstr "Dearbhai~ch am facal-faire"
-
-#: UserAdmin.src#DLG_PASSWORD.modaldialog.text
-msgid "Change Password"
-msgstr "Atharraich am facal-faire"
-
-#: UserAdmin.src#STR_ERROR_PASSWORDS_NOT_IDENTICAL.string.text
-msgid "The passwords do not match. Please enter the password again."
-msgstr "Chan eil an dà fhacal-faire a' freagairt ri chèile. Cuir a-steach e a-rithist."
-
-#: admincontrols.src#RID_MYSQL_NATIVE_SETTINGS.FT_MYSQL_DATABASE_NAME.fixedtext.text
-msgid "~Database name"
-msgstr "Ainm an stòir-~dhàta"
-
-#: admincontrols.src#RID_MYSQL_NATIVE_SETTINGS.RB_MYSQL_HOST_PORT.radiobutton.text
-msgid "Se~rver / Port"
-msgstr "F~rithealaiche / Port"
-
-#: admincontrols.src#RID_MYSQL_NATIVE_SETTINGS.FT_COMMON_HOST_NAME.fixedtext.text
-msgid "~Server"
-msgstr "~Frithealaiche"
-
-#: admincontrols.src#RID_MYSQL_NATIVE_SETTINGS.FT_COMMON_PORT.fixedtext.text
-msgid "~Port"
-msgstr "~Port"
-
-#: admincontrols.src#RID_MYSQL_NATIVE_SETTINGS.FT_COMMON_PORT_DEFAULT.fixedtext.text
-msgctxt "admincontrols.src#RID_MYSQL_NATIVE_SETTINGS.FT_COMMON_PORT_DEFAULT.fixedtext.text"
-msgid "Default: 3306"
-msgstr "Bunaiteach: 3306"
+#. ^ujX
+#: sqlmessage.src
+msgctxt ""
+"sqlmessage.src\n"
+"DLG_SQLEXCEPTIONCHAIN\n"
+"FL_DETAILS\n"
+"fixedline.text"
+msgid "Details"
+msgstr "Mion-fhiosrachadh"
 
-#: admincontrols.src#RID_MYSQL_NATIVE_SETTINGS.RB_MYSQL_SOCKET.radiobutton.text
-msgid "So~cket"
-msgstr "So~caid"
+#. U.*d
+#: sqlmessage.src
+msgctxt ""
+"sqlmessage.src\n"
+"DLG_SQLEXCEPTIONCHAIN\n"
+"FT_ERRORLIST\n"
+"fixedtext.text"
+msgid "Error ~list:"
+msgstr "~Liosta nam mearachd:"
 
-#: admincontrols.src#RID_MYSQL_NATIVE_SETTINGS.RB_MYSQL_NAMED_PIPE.radiobutton.text
-msgid "Named p~ipe"
-msgstr "Pìob a~inmichte"
+#. ]9\m
+#: sqlmessage.src
+msgctxt ""
+"sqlmessage.src\n"
+"DLG_SQLEXCEPTIONCHAIN\n"
+"FT_DESCRIPTION\n"
+"fixedtext.text"
+msgid "~Description:"
+msgstr "T~uairisgeul:"
 
-#: AutoControls_tmpl.hrc#AUTO_BROWSECONTROLGROUP__AUTO_X__AUTO_Y__AUTOPAGE_X__AUTO_HID__AUTO_HID2_.PB_AUTOBROWSEURL.pushbutton.text
-msgid "Browse"
-msgstr "Brabhsaich"
+#. {C_X
+#: sqlmessage.src
+msgctxt ""
+"sqlmessage.src\n"
+"DLG_SQLEXCEPTIONCHAIN\n"
+"STR_EXCEPTION_STATUS\n"
+"string.text"
+msgid "SQL Status"
+msgstr "Cor SQL"
 
-#: AutoControls_tmpl.hrc#AUTO_NAMECONTROLGROUP_AUTO_Y__AUTO_HID_.FT_AUTODATABASENAME.fixedtext.text
-msgid "Database name"
-msgstr "Ainm an stòir-dhàta"
+#. 28;^
+#: sqlmessage.src
+msgctxt ""
+"sqlmessage.src\n"
+"DLG_SQLEXCEPTIONCHAIN\n"
+"STR_EXCEPTION_ERRORCODE\n"
+"string.text"
+msgid "Error code"
+msgstr "Còd na mearachd"
 
-#: AutoControls_tmpl.hrc#AUTO_HOSTCONTROLGROUP_AUTO_Y__AUTO_HID_.FT_AUTOHOSTNAME.fixedtext.text
-msgid "Server"
-msgstr "Frithealaiche"
+#. sZn`
+#: sqlmessage.src
+msgctxt ""
+"sqlmessage.src\n"
+"DLG_SQLEXCEPTIONCHAIN\n"
+"modaldialog.text"
+msgid "%PRODUCTNAME Base"
+msgstr "%PRODUCTNAME Base"
 
-#: AutoControls_tmpl.hrc#AUTO_BASEDNCONTROLGROUP_AUTO_Y__AUTO_HID_.FT_AUTOBASEDN.fixedtext.text
-msgid "Base ~DN"
-msgstr "~DN bunasach"
+#. u$#$
+#: sqlmessage.src
+msgctxt ""
+"sqlmessage.src\n"
+"STR_EXPLAN_STRINGCONVERSION_ERROR\n"
+"string.text"
+msgid "A frequent reason for this error is an inappropriate character set setting for the language of your database. Check the setting by choosing Edit - Database - Properties."
+msgstr "Tachraidh a' mhearachd seo gu tric ma chaidh seata mì-fhreagarrach de charactairean a thaghadh airson cànan an stòir-dhàta. Tagh an roghainn ann an Deasaich - Stòr-dàta - Roghainnean."
 
-#: AutoControls_tmpl.hrc#AUTO_PORTCONTROLGROUP_AUTO_Y__AUTO_HID_.FT_AUTOPORTNUMBER.fixedtext.text
-msgctxt "AutoControls_tmpl.hrc#AUTO_PORTCONTROLGROUP_AUTO_Y__AUTO_HID_.FT_AUTOPORTNUMBER.fixedtext.text"
-msgid "~Port number"
-msgstr "Àireamh a' ~phuirt"
+#. mh$.
+#: sqlmessage.src
+msgctxt ""
+"sqlmessage.src\n"
+"STR_EXCEPTION_ERROR\n"
+"string.text"
+msgid "Error"
+msgstr "Mearachd"
 
-#: AutoControls_tmpl.hrc#AUTO_CHARSET__AUTO_Y__AUTOPAGE_X__.FL_DATACONVERT.fixedline.text
-msgid "Data conversion"
-msgstr "Iompachadh dàta"
+#. k-g!
+#: sqlmessage.src
+msgctxt ""
+"sqlmessage.src\n"
+"STR_EXCEPTION_WARNING\n"
+"string.text"
+msgid "Warning"
+msgstr "Rabhadh"
 
-#: AutoControls_tmpl.hrc#AUTO_CHARSET__AUTO_Y__AUTOPAGE_X__.FT_CHARSET.fixedtext.text
-msgid "~Character set"
-msgstr "Seata ~charactairean"
+#. =`Tc
+#: sqlmessage.src
+msgctxt ""
+"sqlmessage.src\n"
+"STR_EXCEPTION_INFO\n"
+"string.text"
+msgid "Information"
+msgstr "Fiosrachadh"
 
-#: AutoControls_tmpl.hrc#AUTO_SEPARATORCONTROLGROUP_AUTO_Y_AUTOPAGE_X_.FT_AUTOEXTENSIONHEADER.fixedtext.text
-msgid "Specify the type of files you want to access"
-msgstr "Sònraich an seòrsa dh'fhaidhlichean a bu toigh leat inntrigeadh"
+#. x=e|
+#: sqlmessage.src
+msgctxt ""
+"sqlmessage.src\n"
+"STR_EXCEPTION_DETAILS\n"
+"string.text"
+msgid "Details"
+msgstr "Mion-fhiosrachadh"
 
-#: AutoControls_tmpl.hrc#AUTO_SEPARATORCONTROLGROUP_AUTO_Y_AUTOPAGE_X_.RB_AUTOACCESSCTEXTFILES.radiobutton.text
-msgid "Plain text files (*.txt)"
-msgstr "Faidhlichean teacsa luim (*.txt)"
+#. KI/V
+#: AutoControls.src
+msgctxt ""
+"AutoControls.src\n"
+"STR_DBASE_PATH_OR_FILE\n"
+"string.text"
+msgid "Path to the dBASE files"
+msgstr "An t-slighe gu na faidhlichean dBASE"
 
-#: AutoControls_tmpl.hrc#AUTO_SEPARATORCONTROLGROUP_AUTO_Y_AUTOPAGE_X_.RB_AUTOACCESSCCSVFILES.radiobutton.text
-msgid "'Comma separated value' files (*.csv)"
-msgstr "Faidhlichean 'gan sgaradh le cromagan (*.csv)"
+#. 1C(o
+#: AutoControls.src
+msgctxt ""
+"AutoControls.src\n"
+"STR_FLAT_PATH_OR_FILE\n"
+"string.text"
+msgid "Path to the text files"
+msgstr "An t-slighe gu na faidhlichean teacsa"
 
-#: AutoControls_tmpl.hrc#AUTO_SEPARATORCONTROLGROUP_AUTO_Y_AUTOPAGE_X_.RB_AUTOACCESSOTHERS.radiobutton.text
-msgid "Custom:"
-msgstr "Roghainn ghnàthaichte:"
+#. )_e!
+#: AutoControls.src
+msgctxt ""
+"AutoControls.src\n"
+"STR_CALC_PATH_OR_FILE\n"
+"string.text"
+msgid "Path to the spreadsheet document"
+msgstr "An t-slighe gu sgrìobhainn na cliath-dhuilleige"
 
-#: AutoControls_tmpl.hrc#AUTO_SEPARATORCONTROLGROUP_AUTO_Y_AUTOPAGE_X_.FT_AUTOOWNEXTENSIONAPPENDIX.fixedtext.text
-msgid "Custom: *.abc"
-msgstr "Roghainn ghnàthaichte: *.abc"
+#. 5UGP
+#: AutoControls.src
+msgctxt ""
+"AutoControls.src\n"
+"STR_NAME_OF_ODBC_DATASOURCE\n"
+"string.text"
+msgid "Name of the ODBC data source on your system"
+msgstr "Ainm an tùs-dàta ODBC air an t-siostam agad"
 
-#: AutoControls_tmpl.hrc#AUTO_SEPARATORCONTROLGROUP_AUTO_Y_AUTOPAGE_X_.FL_AUTOSEPARATOR2.fixedline.text
-msgid "Row Format"
-msgstr "Fòrmat an ràigh"
+#. 4Gf-
+#: AutoControls.src
+msgctxt ""
+"AutoControls.src\n"
+"STR_MYSQL_DATABASE_NAME\n"
+"string.text"
+msgid "Name of the MySQL database"
+msgstr "Ainm an stòir-dhàta MySQL"
 
-#: AutoControls_tmpl.hrc#AUTO_SEPARATORCONTROLGROUP_AUTO_Y_AUTOPAGE_X_.FT_AUTOFIELDSEPARATOR.fixedtext.text
-msgid "Field separator"
-msgstr "Sgaradair raoin"
+#. QdI$
+#: AutoControls.src
+msgctxt ""
+"AutoControls.src\n"
+"STR_ORACLE_DATABASE_NAME\n"
+"string.text"
+msgid "Name of the Oracle database"
+msgstr "Ainm an stòir-dhàta Oracle"
 
-#: AutoControls_tmpl.hrc#AUTO_SEPARATORCONTROLGROUP_AUTO_Y_AUTOPAGE_X_.FT_AUTOTEXTSEPARATOR.fixedtext.text
-msgid "Text separator"
-msgstr "Sgaradair teacsa"
+#. b%J#
+#: AutoControls.src
+msgctxt ""
+"AutoControls.src\n"
+"STR_MSACCESS_MDB_FILE\n"
+"string.text"
+msgid "Microsoft Access database file"
+msgstr "Faidhle stòir-dhàta Microsoft Access"
 
-#: AutoControls_tmpl.hrc#AUTO_SEPARATORCONTROLGROUP_AUTO_Y_AUTOPAGE_X_.FT_AUTODECIMALSEPARATOR.fixedtext.text
-msgid "Decimal separator"
-msgstr "Sgaradair deicheach"
+#. vdjy
+#: AutoControls.src
+msgctxt ""
+"AutoControls.src\n"
+"STR_NO_ADDITIONAL_SETTINGS\n"
+"string.text"
+msgid "No more settings are necessary. To verify that the connection is working, click the '%test' button."
+msgstr "Chan eil feum air roghainnean a bharrachd. Gus dearbhadh gu bheil an ceangal ag obair, briog air a' phutan'%test'."
 
-#: AutoControls_tmpl.hrc#FT_AUTOTHOUSANDSSEPARATOR.fixedtext.text
-msgid "Thousands separator"
-msgstr "Sgaradair mhìltean"
+#. C^HW
+#: AutoControls.src
+msgctxt ""
+"AutoControls.src\n"
+"STR_COMMONURL\n"
+"string.text"
+msgid "Datasource URL"
+msgstr "URL tùs an dàta"
 
-#: AutoControls_tmpl.hrc#CB_AUTOHEADER.checkbox.text
-msgid "~Text contains headers"
-msgstr "~Tha teacsa sna bannan-cinn"
+#. Lbcq
+#: AutoControls.src
+msgctxt ""
+"AutoControls.src\n"
+"STR_HOSTNAME\n"
+"string.text"
+msgid "~Host name"
+msgstr "Ainm ~an òstair"
 
-#: AutoControls_tmpl.hrc#STR_AUTOTEXT_FIELD_SEP_NONE.string.text
-msgid "{None}"
-msgstr "{Chan eil gin}"
+#. SrR0
+#: AutoControls.src
+msgctxt ""
+"AutoControls.src\n"
+"STR_MOZILLA_PROFILE_NAME\n"
+"string.text"
+msgid "~Mozilla profile name"
+msgstr "Ainm na pròifile ~Mozilla"
 
-#. EM Dec 2002: \'Space\' refers to what you get when you hit the space bar on your keyboard.
-#: AutoControls_tmpl.hrc#STR_AUTOFIELDSEPARATORLIST.string.text
-msgid ";\t59\t,\t44\t:\t58\t{Tab}\t9\t{Space}\t32"
-msgstr ";\t 59\t ,\t 44\t :\t 58\t {Tab}\t 9\t {Space}\t 32"
+#. Rd0$
+#: AutoControls.src
+msgctxt ""
+"AutoControls.src\n"
+"STR_THUNDERBIRD_PROFILE_NAME\n"
+"string.text"
+msgid "~Thunderbird profile name"
+msgstr "Ainm na pròifile ~Thunderbird"
 
-#: AutoControls_tmpl.hrc#STR_AUTODELIMITER_MISSING.string.text
-msgid "#1 must be set."
-msgstr "Feumaidh tu #1 a shocrachadh."
+#. P#xG
+#: dbfindex.src
+msgctxt ""
+"dbfindex.src\n"
+"DLG_DBASE_INDEXES\n"
+"FT_TABLES\n"
+"fixedtext.text"
+msgid "~Table"
+msgstr "~Clàr"
 
-#: AutoControls_tmpl.hrc#STR_AUTODELIMITER_MUST_DIFFER.string.text
-msgid "#1 and #2 must be different."
-msgstr "Feumaidh #1 is #2 a bhith eadar-dhealaichte."
+#. qTrl
+#: dbfindex.src
+msgctxt ""
+"dbfindex.src\n"
+"DLG_DBASE_INDEXES\n"
+"FL_INDEXES\n"
+"fixedline.text"
+msgid "Assignment"
+msgstr "Iomruineadh"
 
-#: AutoControls_tmpl.hrc#STR_AUTONO_WILDCARDS.string.text
-msgid "Wildcards such as ?,* are not allowed in #1."
-msgstr "Chan eil saoragan leithid ?,* ceadaichte ann an #1."
+#. _=:Y
+#: dbfindex.src
+msgctxt ""
+"dbfindex.src\n"
+"DLG_DBASE_INDEXES\n"
+"FT_TABLEINDEXES\n"
+"fixedtext.text"
+msgid "T~able indexes"
+msgstr "Clàr-~amais nan clàr"
 
-#: AutoControls_tmpl.hrc#AUTO_JDBCDRIVERCLASSGROUP_AUTO_Y__AUTO_HID__AUTO_HID2_.FT_AUTOJDBCDRIVERCLASS.fixedtext.text
-msgid "JDBC d~river class"
-msgstr "Clas d~raibhear JDBC"
+#. ,HVL
+#: dbfindex.src
+msgctxt ""
+"dbfindex.src\n"
+"DLG_DBASE_INDEXES\n"
+"FT_ALLINDEXES\n"
+"fixedtext.text"
+msgid "~Free indexes"
+msgstr "Leig ~mu sgaoil na clàir-amais"
 
-#: AutoControls_tmpl.hrc#AUTO_JDBCDRIVERCLASSGROUP_AUTO_Y__AUTO_HID__AUTO_HID2_.PB_AUTOTESTDRIVERCLASS.pushbutton.text
-msgctxt "AutoControls_tmpl.hrc#AUTO_JDBCDRIVERCLASSGROUP_AUTO_Y__AUTO_HID__AUTO_HID2_.PB_AUTOTESTDRIVERCLASS.pushbutton.text"
-msgid "Test class"
-msgstr "Clas deuchainn"
+#. =VnW
+#: dbfindex.src
+msgctxt ""
+"dbfindex.src\n"
+"DLG_DBASE_INDEXES\n"
+"modaldialog.text"
+msgid "Indexes"
+msgstr "Clàir-amais"
 
-#: AutoControls_tmpl.hrc#AUTO_SOCKETCONTROLGROUP_AUTO_Y_.FT_SOCKET.fixedtext.text
-msgid "Socket"
-msgstr "Socaid"
+#. lwB5
+#: directsql.src
+msgctxt ""
+"directsql.src\n"
+"DLG_DIRECTSQL\n"
+"FL_SQL\n"
+"fixedline.text"
+msgid "SQL command"
+msgstr "Àithne SQL"
 
-#: dbadmin2.src#STR_ENTER_CONNECTION_PASSWORD.string.text
-msgid "A password is needed to connect to the data source \"$name$\"."
-msgstr "Tha feum air facal-faire gus ceangal a dhèanamh ris an tùs-dàta \"$name$\"."
+#. R@PQ
+#: directsql.src
+msgctxt ""
+"directsql.src\n"
+"DLG_DIRECTSQL\n"
+"FT_SQL\n"
+"fixedtext.text"
+msgid "Command to execute"
+msgstr "An àithne gus a ruith"
 
-#: dbadmin2.src#STR_ASK_FOR_DIRECTORY_CREATION.string.text
-msgid ""
-"The directory\n"
-"\n"
-"$path$\n"
-"\n"
-"does not exist. Should it be created?"
+#. #bq3
+#: directsql.src
+msgctxt ""
+"directsql.src\n"
+"DLG_DIRECTSQL\n"
+"CB_SHOWOUTPUT\n"
+"checkbox.text"
+msgid "Show output of \"select\" statements"
 msgstr ""
-"Chan eil an t-eòlaire ann an\n"
-"\n"
-"$path$\n"
-"\n"
-"ann. A bheil thu airson a chruthachadh?"
-
-#: dbadmin2.src#STR_COULD_NOT_CREATE_DIRECTORY.string.text
-msgid "The directory $name$ could not be created."
-msgstr "Cha do ghabh an t-eòlaire $name$ a chruthachadh."
-
-#: dbadmin2.src#DLG_DOMAINPASSWORD.FT_PASSWORD.fixedline.text
-msgid "Please enter the ~password for the user 'DOMAIN'."
-msgstr "Cuir a-steach am ~facal-faire aig a' chleachdaiche 'DOMAIN'."
-
-#: dbadmin2.src#DLG_DOMAINPASSWORD.modaldialog.text
-msgid "Convert Database"
-msgstr "Iompaich an stòr-dàta"
-
-#: dbadmin2.src#PAGE_TABLESUBSCRIPTION.FL_SEPARATOR1.fixedline.text
-msgid "Tables and table filter"
-msgstr "Clàir is criathragan clàir"
-
-#: dbadmin2.src#PAGE_TABLESUBSCRIPTION.FT_FILTER_EXPLANATION.fixedtext.text
-msgid "Mark the tables that should be visible for the applications."
-msgstr "Comharradh."
-
-#: dbadmin2.src#PAGE_TABLESUBSCRIPTION.tabpage.text
-msgid "Tables Filter"
-msgstr "Criathrag nan clàr"
-
-#: RelationDlg.src#DLG_REL_PROPERTIES.WND_CONTROL.FL_INVOLVED_TABLES.fixedline.text
-msgid "Tables involved"
-msgstr "Clàir a tha an sàs ann"
 
-#: RelationDlg.src#DLG_REL_PROPERTIES.WND_CONTROL.FL_INVOLVED_FIELDS.fixedline.text
-msgid "Fields involved"
-msgstr "Raointean a tha an sàs ann"
-
-#: RelationDlg.src#DLG_REL_PROPERTIES.FL_CASC_UPD.fixedline.text
-msgid "Update options"
-msgstr "Ùraich na roghainnean"
-
-#: RelationDlg.src#DLG_REL_PROPERTIES.RB_NO_CASC_UPD.radiobutton.text
-msgctxt "RelationDlg.src#DLG_REL_PROPERTIES.RB_NO_CASC_UPD.radiobutton.text"
-msgid "~No action"
-msgstr "Gu~n ghnìomh"
-
-#: RelationDlg.src#DLG_REL_PROPERTIES.RB_CASC_UPD.radiobutton.text
-msgid "~Update cascade"
-msgstr "Ùraich ~an t-eas"
+#. QoyE
+#: directsql.src
+msgctxt ""
+"directsql.src\n"
+"DLG_DIRECTSQL\n"
+"PB_EXECUTE\n"
+"pushbutton.text"
+msgid "Execute"
+msgstr "Ruith"
 
-#: RelationDlg.src#DLG_REL_PROPERTIES.RB_CASC_UPD_NULL.radiobutton.text
-msgctxt "RelationDlg.src#DLG_REL_PROPERTIES.RB_CASC_UPD_NULL.radiobutton.text"
-msgid "~Set null"
-msgstr "~Suidhich mar neoini"
+#. Hqn@
+#: directsql.src
+msgctxt ""
+"directsql.src\n"
+"DLG_DIRECTSQL\n"
+"FT_HISTORY\n"
+"fixedtext.text"
+msgid "Previous commands"
+msgstr "Àitheantan roimhe seo"
 
-#: RelationDlg.src#DLG_REL_PROPERTIES.RB_CASC_UPD_DEFAULT.radiobutton.text
-msgctxt "RelationDlg.src#DLG_REL_PROPERTIES.RB_CASC_UPD_DEFAULT.radiobutton.text"
-msgid "Set ~default"
-msgstr "Sui~dhich mar roghainn bhunaiteach"
+#. SP#3
+#: directsql.src
+msgctxt ""
+"directsql.src\n"
+"DLG_DIRECTSQL\n"
+"FL_STATUS\n"
+"fixedline.text"
+msgid "Status"
+msgstr "Cor"
 
-#: RelationDlg.src#DLG_REL_PROPERTIES.FL_CASC_DEL.fixedline.text
-msgid "Delete options"
-msgstr "Sguab às na roghainnean"
+#. H(_C
+#: directsql.src
+msgctxt ""
+"directsql.src\n"
+"DLG_DIRECTSQL\n"
+"FL_OUTPUT\n"
+"fixedline.text"
+msgid "Output"
+msgstr "Às-chur"
+
+#. opUu
+#: directsql.src
+msgctxt ""
+"directsql.src\n"
+"DLG_DIRECTSQL\n"
+"PB_CLOSE\n"
+"pushbutton.text"
+msgid "Close"
+msgstr "Dùin"
 
-#: RelationDlg.src#DLG_REL_PROPERTIES.RB_NO_CASC_DEL.radiobutton.text
-msgctxt "RelationDlg.src#DLG_REL_PROPERTIES.RB_NO_CASC_DEL.radiobutton.text"
-msgid "~No action"
-msgstr "~Na dèan dad"
+#. 2b!X
+#: directsql.src
+msgctxt ""
+"directsql.src\n"
+"DLG_DIRECTSQL\n"
+"modaldialog.text"
+msgid "Execute SQL Statement"
+msgstr "Ruith an aithris SQL"
 
-#: RelationDlg.src#DLG_REL_PROPERTIES.RB_CASC_DEL.radiobutton.text
-msgid "Delete ~cascade"
-msgstr "Sgua~b às an t-eas"
+#. .qQZ
+#: directsql.src
+msgctxt ""
+"directsql.src\n"
+"STR_COMMAND_EXECUTED_SUCCESSFULLY\n"
+"string.text"
+msgid "Command successfully executed."
+msgstr "Chaidh an àithne a ruith gu soirbheachail."
 
-#: RelationDlg.src#DLG_REL_PROPERTIES.RB_CASC_DEL_NULL.radiobutton.text
-msgctxt "RelationDlg.src#DLG_REL_PROPERTIES.RB_CASC_DEL_NULL.radiobutton.text"
-msgid "~Set null"
-msgstr "~Suidhich mar neoini"
+#. ^@na
+#: directsql.src
+msgctxt ""
+"directsql.src\n"
+"STR_DIRECTSQL_CONNECTIONLOST\n"
+"string.text"
+msgid "The connection to the database has been lost. This dialog will be closed."
+msgstr "Chaidh an ceangal ris an stòr-dàta air chall. Thèid an còmhradh seo a dhùnadh."
 
-#: RelationDlg.src#DLG_REL_PROPERTIES.RB_CASC_DEL_DEFAULT.radiobutton.text
-msgctxt "RelationDlg.src#DLG_REL_PROPERTIES.RB_CASC_DEL_DEFAULT.radiobutton.text"
-msgid "Set ~default"
-msgstr "Sui~dhich mar roghainn bhunaiteach"
+#. Vu5}
+#: queryorder.src
+msgctxt ""
+"queryorder.src\n"
+"DLG_ORDERCRIT.LB_ORDERVALUE1\n"
+"1\n"
+"stringlist.text"
+msgid "ascending"
+msgstr "a' dìreadh"
 
-#: RelationDlg.src#DLG_REL_PROPERTIES.modaldialog.text
-msgid "Relations"
-msgstr "Càirdean"
+#. 7KG$
+#: queryorder.src
+msgctxt ""
+"queryorder.src\n"
+"DLG_ORDERCRIT.LB_ORDERVALUE1\n"
+"2\n"
+"stringlist.text"
+msgid "descending"
+msgstr "a' dìreadh"
 
-#: dsselect.src#DLG_DATASOURCE_SELECTION.FT_DESCRIPTION.fixedtext.text
-msgid "Choose a data source:"
-msgstr "Tagh an tùs-dàta:"
+#. ;|C!
+#: queryorder.src
+msgctxt ""
+"queryorder.src\n"
+"DLG_ORDERCRIT.LB_ORDERVALUE2\n"
+"1\n"
+"stringlist.text"
+msgid "ascending"
+msgstr "a' dìreadh"
 
-#: dsselect.src#DLG_DATASOURCE_SELECTION.PB_MANAGE.pushbutton.text
-msgid "Organize..."
-msgstr "Eagraich..."
+#. !9O5
+#: queryorder.src
+msgctxt ""
+"queryorder.src\n"
+"DLG_ORDERCRIT.LB_ORDERVALUE2\n"
+"2\n"
+"stringlist.text"
+msgid "descending"
+msgstr "a' teàrnadh"
 
-#: dsselect.src#DLG_DATASOURCE_SELECTION.PB_CREATE.pushbutton.text
-msgid "Create..."
-msgstr "Cruthaich..."
+#. .xG#
+#: queryorder.src
+msgctxt ""
+"queryorder.src\n"
+"DLG_ORDERCRIT.LB_ORDERVALUE3\n"
+"1\n"
+"stringlist.text"
+msgid "ascending"
+msgstr "a' teàrnadh"
 
-#: dsselect.src#DLG_DATASOURCE_SELECTION.STR_LOCAL_DATASOURCES.string.text
-msgid "Local Databases"
-msgstr "Stòir-dhàta ionadail"
+#. J@T?
+#: queryorder.src
+msgctxt ""
+"queryorder.src\n"
+"DLG_ORDERCRIT.LB_ORDERVALUE3\n"
+"2\n"
+"stringlist.text"
+msgid "descending"
+msgstr "a' teàrnadh"
 
-#: dsselect.src#DLG_DATASOURCE_SELECTION.STR_DESCRIPTION2.string.text
-msgid "Choose a database"
-msgstr "Tagh stòr-dàta"
+#. Ci!@
+#: queryorder.src
+msgctxt ""
+"queryorder.src\n"
+"DLG_ORDERCRIT\n"
+"FT_ORDERFIELD\n"
+"fixedtext.text"
+msgid "Field name"
+msgstr "Ainm an raoin"
 
-#: dsselect.src#DLG_DATASOURCE_SELECTION.modaldialog.text
-msgid "Data Source"
-msgstr "Tùs-dàta"
+#. /sG1
+#: queryorder.src
+msgctxt ""
+"queryorder.src\n"
+"DLG_ORDERCRIT\n"
+"FT_ORDERAFTER1\n"
+"fixedtext.text"
+msgid "and then"
+msgstr "agus an uairsin"
 
-#: AutoControls.src#STR_DBASE_PATH_OR_FILE.string.text
-msgid "Path to the dBASE files"
-msgstr "An t-slighe gu na faidhlichean dBASE"
+#. I3/[
+#: queryorder.src
+msgctxt ""
+"queryorder.src\n"
+"DLG_ORDERCRIT\n"
+"FT_ORDERAFTER2\n"
+"fixedtext.text"
+msgid "and then"
+msgstr "agus an uairsin"
 
-#: AutoControls.src#STR_FLAT_PATH_OR_FILE.string.text
-msgid "Path to the text files"
-msgstr "An t-slighe gu na faidhlichean teacsa"
+#. Cy)e
+#: queryorder.src
+msgctxt ""
+"queryorder.src\n"
+"DLG_ORDERCRIT\n"
+"FT_ORDEROPER\n"
+"fixedtext.text"
+msgid "Operator"
+msgstr "Gnìomharaiche"
 
-#: AutoControls.src#STR_CALC_PATH_OR_FILE.string.text
-msgid "Path to the spreadsheet document"
-msgstr "An t-slighe gu sgrìobhainn na cliath-dhuilleige"
+#. Sd%+
+#: queryorder.src
+msgctxt ""
+"queryorder.src\n"
+"DLG_ORDERCRIT\n"
+"FT_ORDERDIR\n"
+"fixedtext.text"
+msgid "Order"
+msgstr "Òrdugh"
 
-#: AutoControls.src#STR_NAME_OF_ODBC_DATASOURCE.string.text
-msgid "Name of the ODBC data source on your system"
-msgstr "Ainm an tùs-dàta ODBC air an t-siostam agad"
+#. Qyn7
+#: queryorder.src
+msgctxt ""
+"queryorder.src\n"
+"DLG_ORDERCRIT\n"
+"FL_ORDER\n"
+"fixedline.text"
+msgid "Sort order"
+msgstr "Òrdugh an t-seòrsachaidh"
 
-#: AutoControls.src#STR_MYSQL_DATABASE_NAME.string.text
-msgid "Name of the MySQL database"
-msgstr "Ainm an stòir-dhàta MySQL"
+#. pN.P
+#: queryorder.src
+msgctxt ""
+"queryorder.src\n"
+"DLG_ORDERCRIT\n"
+"STR_NOENTRY\n"
+"string.text"
+msgid "<none>"
+msgstr "<chan eil gin>"
 
-#: AutoControls.src#STR_ORACLE_DATABASE_NAME.string.text
-msgid "Name of the Oracle database"
-msgstr "Ainm an stòir-dhàta Oracle"
+#. 2Cd\
+#: queryorder.src
+msgctxt ""
+"queryorder.src\n"
+"DLG_ORDERCRIT\n"
+"modaldialog.text"
+msgid "Sort Order"
+msgstr "Òrdugh an t-seòrsachaidh"
 
-#: AutoControls.src#STR_MSACCESS_MDB_FILE.string.text
-msgid "Microsoft Access database file"
-msgstr "Faidhle stòir-dhàta Microsoft Access"
+#. 3k+d
+#: dlgattr.src
+msgctxt ""
+"dlgattr.src\n"
+"DLG_ATTR\n"
+"1\n"
+"pushbutton.text"
+msgid "Bac~k"
+msgstr "Air ai~s"
 
-#: AutoControls.src#STR_NO_ADDITIONAL_SETTINGS.string.text
-msgid "No more settings are necessary. To verify that the connection is working, click the '%test' button."
-msgstr "Chan eil feum air roghainnean a bharrachd. Gus dearbhadh gu bheil an ceangal ag obair, briog air a' phutan'%test'."
+#. b?cs
+#: dlgattr.src
+msgctxt ""
+"dlgattr.src\n"
+"DLG_ATTR\n"
+"TP_ATTR_CHAR\n"
+"string.text"
+msgid "Font"
+msgstr "Cruth-clò"
 
-#: AutoControls.src#STR_COMMONURL.string.text
-msgid "Datasource URL"
-msgstr "URL tùs an dàta"
+#. 2OM{
+#: dlgattr.src
+msgctxt ""
+"dlgattr.src\n"
+"DLG_ATTR\n"
+"TP_ATTR_NUMBER\n"
+"string.text"
+msgid "Format"
+msgstr "Fòrmat"
 
-#: AutoControls.src#STR_HOSTNAME.string.text
-msgctxt "AutoControls.src#STR_HOSTNAME.string.text"
-msgid "~Host name"
-msgstr "Ainm ~an òstair"
+#. 2pg9
+#: dlgattr.src
+msgctxt ""
+"dlgattr.src\n"
+"DLG_ATTR\n"
+"TP_ATTR_ALIGN\n"
+"string.text"
+msgid "Alignment"
+msgstr "Co-thaobhadh"
 
-#: AutoControls.src#STR_MOZILLA_PROFILE_NAME.string.text
-msgid "~Mozilla profile name"
-msgstr "Ainm na pròifile ~Mozilla"
+#. Ph37
+#: dlgattr.src
+msgctxt ""
+"dlgattr.src\n"
+"DLG_ATTR\n"
+"ST_ROW\n"
+"string.text"
+msgid "Table Format"
+msgstr "Fòrmat a' chlàir"
 
-#: AutoControls.src#STR_THUNDERBIRD_PROFILE_NAME.string.text
-msgid "~Thunderbird profile name"
-msgstr "Ainm na pròifile ~Thunderbird"
+#. rxJX
+#: dlgattr.src
+msgctxt ""
+"dlgattr.src\n"
+"DLG_ATTR\n"
+"tabdialog.text"
+msgid "Field Format"
+msgstr "Fòrmat an raoin"
 
-#: dbadmin.src#AUTO_USECATALOG_AUTO_Y_.CB_USECATALOG.checkbox.text
+#. c@0H
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"AUTO_USECATALOG(AUTO_Y)\n"
+"CB_USECATALOG\n"
+"checkbox.text"
 msgid "Use catalog for file-based databases"
 msgstr "Cleachd catalog airson stòir-dhàta a tha stèidhichte air faidhle"
 
-#: dbadmin.src#AUTO_FIXEDLINE_CONNSETTINGS_AUTO_Y_.FL_SEPARATOR1.fixedline.text
-msgctxt "dbadmin.src#AUTO_FIXEDLINE_CONNSETTINGS_AUTO_Y_.FL_SEPARATOR1.fixedline.text"
+#. ^ZGR
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"AUTO_FIXEDLINE_CONNSETTINGS(AUTO_Y)\n"
+"FL_SEPARATOR1\n"
+"fixedline.text"
 msgid "Connection Settings"
 msgstr "Roghainnean ceangail"
 
-#: dbadmin.src#AUTO_HOST_AND_PORT_AUTO_Y_.FT_HOSTNAME.fixedtext.text
-msgctxt "dbadmin.src#AUTO_HOST_AND_PORT_AUTO_Y_.FT_HOSTNAME.fixedtext.text"
+#. ejW]
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"AUTO_HOST_AND_PORT(AUTO_Y)\n"
+"FT_HOSTNAME\n"
+"fixedtext.text"
 msgid "~Host name"
 msgstr "Ain~m an òstair"
 
-#: dbadmin.src#AUTO_HOST_AND_PORT_AUTO_Y_.FT_PORTNUMBER.fixedtext.text
-msgctxt "dbadmin.src#AUTO_HOST_AND_PORT_AUTO_Y_.FT_PORTNUMBER.fixedtext.text"
+#. DX0)
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"AUTO_HOST_AND_PORT(AUTO_Y)\n"
+"FT_PORTNUMBER\n"
+"fixedtext.text"
 msgid "~Port number"
 msgstr "Àireamh a' ~phuirt"
 
-#: dbadmin.src#DLG_DATABASE_ADMINISTRATION.STR_PAGETITLE_GENERAL.string.text
+#. E=m_
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"DLG_DATABASE_ADMINISTRATION\n"
+"STR_PAGETITLE_GENERAL\n"
+"string.text"
 msgid "Advanced Properties"
 msgstr "Roghainnean adhartach"
 
-#: dbadmin.src#DLG_DATABASE_ADMINISTRATION.STR_PAGETITLE_ADVANCED.string.text
+#. XEmD
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"DLG_DATABASE_ADMINISTRATION\n"
+"STR_PAGETITLE_ADVANCED\n"
+"string.text"
 msgid "Additional Settings"
 msgstr "Roghainnean a bharrachd"
 
-#: dbadmin.src#DLG_DATABASE_ADMINISTRATION.STR_PAGETITLE_CONNECTION.string.text
+#. L=D~
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"DLG_DATABASE_ADMINISTRATION\n"
+"STR_PAGETITLE_CONNECTION\n"
+"string.text"
 msgid "Connection settings"
 msgstr "Roghainnean ceangail"
 
-#: dbadmin.src#DLG_DATABASE_ADMINISTRATION.tabdialog.text
-msgctxt "dbadmin.src#DLG_DATABASE_ADMINISTRATION.tabdialog.text"
+#. ]q!n
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"DLG_DATABASE_ADMINISTRATION\n"
+"tabdialog.text"
 msgid "Database properties"
 msgstr "Roghainnean stòir-dhàta"
 
-#: dbadmin.src#DLG_DATABASE_TYPE_CHANGE.modaldialog.text
-msgctxt "dbadmin.src#DLG_DATABASE_TYPE_CHANGE.modaldialog.text"
+#. pRGW
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"DLG_DATABASE_TYPE_CHANGE\n"
+"modaldialog.text"
 msgid "Database properties"
 msgstr "Roghainnean stòir-dhàta"
 
-#: dbadmin.src#PAGE_GENERAL.FT_GENERALHEADERTEXT.fixedtext.text
+#. =Pu^
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_GENERAL\n"
+"FT_GENERALHEADERTEXT\n"
+"fixedtext.text"
 msgid "Welcome to the %PRODUCTNAME Database Wizard"
 msgstr "Fàilte gu draoidh nan stòr-dàta aig %PRODUCTNAME"
 
-#: dbadmin.src#PAGE_GENERAL.FT_GENERALHELPTEXT.fixedtext.text
+#. })5x
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_GENERAL\n"
+"FT_GENERALHELPTEXT\n"
+"fixedtext.text"
 msgid "Use the Database Wizard to create a new database, open an existing database file, or connect to a database stored on a server."
 msgstr "Cleachd draoidh nan stòr-dàta gus stòr-dàtaùr a chruthachadh, faidhle stòir-dhàta a tha ann mu thràth fhosgladh no ceangal ri stòr-dàta a tha air frithealaiche."
 
-#: dbadmin.src#PAGE_GENERAL.FT_DATASOURCEHEADER.fixedtext.text
+#. /f4U
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_GENERAL\n"
+"FT_DATASOURCEHEADER\n"
+"fixedtext.text"
 msgid "What do you want to do?"
 msgstr "Dè tha thu airson dèanamh?"
 
-#: dbadmin.src#PAGE_GENERAL.RB_CREATEDBDATABASE.radiobutton.text
+#. ^h6]
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_GENERAL\n"
+"RB_CREATEDBDATABASE\n"
+"radiobutton.text"
 msgid "Create a n~ew database"
 msgstr "Cruthaich ~stòr-dàta ùr"
 
-#: dbadmin.src#PAGE_GENERAL.RB_OPENEXISTINGDOC.radiobutton.text
+#. ,hb*
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_GENERAL\n"
+"RB_OPENEXISTINGDOC\n"
+"radiobutton.text"
 msgid "Open an existing database ~file"
 msgstr "Fosgail ~faidhle stòir-dhàta a tha ann mu thràth"
 
-#: dbadmin.src#PAGE_GENERAL.FT_DOCLISTLABEL.fixedtext.text
+#. `Xr@
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_GENERAL\n"
+"FT_DOCLISTLABEL\n"
+"fixedtext.text"
 msgid "Recently used"
 msgstr "'Ga chleachdadh o chionn ghoirid"
 
-#: dbadmin.src#PAGE_GENERAL.RB_GETEXISTINGDATABASE.radiobutton.text
+#. R-kZ
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_GENERAL\n"
+"RB_GETEXISTINGDATABASE\n"
+"radiobutton.text"
 msgid "Connect to an e~xisting database"
 msgstr "Ceangail ri stòr-dàta a tha ann ~mu thràth"
 
-#: dbadmin.src#PAGE_GENERAL.FT_DATASOURCETYPE_PRE.fixedtext.text
+#. 9=#0
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_GENERAL\n"
+"FT_DATASOURCETYPE_PRE\n"
+"fixedtext.text"
 msgid "Select the type of database to which you want to establish a connection."
 msgstr "Tagh seòrsa an stòir-dhàta ris a nithear ceangal."
 
-#: dbadmin.src#PAGE_GENERAL.FT_DATATYPE.fixedtext.text
+#. N@Z\
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_GENERAL\n"
+"FT_DATATYPE\n"
+"fixedtext.text"
 msgid "Database ~type "
 msgstr "Seòrsa an stòir-dhà~ta "
 
-#: dbadmin.src#PAGE_GENERAL.FT_DATATYPEAPPENDIX.fixedtext.text
+#. 0:5]
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_GENERAL\n"
+"FT_DATATYPEAPPENDIX\n"
+"fixedtext.text"
 msgid "Database"
 msgstr "Stòr-dàta"
 
-#: dbadmin.src#PAGE_GENERAL.FT_DATASOURCETYPE_POST.fixedtext.text
+#. kO@$
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_GENERAL\n"
+"FT_DATASOURCETYPE_POST\n"
+"fixedtext.text"
 msgid ""
 "On the following pages, you can make detailed settings for the connection.\n"
 "\n"
@@ -1476,19 +3293,43 @@ msgstr ""
 "\n"
 "Thèid na roghainnean ùra an àite nan roghainnean a tha ann an-dràsta."
 
-#: dbadmin.src#PAGE_GENERAL.STR_MYSQLENTRY.string.text
+#. e~n0
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_GENERAL\n"
+"STR_MYSQLENTRY\n"
+"string.text"
 msgid "MySQL"
 msgstr "MySQL"
 
-#: dbadmin.src#PAGE_GENERAL.STR_PARENTTITLE.string.text
+#. *it,
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_GENERAL\n"
+"STR_PARENTTITLE\n"
+"string.text"
 msgid "Data Source Properties: #"
 msgstr "Roghainnean an tùs-dàta: #"
 
-#: dbadmin.src#PAGE_GENERAL.STR_COULDNOTLOAD_ODBCLIB.string.text
+#. w0gU
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_GENERAL\n"
+"STR_COULDNOTLOAD_ODBCLIB\n"
+"string.text"
 msgid "Could not load the program library #lib# or it is corrupted. The ODBC data source selection is not available."
 msgstr "Cha do ghabh leabhar-lann nam prògram #lib# a luchdadh no chaidh a thruailleadh. Chan eil tadhagh tùs-dàta ODBC ri fhaighinn."
 
-#: dbadmin.src#PAGE_GENERAL.STR_UNSUPPORTED_DATASOURCE_TYPE.string.text
+#. f^dK
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_GENERAL\n"
+"STR_UNSUPPORTED_DATASOURCE_TYPE\n"
+"string.text"
 msgid ""
 "This kind of data source is not supported on this platform.\n"
 "You are allowed to change the settings, but you probably will not be able to connect to the database."
@@ -1496,103 +3337,328 @@ msgstr ""
 "Chan eil taic ann do sheòrsa an tùs-dàta seo air an ùrlar seo.\n"
 "Tha cead agad na roghainnean atharrachadh ach 's mathaid nach urrainn dhut ceangal ris an stòr-dàta."
 
-#: dbadmin.src#PAGE_GENERAL.tabpage.text
-msgctxt "dbadmin.src#PAGE_GENERAL.tabpage.text"
+#. C*#+
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_GENERAL\n"
+"tabpage.text"
 msgid "General"
 msgstr "Coitcheann"
 
-#: dbadmin.src#PAGE_DBASE.FL_SEPARATOR1.fixedline.text
+#. 0NKa
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_DBASE\n"
+"FL_SEPARATOR1\n"
+"fixedline.text"
 msgid "Optional settings"
 msgstr "Roghainnean roghainneil"
 
-#: dbadmin.src#PAGE_DBASE.CB_SHOWDELETEDROWS.checkbox.text
+#. 3aG,
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_DBASE\n"
+"CB_SHOWDELETEDROWS\n"
+"checkbox.text"
 msgid "Display deleted records as well"
 msgstr "Seall na reacordan a chaidh a sguabadh às cuideachd"
 
-#: dbadmin.src#PAGE_DBASE.FT_SPECIAL_MESSAGE.fixedtext.text
+#. 5ERl
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_DBASE\n"
+"FT_SPECIAL_MESSAGE\n"
+"fixedtext.text"
 msgid "Note: When deleted, and thus inactive, records are displayed, you will not be able to delete records from the data source."
 msgstr "An aire: Nuair a thèid reacordan a chaidh a sguabadh às, is a tha neo-ghnìomhach mar sin, a shealltainn chan urrainn dhut reacordan a sguabadh às an tùs-dàta."
 
-#: dbadmin.src#PAGE_DBASE.PB_INDICIES.pushbutton.text
+#. b$A0
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_DBASE\n"
+"PB_INDICIES\n"
+"pushbutton.text"
 msgid "Indexes..."
 msgstr "Clàir-amais..."
 
-#: dbadmin.src#PAGE_ODBC.FL_SEPARATOR1.fixedline.text
+#. #o]#
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_ODBC\n"
+"FL_SEPARATOR1\n"
+"fixedline.text"
 msgid "Optional Settings"
 msgstr "Roghainnean roghainneil"
 
-#: dbadmin.src#PAGE_ODBC.FT_OPTIONS.fixedtext.text
+#. F{_:
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_ODBC\n"
+"FT_OPTIONS\n"
+"fixedtext.text"
 msgid "ODBC ~options"
 msgstr "R~oghainnean ODBC"
 
-#: dbadmin.src#PAGE_MYSQL_JDBC.FT_JDBCDRIVERCLASS.fixedtext.text
+#. %()v
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_MYSQL_JDBC\n"
+"FT_JDBCDRIVERCLASS\n"
+"fixedtext.text"
 msgid "MySQL JDBC d~river class"
 msgstr "Clas d~raibhear MySQL JDBC"
 
-#: dbadmin.src#PAGE_MYSQL_JDBC.PB_TESTDRIVERCLASS.pushbutton.text
-msgctxt "dbadmin.src#PAGE_MYSQL_JDBC.PB_TESTDRIVERCLASS.pushbutton.text"
+#. ~|U$
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_MYSQL_JDBC\n"
+"PB_TESTDRIVERCLASS\n"
+"pushbutton.text"
 msgid "Test class"
 msgstr "Clas deuchainne"
 
-#: dbadmin.src#PAGE_MYSQL_NATIVE.FL_SEPARATOR2.fixedline.text
-msgctxt "dbadmin.src#PAGE_MYSQL_NATIVE.FL_SEPARATOR2.fixedline.text"
+#. hahS
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_MYSQL_NATIVE\n"
+"FL_SEPARATOR2\n"
+"fixedline.text"
 msgid "User authentication"
 msgstr "Dearbhadh cleachdaiche"
 
-#: dbadmin.src#PAGE_MYSQL_NATIVE.FT_USERNAME.fixedtext.text
-msgctxt "dbadmin.src#PAGE_MYSQL_NATIVE.FT_USERNAME.fixedtext.text"
+#. Pbb,
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_MYSQL_NATIVE\n"
+"FT_USERNAME\n"
+"fixedtext.text"
 msgid "~User name"
 msgstr "Ainm ~cleachdaiche"
 
-#: dbadmin.src#PAGE_MYSQL_NATIVE.CB_PASSWORD_REQUIRED.checkbox.text
-msgctxt "dbadmin.src#PAGE_MYSQL_NATIVE.CB_PASSWORD_REQUIRED.checkbox.text"
+#. ~Txm
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_MYSQL_NATIVE\n"
+"CB_PASSWORD_REQUIRED\n"
+"checkbox.text"
 msgid "Password required"
 msgstr "Tha feum air facal-faire"
 
-#: dbadmin.src#PAGE_ORACLE_JDBC.FT_JDBCDRIVERCLASS.fixedtext.text
+#. (Av;
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_ORACLE_JDBC\n"
+"FT_JDBCDRIVERCLASS\n"
+"fixedtext.text"
 msgid "Oracle JDBC d~river class"
 msgstr "Clas d~raibhear Oracle JDBC"
 
-#: dbadmin.src#PAGE_ORACLE_JDBC.PB_TESTDRIVERCLASS.pushbutton.text
-msgctxt "dbadmin.src#PAGE_ORACLE_JDBC.PB_TESTDRIVERCLASS.pushbutton.text"
+#. !fXk
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_ORACLE_JDBC\n"
+"PB_TESTDRIVERCLASS\n"
+"pushbutton.text"
 msgid "Test class"
 msgstr "Clas deuchainne"
 
-#: dbadmin.src#PAGE_LDAP.FL_SEPARATOR1.fixedline.text
-msgctxt "dbadmin.src#PAGE_LDAP.FL_SEPARATOR1.fixedline.text"
+#. g!\o
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_LDAP\n"
+"FL_SEPARATOR1\n"
+"fixedline.text"
 msgid "Connection Settings"
 msgstr "Roghainnean ceangail"
 
-#: dbadmin.src#PAGE_LDAP.FT_BASEDN.fixedtext.text
+#. =r!-
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_LDAP\n"
+"FT_BASEDN\n"
+"fixedtext.text"
 msgid "~Base DN"
 msgstr "DN ~bunasach"
 
-#: dbadmin.src#PAGE_LDAP.CB_USESSL.checkbox.text
+#. B\Ag
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_LDAP\n"
+"CB_USESSL\n"
+"checkbox.text"
 msgid "Use secure connection (SSL)"
 msgstr "Cleachd ceangal tèarainte (SSL)"
 
-#: dbadmin.src#PAGE_LDAP.FT_PORTNUMBER.fixedtext.text
-msgctxt "dbadmin.src#PAGE_LDAP.FT_PORTNUMBER.fixedtext.text"
+#. WpTf
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_LDAP\n"
+"FT_PORTNUMBER\n"
+"fixedtext.text"
 msgid "~Port number"
 msgstr "Àireamh a' ~phuirt"
 
-#: dbadmin.src#PAGE_LDAP.FT_LDAPROWCOUNT.fixedtext.text
+#. GQcj
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_LDAP\n"
+"FT_LDAPROWCOUNT\n"
+"fixedtext.text"
 msgid "Maximum number of ~records"
 msgstr "Àireamh as motha de ~reacordan"
 
-#: dbadmin.src#PAGE_USERDRIVER.FT_HOSTNAME.fixedtext.text
+#. =`Pn
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_USERDRIVER\n"
+"FT_HOSTNAME\n"
+"fixedtext.text"
 msgid "~Hostname"
 msgstr "~Ainm an òstair"
 
-#: dbadmin.src#PAGE_USERDRIVER.FT_PORTNUMBER.fixedtext.text
-msgctxt "dbadmin.src#PAGE_USERDRIVER.FT_PORTNUMBER.fixedtext.text"
+#. 5!kk
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_USERDRIVER\n"
+"FT_PORTNUMBER\n"
+"fixedtext.text"
 msgid "~Port number"
 msgstr "Àireamh a' ~phuirt"
 
-#: dbadmin.src#PAGE_USERDRIVER.FT_OPTIONS.fixedtext.text
+#. /w7`
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"PAGE_USERDRIVER\n"
+"FT_OPTIONS\n"
+"fixedtext.text"
 msgid "~Driver settings"
 msgstr "Roghainnean nan ~draibhear"
 
-#: dbadmin.src#STR_ERR_USE_CONNECT_TO.string.text
+#. ;`uA
+#: dbadmin.src
+msgctxt ""
+"dbadmin.src\n"
+"STR_ERR_USE_CONNECT_TO\n"
+"string.text"
 msgid "Please choose 'Connect to an existing database' to connect to an existing database instead."
 msgstr "Tagh 'Ceangail ri stòr-dàta a tha ann mu thràth' gus ceangal a dhèanamh ri stòr-dàta a tha ann mu thràth 'na àite."
+
+#. v)e%
+#: dlgsave.src
+msgctxt ""
+"dlgsave.src\n"
+"DLG_SAVE_AS\n"
+"FT_DESCRIPTION\n"
+"fixedtext.text"
+msgid "Please enter a name for the object to be created:"
+msgstr "Cuir a-steach ainm airson an oibseict a thèid a chruthachadh:"
+
+#. c3eC
+#: dlgsave.src
+msgctxt ""
+"dlgsave.src\n"
+"DLG_SAVE_AS\n"
+"FT_CATALOG\n"
+"fixedtext.text"
+msgid "~Catalog"
+msgstr "~Catalog"
+
+#. Z0U.
+#: dlgsave.src
+msgctxt ""
+"dlgsave.src\n"
+"DLG_SAVE_AS\n"
+"FT_SCHEMA\n"
+"fixedtext.text"
+msgid "~Schema"
+msgstr "~Sgeama"
+
+#. `D?l
+#: dlgsave.src
+msgctxt ""
+"dlgsave.src\n"
+"DLG_SAVE_AS\n"
+"STR_TBL_LABEL\n"
+"string.text"
+msgid "~Table Name"
+msgstr "Ainm a' ~chlàir"
+
+#. e[Yw
+#: dlgsave.src
+msgctxt ""
+"dlgsave.src\n"
+"DLG_SAVE_AS\n"
+"STR_VW_LABEL\n"
+"string.text"
+msgid "~Name of table view"
+msgstr "Ainm ~sealladh a' chlàir"
+
+#. ape!
+#: dlgsave.src
+msgctxt ""
+"dlgsave.src\n"
+"DLG_SAVE_AS\n"
+"STR_QRY_LABEL\n"
+"string.text"
+msgid "~Query name"
+msgstr "Ainm ~na ceiste"
+
+#. j1j;
+#: dlgsave.src
+msgctxt ""
+"dlgsave.src\n"
+"DLG_SAVE_AS\n"
+"STR_TITLE_RENAME\n"
+"string.text"
+msgid "Rename to"
+msgstr "Cuir ainm ùr air"
+
+#. 7+Kr
+#: dlgsave.src
+msgctxt ""
+"dlgsave.src\n"
+"DLG_SAVE_AS\n"
+"STR_TITLE_PASTE_AS\n"
+"string.text"
+msgid "Insert as"
+msgstr "Cuir a-steach mar"
+
+#. sloO
+#: dlgsave.src
+msgctxt ""
+"dlgsave.src\n"
+"DLG_SAVE_AS\n"
+"modaldialog.text"
+msgid "Save As"
+msgstr "Sàbhail mar"
+
+#. n]DW
+#: textconnectionsettings.src
+msgctxt ""
+"textconnectionsettings.src\n"
+"DLG_TEXT_CONNECTION_SETTINGS\n"
+"modaldialog.text"
+msgid "Text Connection Settings"
+msgstr "Roghainnean ceangal teacsa"
diff --git a/source/gd/dbaccess/source/ui/inc.po b/source/gd/dbaccess/source/ui/inc.po
index a27f246140c..ad7a2bc2746 100644
--- a/source/gd/dbaccess/source/ui/inc.po
+++ b/source/gd/dbaccess/source/ui/inc.po
@@ -1,10 +1,10 @@
-#. extracted from dbaccess/source/ui/inc.oo
+#. extracted from dbaccess/source/ui/inc
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+dbaccess%2Fsource%2Fui%2Finc.oo&subcomponent=ui\n"
-"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2011-05-28 22:52+0200\n"
+"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
+"POT-Creation-Date: 2012-11-17 19:02+0200\n"
+"PO-Revision-Date: 2012-08-24 12:53+0200\n"
 "Last-Translator: Michael <fios@akerbeltz.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: gd\n"
@@ -12,49 +12,104 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "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-Generator: Translate Toolkit 1.9.0\n"
+"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
 
-#: toolbox_tmpl.hrc#MID_SBA_QRY_REFRESH.#define.text
+#. y~aA
+#: toolbox_tmpl.hrc
+msgctxt ""
+"toolbox_tmpl.hrc\n"
+"MID_SBA_QRY_REFRESH\n"
+"#define.text"
 msgid "Refresh"
-msgstr "Ùraich"
+msgstr "Ath-nuadhaich"
 
-#: toolbox_tmpl.hrc#MID_NEW_VIEW_DESIGN.#define.text
+#. .g*Q
+#: toolbox_tmpl.hrc
+msgctxt ""
+"toolbox_tmpl.hrc\n"
+"MID_NEW_VIEW_DESIGN\n"
+"#define.text"
 msgid "New ~View Design"
 msgstr "Dealbhadh ~sheallaidh ùr"
 
-#: toolbox_tmpl.hrc#MID_NEW_TABLE_DESIGN.#define.text
+#. Z39f
+#: toolbox_tmpl.hrc
+msgctxt ""
+"toolbox_tmpl.hrc\n"
+"MID_NEW_TABLE_DESIGN\n"
+"#define.text"
 msgid "New ~Table Design"
 msgstr "Dealbhadh ~clàir ùr"
 
-#: toolbox_tmpl.hrc#MID_QUERY_WIZARD.#define.text
+#. xZ!m
+#: toolbox_tmpl.hrc
+msgctxt ""
+"toolbox_tmpl.hrc\n"
+"MID_QUERY_WIZARD\n"
+"#define.text"
 msgid "Query AutoPilot..."
 msgstr "Fèin-phaidhleat ceiste..."
 
-#: toolbox_tmpl.hrc#MID_QUERY_NEW_DESIGN.#define.text
+#. gmw^
+#: toolbox_tmpl.hrc
+msgctxt ""
+"toolbox_tmpl.hrc\n"
+"MID_QUERY_NEW_DESIGN\n"
+"#define.text"
 msgid "New ~Query (Design View)"
 msgstr "Ceist ù~r (Sealladh dealbhaidh)"
 
-#: toolbox_tmpl.hrc#MID_QUERY_EDIT_DESIGN.#define.text
+#. XmK)
+#: toolbox_tmpl.hrc
+msgctxt ""
+"toolbox_tmpl.hrc\n"
+"MID_QUERY_EDIT_DESIGN\n"
+"#define.text"
 msgid "~Edit Query"
 msgstr "D~easaich a' cheist"
 
-#: toolbox_tmpl.hrc#MID_QUERY_NEW_SQL.#define.text
+#. {Vbo
+#: toolbox_tmpl.hrc
+msgctxt ""
+"toolbox_tmpl.hrc\n"
+"MID_QUERY_NEW_SQL\n"
+"#define.text"
 msgid "New Query (~SQL View)"
 msgstr "Ceist ùr (Sealladh ~SQL)"
 
-#: toolbox_tmpl.hrc#MID_DBUI_QUERY_EDIT_JOINCONNECTION.#define.text
+#. hUMy
+#: toolbox_tmpl.hrc
+msgctxt ""
+"toolbox_tmpl.hrc\n"
+"MID_DBUI_QUERY_EDIT_JOINCONNECTION\n"
+"#define.text"
 msgid "Edit..."
 msgstr "Deasaich..."
 
-#: toolbox_tmpl.hrc#MID_COLUMN_WIDTH.#define.text
+#. KH%8
+#: toolbox_tmpl.hrc
+msgctxt ""
+"toolbox_tmpl.hrc\n"
+"MID_COLUMN_WIDTH\n"
+"#define.text"
 msgid "Column ~Width..."
 msgstr "~Leud a' chuilbh..."
 
-#: toolbox_tmpl.hrc#MID_DOCUMENT_CREATE_REPWIZ.#define.text
+#. B3ba
+#: toolbox_tmpl.hrc
+msgctxt ""
+"toolbox_tmpl.hrc\n"
+"MID_DOCUMENT_CREATE_REPWIZ\n"
+"#define.text"
 msgid "Report Wizard..."
 msgstr "Draoidh nan aithisgean..."
 
-#: toolbox_tmpl.hrc#MID_DOCUMENT_NEW_AUTOPILOT.#define.text
+#. #v:m
+#: toolbox_tmpl.hrc
+msgctxt ""
+"toolbox_tmpl.hrc\n"
+"MID_DOCUMENT_NEW_AUTOPILOT\n"
+"#define.text"
 msgid "Form AutoPilot..."
 msgstr "Fèin-phaidhleat foirm..."
diff --git a/source/gd/dbaccess/source/ui/misc.po b/source/gd/dbaccess/source/ui/misc.po
index a272b3c19aa..2ea66ded480 100644
--- a/source/gd/dbaccess/source/ui/misc.po
+++ b/source/gd/dbaccess/source/ui/misc.po
@@ -1,9 +1,9 @@
-#. extracted from dbaccess/source/ui/misc.oo
+#. extracted from dbaccess/source/ui/misc
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+dbaccess%2Fsource%2Fui%2Fmisc.oo&subcomponent=ui\n"
-"POT-Creation-Date: 2012-07-04 16:40+0200\n"
+"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
+"POT-Creation-Date: 2012-11-17 19:02+0200\n"
 "PO-Revision-Date: 2011-10-10 19:52+0200\n"
 "Last-Translator: Michael <fios@akerbeltz.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,197 +12,447 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "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-Generator: Translate Toolkit 1.9.0\n"
+"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
 
-#: dbumiscres.src#RSC_CHARSETS.1.string.text
-msgid "System"
-msgstr "Siostam"
-
-#: dbumiscres.src#STR_ERROR_DURING_CREATION.string.text
-msgid "Error during creation"
-msgstr "Mearachd rè a chruthachaidh"
-
-#: dbumiscres.src#STR_UNEXPECTED_ERROR.string.text
-msgid "An unexpected error occurred. The operation could not be performed."
-msgstr "Thachair mearachd gun mhìneachadh. Cha do ghabh an gnìomh a thoirt gu buil."
-
-#: dbumiscres.src#STR_COULDNOTOPEN_LINKEDDOC.string.text
-msgid "The document \"$file$\" could not be opened."
-msgstr "Cha do ghabh an sgrìobhainn \"$file$\" fhosgladh."
-
-#: dbumiscres.src#STR_MISSING_TABLES_XDROP.string.text
-msgid "The table cannot be deleted because the database connection does not support this."
-msgstr "Cha do ghabh an clàr a sguabadh às a chionn 's nach eil ceangal an stòir-dhàta a' cur taic ris."
-
-#: dbumiscres.src#STR_BUTTON_TEXT_ALL.string.text
-msgctxt "dbumiscres.src#STR_BUTTON_TEXT_ALL.string.text"
-msgid "~All"
-msgstr "~A h-uile"
-
-#: dbumiscres.src#STR_UNDO_COLON.string.text
-msgid "Undo:"
-msgstr "Neo-dhèan:"
-
-#: dbumiscres.src#STR_REDO_COLON.string.text
-msgid "Redo:"
-msgstr "Ath-dhèan:"
-
-#: dbumiscres.src#STR_UNKNOWN_TYPE_FOUND.string.text
-msgid "No corresponding column type could be found for column '#1'."
-msgstr "Cha deach seòrsa cuilbh co-fhreagrach a lorg airson a' chuilbh '#1'."
-
-#: dbumiscres.src#STR_FILE_DOES_NOT_EXIST.string.text
-msgid "The file \"$file$\" does not exist."
-msgstr "Chan eil am faidhle \"$file$\" ann."
-
-#: dbumiscres.src#STR_WARNINGS_DURING_CONNECT.string.text
-msgid "Warnings were encountered while connecting to the data source. Press \"$buttontext$\" to view them."
-msgstr "Fhuaradh rabhaidhean fhad 's a chaidh ceangal a dhèanamh ris an tùs-dàta. Briog air \"$buttontext$\" gus fhaicinn."
-
-#: dbumiscres.src#STR_NAMED_OBJECT_ALREADY_EXISTS.string.text
-msgid ""
-"The name '$#$' already exists.\n"
-"Please enter another name."
-msgstr ""
-"Tha an t-ainm '$#$' ann mu thràth.\n"
-"Cuir a-steach ainm eile."
-
-#: dbumiscres.src#RID_STR_EXTENSION_NOT_PRESENT.string.text
-msgid "The report, \"$file$\", requires the extension Oracle Report Builder."
-msgstr "Tha feum aig an aithisg \"$file$\" air an leudachan Oracle Report Builder."
-
-#: WizardPages.src#STR_WIZ_COLUMN_SELECT_TITEL.string.text
+#. kTJJ
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"STR_WIZ_COLUMN_SELECT_TITEL\n"
+"string.text"
 msgid "Apply columns"
 msgstr "Cuir an sàs na colbhan"
 
-#: WizardPages.src#STR_WIZ_TYPE_SELECT_TITEL.string.text
+#. OCCW
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"STR_WIZ_TYPE_SELECT_TITEL\n"
+"string.text"
 msgid "Type formatting"
 msgstr "Fòrmatadh an t-seòrsa"
 
-#: WizardPages.src#STR_WIZ_PKEY_ALREADY_DEFINED.string.text
+#. oYJb
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"STR_WIZ_PKEY_ALREADY_DEFINED\n"
+"string.text"
 msgid "The following fields have already been set as primary keys:\n"
 msgstr "Chaidh na raointean a leanas a shuidheachadh mar phrìomh-iuchraichean mu thràth:\n"
 
-#: WizardPages.src#STR_WIZ_NAME_MATCHING_TITEL.string.text
+#. ?DZP
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"STR_WIZ_NAME_MATCHING_TITEL\n"
+"string.text"
 msgid "Assign columns"
 msgstr "Iomruin na colbhan"
 
-#: WizardPages.src#WIZ_RTFCOPYTABLE.PB_HELP.helpbutton.text
+#. {.7a
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"WIZ_RTFCOPYTABLE\n"
+"PB_HELP\n"
+"helpbutton.text"
 msgid "~Help"
 msgstr "Cob~hair"
 
-#: WizardPages.src#WIZ_RTFCOPYTABLE.PB_CANCEL.cancelbutton.text
+#. ?{e|
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"WIZ_RTFCOPYTABLE\n"
+"PB_CANCEL\n"
+"cancelbutton.text"
 msgid "~Cancel"
 msgstr "~Sguir dheth"
 
-#: WizardPages.src#WIZ_RTFCOPYTABLE.PB_PREV.pushbutton.text
+#. EJ$?
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"WIZ_RTFCOPYTABLE\n"
+"PB_PREV\n"
+"pushbutton.text"
 msgid "< ~Back"
 msgstr "< ~Air ais"
 
-#: WizardPages.src#WIZ_RTFCOPYTABLE.PB_NEXT.pushbutton.text
+#. XLgB
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"WIZ_RTFCOPYTABLE\n"
+"PB_NEXT\n"
+"pushbutton.text"
 msgid "~Next>"
 msgstr "Air a~dhart >"
 
-#: WizardPages.src#WIZ_RTFCOPYTABLE.PB_OK.okbutton.text
+#. !Ss)
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"WIZ_RTFCOPYTABLE\n"
+"PB_OK\n"
+"okbutton.text"
 msgid "C~reate"
 msgstr "C~ruthaich"
 
-#: WizardPages.src#WIZ_RTFCOPYTABLE.modaldialog.text
+#. 5}TZ
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"WIZ_RTFCOPYTABLE\n"
+"modaldialog.text"
 msgid "Copy RTF Table"
 msgstr "Dèan lethbhreac dhen chlàr RTF"
 
-#: WizardPages.src#TAB_WIZ_COLUMN_SELECT.FL_COLUMN_SELECT.fixedline.text
+#. Nhe\
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"TAB_WIZ_COLUMN_SELECT\n"
+"FL_COLUMN_SELECT\n"
+"fixedline.text"
 msgid "Existing columns"
 msgstr "Colbhan a tha ann"
 
-#: WizardPages.src#TAB_WIZ_TYPE_SELECT.FL_COLUMN_NAME.fixedline.text
+#. E#D^
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"TAB_WIZ_TYPE_SELECT\n"
+"FL_COLUMN_NAME\n"
+"fixedline.text"
 msgid "Column information"
 msgstr "Fiosrachadh a' chuilbh"
 
-#: WizardPages.src#TAB_WIZ_TYPE_SELECT.FL_AUTO_TYPE.fixedline.text
+#. ,9{H
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"TAB_WIZ_TYPE_SELECT\n"
+"FL_AUTO_TYPE\n"
+"fixedline.text"
 msgid "Automatic type recognition"
 msgstr "Fèin-aithneachadh an t-seòrsa"
 
-#: WizardPages.src#TAB_WIZ_TYPE_SELECT.FT_AUTO.fixedtext.text
+#. `NE6
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"TAB_WIZ_TYPE_SELECT\n"
+"FT_AUTO\n"
+"fixedtext.text"
 msgid "Lines (ma~x)"
 msgstr "Loidhnichean (àireamh as ~motha)"
 
-#: WizardPages.src#RID_SBA_RTF_PKEYPOPUP.SID_TABLEDESIGN_TABED_PRIMARYKEY.menuitem.text
+#. $+=1
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"RID_SBA_RTF_PKEYPOPUP\n"
+"SID_TABLEDESIGN_TABED_PRIMARYKEY\n"
+"menuitem.text"
 msgid "Primary Key"
 msgstr "Prìomh-iuchair"
 
-#: WizardPages.src#TAB_WIZ_NAME_MATCHING.FT_TABLE_LEFT.fixedtext.text
+#. AX+?
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"TAB_WIZ_NAME_MATCHING\n"
+"FT_TABLE_LEFT\n"
+"fixedtext.text"
 msgid "Source table: \n"
 msgstr "An tùs-chlàr: \n"
 
-#: WizardPages.src#TAB_WIZ_NAME_MATCHING.FT_TABLE_RIGHT.fixedtext.text
+#. hf?!
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"TAB_WIZ_NAME_MATCHING\n"
+"FT_TABLE_RIGHT\n"
+"fixedtext.text"
 msgid "Destination table: \n"
 msgstr "An clàr-uidhe: \n"
 
-#: WizardPages.src#TAB_WIZ_NAME_MATCHING.PB_ALL.pushbutton.text
-msgctxt "WizardPages.src#TAB_WIZ_NAME_MATCHING.PB_ALL.pushbutton.text"
+#. {O8B
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"TAB_WIZ_NAME_MATCHING\n"
+"PB_ALL\n"
+"pushbutton.text"
 msgid "~All"
 msgstr "~A h-uile"
 
-#: WizardPages.src#TAB_WIZ_NAME_MATCHING.PB_NONE.pushbutton.text
+#. ZWa*
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"TAB_WIZ_NAME_MATCHING\n"
+"PB_NONE\n"
+"pushbutton.text"
 msgid "Non~e"
 msgstr "Chan ~eil gin"
 
-#: WizardPages.src#TAB_WIZ_COPYTABLE.FT_TABLENAME.fixedtext.text
+#. gcfF
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"TAB_WIZ_COPYTABLE\n"
+"FT_TABLENAME\n"
+"fixedtext.text"
 msgid "Ta~ble name"
 msgstr "Ainm a' ~chlàir"
 
-#: WizardPages.src#TAB_WIZ_COPYTABLE.FL_OPTIONS.fixedline.text
+#. !JEQ
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"TAB_WIZ_COPYTABLE\n"
+"FL_OPTIONS\n"
+"fixedline.text"
 msgid "Options"
 msgstr "Roghainnean"
 
-#: WizardPages.src#TAB_WIZ_COPYTABLE.RB_DEFDATA.radiobutton.text
+#. QOk;
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"TAB_WIZ_COPYTABLE\n"
+"RB_DEFDATA\n"
+"radiobutton.text"
 msgid "De~finition and data"
 msgstr "Mìneachadh is ~dàta"
 
-#: WizardPages.src#TAB_WIZ_COPYTABLE.RB_DEF.radiobutton.text
+#. 6zkh
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"TAB_WIZ_COPYTABLE\n"
+"RB_DEF\n"
+"radiobutton.text"
 msgid "Def~inition"
 msgstr "~Mìneachadh"
 
-#: WizardPages.src#TAB_WIZ_COPYTABLE.RB_VIEW.radiobutton.text
+#. VRP*
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"TAB_WIZ_COPYTABLE\n"
+"RB_VIEW\n"
+"radiobutton.text"
 msgid "A~s table view"
 msgstr "Mar ~shealladh clàir"
 
-#: WizardPages.src#TAB_WIZ_COPYTABLE.RB_APPENDDATA.radiobutton.text
+#. M?|_
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"TAB_WIZ_COPYTABLE\n"
+"RB_APPENDDATA\n"
+"radiobutton.text"
 msgid "Append ~data"
 msgstr "Cuir a~n dàta ris"
 
-#: WizardPages.src#TAB_WIZ_COPYTABLE.CB_USEHEADERLINE.checkbox.text
+#. -au[
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"TAB_WIZ_COPYTABLE\n"
+"CB_USEHEADERLINE\n"
+"checkbox.text"
 msgid "Use first ~line as column names"
 msgstr "Cleachd a' chiad l~oidhne mar ainm de cholbh"
 
-#: WizardPages.src#TAB_WIZ_COPYTABLE.CB_PRIMARY_COLUMN.checkbox.text
+#. 09rg
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"TAB_WIZ_COPYTABLE\n"
+"CB_PRIMARY_COLUMN\n"
+"checkbox.text"
 msgid "Crea~te primary key"
 msgstr "Cru~thaich prìomh-iuchair"
 
-#: WizardPages.src#TAB_WIZ_COPYTABLE.FT_KEYNAME.fixedtext.text
+#. =79|
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"TAB_WIZ_COPYTABLE\n"
+"FT_KEYNAME\n"
+"fixedtext.text"
 msgid "Name"
 msgstr "Ainm"
 
-#: WizardPages.src#STR_WIZ_TABLE_COPY.string.text
-msgctxt "WizardPages.src#STR_WIZ_TABLE_COPY.string.text"
+#. *`p=
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"STR_WIZ_TABLE_COPY\n"
+"string.text"
 msgid "Copy table"
 msgstr "Dèan lethbhreac dhen chlàr"
 
-#: WizardPages.src#STR_COPYTABLE_TITLE_COPY.string.text
-msgctxt "WizardPages.src#STR_COPYTABLE_TITLE_COPY.string.text"
+#. )^(0
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"STR_COPYTABLE_TITLE_COPY\n"
+"string.text"
 msgid "Copy table"
 msgstr "Dèan lethbhreac dhen chlàr"
 
-#: WizardPages.src#STR_INVALID_TABLE_NAME.string.text
+#. +^3G
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"STR_INVALID_TABLE_NAME\n"
+"string.text"
 msgid "This table name is not valid in the current database."
 msgstr "Chan eil an t-ainm clàir seo dligheach sa stòr-dàta làithreach."
 
-#: WizardPages.src#STR_SUGGEST_APPEND_TABLE_DATA.string.text
+#. zpA1
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"STR_SUGGEST_APPEND_TABLE_DATA\n"
+"string.text"
 msgid "Choose the option 'Append data' on the first page to append data to an existing table."
 msgstr "Tagh an roghainn 'Cuir an dàta ris' air a' chiad duilleag gus dàta a chur ri clàr a tha ann mu thràth."
 
-#: WizardPages.src#STR_INVALID_TABLE_NAME_LENGTH.string.text
+#. u#s2
+#: WizardPages.src
+msgctxt ""
+"WizardPages.src\n"
+"STR_INVALID_TABLE_NAME_LENGTH\n"
+"string.text"
 msgid "Please change the table name. It is too long."
 msgstr "Atharraich ainm a' chlàir. Tha e ro fhada."
+
+#. Q1z5
+#: dbumiscres.src
+msgctxt ""
+"dbumiscres.src\n"
+"RSC_CHARSETS\n"
+"1\n"
+"string.text"
+msgid "System"
+msgstr "Siostam"
+
+#. UEPj
+#: dbumiscres.src
+msgctxt ""
+"dbumiscres.src\n"
+"STR_ERROR_DURING_CREATION\n"
+"string.text"
+msgid "Error during creation"
+msgstr "Mearachd rè a chruthachaidh"
+
+#. oM]T
+#: dbumiscres.src
+msgctxt ""
+"dbumiscres.src\n"
+"STR_UNEXPECTED_ERROR\n"
+"string.text"
+msgid "An unexpected error occurred. The operation could not be performed."
+msgstr "Thachair mearachd gun mhìneachadh. Cha do ghabh an gnìomh a thoirt gu buil."
+
+#. ?a9N
+#: dbumiscres.src
+msgctxt ""
+"dbumiscres.src\n"
+"STR_COULDNOTOPEN_LINKEDDOC\n"
+"string.text"
+msgid "The document \"$file$\" could not be opened."
+msgstr "Cha do ghabh an sgrìobhainn \"$file$\" fhosgladh."
+
+#. W~t+
+#: dbumiscres.src
+msgctxt ""
+"dbumiscres.src\n"
+"STR_MISSING_TABLES_XDROP\n"
+"string.text"
+msgid "The table cannot be deleted because the database connection does not support this."
+msgstr "Cha do ghabh an clàr a sguabadh às a chionn 's nach eil ceangal an stòir-dhàta a' cur taic ris."
+
+#. /vzc
+#: dbumiscres.src
+msgctxt ""
+"dbumiscres.src\n"
+"STR_BUTTON_TEXT_ALL\n"
+"string.text"
+msgid "~All"
+msgstr "~A h-uile"
+
+#. ;!wA
+#: dbumiscres.src
+msgctxt ""
+"dbumiscres.src\n"
+"STR_UNDO_COLON\n"
+"string.text"
+msgid "Undo:"
+msgstr "Neo-dhèan:"
+
+#. @QFQ
+#: dbumiscres.src
+msgctxt ""
+"dbumiscres.src\n"
+"STR_REDO_COLON\n"
+"string.text"
+msgid "Redo:"
+msgstr "Ath-dhèan:"
+
+#. 4+;Y
+#: dbumiscres.src
+msgctxt ""
+"dbumiscres.src\n"
+"STR_UNKNOWN_TYPE_FOUND\n"
+"string.text"
+msgid "No corresponding column type could be found for column '#1'."
+msgstr "Cha deach seòrsa cuilbh co-fhreagrach a lorg airson a' chuilbh '#1'."
+
+#. 71C1
+#: dbumiscres.src
+msgctxt ""
+"dbumiscres.src\n"
+"STR_FILE_DOES_NOT_EXIST\n"
+"string.text"
+msgid "The file \"$file$\" does not exist."
+msgstr "Chan eil am faidhle \"$file$\" ann."
+
+#. 8#h)
+#: dbumiscres.src
+msgctxt ""
+"dbumiscres.src\n"
+"STR_WARNINGS_DURING_CONNECT\n"
+"string.text"
+msgid "Warnings were encountered while connecting to the data source. Press \"$buttontext$\" to view them."
+msgstr "Fhuaradh rabhaidhean fhad 's a chaidh ceangal a dhèanamh ris an tùs-dàta. Briog air \"$buttontext$\" gus fhaicinn."
+
+#. Bori
+#: dbumiscres.src
+msgctxt ""
+"dbumiscres.src\n"
+"STR_NAMED_OBJECT_ALREADY_EXISTS\n"
+"string.text"
+msgid ""
+"The name '$#$' already exists.\n"
+"Please enter another name."
+msgstr ""
+"Tha an t-ainm '$#$' ann mu thràth.\n"
+"Cuir a-steach ainm eile."
+
+#. X@3n
+#: dbumiscres.src
+msgctxt ""
+"dbumiscres.src\n"
+"RID_STR_EXTENSION_NOT_PRESENT\n"
+"string.text"
+msgid "The report, \"$file$\", requires the extension Oracle Report Builder."
+msgstr "Tha feum aig an aithisg \"$file$\" air an leudachan Oracle Report Builder."
diff --git a/source/gd/dbaccess/source/ui/querydesign.po b/source/gd/dbaccess/source/ui/querydesign.po
index 24d79b5f2c7..9ed68a069d3 100644
--- a/source/gd/dbaccess/source/ui/querydesign.po
+++ b/source/gd/dbaccess/source/ui/querydesign.po
@@ -1,9 +1,9 @@
-#. extracted from dbaccess/source/ui/querydesign.oo
+#. extracted from dbaccess/source/ui/querydesign
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+dbaccess%2Fsource%2Fui%2Fquerydesign.oo&subcomponent=ui\n"
-"POT-Creation-Date: 2012-07-04 16:39+0200\n"
+"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
+"POT-Creation-Date: 2012-11-17 19:02+0200\n"
 "PO-Revision-Date: 2012-06-17 03:25+0200\n"
 "Last-Translator: Michael <fios@akerbeltz.org>\n"
 "Language-Team: Akerbeltz\n"
@@ -12,204 +12,616 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "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-Generator: Translate Toolkit 1.9.0\n"
+"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
 "X-Project-Style: openoffice\n"
 
-#: query.src#STR_QUERY_UNDO_TABWINSHOW.string.text
+#. rJ%%
+#: querydlg.src
+msgctxt ""
+"querydlg.src\n"
+"DLG_QRY_JOIN.WND_JOIN_CONTROL\n"
+"FL_JOIN\n"
+"fixedline.text"
+msgid "Options"
+msgstr "Roghainnean"
+
+#. =9+%
+#: querydlg.src
+msgctxt ""
+"querydlg.src\n"
+"DLG_QRY_JOIN.WND_JOIN_CONTROL\n"
+"FT_LISTBOXTITLE\n"
+"fixedtext.text"
+msgid "~Type"
+msgstr "~Seòrsa"
+
+#. \iJy
+#: querydlg.src
+msgctxt ""
+"querydlg.src\n"
+"DLG_QRY_JOIN.WND_JOIN_CONTROL.LB_JOINTYPE\n"
+"1\n"
+"stringlist.text"
+msgid "Inner join"
+msgstr "Alt a-staigh"
+
+#. dVrr
+#: querydlg.src
+msgctxt ""
+"querydlg.src\n"
+"DLG_QRY_JOIN.WND_JOIN_CONTROL.LB_JOINTYPE\n"
+"2\n"
+"stringlist.text"
+msgid "Left join"
+msgstr "Alt clì"
+
+#. SsFj
+#: querydlg.src
+msgctxt ""
+"querydlg.src\n"
+"DLG_QRY_JOIN.WND_JOIN_CONTROL.LB_JOINTYPE\n"
+"3\n"
+"stringlist.text"
+msgid "Right join"
+msgstr "Alt deas"
+
+#. 5HYb
+#: querydlg.src
+msgctxt ""
+"querydlg.src\n"
+"DLG_QRY_JOIN.WND_JOIN_CONTROL.LB_JOINTYPE\n"
+"4\n"
+"stringlist.text"
+msgid "Full (outer) join"
+msgstr "Alt iomlan (a-muigh)"
+
+#. v7q7
+#: querydlg.src
+msgctxt ""
+"querydlg.src\n"
+"DLG_QRY_JOIN.WND_JOIN_CONTROL.LB_JOINTYPE\n"
+"5\n"
+"stringlist.text"
+msgid "Cross join"
+msgstr "Crois-alt"
+
+#. k**g
+#: querydlg.src
+msgctxt ""
+"querydlg.src\n"
+"DLG_QRY_JOIN.WND_JOIN_CONTROL\n"
+"CB_NATURAL\n"
+"checkbox.text"
+msgid "Natural"
+msgstr "Nàdarra"
+
+#. 46q*
+#: querydlg.src
+msgctxt ""
+"querydlg.src\n"
+"DLG_QRY_JOIN.WND_CONTROL\n"
+"FL_INVOLVED_TABLES\n"
+"fixedline.text"
+msgid "Tables involved"
+msgstr "Clàir a tha an sàs ann"
+
+#. GK=\
+#: querydlg.src
+msgctxt ""
+"querydlg.src\n"
+"DLG_QRY_JOIN.WND_CONTROL\n"
+"FL_INVOLVED_FIELDS\n"
+"fixedline.text"
+msgid "Fields involved"
+msgstr "Raointean a tha an sàs ann"
+
+#. $;xp
+#: querydlg.src
+msgctxt ""
+"querydlg.src\n"
+"DLG_QRY_JOIN\n"
+"modaldialog.text"
+msgid "Join Properties"
+msgstr "Roghainnean an uilt"
+
+#. _a)x
+#: querydlg.src
+msgctxt ""
+"querydlg.src\n"
+"STR_JOIN_TYPE_HINT\n"
+"string.text"
+msgid "Please note that some databases may not support this join type."
+msgstr "Thoir an aire nach eil cuid de stòir-dhàta a' cur taic ris an t-seòrsa seo de dh'alt."
+
+#. [gm?
+#: querydlg.src
+msgctxt ""
+"querydlg.src\n"
+"STR_QUERY_INNER_JOIN\n"
+"string.text"
+msgid "Includes only records for which the contents of the related fields of both tables are identical."
+msgstr "Gabhaidh seo a-steach reacordan a-mhàin a tha susbaint nan raointean co-cheangailte co-ionnann san dà chlàr."
+
+#. X2Gm
+#: querydlg.src
+msgctxt ""
+"querydlg.src\n"
+"STR_QUERY_LEFTRIGHT_JOIN\n"
+"string.text"
+msgid "Contains ALL records from table '%1' but only records from table '%2' where the values in the related fields are matching."
+msgstr "Tha a-steach GACH reacord on chlàr \"%1\" ann ach reacordan on chlàr \"%2\" a-mhàin far a bheil na luachan a' freagairt ri chèile sna raointean co-cheangailte."
+
+#. 4zbd
+#: querydlg.src
+msgctxt ""
+"querydlg.src\n"
+"STR_QUERY_FULL_JOIN\n"
+"string.text"
+msgid "Contains ALL records from '%1' and from '%2'."
+msgstr "Tha GACH reacord o \"%1\" agus \"%2\" ann."
+
+#. kpOB
+#: querydlg.src
+msgctxt ""
+"querydlg.src\n"
+"STR_QUERY_CROSS_JOIN\n"
+"string.text"
+msgid "Contains the cartesian product of ALL records from '%1' and from '%2'."
+msgstr "Tha toradh Cartesach de GACH reacord o \"%1\" agus \"%2\" ann."
+
+#. PD$H
+#: querydlg.src
+msgctxt ""
+"querydlg.src\n"
+"STR_QUERY_NATURAL_JOIN\n"
+"string.text"
+msgid "Contains only one column for each pair of equally-named columns from '%1' and from '%2'."
+msgstr "Chan eil ann ach aon cholbh airson gach paidhir de cholbhan o \"%1\" is \"%2\" air a bheil an dearbh-ainm."
+
+#. 0-qf
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QUERY_UNDO_TABWINSHOW\n"
+"string.text"
 msgid "Add Table Window"
 msgstr "Cuir uinneag clàir ris"
 
-#: query.src#STR_QUERY_UNDO_MOVETABWIN.string.text
+#. uig%
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QUERY_UNDO_MOVETABWIN\n"
+"string.text"
 msgid "Move table window"
 msgstr "Gluais uinneag a' chlàir"
 
-#: query.src#STR_QUERY_UNDO_INSERTCONNECTION.string.text
+#. 8WpA
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QUERY_UNDO_INSERTCONNECTION\n"
+"string.text"
 msgid "Insert Join"
 msgstr "Cuir a-steach alt"
 
-#: query.src#STR_QUERY_UNDO_REMOVECONNECTION.string.text
+#. sG6M
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QUERY_UNDO_REMOVECONNECTION\n"
+"string.text"
 msgid "Delete Join"
 msgstr "Sguab às an t-alt"
 
-#: query.src#STR_QUERY_UNDO_SIZETABWIN.string.text
+#. L+^W
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QUERY_UNDO_SIZETABWIN\n"
+"string.text"
 msgid "Resize table window"
 msgstr "Atharraich meud uinneag a' chlàir"
 
-#: query.src#STR_QUERY_UNDO_TABFIELDDELETE.string.text
+#. D^BY
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QUERY_UNDO_TABFIELDDELETE\n"
+"string.text"
 msgid "Delete Column"
 msgstr "Sguab às an colbh"
 
-#: query.src#STR_QUERY_UNDO_TABFIELDMOVED.string.text
+#. AW%^
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QUERY_UNDO_TABFIELDMOVED\n"
+"string.text"
 msgid "Move column"
 msgstr "Gluais an colbh"
 
-#: query.src#STR_QUERY_UNDO_TABFIELDCREATE.string.text
+#. nOk3
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QUERY_UNDO_TABFIELDCREATE\n"
+"string.text"
 msgid "Add Column"
 msgstr "Cuir colbh ris"
 
-#: query.src#RID_STR_TABLE_DOESNT_EXIST.string.text
+#. )UDE
+#: query.src
+msgctxt ""
+"query.src\n"
+"RID_STR_TABLE_DOESNT_EXIST\n"
+"string.text"
 msgid "Invalid expression, table '$name$' does not exist."
 msgstr "Eas-preisean mì-dhligheach, chan eil an clàr \"$name$\" ann."
 
-#: query.src#RID_STR_FIELD_DOESNT_EXIST.string.text
+#. .W\\
+#: query.src
+msgctxt ""
+"query.src\n"
+"RID_STR_FIELD_DOESNT_EXIST\n"
+"string.text"
 msgid "Invalid expression, field name '$name$' does not exist."
 msgstr "Eas-preisean mì-dhligheach, chan eil an raon $name$ ann."
 
-#: query.src#RID_STR_TOMUCHTABLES.string.text
+#. a1mP
+#: query.src
+msgctxt ""
+"query.src\n"
+"RID_STR_TOMUCHTABLES\n"
+"string.text"
 msgid "The query covers #num# tables. The selected database type, however, can only process a maximum of #maxnum# table(s) per statement."
 msgstr "Tha a' cheist seo a' buntainn ri #num# clàr. Ge-tà, chan eil an seòrsa de stòr-dàta a thagh thu a' cur taic ach ri #maxnum# clàir gach radh air a' char as motha."
 
-#: query.src#STR_QUERY_UNDO_TABWINDELETE.string.text
+#. 3I|w
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QUERY_UNDO_TABWINDELETE\n"
+"string.text"
 msgid "Delete Table Window"
 msgstr "Sguab às uinneag a' chlàir"
 
-#: query.src#STR_QUERY_UNDO_MODIFY_CELL.string.text
+#. wI.O
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QUERY_UNDO_MODIFY_CELL\n"
+"string.text"
 msgid "Edit Column Description"
 msgstr "Deasaich tuairisgeul a' chuilbh"
 
-#: query.src#STR_QUERY_UNDO_SIZE_COLUMN.string.text
+#. krXD
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QUERY_UNDO_SIZE_COLUMN\n"
+"string.text"
 msgid "Adjust column width"
 msgstr "Cuir air gleus leud a' chuilbh"
 
-#: query.src#STR_QUERY_SORTTEXT.string.text
+#. /HIh
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QUERY_SORTTEXT\n"
+"string.text"
 msgid "(not sorted);ascending;descending"
 msgstr "(gun seòrsachadh);a' dìreadh;a' teàrnadh"
 
-#: query.src#STR_QUERY_FUNCTIONS.string.text
+#. W|zJ
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QUERY_FUNCTIONS\n"
+"string.text"
 msgid "(no function);Group"
 msgstr "(gun fhoincsean);Buidhnich"
 
-#: query.src#STR_QUERY_NOTABLE.string.text
+#. bG9n
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QUERY_NOTABLE\n"
+"string.text"
 msgid "(no table)"
 msgstr "(gun chlàr)"
 
-#: query.src#STR_QRY_ORDERBY_UNRELATED.string.text
+#. )!;O
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QRY_ORDERBY_UNRELATED\n"
+"string.text"
 msgid "The database only supports sorting for visible fields."
 msgstr "Chan eil an stòr-dàta a' cur taic do sheòrsachadh de raointean do-fhaicsinneach."
 
-#: query.src#RID_QUERYFUNCTION_POPUPMENU.ID_QUERY_FUNCTION.menuitem.text
+#. Fh8`
+#: query.src
+msgctxt ""
+"query.src\n"
+"RID_QUERYFUNCTION_POPUPMENU\n"
+"ID_QUERY_FUNCTION\n"
+"menuitem.text"
 msgid "Functions"
 msgstr "Foincseanan"
 
-#: query.src#RID_QUERYFUNCTION_POPUPMENU.ID_QUERY_TABLENAME.menuitem.text
+#. 7*N!
+#: query.src
+msgctxt ""
+"query.src\n"
+"RID_QUERYFUNCTION_POPUPMENU\n"
+"ID_QUERY_TABLENAME\n"
+"menuitem.text"
 msgid "Table Name"
 msgstr "Ainm a' chlàir"
 
-#: query.src#RID_QUERYFUNCTION_POPUPMENU.ID_QUERY_ALIASNAME.menuitem.text
+#. 4toX
+#: query.src
+msgctxt ""
+"query.src\n"
+"RID_QUERYFUNCTION_POPUPMENU\n"
+"ID_QUERY_ALIASNAME\n"
+"menuitem.text"
 msgid "Alias"
 msgstr "Ainm-brèige"
 
-#: query.src#RID_QUERYFUNCTION_POPUPMENU.ID_QUERY_DISTINCT.menuitem.text
+#. )b[Y
+#: query.src
+msgctxt ""
+"query.src\n"
+"RID_QUERYFUNCTION_POPUPMENU\n"
+"ID_QUERY_DISTINCT\n"
+"menuitem.text"
 msgid "Distinct Values"
 msgstr "Luachan àraidh"
 
-#: query.src#STR_QUERY_HANDLETEXT.string.text
+#. :]VY
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QUERY_HANDLETEXT\n"
+"string.text"
 msgid "Field;Alias;Table;Sort;Visible;Function;Criterion;Or;Or"
 msgstr "Raon;Ainm-brèige;Clàr;Seòrsaich;Faicsinneach;Foincsean;No;No"
 
-#: query.src#STR_QRY_TOO_MANY_COLUMNS.string.text
+#. ukK~
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QRY_TOO_MANY_COLUMNS\n"
+"string.text"
 msgid "There are too many columns."
 msgstr "Tha cus cholbhan ann."
 
-#: query.src#ERR_QRY_CRITERIA_ON_ASTERISK.errorbox.text
+#. XKI9
+#: query.src
+msgctxt ""
+"query.src\n"
+"ERR_QRY_CRITERIA_ON_ASTERISK\n"
+"errorbox.text"
 msgid "A condition cannot be applied to field [*]"
 msgstr "Chan urrainn dhut cumha a chur an sàs san raon [*]"
 
-#: query.src#STR_QRY_TOO_LONG_STATEMENT.string.text
+#. 3f`+
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QRY_TOO_LONG_STATEMENT\n"
+"string.text"
 msgid "The SQL statement created is too long."
 msgstr "Tha an aithris SQL a chruthaich thu ro fhada."
 
-#: query.src#STR_QRY_TOOCOMPLEX.string.text
+#. 4({}
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QRY_TOOCOMPLEX\n"
+"string.text"
 msgid "Query is too complex"
 msgstr "Tha a' cheist ro thoinnte"
 
-#: query.src#STR_QRY_NOSELECT.string.text
+#. qiv2
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QRY_NOSELECT\n"
+"string.text"
 msgid "Nothing has been selected."
 msgstr "Cha do thagh thu dad."
 
-#: query.src#STR_QRY_TOOMANYCOND.string.text
+#. =0zi
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QRY_TOOMANYCOND\n"
+"string.text"
 msgid "Too many search criteria"
 msgstr "Cus cuspair-deuchainnean ann"
 
-#: query.src#STR_QRY_SYNTAX.string.text
+#. r~B!
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QRY_SYNTAX\n"
+"string.text"
 msgid "SQL syntax error"
 msgstr "Mearachd ann an co-chàradh an SQL"
 
-#: query.src#ERR_QRY_ORDERBY_ON_ASTERISK.errorbox.text
+#. iOY@
+#: query.src
+msgctxt ""
+"query.src\n"
+"ERR_QRY_ORDERBY_ON_ASTERISK\n"
+"errorbox.text"
 msgid "[*] cannot be used as a sort criterion."
 msgstr "Chan urrainn dhut [*] a chleachdadh mar chuspair-deuchainn."
 
-#: query.src#STR_QRY_TOO_MANY_TABLES.string.text
+#. ;2~e
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QRY_TOO_MANY_TABLES\n"
+"string.text"
 msgid "There are too many tables."
 msgstr "Tha cus chlàr ann."
 
-#: query.src#STR_QRY_NATIVE.string.text
+#. `ItO
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QRY_NATIVE\n"
+"string.text"
 msgid "The statement will not be applied when querying in the SQL dialect of the database."
 msgstr "Cha dèid an aithris a chur an sàs nuair a nithear ceist ann an dual-chainnt SQL an stòir-dhàta."
 
-#: query.src#ERR_QRY_AMB_FIELD.errorbox.text
+#. /)~O
+#: query.src
+msgctxt ""
+"query.src\n"
+"ERR_QRY_AMB_FIELD\n"
+"errorbox.text"
 msgid "Field name not found or not unique"
 msgstr "Cha deach ainm an raoin a lorg no chan eil e àraidh"
 
-#: query.src#STR_QRY_ILLEGAL_JOIN.string.text
+#. Es13
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QRY_ILLEGAL_JOIN\n"
+"string.text"
 msgid "Join could not be processed"
 msgstr "Cha do ghabh an t-alt a phròiseadadh"
 
-#: query.src#STR_SVT_SQL_SYNTAX_ERROR.string.text
+#. F{b/
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_SVT_SQL_SYNTAX_ERROR\n"
+"string.text"
 msgid "Syntax error in SQL statement"
 msgstr "Mearachd co-chàraidh ann an aithris an SQL"
 
-#: query.src#STR_QUERYDESIGN_NO_VIEW_SUPPORT.string.text
+#. #D4O
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QUERYDESIGN_NO_VIEW_SUPPORT\n"
+"string.text"
 msgid "This database does not support table views."
 msgstr "Chan eil an stòr-dàta a' cur taic ri seallaidhean clàir."
 
-#: query.src#STR_NO_ALTER_VIEW_SUPPORT.string.text
+#. 05;K
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_NO_ALTER_VIEW_SUPPORT\n"
+"string.text"
 msgid "This database does not support altering of existing table views."
 msgstr "Chan eil an stòr-dàta seo a' cur taic ri atharrachadh de sheallaidhean clàir làithreach."
 
-#: query.src#STR_QUERYDESIGN_NO_VIEW_ASK.string.text
+#. Xae+
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QUERYDESIGN_NO_VIEW_ASK\n"
+"string.text"
 msgid "Do you want to create a query instead?"
 msgstr "A bheil thu airson ceist a chruthachadh 'na àite?"
 
-#: query.src#ERR_QRY_NOSTATEMENT.errorbox.text
+#. xN(!
+#: query.src
+msgctxt ""
+"query.src\n"
+"ERR_QRY_NOSTATEMENT\n"
+"errorbox.text"
 msgid "No query could be created."
 msgstr "Cha do ghabh a' cheist a chruthachadh."
 
-#: query.src#ERR_QRY_NOCRITERIA.errorbox.text
+#. Dg/-
+#: query.src
+msgctxt ""
+"query.src\n"
+"ERR_QRY_NOCRITERIA\n"
+"errorbox.text"
 msgid "No query could be created because no fields were selected."
 msgstr "Cha do ghabh a' cheist a chruthachadh a chionn 's nach do thagh thu raointean."
 
-#: query.src#STR_DATASOURCE_DELETED.string.text
+#. @Y.Y
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_DATASOURCE_DELETED\n"
+"string.text"
 msgid "The corresponding data source has been deleted. Therefore, data relevant to that data source cannot be saved."
 msgstr "Chaidh an tùs-dàta a tha co-cheangailte ris a sguabadh às. Mar sin dheth, chan urrainn dhut dàta a shàbhaladh a tha co-cheangailte ris an tùs-dàta sin."
 
-#: query.src#STR_QRY_COLUMN_NOT_FOUND.string.text
+#. 8C.r
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QRY_COLUMN_NOT_FOUND\n"
+"string.text"
 msgid "The column '$name$' is unknown."
 msgstr "Chan aithnichear an colbh \"$name$\"."
 
-#: query.src#STR_QRY_JOIN_COLUMN_COMPARE.string.text
+#. 5SB6
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QRY_JOIN_COLUMN_COMPARE\n"
+"string.text"
 msgid "Columns can only be compared using '='."
 msgstr "Chan urrainn dhut coimeas a dhèanamh eadar colbhan ach le \"=\"."
 
-#: query.src#STR_QRY_LIKE_LEFT_NO_COLUMN.string.text
+#. q-oU
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QRY_LIKE_LEFT_NO_COLUMN\n"
+"string.text"
 msgid "You must use a column name before 'LIKE'."
 msgstr "Feumaidh tu ainm cuilbh a chur air beulaibh \"LIKE\"."
 
-#: query.src#STR_QRY_CHECK_CASESENSITIVE.string.text
+#. d0vF
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QRY_CHECK_CASESENSITIVE\n"
+"string.text"
 msgid "The column could not be found. Please note that the database is case-sensitive."
 msgstr "Cha deach an colbh a lorg. Dèan cinnteach gu bheil aire ri litrichean mòra is beaga san stòr-dàta."
 
-#: query.src#STR_QUERYDESIGN.string.text
+#. 5v?A
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QUERYDESIGN\n"
+"string.text"
 msgid " - %PRODUCTNAME Base: Query Design"
 msgstr " - %PRODUCTNAME Base: Dealbhadh cheistean"
 
-#: query.src#STR_VIEWDESIGN.string.text
+#. %0im
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_VIEWDESIGN\n"
+"string.text"
 msgid " - %PRODUCTNAME Base: View Design"
 msgstr " - %PRODUCTNAME Base: Dealbhadh sheallaidhean"
 
 #. For $object$, one of the values of the RSC_QUERY_OBJECT_TYPE resource will be inserted.
-#: query.src#STR_QUERY_SAVEMODIFIED.string.text
+#. Y-cb
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_QUERY_SAVEMODIFIED\n"
+"string.text"
 msgid ""
 "$object$ has been changed.\n"
 "Do you want to save the changes?"
@@ -218,99 +630,69 @@ msgstr ""
 "A bheil thu airson na h-atharraichean a shàbhaladh?"
 
 #. For $object$, one of the values of the RSC_QUERY_OBJECT_TYPE resource (except "SQL command", which doesn't make sense here) will be inserted.
-#: query.src#STR_ERROR_PARSING_STATEMENT.string.text
+#. Cw:+
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_ERROR_PARSING_STATEMENT\n"
+"string.text"
 msgid "$object$ is based on an SQL command which could not be parsed."
 msgstr "Tha $object$ stèidhichte air àithne SQL nach gabh a pharsadh."
 
 #. For $object$, one of the values of the RSC_QUERY_OBJECT_TYPE resource (except "SQL command", which doesn't make sense here) will be inserted.
-#: query.src#STR_INFO_OPENING_IN_SQL_VIEW.string.text
+#. @bfe
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_INFO_OPENING_IN_SQL_VIEW\n"
+"string.text"
 msgid "$object$ will be opened in SQL view."
 msgstr "Thèid $object$ fhosgladh san t-sealladh SQL."
 
-#: query.src#RSC_QUERY_OBJECT_TYPE.1.string.text
+#. HAdD
+#: query.src
+msgctxt ""
+"query.src\n"
+"RSC_QUERY_OBJECT_TYPE\n"
+"1\n"
+"string.text"
 msgid "The table view"
 msgstr "Sealladh a' chlàir"
 
-#: query.src#RSC_QUERY_OBJECT_TYPE.2.string.text
+#. Nl{E
+#: query.src
+msgctxt ""
+"query.src\n"
+"RSC_QUERY_OBJECT_TYPE\n"
+"2\n"
+"string.text"
 msgid "The query"
 msgstr "A' cheist"
 
-#: query.src#RSC_QUERY_OBJECT_TYPE.3.string.text
+#. f\zj
+#: query.src
+msgctxt ""
+"query.src\n"
+"RSC_QUERY_OBJECT_TYPE\n"
+"3\n"
+"string.text"
 msgid "The SQL statement"
 msgstr "An aithris SQL"
 
-#: query.src#STR_STATEMENT_WITHOUT_RESULT_SET.string.text
+#. y=%/
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_STATEMENT_WITHOUT_RESULT_SET\n"
+"string.text"
 msgid "The query does not create a result set, and thus cannot be part of another query."
 msgstr "Cha chruthaich a' cheist seata thoraidhean agus mar sin dheth, chan urrainn dhut a chleachdadh mar phàirt de cheist eile."
 
-#: query.src#STR_NO_DATASOURCE_OR_CONNECTION.string.text
+#. SIJ`
+#: query.src
+msgctxt ""
+"query.src\n"
+"STR_NO_DATASOURCE_OR_CONNECTION\n"
+"string.text"
 msgid "Both the ActiveConnection and the DataSourceName parameter are missing or wrong - cannot initialize the query designer."
 msgstr "Tha an dà chuid paramadair an ActiveConnection agus DataSourceName a dhìth no cearr - cha ghabh dealbhaiche nan ceist a chur gu dol."
-
-#: querydlg.src#DLG_QRY_JOIN.WND_JOIN_CONTROL.FL_JOIN.fixedline.text
-msgid "Options"
-msgstr "Roghainnean"
-
-#: querydlg.src#DLG_QRY_JOIN.WND_JOIN_CONTROL.FT_LISTBOXTITLE.fixedtext.text
-msgid "~Type"
-msgstr "~Seòrsa"
-
-#: querydlg.src#DLG_QRY_JOIN.WND_JOIN_CONTROL.LB_JOINTYPE.1.stringlist.text
-msgid "Inner join"
-msgstr "Alt a-staigh"
-
-#: querydlg.src#DLG_QRY_JOIN.WND_JOIN_CONTROL.LB_JOINTYPE.2.stringlist.text
-msgid "Left join"
-msgstr "Alt clì"
-
-#: querydlg.src#DLG_QRY_JOIN.WND_JOIN_CONTROL.LB_JOINTYPE.3.stringlist.text
-msgid "Right join"
-msgstr "Alt deas"
-
-#: querydlg.src#DLG_QRY_JOIN.WND_JOIN_CONTROL.LB_JOINTYPE.4.stringlist.text
-msgid "Full (outer) join"
-msgstr "Alt iomlan (a-muigh)"
-
-#: querydlg.src#DLG_QRY_JOIN.WND_JOIN_CONTROL.LB_JOINTYPE.5.stringlist.text
-msgid "Cross join"
-msgstr "Crois-alt"
-
-#: querydlg.src#DLG_QRY_JOIN.WND_JOIN_CONTROL.CB_NATURAL.checkbox.text
-msgid "Natural"
-msgstr "Nàdarra"
-
-#: querydlg.src#DLG_QRY_JOIN.WND_CONTROL.FL_INVOLVED_TABLES.fixedline.text
-msgid "Tables involved"
-msgstr "Clàir a tha an sàs ann"
-
-#: querydlg.src#DLG_QRY_JOIN.WND_CONTROL.FL_INVOLVED_FIELDS.fixedline.text
-msgid "Fields involved"
-msgstr "Raointean a tha an sàs ann"
-
-#: querydlg.src#DLG_QRY_JOIN.modaldialog.text
-msgid "Join Properties"
-msgstr "Roghainnean an uilt"
-
-#: querydlg.src#STR_JOIN_TYPE_HINT.string.text
-msgid "Please note that some databases may not support this join type."
-msgstr "Thoir an aire nach eil cuid de stòir-dhàta a' cur taic ris an t-seòrsa seo de dh'alt."
-
-#: querydlg.src#STR_QUERY_INNER_JOIN.string.text
-msgid "Includes only records for which the contents of the related fields of both tables are identical."
-msgstr "Gabhaidh seo a-steach reacordan a-mhàin a tha susbaint nan raointean co-cheangailte co-ionnann san dà chlàr."
-
-#: querydlg.src#STR_QUERY_LEFTRIGHT_JOIN.string.text
-msgid "Contains ALL records from table '%1' but only records from table '%2' where the values in the related fields are matching."
-msgstr "Tha a-steach GACH reacord on chlàr \"%1\" ann ach reacordan on chlàr \"%2\" a-mhàin far a bheil na luachan a' freagairt ri chèile sna raointean co-cheangailte."
-
-#: querydlg.src#STR_QUERY_FULL_JOIN.string.text
-msgid "Contains ALL records from '%1' and from '%2'."
-msgstr "Tha GACH reacord o \"%1\" agus \"%2\" ann."
-
-#: querydlg.src#STR_QUERY_CROSS_JOIN.string.text
-msgid "Contains the cartesian product of ALL records from '%1' and from '%2'."
-msgstr "Tha toradh Cartesach de GACH reacord o \"%1\" agus \"%2\" ann."
-
-#: querydlg.src#STR_QUERY_NATURAL_JOIN.string.text
-msgid "Contains only one column for each pair of equally-named columns from '%1' and from '%2'."
-msgstr "Chan eil ann ach aon cholbh airson gach paidhir de cholbhan o \"%1\" is \"%2\" air a bheil an dearbh-ainm."
diff --git a/source/gd/dbaccess/source/ui/relationdesign.po b/source/gd/dbaccess/source/ui/relationdesign.po
index 25f4e3158fb..74ed345c06e 100644
--- a/source/gd/dbaccess/source/ui/relationdesign.po
+++ b/source/gd/dbaccess/source/ui/relationdesign.po
@@ -1,9 +1,9 @@
-#. extracted from dbaccess/source/ui/relationdesign.oo
+#. extracted from dbaccess/source/ui/relationdesign
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+dbaccess%2Fsource%2Fui%2Frelationdesign.oo&subcomponent=ui\n"
-"POT-Creation-Date: 2012-07-04 16:39+0200\n"
+"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
+"POT-Creation-Date: 2012-11-17 19:02+0200\n"
 "PO-Revision-Date: 2011-12-23 03:29+0200\n"
 "Last-Translator: Michael <fios@akerbeltz.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,30 +12,60 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "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-Generator: Translate Toolkit 1.9.0\n"
+"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
 
-#: relation.src#STR_QUERY_REL_EDIT_RELATION.string.text
+#. hOZ_
+#: relation.src
+msgctxt ""
+"relation.src\n"
+"STR_QUERY_REL_EDIT_RELATION\n"
+"string.text"
 msgid "This relation already exists. Do you want to edit it or create a new one?"
 msgstr "Tha an dàimh seo ann mu thràth. A bheil thu airson a dheasachadh no airson tè ùr a chruthachadh?"
 
-#: relation.src#STR_QUERY_REL_EDIT.string.text
+#. o];n
+#: relation.src
+msgctxt ""
+"relation.src\n"
+"STR_QUERY_REL_EDIT\n"
+"string.text"
 msgid "Edit..."
 msgstr "Deasaich..."
 
-#: relation.src#STR_QUERY_REL_CREATE.string.text
+#. 1c[-
+#: relation.src
+msgctxt ""
+"relation.src\n"
+"STR_QUERY_REL_CREATE\n"
+"string.text"
 msgid "Create..."
 msgstr "Cruthaich..."
 
-#: relation.src#STR_RELATIONDESIGN.string.text
+#. AoH_
+#: relation.src
+msgctxt ""
+"relation.src\n"
+"STR_RELATIONDESIGN\n"
+"string.text"
 msgid " - %PRODUCTNAME Base: Relation design"
 msgstr " - %PRODUCTNAME Base: Dealbhadh dàimh"
 
-#: relation.src#STR_RELATIONDESIGN_NOT_AVAILABLE.string.text
+#. )MM4
+#: relation.src
+msgctxt ""
+"relation.src\n"
+"STR_RELATIONDESIGN_NOT_AVAILABLE\n"
+"string.text"
 msgid "The database does not support relations."
 msgstr "Chan eil an stòr-dàta a' cur taic ri dàimhean."
 
-#: relation.src#RELATION_DESIGN_SAVEMODIFIED.querybox.text
+#. NYJF
+#: relation.src
+msgctxt ""
+"relation.src\n"
+"RELATION_DESIGN_SAVEMODIFIED\n"
+"querybox.text"
 msgid ""
 "The relation design has been changed.\n"
 "Do you want to save the changes?"
@@ -43,11 +73,21 @@ msgstr ""
 "Chaidh dealbhadh nan dàimh atharrachadh.\n"
 "A bheil thu airson na h-atharrachaidhean a shàbhaladh?"
 
-#: relation.src#STR_QUERY_REL_DELETE_WINDOW.string.text
+#. #EzH
+#: relation.src
+msgctxt ""
+"relation.src\n"
+"STR_QUERY_REL_DELETE_WINDOW\n"
+"string.text"
 msgid "When you delete this table all corresponding relations will be deleted as well. Continue?"
 msgstr "Ma sguabas tu às an clàr seo, thèid gach dàimh cho-cheangailte a sguabadh às cuideachd. A bheil thu airson leantainn ort?"
 
-#: relation.src#STR_QUERY_REL_COULD_NOT_CREATE.string.text
+#. {1NJ
+#: relation.src
+msgctxt ""
+"relation.src\n"
+"STR_QUERY_REL_COULD_NOT_CREATE\n"
+"string.text"
 msgid ""
 "The database could not create the relation. Maybe foreign keys for this kind of table aren't supported.\n"
 "Please check your documentation of the database."
diff --git a/source/gd/dbaccess/source/ui/tabledesign.po b/source/gd/dbaccess/source/ui/tabledesign.po
index 9a8ea829f70..ebe7517b29d 100644
--- a/source/gd/dbaccess/source/ui/tabledesign.po
+++ b/source/gd/dbaccess/source/ui/tabledesign.po
@@ -1,9 +1,9 @@
-#. extracted from dbaccess/source/ui/tabledesign.oo
+#. extracted from dbaccess/source/ui/tabledesign
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+dbaccess%2Fsource%2Fui%2Ftabledesign.oo&subcomponent=ui\n"
-"POT-Creation-Date: 2012-07-04 16:39+0200\n"
+"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
+"POT-Creation-Date: 2012-11-17 19:02+0200\n"
 "PO-Revision-Date: 2012-06-17 13:11+0200\n"
 "Last-Translator: Michael <fios@akerbeltz.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,158 +12,341 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "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-Generator: Translate Toolkit 1.9.0\n"
+"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
 
-#: table.src#STR_TABLEDESIGN_DBFIELDTYPES.string.text
+#. +zNj
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TABLEDESIGN_DBFIELDTYPES\n"
+"string.text"
 msgid "Unknown;Text;Number;Date/Time;Date;Time;Yes/No;Currency;Memo;Counter;Image;Text (fix);Decimal;Binary (fix);Binary;BigInt;Double;Float;Real;Integer;Small Integer;Tiny Integer;SQL Null;Object;Distinct;Structure;Field;BLOB;CLOB;REF;OTHER;Bit (fix)"
 msgstr "Neo-aithnichte;Teacsa;Àireamh;Ceann-là/Àm;Ceann-là;Àm;Tha/Chan eil;Airgeadra;Cuimhneachan;Cunntair;Ìomhaigh;Teacsa (socraich);Deicheach;Bìnearaidh (socraich);Àireamh shlàn mhòr;Dùbailte;Fleodragan;Fìor-àireamh;Àireamh shlàn;Àireamh shlàn bheag;Meanbh-àireamh shlàn;Neoini SQL;Oibseact;Air leth;Structar;Raon;BLOB;CLOB;REF;OTHER;Bit (socraich)"
 
-#: table.src#STR_TABLEDESIGN_UNDO_PRIMKEY.string.text
-msgctxt "table.src#STR_TABLEDESIGN_UNDO_PRIMKEY.string.text"
+#. |sU@
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TABLEDESIGN_UNDO_PRIMKEY\n"
+"string.text"
 msgid "Insert/remove primary key"
 msgstr "Cuir a-steach/thoir air falbh a' phrìomh-iuchair"
 
-#: table.src#STR_VALUE_YES.string.text
+#. UI--
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_VALUE_YES\n"
+"string.text"
 msgid "Yes"
 msgstr "Tha"
 
-#: table.src#STR_VALUE_NO.string.text
+#. X9{a
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_VALUE_NO\n"
+"string.text"
 msgid "No"
 msgstr "Chan eil"
 
-#: table.src#STR_VALUE_ASC.string.text
+#. ..-$
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_VALUE_ASC\n"
+"string.text"
 msgid "Ascending"
 msgstr "A' dìreadh"
 
-#: table.src#STR_VALUE_DESC.string.text
+#. :+)e
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_VALUE_DESC\n"
+"string.text"
 msgid "Descending"
 msgstr "A' teàrnadh"
 
-#: table.src#STR_VALUE_NONE.string.text
+#. 5(BM
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_VALUE_NONE\n"
+"string.text"
 msgid "<none>"
 msgstr "-chan eil gin>"
 
-#: table.src#STR_TAB_FIELD_NAME.string.text
+#. =2Fw
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TAB_FIELD_NAME\n"
+"string.text"
 msgid "Field name"
 msgstr "Ainm an raoin"
 
-#: table.src#STR_TAB_FIELD_COLUMN_NAME.string.text
+#. b!J7
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TAB_FIELD_COLUMN_NAME\n"
+"string.text"
 msgid "Field Name"
 msgstr "Ainm an raoin"
 
-#: table.src#STR_TAB_FIELD_DATATYPE.string.text
+#. Ke6E
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TAB_FIELD_DATATYPE\n"
+"string.text"
 msgid "Field ~type"
 msgstr "Seòrsa an ~raoin"
 
-#: table.src#STR_TAB_FIELD_COLUMN_DATATYPE.string.text
+#. 3=e_
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TAB_FIELD_COLUMN_DATATYPE\n"
+"string.text"
 msgid "Field Type"
 msgstr "Seòrsa an raoin"
 
-#: table.src#STR_TAB_FIELD_LENGTH.string.text
+#. H%CY
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TAB_FIELD_LENGTH\n"
+"string.text"
 msgid "Field length"
 msgstr "Faid an raoin"
 
-#: table.src#STR_TAB_HELP_TEXT.string.text
+#. M[,x
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TAB_HELP_TEXT\n"
+"string.text"
 msgid "Description"
 msgstr "Tuairisgeul"
 
-#: table.src#STR_COLUMN_DESCRIPTION.string.text
+#. {oh-
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_COLUMN_DESCRIPTION\n"
+"string.text"
 msgid "Column Description"
 msgstr "Tuairisgeul an raoin"
 
-#: table.src#STR_TAB_FIELD_NULLABLE.string.text
+#. #FSY
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TAB_FIELD_NULLABLE\n"
+"string.text"
 msgid "Input required"
 msgstr "Feumaidh tu rud a chur a-stach"
 
-#: table.src#STR_FIELD_AUTOINCREMENT.string.text
+#. A[jT
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_FIELD_AUTOINCREMENT\n"
+"string.text"
 msgid "~AutoValue"
 msgstr "FèinLu~ach"
 
-#: table.src#STR_TAB_PROPERTIES.string.text
+#. ,izf
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TAB_PROPERTIES\n"
+"string.text"
 msgid "Field Properties"
 msgstr "Roghainnean an raoin"
 
-#: table.src#STR_TABPAGE_GENERAL.string.text
+#. Wp+k
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TABPAGE_GENERAL\n"
+"string.text"
 msgid "General"
 msgstr "Coitcheann"
 
-#: table.src#STR_TAB_TABLE_DESCRIPTION.string.text
+#. X?RF
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TAB_TABLE_DESCRIPTION\n"
+"string.text"
 msgid "Description:"
 msgstr "Tuairisgeul:"
 
-#: table.src#STR_TAB_TABLE_PROPERTIES.string.text
+#. v]`~
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TAB_TABLE_PROPERTIES\n"
+"string.text"
 msgid "Table properties"
 msgstr "Roghainnean a' chlàir"
 
-#: table.src#ERR_INVALID_LISTBOX_ENTRY.errorbox.text
+#. hCr$
+#: table.src
+msgctxt ""
+"table.src\n"
+"ERR_INVALID_LISTBOX_ENTRY\n"
+"errorbox.text"
 msgid "The text you entered is not a list element. "
 msgstr "Chan e ball liosta a tha san teacsa a chuir thu a-steach. "
 
-#: table.src#RID_TABLEDESIGNROWPOPUPMENU.SID_TABLEDESIGN_INSERTROWS.menuitem.text
+#. Z~\!
+#: table.src
+msgctxt ""
+"table.src\n"
+"RID_TABLEDESIGNROWPOPUPMENU\n"
+"SID_TABLEDESIGN_INSERTROWS\n"
+"menuitem.text"
 msgid "Insert Rows"
 msgstr "Cuir a-steach ràghan"
 
-#: table.src#RID_TABLEDESIGNROWPOPUPMENU.SID_TABLEDESIGN_TABED_PRIMARYKEY.menuitem.text
+#. buHQ
+#: table.src
+msgctxt ""
+"table.src\n"
+"RID_TABLEDESIGNROWPOPUPMENU\n"
+"SID_TABLEDESIGN_TABED_PRIMARYKEY\n"
+"menuitem.text"
 msgid "Primary Key"
 msgstr "Prìomh-iuchair"
 
-#: table.src#STR_TABED_UNDO_CELLMODIFIED.string.text
+#. :tSG
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TABED_UNDO_CELLMODIFIED\n"
+"string.text"
 msgid "Modify cell"
 msgstr "Atharraich an cealla"
 
-#: table.src#STR_TABED_UNDO_ROWDELETED.string.text
+#. `87G
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TABED_UNDO_ROWDELETED\n"
+"string.text"
 msgid "Delete row"
 msgstr "Sguab às ràgh"
 
-#: table.src#STR_TABED_UNDO_TYPE_CHANGED.string.text
+#. 6PCw
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TABED_UNDO_TYPE_CHANGED\n"
+"string.text"
 msgid "Modify field type"
 msgstr "Atharraich seòrsa an raoin"
 
-#: table.src#STR_TABED_UNDO_ROWINSERTED.string.text
+#. of6E
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TABED_UNDO_ROWINSERTED\n"
+"string.text"
 msgid "Insert row"
 msgstr "Cuir a-steach ràgh"
 
-#: table.src#STR_TABED_UNDO_NEWROWINSERTED.string.text
+#. gP#0
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TABED_UNDO_NEWROWINSERTED\n"
+"string.text"
 msgid "Insert new row"
 msgstr "Cuir a-steach ràgh ùr"
 
-#: table.src#STR_TABED_UNDO_PRIMKEY.string.text
-msgctxt "table.src#STR_TABED_UNDO_PRIMKEY.string.text"
+#. O90e
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TABED_UNDO_PRIMKEY\n"
+"string.text"
 msgid "Insert/remove primary key"
 msgstr "Cuir a-steach/thoir air falbh prìomh-iuchair"
 
-#: table.src#STR_DEFAULT_VALUE.string.text
+#. h)Dv
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_DEFAULT_VALUE\n"
+"string.text"
 msgid "~Default value"
 msgstr "~Luach bunaiteach"
 
-#: table.src#STR_FIELD_REQUIRED.string.text
+#. AHx$
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_FIELD_REQUIRED\n"
+"string.text"
 msgid "~Entry required"
 msgstr "F~eumaidh tu a chur a-steach"
 
-#: table.src#STR_TEXT_LENGTH.string.text
-msgctxt "table.src#STR_TEXT_LENGTH.string.text"
+#. IM1C
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TEXT_LENGTH\n"
+"string.text"
 msgid "~Length"
 msgstr "~Faid"
 
-#: table.src#STR_NUMERIC_TYPE.string.text
+#. UMNU
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_NUMERIC_TYPE\n"
+"string.text"
 msgid "~Type"
 msgstr "~Seòrsa"
 
-#: table.src#STR_LENGTH.string.text
-msgctxt "table.src#STR_LENGTH.string.text"
+#. +E.l
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_LENGTH\n"
+"string.text"
 msgid "~Length"
 msgstr "~Faid"
 
-#: table.src#STR_SCALE.string.text
+#. 6)Qn
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_SCALE\n"
+"string.text"
 msgid "Decimal ~places"
 msgstr "Ionadan ~deicheach"
 
-#: table.src#STR_FORMAT.string.text
+#. 3W;J
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_FORMAT\n"
+"string.text"
 msgid "Format example"
 msgstr "Ball-sampaill an fhòrmait"
 
-#: table.src#STR_HELP_BOOL_DEFAULT.string.text
+#. pENt
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_HELP_BOOL_DEFAULT\n"
+"string.text"
 msgid ""
 "Select a value that is to appear in all new records as default.\n"
 "If the field is not to have a default value, select the empty string."
@@ -171,7 +354,12 @@ msgstr ""
 "Tagh luach a bhios 'na roghainn bhunaiteach anns gach reacord ùr.\n"
 "Mur eil luach bunaiteach gu bhith aig an raon, tagh an t-sreang fhalamh."
 
-#: table.src#STR_HELP_DEFAULT_VALUE.string.text
+#. ;^|H
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_HELP_DEFAULT_VALUE\n"
+"string.text"
 msgid ""
 "Enter a default value for this field.\n"
 "\n"
@@ -181,19 +369,39 @@ msgstr ""
 "\n"
 "Nuair a chuireas tu dàta sa chlàr as a dhèidh seo, thèid an t-sreang seo a chleachdadh anns gach reacord ùr san raon a thagh thu. Mar sin dheth, bu chòir dha co-fhreagairt ris an fhòrmat chealla a dh'fheumas tu cur a-steach gu h-ìosal."
 
-#: table.src#STR_HELP_FIELD_REQUIRED.string.text
+#. 3}PH
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_HELP_FIELD_REQUIRED\n"
+"string.text"
 msgid "Activate this option if this field cannot contain NULL values, i.e. the user must always enter data."
 msgstr "Cuir an gnìomh an roghainn seo mura bi e ceadaichte luachan NULL a chur san raon seo, .i. feumaidh an cleachdaiche dàta a chur a-steach an-còmhnaidh."
 
-#: table.src#STR_HELP_TEXT_LENGTH.string.text
+#. 7mL^
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_HELP_TEXT_LENGTH\n"
+"string.text"
 msgid "Enter the maximum text length permitted."
 msgstr "Cuir a-steach an fhaid as motha a tha ceadaichte dhan teacsa."
 
-#: table.src#STR_HELP_NUMERIC_TYPE.string.text
+#. 7#=!
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_HELP_NUMERIC_TYPE\n"
+"string.text"
 msgid "Enter the number format."
 msgstr "Cuir a-steach fòrmat nan àireamhan."
 
-#: table.src#STR_HELP_LENGTH.string.text
+#. b1p*
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_HELP_LENGTH\n"
+"string.text"
 msgid ""
 "Determine the length data can have in this field.\n"
 "\n"
@@ -205,19 +413,39 @@ msgstr ""
 "Mas e raon deicheach a tha ann, cuir a-steach an fhaid as motha, mas e raon bìnearaidh a tha ann, cuir a-steach faid bloc an dàta.\n"
 "Thèid an luach a cheartachadh d' a rèir ma thèid e thairis air an fhaid as motha a tha ceadaichte sa stòr-dàta seo."
 
-#: table.src#STR_HELP_SCALE.string.text
+#. -^69
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_HELP_SCALE\n"
+"string.text"
 msgid "Specify the number of decimal places permitted in this field."
 msgstr "Sònraich an àireamh de dh'ionadan deicheach a tha ceadaichte sa raon seo."
 
-#: table.src#STR_HELP_FORMAT_CODE.string.text
+#. C%%|
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_HELP_FORMAT_CODE\n"
+"string.text"
 msgid "This is where you see how the data would be displayed in the current format (use the button on the right to modify the format)."
 msgstr "Seo far am faic thu cò ris a bhios an dàta coltach leis an fhòrmat làithreach (cleachd am putan air an taobh deis gus am fòrmat atharrachadh)."
 
-#: table.src#STR_HELP_FORMAT_BUTTON.string.text
+#. Hqk$
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_HELP_FORMAT_BUTTON\n"
+"string.text"
 msgid "This is where you determine the output format of the data."
 msgstr "Seo far an socraich thu fòrmat às-chur an dàta."
 
-#: table.src#STR_HELP_AUTOINCREMENT.string.text
+#. [?XS
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_HELP_AUTOINCREMENT\n"
+"string.text"
 msgid ""
 "Choose if this field should contain AutoIncrement values.\n"
 "\n"
@@ -227,35 +455,75 @@ msgstr ""
 "\n"
 "Chan urrainnear dàta a chur ann an raointean mar seo. Thèid luach a chur ri gach reacord ùr gu fèin-obrachail (a-rèir ioncramaid an luach roimhe)."
 
-#: table.src#PB_FORMAT.pushbutton.text
+#. .I\i
+#: table.src
+msgctxt ""
+"table.src\n"
+"PB_FORMAT\n"
+"pushbutton.text"
 msgid "~..."
 msgstr "~..."
 
-#: table.src#STR_TABLEDESIGN_DUPLICATE_NAME.string.text
+#. (WO0
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TABLEDESIGN_DUPLICATE_NAME\n"
+"string.text"
 msgid "The table cannot be saved because column name \"$column$\" was assigned twice."
 msgstr "Cha ghabh an clàr a shàbhaladh a chionn 's gun deach an t-ainm \"$column$\" a chleachdadh dà thuras."
 
-#: table.src#STR_TBL_COLUMN_IS_KEYCOLUMN.string.text
+#. BE=K
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TBL_COLUMN_IS_KEYCOLUMN\n"
+"string.text"
 msgid "The column \"$column$\" belongs to the primary key. If the column is deleted, the primary key will also be deleted. Do you really want to continue?"
 msgstr "'S ann aig a' cholbh \"$column$\" a tha a' phrìomh-iuchair. Ma thèid an colbh seo a sguabadh às, thèid a' phrìomh-iuchair a sguabadh às cuideachd. A bheil thu cinnteach gu bheil thu airson seo a dhèanamh?"
 
-#: table.src#STR_TBL_COLUMN_IS_KEYCOLUMN_TITLE.string.text
+#. H0za
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TBL_COLUMN_IS_KEYCOLUMN_TITLE\n"
+"string.text"
 msgid "Primary Key Affected"
 msgstr "Buaidh air a' phrìomh-iuchair"
 
-#: table.src#STR_COLUMN_NAME.string.text
+#. ^k*0
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_COLUMN_NAME\n"
+"string.text"
 msgid "Column"
 msgstr "Colbh"
 
-#: table.src#STR_QRY_CONTINUE.string.text
+#. o1m@
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_QRY_CONTINUE\n"
+"string.text"
 msgid "Continue anyway?"
 msgstr "A bheil thu airson leantainn ort co-dhiù?"
 
-#: table.src#STR_STAT_WARNING.string.text
+#. :}Ea
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_STAT_WARNING\n"
+"string.text"
 msgid "Warning!"
 msgstr "Rabhadh!"
 
-#: table.src#TABLE_DESIGN_SAVEMODIFIED.querybox.text
+#. 3U@W
+#: table.src
+msgctxt ""
+"table.src\n"
+"TABLE_DESIGN_SAVEMODIFIED\n"
+"querybox.text"
 msgid ""
 "The table has been changed.\n"
 "Do you want to save the changes?"
@@ -263,7 +531,12 @@ msgstr ""
 "Chaidh an clàr air atharrachadh.\n"
 "A bheil thu airson na h-atharrachaidhean a shàbhaladh?"
 
-#: table.src#TABLE_QUERY_CONNECTION_LOST.querybox.text
+#. LHZG
+#: table.src
+msgctxt ""
+"table.src\n"
+"TABLE_QUERY_CONNECTION_LOST\n"
+"querybox.text"
 msgid ""
 "The connection to the database was lost! The table design can only be used with limited functionality without a connection.\n"
 "Reconnect?"
@@ -271,15 +544,30 @@ msgstr ""
 "Bhris an ceangal ris an stòr-dàta! Chan obraich ach cuid de dhealbhadh a' chlàir as aonais ceangail.\n"
 "A bheil thu airson ceangal ris a-rithist?"
 
-#: table.src#STR_TABLEDESIGN_CONNECTION_MISSING.string.text
+#. IXlV
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TABLEDESIGN_CONNECTION_MISSING\n"
+"string.text"
 msgid "The table could not be saved due to problems connecting to the database."
 msgstr "Cha deach an clàr a shàbhaladh a chionn 's gun robh duilgheadas ann leis a' cheangal ris an stòr-dàta."
 
-#: table.src#STR_TABLEDESIGN_DATASOURCE_DELETED.string.text
+#. g4@I
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TABLEDESIGN_DATASOURCE_DELETED\n"
+"string.text"
 msgid "The table filter could not be adjusted because the data source has been deleted."
 msgstr "Cha deach criathrag a' chlàir a chur air gleus a chionn 's gun deach an tùs-dàta a sguabadh às."
 
-#: table.src#QUERY_SAVE_TABLE_EDIT_INDEXES.querybox.text
+#. w5qJ
+#: table.src
+msgctxt ""
+"table.src\n"
+"QUERY_SAVE_TABLE_EDIT_INDEXES\n"
+"querybox.text"
 msgid ""
 "Before you can edit the indexes of a table, you have to save it.\n"
 "Do you want to save the changes now?"
@@ -287,11 +575,21 @@ msgstr ""
 "Mus urrainn dhut clàir-amais de chlàr a dheasachadh, feumaidh tu a shàbhaladh.\n"
 "A bheil thu airson na h-atharrachaidhean a shàbhaladh an-dràsta?"
 
-#: table.src#STR_TABLEDESIGN_NO_PRIM_KEY_HEAD.string.text
+#. IT/l
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TABLEDESIGN_NO_PRIM_KEY_HEAD\n"
+"string.text"
 msgid "No primary key"
 msgstr "Gun phrìomh-iuchair"
 
-#: table.src#STR_TABLEDESIGN_NO_PRIM_KEY.string.text
+#. gnM:
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TABLEDESIGN_NO_PRIM_KEY\n"
+"string.text"
 msgid ""
 "A unique index or primary key is required for data record identification in this database.\n"
 "You can only enter data into this table when one of these two structural conditions has been met.\n"
@@ -303,31 +601,66 @@ msgstr ""
 "\n"
 "A bheil thu airson prìomh-iuchair a chruthachadh an-dràsta?"
 
-#: table.src#STR_TABLEDESIGN_TITLE.string.text
+#. ds(e
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TABLEDESIGN_TITLE\n"
+"string.text"
 msgid " - %PRODUCTNAME Base: Table Design"
 msgstr " - %PRODUCTNAME Base: Dealbhadh clàir"
 
-#: table.src#STR_TABLEDESIGN_ALTER_ERROR.string.text
+#. j\[$
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TABLEDESIGN_ALTER_ERROR\n"
+"string.text"
 msgid "The column \"$column$\" could not be changed. Should the column instead be deleted and the new format appended?"
 msgstr "Cha do ghabh an colbh \"$column$\" atharrachadh. A bheil thu airson an colbh a sguabadh às agus am fòrmat ùr a chur ris?"
 
-#: table.src#STR_TABLEDESIGN_SAVE_ERROR.string.text
+#. 3pC`
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TABLEDESIGN_SAVE_ERROR\n"
+"string.text"
 msgid "Error while saving the table design"
 msgstr "Thachair mearachd rè sàbhaladh dealbhadh a' chlàir"
 
-#: table.src#STR_TABLEDESIGN_COULD_NOT_DROP_COL.string.text
+#. s$A0
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_TABLEDESIGN_COULD_NOT_DROP_COL\n"
+"string.text"
 msgid "The column $column$ could not be deleted."
 msgstr "Cha do ghabh an colbh \"$column$\" a sguabadh às."
 
-#: table.src#TABLE_DESIGN_ALL_ROWS_DELETED.querybox.text
+#. b+/B
+#: table.src
+msgctxt ""
+"table.src\n"
+"TABLE_DESIGN_ALL_ROWS_DELETED\n"
+"querybox.text"
 msgid "You are trying to delete all the columns in the table. A table cannot exist without columns. Should the table be deleted from the database? If not, the table will remain unchanged."
 msgstr "Tha thu a' feuchainn ri gach colbh sa chlàr a sguabadh às. Chan fhaod clàr a bhith ann as aonais cholbhan. A bheil thu airson an clàr a sguabadh às an stòr-dàta? Mur eil, cha dèid an clàr atharrachadh."
 
-#: table.src#STR_AUTOINCREMENT_VALUE.string.text
+#. mb.U
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_AUTOINCREMENT_VALUE\n"
+"string.text"
 msgid "A~uto-increment statement"
 msgstr "Aithris fèin-i~oncramaididh"
 
-#: table.src#STR_HELP_AUTOINCREMENT_VALUE.string.text
+#. ZA{U
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_HELP_AUTOINCREMENT_VALUE\n"
+"string.text"
 msgid ""
 "Enter an SQL statement for the auto-increment field.\n"
 "\n"
@@ -337,7 +670,12 @@ msgstr ""
 "\n"
 "Thèid an aithris seo a chur a-null dhan stòr-dàta nuair a bhios an clàr air a chruthachadh."
 
-#: table.src#STR_NO_TYPE_INFO_AVAILABLE.string.text
+#. -CSJ
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_NO_TYPE_INFO_AVAILABLE\n"
+"string.text"
 msgid ""
 "No type information could be retrieved from the database.\n"
 "The table design mode is not available for this data source."
@@ -345,18 +683,38 @@ msgstr ""
 "Cha d'fhuaradh fiosrachadh mun t-seòrsa on stòr-dàta.\n"
 "Chan eil am modh dealbhadh chlàr ri fhaighinn airson an tùs-dàta seo."
 
-#: table.src#STR_CHANGE_COLUMN_NAME.string.text
+#. da%i
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_CHANGE_COLUMN_NAME\n"
+"string.text"
 msgid "change field name"
 msgstr "atharraich ainm an raoin"
 
-#: table.src#STR_CHANGE_COLUMN_TYPE.string.text
+#. V6k6
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_CHANGE_COLUMN_TYPE\n"
+"string.text"
 msgid "change field type"
 msgstr "atharraich seòrsa an raoin"
 
-#: table.src#STR_CHANGE_COLUMN_DESCRIPTION.string.text
+#. \=gd
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_CHANGE_COLUMN_DESCRIPTION\n"
+"string.text"
 msgid "change field description"
 msgstr "atharraich tuairisgeul an raoin"
 
-#: table.src#STR_CHANGE_COLUMN_ATTRIBUTE.string.text
+#. AAJ]
+#: table.src
+msgctxt ""
+"table.src\n"
+"STR_CHANGE_COLUMN_ATTRIBUTE\n"
+"string.text"
 msgid "change field attribute"
 msgstr "atharraich buadh an raoin"
diff --git a/source/gd/dbaccess/source/ui/uno.po b/source/gd/dbaccess/source/ui/uno.po
index 6a5b94287c6..4de04ae0a69 100644
--- a/source/gd/dbaccess/source/ui/uno.po
+++ b/source/gd/dbaccess/source/ui/uno.po
@@ -1,9 +1,9 @@
-#. extracted from dbaccess/source/ui/uno.oo
+#. extracted from dbaccess/source/ui/uno
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+dbaccess%2Fsource%2Fui%2Funo.oo&subcomponent=ui\n"
-"POT-Creation-Date: 2012-07-04 16:38+0200\n"
+"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
+"POT-Creation-Date: 2012-11-17 19:02+0200\n"
 "PO-Revision-Date: 2012-07-18 18:11+0200\n"
 "Last-Translator: Michael <fios@akerbeltz.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,57 +12,122 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "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-Generator: Pootle 2.1.6\n"
+"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
 
-#: dbinteraction.src#STR_REMEMBERPASSWORD_SESSION.string.text
-msgid "~Remember password until end of session"
-msgstr "Cuimhnich am facal-fai~re gu deireadh an t-seisein"
-
-#: dbinteraction.src#STR_REMEMBERPASSWORD_PERSISTENT.string.text
-msgid "~Remember password"
-msgstr "Cui~mhnich am facal-faire"
-
-#: copytablewizard.src#STR_CTW_NO_VIEWS_SUPPORT.string.text
+#. eQiO
+#: copytablewizard.src
+msgctxt ""
+"copytablewizard.src\n"
+"STR_CTW_NO_VIEWS_SUPPORT\n"
+"string.text"
 msgid "The destination database does not support views."
 msgstr "Chan eil an stòr-dàta a tha thu ag amas air a' cur taic ri seallaidhean."
 
-#: copytablewizard.src#STR_CTW_NO_PRIMARY_KEY_SUPPORT.string.text
+#. _=Y9
+#: copytablewizard.src
+msgctxt ""
+"copytablewizard.src\n"
+"STR_CTW_NO_PRIMARY_KEY_SUPPORT\n"
+"string.text"
 msgid "The destination database does not support primary keys."
 msgstr "Chan eil an stòr-dàta a tha thu ag amas air a' cur taic ri prìomh-iuchraichean."
 
-#: copytablewizard.src#STR_CTW_INVALID_DATA_ACCESS_DESCRIPTOR.string.text
+#. 3?2,
+#: copytablewizard.src
+msgctxt ""
+"copytablewizard.src\n"
+"STR_CTW_INVALID_DATA_ACCESS_DESCRIPTOR\n"
+"string.text"
 msgid "no data access descriptor found, or no data access descriptor able to provide all necessary information"
 msgstr "Cha deach tuairisgeulaiche inntrigeadh dàta a lorg no chan urrainn dhan tuairisgeulaiche inntrigeadh dàta gach fiosrachadh a thoirt seachad air a bheil feum"
 
-#: copytablewizard.src#STR_CTW_ONLY_TABLES_AND_QUERIES_SUPPORT.string.text
+#. zV0M
+#: copytablewizard.src
+msgctxt ""
+"copytablewizard.src\n"
+"STR_CTW_ONLY_TABLES_AND_QUERIES_SUPPORT\n"
+"string.text"
 msgid "Only tables and queries are supported at the moment."
 msgstr "Chan eil taic ann ach do chlàir is do cheistean aig an àm seo."
 
-#: copytablewizard.src#STR_CTW_COPY_SOURCE_NEEDS_BOOKMARKS.string.text
+#. ~}tx
+#: copytablewizard.src
+msgctxt ""
+"copytablewizard.src\n"
+"STR_CTW_COPY_SOURCE_NEEDS_BOOKMARKS\n"
+"string.text"
 msgid "The copy source's result set must support bookmarks."
 msgstr "Feumaidh seata nan toraidhean aig tùs an lethbhric taic a chur ri comharran-leabhair."
 
-#: copytablewizard.src#STR_CTW_UNSUPPORTED_COLUMN_TYPE.string.text
+#. UCzS
+#: copytablewizard.src
+msgctxt ""
+"copytablewizard.src\n"
+"STR_CTW_UNSUPPORTED_COLUMN_TYPE\n"
+"string.text"
 msgid "Unsupported source column type ($type$) at column position $pos$."
 msgstr "Tha seòrsa de thùs-cholbh ($type$) nach eil taic ann dha san ionad chuilbh $pos$."
 
-#: copytablewizard.src#STR_CTW_ILLEGAL_PARAMETER_COUNT.string.text
+#. We~`
+#: copytablewizard.src
+msgctxt ""
+"copytablewizard.src\n"
+"STR_CTW_ILLEGAL_PARAMETER_COUNT\n"
+"string.text"
 msgid "Illegal number of initialization parameters."
 msgstr "Àireamh mhì-laghail de pharamadairean tòiseachaidh."
 
-#: copytablewizard.src#STR_CTW_ERROR_DURING_INITIALIZATION.string.text
+#. mBwh
+#: copytablewizard.src
+msgctxt ""
+"copytablewizard.src\n"
+"STR_CTW_ERROR_DURING_INITIALIZATION\n"
+"string.text"
 msgid "An error occurred during initialization."
 msgstr "Thachair mearachd rè an tòiseachaidh."
 
-#: copytablewizard.src#STR_CTW_ERROR_UNSUPPORTED_SETTING.string.text
+#. HAbb
+#: copytablewizard.src
+msgctxt ""
+"copytablewizard.src\n"
+"STR_CTW_ERROR_UNSUPPORTED_SETTING\n"
+"string.text"
 msgid "Unsupported setting in the copy source descriptor: $name$."
 msgstr "Tha roghainn nach eil taic ann dha ann an tuairisgeulaiche tùs an lethbhric: $name$."
 
-#: copytablewizard.src#STR_CTW_ERROR_NO_QUERY.string.text
+#. mJDu
+#: copytablewizard.src
+msgctxt ""
+"copytablewizard.src\n"
+"STR_CTW_ERROR_NO_QUERY\n"
+"string.text"
 msgid "To copy a query, your connection must be able to provide queries."
 msgstr "Gus lethbhreac a dhèanamh de cheist, feumaidh an ceangal agad a bhith comasach air ceistean a sholar."
 
-#: copytablewizard.src#STR_CTW_ERROR_INVALID_INTERACTIONHANDLER.string.text
+#. poOe
+#: copytablewizard.src
+msgctxt ""
+"copytablewizard.src\n"
+"STR_CTW_ERROR_INVALID_INTERACTIONHANDLER\n"
+"string.text"
 msgid "The given interaction handler is invalid."
 msgstr "Tha an làimhsiche eadar-obrachaidh a chuir thu ann mì-dhligheach."
+
+#. D3WL
+#: dbinteraction.src
+msgctxt ""
+"dbinteraction.src\n"
+"STR_REMEMBERPASSWORD_SESSION\n"
+"string.text"
+msgid "~Remember password until end of session"
+msgstr "Cuimhnich am facal-fai~re gu deireadh an t-seisein"
+
+#. ?:go
+#: dbinteraction.src
+msgctxt ""
+"dbinteraction.src\n"
+"STR_REMEMBERPASSWORD_PERSISTENT\n"
+"string.text"
+msgid "~Remember password"
+msgstr "Cui~mhnich am facal-faire"