[LyX master] Merge branch 'master' of git.lyx.org:lyx

Sat, 18 Aug 2012 04:58:53 -0700 

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 8570e14501f2a8993ed431270c7841cc8d43277c
Merge: aac637d 6dd333b
Author: Kornel Benko <kor...@lyx.org>
Date:   Sat Aug 18 13:58:11 2012 +0200

    Merge branch 'master' of git.lyx.org:lyx


commit aac637ddabaadd004840e39a720bc5e895a541fc
Author: Kornel Benko <kor...@lyx.org>
Date:   Sat Aug 18 13:57:46 2012 +0200

    * sk.po

diff --git a/po/sk.po b/po/sk.po
index e0f6ffc..4859e5c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LyX-2.1\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
-"POT-Creation-Date: 2012-07-20 11:25+0200\n"
+"POT-Creation-Date: 2012-08-18 13:20+0200\n"
 "PO-Revision-Date: 2012-04-08 11:27+0100\n"
 "Last-Translator: Kornel Benko <kor...@lyx.org>\n"
 "Language-Team: Slovak <lyx-d...@lists.lyx.org>\n"
@@ -11745,6 +11745,110 @@ msgstr "Vietnamsky"
 msgid "Welsh"
 msgstr "Walesky"
 
+#: src/frontends/qt4/GuiDocument.cpp:129
+msgid "AE (Almost European)"
+msgstr "AE (Almost European)"
+
+#: src/frontends/qt4/GuiDocument.cpp:131
+msgid "Bera Serif"
+msgstr "Bera Serif"
+
+#: src/frontends/qt4/GuiDocument.cpp:130
+msgid "Bookman"
+msgstr "Bookman"
+
+#: src/frontends/qt4/GuiDocument.cpp:131
+msgid "Concrete Roman"
+msgstr "Concrete Roman"
+
+#: src/frontends/qt4/GuiDocument.cpp:131
+msgid "Zapf Chancery"
+msgstr "Zapf Chancery"
+
+#: src/frontends/qt4/GuiDocument.cpp:130
+msgid "Bitstream Charter"
+msgstr "Bitstream Charter"
+
+#: src/frontends/qt4/GuiDocument.cpp:128
+msgid "Computer Modern Roman"
+msgstr "Computer Modern Roman"
+
+#: lib/latexfonts:109
+msgid "Libertine"
+msgstr "Libertine"
+
+#: src/frontends/qt4/GuiDocument.cpp:128
+msgid "Latin Modern Roman"
+msgstr "Latin Modern Roman"
+
+#: src/frontends/qt4/GuiDocument.cpp:130
+msgid "New Century Schoolbook"
+msgstr "New Century Schoolbook"
+
+#: src/frontends/qt4/GuiDocument.cpp:129
+msgid "Palatino"
+msgstr "Palatino"
+
+#: src/frontends/qt4/GuiDocument.cpp:129
+msgid "Times Roman"
+msgstr "Times Roman"
+
+#: src/frontends/qt4/GuiDocument.cpp:131
+msgid "Utopia"
+msgstr "Utopia"
+
+#: src/frontends/qt4/GuiDocument.cpp:145
+msgid "Avant Garde"
+msgstr "Avant Garde"
+
+#: src/frontends/qt4/GuiDocument.cpp:145
+msgid "Bera Sans"
+msgstr "Bera Sans"
+
+#: src/frontends/qt4/GuiDocument.cpp:145
+msgid "CM Bright"
+msgstr "CM Bright"
+
+#: src/frontends/qt4/GuiDocument.cpp:144
+msgid "Computer Modern Sans"
+msgstr "Computer Modern Sans"
+
+#: src/frontends/qt4/GuiDocument.cpp:145
+msgid "Helvetica"
+msgstr "Helvetica"
+
+#: src/frontends/qt4/GuiDocument.cpp:144
+msgid "Latin Modern Sans"
+msgstr "Latin Modern Sans"
+
+#: src/frontends/qt4/GuiDocument.cpp:158
+msgid "Bera Mono"
+msgstr "Bera Mono"
+
+#: src/frontends/qt4/GuiDocument.cpp:159
+msgid "CM Typewriter Light"
+msgstr "CM Typewriter Light"
+
+#: src/frontends/qt4/GuiDocument.cpp:157
+msgid "Computer Modern Typewriter"
+msgstr "Computer Modern Typewriter"
+
+#: src/frontends/qt4/GuiDocument.cpp:158
+msgid "Courier"
+msgstr "Courier"
+
+#: src/frontends/qt4/GuiDocument.cpp:158
+msgid "Latin Modern Typewriter"
+msgstr "Latin Modern Typewriter"
+
+#: src/frontends/qt4/GuiDocument.cpp:159
+msgid "LuxiMono"
+msgstr "LuxiMono"
+
+#: lib/latexfonts:253
+msgid "TX Typewriter"
+msgstr "TX Typewriter"
+
 #: lib/encodings:14
 msgid "Unicode (utf8)"
 msgstr "Unicode (utf8)"
