aboutsummaryrefslogtreecommitdiff
path: root/source/sat/dbaccess
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2013-05-27 10:37:03 +0200
committerAndras Timar <atimar@suse.com>2013-05-27 10:37:03 +0200
commit40e56fe83f5a05f8c87821d0c30ef1585b601fc8 (patch)
tree1f80161464f7cc25439e55fded783ffd1a4f5f80 /source/sat/dbaccess
parent7db61e0f23b962f97e9246e0a8fb60e47fff0ac9 (diff)
Compendium Conflicts should be fuzzy
Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59
Diffstat (limited to 'source/sat/dbaccess')
-rw-r--r--source/sat/dbaccess/source/sdbtools/resource.po7
-rw-r--r--source/sat/dbaccess/source/ui/dlg.po8
-rw-r--r--source/sat/dbaccess/source/ui/relationdesign.po7
-rw-r--r--source/sat/dbaccess/source/ui/tabledesign.po8
4 files changed, 18 insertions, 12 deletions
diff --git a/source/sat/dbaccess/source/sdbtools/resource.po b/source/sat/dbaccess/source/sdbtools/resource.po
index dbbe6259ad0..c14c7294855 100644
--- a/source/sat/dbaccess/source/sdbtools/resource.po
+++ b/source/sat/dbaccess/source/sdbtools/resource.po
@@ -1,4 +1,4 @@
-#. extracted from dbaccess/source/sdbtools/resource
+#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
"PO-Revision-Date: 2011-04-06 14:31+0200\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: sat\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: sat\n"
"X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
#: sdbt_strings.src
msgctxt ""
@@ -23,6 +23,7 @@ msgid "You cannot give a table and a query the same name. Please use a name whic
msgstr ""
#: sdbt_strings.src
+#, fuzzy
msgctxt ""
"sdbt_strings.src\n"
"STR_BASENAME_TABLE\n"
diff --git a/source/sat/dbaccess/source/ui/dlg.po b/source/sat/dbaccess/source/ui/dlg.po
index 00034f4df93..45ef57ac3a2 100644
--- a/source/sat/dbaccess/source/ui/dlg.po
+++ b/source/sat/dbaccess/source/ui/dlg.po
@@ -1,4 +1,4 @@
-#. extracted from dbaccess/source/ui/dlg
+#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
"PO-Revision-Date: 2011-12-15 16:08+0200\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: sat\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: sat\n"
"X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
#: AutoControls.src
msgctxt ""
@@ -827,6 +827,7 @@ msgid "~Server"
msgstr "सर्वर ~URL"
#: admincontrols.src
+#, fuzzy
msgctxt ""
"admincontrols.src\n"
"RID_MYSQL_NATIVE_SETTINGS\n"
@@ -869,6 +870,7 @@ msgid "Named p~ipe"
msgstr ""
#: adtabdlg.src
+#, fuzzy
msgctxt ""
"adtabdlg.src\n"
"DLG_JOIN_TABADD\n"
diff --git a/source/sat/dbaccess/source/ui/relationdesign.po b/source/sat/dbaccess/source/ui/relationdesign.po
index c9f1c0c6a04..e28e065650d 100644
--- a/source/sat/dbaccess/source/ui/relationdesign.po
+++ b/source/sat/dbaccess/source/ui/relationdesign.po
@@ -1,4 +1,4 @@
-#. extracted from dbaccess/source/ui/relationdesign
+#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
"PO-Revision-Date: 2011-04-06 14:31+0200\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: sat\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: sat\n"
"X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
#: relation.src
msgctxt ""
@@ -23,6 +23,7 @@ msgid "This relation already exists. Do you want to edit it or create a new one?
msgstr ""
#: relation.src
+#, fuzzy
msgctxt ""
"relation.src\n"
"STR_QUERY_REL_EDIT\n"
diff --git a/source/sat/dbaccess/source/ui/tabledesign.po b/source/sat/dbaccess/source/ui/tabledesign.po
index 903eae87905..393546807f0 100644
--- a/source/sat/dbaccess/source/ui/tabledesign.po
+++ b/source/sat/dbaccess/source/ui/tabledesign.po
@@ -1,4 +1,4 @@
-#. extracted from dbaccess/source/ui/tabledesign
+#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
"PO-Revision-Date: 2011-04-12 01:03+0200\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: sat\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: sat\n"
"X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
#: table.src
msgctxt ""
@@ -71,6 +71,7 @@ msgid "<none>"
msgstr "ओका हों बाङ"
#: table.src
+#, fuzzy
msgctxt ""
"table.src\n"
"STR_TAB_FIELD_NAME\n"
@@ -115,6 +116,7 @@ msgid "Field length"
msgstr "जायगा जिलिञतेत्"
#: table.src
+#, fuzzy
msgctxt ""
"table.src\n"
"STR_TAB_HELP_TEXT\n"