aboutsummaryrefslogtreecommitdiff
path: root/source/bo/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/bo/dbaccess
parent7db61e0f23b962f97e9246e0a8fb60e47fff0ac9 (diff)
Compendium Conflicts should be fuzzy
Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59
Diffstat (limited to 'source/bo/dbaccess')
-rw-r--r--source/bo/dbaccess/source/sdbtools/resource.po8
-rw-r--r--source/bo/dbaccess/source/ui/dlg.po7
2 files changed, 9 insertions, 6 deletions
diff --git a/source/bo/dbaccess/source/sdbtools/resource.po b/source/bo/dbaccess/source/sdbtools/resource.po
index bc5b02fd2c0..1eedcca4a07 100644
--- a/source/bo/dbaccess/source/sdbtools/resource.po
+++ b/source/bo/dbaccess/source/sdbtools/resource.po
@@ -1,4 +1,4 @@
-#. extracted from dbaccess/source/sdbtools/resource
+#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
"PO-Revision-Date: 2011-04-05 19:01+0200\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: bo\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: bo\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
"X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
#: sdbt_strings.src
msgctxt ""
@@ -24,6 +24,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"
@@ -60,6 +61,7 @@ msgstr ""
"རེའུ་མིག"
#: sdbt_strings.src
+#, fuzzy
msgctxt ""
"sdbt_strings.src\n"
"STR_BASENAME_QUERY\n"
diff --git a/source/bo/dbaccess/source/ui/dlg.po b/source/bo/dbaccess/source/ui/dlg.po
index 610b1e3ff16..b74c37aa76f 100644
--- a/source/bo/dbaccess/source/ui/dlg.po
+++ b/source/bo/dbaccess/source/ui/dlg.po
@@ -1,4 +1,4 @@
-#. extracted from dbaccess/source/ui/dlg
+#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
"PO-Revision-Date: 2013-02-17 20:16+0000\n"
"Last-Translator: Andras <timar74@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: bo\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: bo\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
"X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
"X-POOTLE-MTIME: 1361132189.0\n"
#: AutoControls.src
@@ -829,6 +829,7 @@ msgid "~Server"
msgstr "server"
#: admincontrols.src
+#, fuzzy
msgctxt ""
"admincontrols.src\n"
"RID_MYSQL_NATIVE_SETTINGS\n"