@@ -18629,6 +18733,19 @@ msgstr "Spúšťam BibTeX."
 msgid "Running MakeIndex for nomencl."
 msgstr "Spúšťam MakeIndex pre nomencl."
 
+#: src/LaTeXFonts.cpp:89 src/LaTeXFonts.cpp:116 src/LaTeXFonts.cpp:168
+msgid "Font not available"
+msgstr "Font nie je dostupný"
+
+#: src/LaTeXFonts.cpp:90 src/LaTeXFonts.cpp:117 src/LaTeXFonts.cpp:169
+#, c-format
+msgid ""
+"The LaTeX package `%1$s' needed for the font `%2$s'\n"
+"is not available on your system. LyX will fall back to the default font."
+msgstr ""
+"Balík LaTeXa `%1$s' ktorý font `%2$s potrebuje\n"
+"nie je dostupný na vašom systéme. LyX sa stiahne na štandardný font."
+
 #: src/LyX.cpp:120
 msgid "Could not read configuration file"
 msgstr "Nemôžem čítať konfiguračný súbor"
@@ -19059,10 +19176,6 @@ msgstr ""
 msgid "The default format used with LFUN_BUFFER_[VIEW|UPDATE]."
 msgstr "Štandardný formát použitý s LFUN_BUFFER_[VIEW|UPDATE]."
 
-#: src/LyXRC.cpp:3157
-msgid "New documents will be assigned this language."
-msgstr "Novým dokumentom bude priradený tento jazyk."
-
 #: src/LyXRC.cpp:3161
 msgid ""
 "Iconify the dialogs when the main window is iconified. (Affects only dialogs "
@@ -20300,9 +20413,9 @@ msgstr ""
 "pracovať správne.\n"
 "Keď nutné, skúste prosím ešte raz rekonfigurovať."
 
-#: src/frontends/qt4/GuiApplication.cpp:1266
+#: src/frontends/qt4/GuiApplication.cpp:1290
 msgid "System reconfigured"
-msgstr "Systém je prekonfigurovaný"
+msgstr "Systém je rekonfigurovaný"
 
 #: src/frontends/qt4/GuiApplication.cpp:1267
 msgid ""
@@ -20799,102 +20912,6 @@ msgstr "(Žiadne)"
 msgid "Variable"
 msgstr "Variabilná"
 
