sync libreoffice-4-1 and master

Change-Id: Ice8bb498f8a6bee4bb6b5c460ac3e0a0deaecb92

3 files changed, 15 insertions, 13 deletions

diff --git a/source/sl/helpcontent2/source/text/shared/02.po b/source/sl/helpcontent2/source/text/shared/02.po
index bc7a17e499e..29198b44c93 100644
--- a/source/sl/helpcontent2/source/text/shared/02.po
+++ b/source/sl/helpcontent2/source/text/shared/02.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 4.1\n"
 "Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2013-06-13 17:25+0200\n"
-"PO-Revision-Date: 2013-06-10 13:05+0200\n"
+"POT-Creation-Date: 2013-06-22 14:15+0200\n"
+"PO-Revision-Date: 2013-06-23 00:14+0200\n"
 "Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n"
 "Language-Team: sl.libreoffice.org\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
@@ -49,7 +49,7 @@ msgctxt ""
 "2\n"
 "help.text"
 msgid "<ahelp hid=\".uno:PrintDefault\">Click the <emph>Print File Directly</emph> icon to print the active document with the current default print settings.</ahelp> These can be found in the <emph>Printer Setup</emph> dialog, which you can call with the <link href=\"text/shared/01/01140000.xhp\" name=\"Printer Settings\"><emph>Printer Settings</emph></link> menu command."
-msgstr "<ahelp hid=\".uno:PrintDefault\"> Kliknite ikono <emph>Neposredni natis datoteke</emph>, da natisnete aktivni dokument s trenutnimi privzetimi nastavitvami tiskalnika.</ahelp> Te nastavitve najdete v pogovornem oknu <emph>Nastavitev tiskalnika</emph>, v katerem lahko prikličete menijski ukaz <link href=\"text/shared/01/01140000.xhp\" name=\"Nastavitve tiskalnika\"><emph>Nastavitve tiskalnika</emph></link>."
+msgstr "<ahelp hid=\".uno:PrintDefault\"> Kliknite ikono <emph>Neposredno natisni datoteko</emph>, da natisnete aktivni dokument s trenutnimi privzetimi nastavitvami tiskalnika.</ahelp> Te nastavitve najdete v pogovornem oknu <emph>Nastavitev tiskalnika</emph>, v katerem lahko prikličete menijski ukaz <link href=\"text/shared/01/01140000.xhp\" name=\"Nastavitve tiskalnika\"><emph>Nastavitve tiskalnika</emph></link>."
 
 #: 01110000.xhp
 msgctxt ""
@@ -18905,8 +18905,8 @@ msgctxt ""
 "querypropdlg.xhp\n"
 "par_id3152820\n"
 "help.text"
-msgid "In the <emph>Query Properties</emph> dialog, set properties belong to SQL Query, that you need your current task."
-msgstr "V pogovornem oknu <emph>Lastnosti poizvedbe</emph> nastavite lastnosti poizvedbe SQL, ki ustrezajo trenutni nalogi."
+msgid "In the <emph>Query Properties</emph> dialog you can set two properties of the SQL Query, i.e. whether to return distinct values, and whether to limit the result set."
+msgstr "V pogovornem oknu <emph>Lastnosti poizvedbe</emph> nastavite dve lastnosti poizvedbe SQL, t.j. ali naj poizvedba vrne le različne vrednosti in ali naj bo nabor rezultatov številčno omejen."
 
 #: querypropdlg.xhp
 msgctxt ""
diff --git a/source/sl/helpcontent2/source/text/shared/guide.po b/source/sl/helpcontent2/source/text/shared/guide.po
index 5c858387bbe..e6961d2a1cf 100644
--- a/source/sl/helpcontent2/source/text/shared/guide.po
+++ b/source/sl/helpcontent2/source/text/shared/guide.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 4.1\n"
 "Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2013-06-16 22:46+0200\n"
+"POT-Creation-Date: 2013-06-22 14:15+0200\n"
 "PO-Revision-Date: 2013-06-17 01:41+0200\n"
 "Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
diff --git a/source/sl/helpcontent2/source/text/shared/optionen.po b/source/sl/helpcontent2/source/text/shared/optionen.po
index da36ac9a7f5..5bde0018564 100644
--- a/source/sl/helpcontent2/source/text/shared/optionen.po
+++ b/source/sl/helpcontent2/source/text/shared/optionen.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 4.1\n"
 "Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2013-06-16 22:46+0200\n"
-"PO-Revision-Date: 2013-06-14 01:52+0200\n"
+"POT-Creation-Date: 2013-06-22 14:15+0200\n"
+"PO-Revision-Date: 2013-06-23 00:32+0200\n"
 "Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n"
 "Language-Team: sl.libreoffice.org\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
@@ -1001,8 +1001,10 @@ msgctxt ""
 "01010200.xhp\n"
 "par_id7198401\n"
 "help.text"
-msgid "With several legacy pre-ODF1.2 and ODF1.2-only consumers out there, users wanted a more backward-compatible ODF 1.2 extended mode, that uses stuff deprecated in 1.2, and/or is 'bug-compatible' to older OpenOffice.org versions. Therefore the ODF 1.2 Extended (compat) mode was introduced."
-msgstr "Številni uporabniki še vedno uporabljajo ODF 1.2 ali starejše različice zapisa, zato so potrebovali razširjeni način, ki podpira zapis ODF 1.2 in funkcije, ki jih v novejših zapisih ni več, ter je 'združljiv s hrošči' v starejših različicah OpenOffice.org. Tako je nastal razširjeni (združljivostni) način ODF 1.2."
+msgid "The ODF 1.2 Extended (compat) mode is a more backward-compatible ODF 1.2 extended mode. It uses features that are deprecated in ODF1.2 and/or it is 'bug-compatible' to older OpenOffice.org versions. It may be useful, if you need to interchange ODF documents with users, who use pre-ODF1.2 or ODF1.2-only legacy applications."
+msgstr ""
+"\n"
+"Razširjeni način ODF 1.2 (združljivostni) podpira zapis ODF 1.2 in funkcije, ki jih v novejših zapisih ni več, ter je 'združljiv s hrošči' v starejših različicah OpenOffice.org. Lahko vam pride prav, ko želite izmenjati dokumente ODF z uporabniki, ki uporabljajo zastarele programe z zapisi pred ODF1.2 ali zgolj ODF1.2."
 
 #: 01010200.xhp
 msgctxt ""