-#: src/frontends/qt4/GuiDocument.cpp:128
-msgid "Computer Modern Roman"
-msgstr "Computer Modern Roman"
-
-#: src/frontends/qt4/GuiDocument.cpp:128
-msgid "Latin Modern Roman"
-msgstr "Latin Modern Roman"
-
-#: src/frontends/qt4/GuiDocument.cpp:129
-msgid "AE (Almost European)"
-msgstr "AE (Almost European)"
-
-#: src/frontends/qt4/GuiDocument.cpp:129
-msgid "Times Roman"
-msgstr "Times Roman"
-
-#: src/frontends/qt4/GuiDocument.cpp:129
-msgid "Palatino"
-msgstr "Palatino"
-
-#: src/frontends/qt4/GuiDocument.cpp:130
-msgid "Bitstream Charter"
-msgstr "Bitstream Charter"
-
-#: src/frontends/qt4/GuiDocument.cpp:130
-msgid "New Century Schoolbook"
-msgstr "New Century Schoolbook"
-
-#: src/frontends/qt4/GuiDocument.cpp:130
-msgid "Bookman"
-msgstr "Bookman"
-
-#: src/frontends/qt4/GuiDocument.cpp:131
-msgid "Utopia"
-msgstr "Utopia"
-
-#: src/frontends/qt4/GuiDocument.cpp:131
-msgid "Bera Serif"
-msgstr "Bera Serif"
-
-#: src/frontends/qt4/GuiDocument.cpp:131
-msgid "Concrete Roman"
-msgstr "Concrete Roman"
-
-#: src/frontends/qt4/GuiDocument.cpp:131
-msgid "Zapf Chancery"
-msgstr "Zapf Chancery"
-
-#: src/frontends/qt4/GuiDocument.cpp:144
-msgid "Computer Modern Sans"
-msgstr "Computer Modern Sans"
-
-#: src/frontends/qt4/GuiDocument.cpp:144
-msgid "Latin Modern Sans"
-msgstr "Latin Modern Sans"
-
-#: src/frontends/qt4/GuiDocument.cpp:145
-msgid "Helvetica"
-msgstr "Helvetica"
-
-#: src/frontends/qt4/GuiDocument.cpp:145
-msgid "Avant Garde"
-msgstr "Avant Garde"
-
-#: src/frontends/qt4/GuiDocument.cpp:145
-msgid "Bera Sans"
-msgstr "Bera Sans"
-
-#: src/frontends/qt4/GuiDocument.cpp:145
-msgid "CM Bright"
-msgstr "CM Bright"
-
-#: src/frontends/qt4/GuiDocument.cpp:157
-msgid "Computer Modern Typewriter"
-msgstr "Computer Modern Typewriter"
-
-#: src/frontends/qt4/GuiDocument.cpp:158
-msgid "Latin Modern Typewriter"
-msgstr "Latin Modern Typewriter"
-
-#: src/frontends/qt4/GuiDocument.cpp:158
-msgid "Courier"
-msgstr "Courier"
-
-#: src/frontends/qt4/GuiDocument.cpp:158
-msgid "Bera Mono"
-msgstr "Bera Mono"
-
-#: src/frontends/qt4/GuiDocument.cpp:159
-msgid "LuxiMono"
-msgstr "LuxiMono"
-
-#: src/frontends/qt4/GuiDocument.cpp:159
-msgid "CM Typewriter Light"
-msgstr "CM Typewriter Light"
-
 #: src/frontends/qt4/GuiDocument.cpp:171
 msgid "Page"
 msgstr "Stránka"
@@ -24734,6 +24751,9 @@ msgstr ""
 msgid "Unknown user"
 msgstr "Neznámy používateľ"
 
+#~ msgid "New documents will be assigned this language."
+#~ msgstr "Novým dokumentom bude priradený tento jazyk."
+
 #~ msgid "LatinOn"
 #~ msgstr "LatinOn"
 
@@ -24955,9 +24975,6 @@ msgstr "Neznámy používateľ"
 #~ msgid "List of %1$s"
 #~ msgstr "Zoznam od %1$s"
 
-#~ msgid "Liber"
-#~ msgstr "Liber"
-
 #, qt-format
 #~ msgid "%1$s unknown"
 #~ msgstr "%1$s neznámy"

-----------------------------------------------------------------------

Summary of changes:
 po/sk.po |  229 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 123 insertions(+), 106 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to