From 4985015e8939df78a8d29c31aa04bc28caa3a47f Mon Sep 17 00:00:00 2001 From: Tommaso Cucinotta Date: Sat, 15 Sep 2012 23:37:55 +0100 Subject: [PATCH 01/30] Now LyX closes the current document WA only by default (other WAs remain open). If the WA is the last one showing a buffer, then the buffer may either be closed or kept hidden, or the user is asked. The behaviour is controlled by a new preference option. For discussion, see http://comments.gmane.org/gmane.editors.lyx.devel/142638 --- RELEASE-NOTES | 20 +++++++++++ lib/bind/cua.bind | 2 +- src/FuncCode.h | 1 + src/LyXAction.cpp | 12 +++++++ src/LyXRC.cpp | 18 ++++++++++ src/LyXRC.h | 3 ++ src/frontends/qt4/GuiPrefs.cpp | 21 +++++++++++ src/frontends/qt4/GuiView.cpp | 65 +++++++++++++++++++++++++++++++++- src/frontends/qt4/GuiView.h | 2 +- src/frontends/qt4/ui/PrefUi.ui | 51 ++++++++++++++++++++------ 10 files changed, 181 insertions(+), 14 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index ee523fb21c..3d5d7469cd 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -6,6 +6,17 @@ when upgrading from earlier versions to a version of the 2.1.x series. Interface changes ----------------- +Whenever the user closes a (tabbed) view on a document, either by +clicking on the tab close button, or by using the File->Close menu, +LyX now closes exclusively that specific view. If there are other +views showing the same document, they are not closed. When the user +closes the last view, LyX can be configured for either closing the +document, or keeping it into memory as a hidden document (that can be +shown again through the View->Hidden-> submenu). + +A new configurable preference option has been added, allowing for either +(close_buffer_with_last_view) + There have been some changes to the LyX command line. The following new options have been added: @@ -27,6 +38,11 @@ search operation by hitting the ESC key. The following pref variables were changed in 2.1: +- \\close_buffer_with_last_view [yes|no|ask] + When user closes the last view on a document, close the document + as well ("yes"), or hide the document ("no"), or ask the user + ("ask"). + The following pref variables are obsoleted in 2.1: - \\default_language @@ -45,6 +61,10 @@ The following new LyX functions have been introduced: This is also available through a new menu voice within the [Edit]->[Paste Special...] sub-menu. +- LFUN_VIEW_CLOSE + Close the current document view only, if there are no more views + on the document, either close or hide it (see the new preference + option \\close_buffer_with_last_view) The following LyX functions have been removed: diff --git a/lib/bind/cua.bind b/lib/bind/cua.bind index f224af6f8b..6860bff84c 100644 --- a/lib/bind/cua.bind +++ b/lib/bind/cua.bind @@ -39,7 +39,7 @@ Format 1 \bind "C-n" "buffer-new" \bind "C-S-N" "buffer-new-template" \bind "C-o" "file-open" -\bind "C-w" "buffer-close" +\bind "C-w" "view-close" \bind "C-s" "buffer-write" \bind "C-S-S" "buffer-write-as" \bind "C-p" "dialog-show print" diff --git a/src/FuncCode.h b/src/FuncCode.h index 4924ad2c5d..d196d641af 100644 --- a/src/FuncCode.h +++ b/src/FuncCode.h @@ -456,6 +456,7 @@ enum FuncCode LFUN_IN_IPA, // spitz, 20120520 LFUN_IPAMACRO_INSERT, // spitz, 20120822 // 355 + LFUN_VIEW_CLOSE, // Tommaso, 20120915 LFUN_LASTACTION // end of the table }; diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp index 20cbb833f0..929c35236b 100644 --- a/src/LyXAction.cpp +++ b/src/LyXAction.cpp @@ -2685,6 +2685,18 @@ void LyXAction::init() * \endvar */ { LFUN_CLOSE_TAB_GROUP, "close-tab-group", ReadOnly, Buffer }, + +/*! + * \var lyx::FuncCode lyx::LFUN_VIEW_CLOSE + * \li Action: Close the current document work area. + * \li Notion: Close the current work area. If no other work areas are showing the buffer, + then close the associated buffer as well. + * \li Syntax: view-close + * \li Origin: Tommaso, 15 Sep 2012 + * \endvar + */ + { LFUN_VIEW_CLOSE, "view-close", ReadOnly, Buffer }, + /*! * \var lyx::FuncCode lyx::LFUN_DIALOG_SHOW * \li Action: Shows hidden dialog or creates new one for a given function/inset settings etc. diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp index 4669f68bab..b7dd2250fe 100644 --- a/src/LyXRC.cpp +++ b/src/LyXRC.cpp @@ -210,6 +210,7 @@ LexerKeyword lyxrcTags[] = { { "\\viewer", LyXRC::RC_VIEWER}, { "\\viewer_alternatives", LyXRC::RC_VIEWER_ALTERNATIVES }, { "\\visual_cursor", LyXRC::RC_VISUAL_CURSOR }, + { "\\close_buffer_with_last_view", LyXRC::RC_CLOSE_BUFFER_WITH_LAST_VIEW }, { "format", LyXRC::RC_LYXRCFORMAT } }; @@ -370,6 +371,7 @@ void LyXRC::setDefaults() default_decimal_point = "."; default_length_unit = Length::CM; cursor_width = 1; + close_buffer_with_last_view = "yes"; } @@ -1042,6 +1044,9 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) case RC_VISUAL_CURSOR: lexrc >> visual_cursor; break; + case RC_CLOSE_BUFFER_WITH_LAST_VIEW: + lexrc >> close_buffer_with_last_view; + break; case RC_AUTO_NUMBER: lexrc >> auto_number; break; @@ -2528,6 +2533,14 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c } if (tag != RC_LAST) break; + case RC_CLOSE_BUFFER_WITH_LAST_VIEW: + if (ignore_system_lyxrc || + close_buffer_with_last_view != system_lyxrc.close_buffer_with_last_view) { + os << "# When closing last view, buffer closes (yes), hides (no), or ask the user (ask)\n"; + os << "\\close_buffer_with_last_view " << close_buffer_with_last_view << '\n'; + } + if (tag != RC_LAST) + break; case RC_LANGUAGE_CUSTOM_PACKAGE: if (ignore_system_lyxrc || language_custom_package != system_lyxrc.language_custom_package) { @@ -3025,6 +3038,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new) case LyXRC::RC_FULL_SCREEN_TOOLBARS: case LyXRC::RC_FULL_SCREEN_WIDTH: case LyXRC::RC_VISUAL_CURSOR: + case LyXRC::RC_CLOSE_BUFFER_WITH_LAST_VIEW: case LyXRC::RC_VIEWER: case LyXRC::RC_VIEWER_ALTERNATIVES: case LyXRC::RC_FORWARD_SEARCH_DVI: @@ -3387,6 +3401,10 @@ string const LyXRC::getDescription(LyXRCTags tag) str = _("Select to have visual bidi cursor movement, unselect for logical movement."); break; + case RC_CLOSE_BUFFER_WITH_LAST_VIEW: + str = _("Specify whether, closing the last view of an open document, LyX should close the document (yes), hide it (no), or ask the user (ask)."); + break; + case RC_SCREEN_DPI: str = _("DPI (dots per inch) of your monitor is auto-detected by LyX. If that goes wrong, override the setting here."); break; diff --git a/src/LyXRC.h b/src/LyXRC.h index 4032e6bebc..dbda8d9153 100644 --- a/src/LyXRC.h +++ b/src/LyXRC.h @@ -190,6 +190,7 @@ public: RC_VIEWER, RC_VIEWER_ALTERNATIVES, RC_VISUAL_CURSOR, + RC_CLOSE_BUFFER_WITH_LAST_VIEW, RC_LAST }; @@ -547,6 +548,8 @@ public: bool force_paint_single_char; /// int cursor_width; + /// One of: yes, no, ask + std::string close_buffer_with_last_view; }; diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp index d377084750..a65af05d76 100644 --- a/src/frontends/qt4/GuiPrefs.cpp +++ b/src/frontends/qt4/GuiPrefs.cpp @@ -2526,6 +2526,8 @@ PrefUserInterface::PrefUserInterface(GuiPreferences * form) this, SIGNAL(changed())); connect(iconSetCO, SIGNAL(activated(int)), this, SIGNAL(changed())); + connect(closeLastViewCO, SIGNAL(activated(int)), + this, SIGNAL(changed())); connect(restoreCursorCB, SIGNAL(clicked()), this, SIGNAL(changed())); connect(loadSessionCB, SIGNAL(clicked()), @@ -2572,6 +2574,19 @@ void PrefUserInterface::apply(LyXRC & rc) const #if QT_VERSION < 0x040500 rc.single_close_tab_button = true; #endif + switch (closeLastViewCO->currentIndex()) { + case 0: + rc.close_buffer_with_last_view = "yes"; + break; + case 1: + rc.close_buffer_with_last_view = "no"; + break; + case 2: + rc.close_buffer_with_last_view = "ask"; + break; + default: + ; + } } @@ -2601,6 +2616,12 @@ void PrefUserInterface::update(LyXRC const & rc) singleInstanceCB->setChecked(rc.single_instance && !rc.lyxpipes.empty()); singleInstanceCB->setEnabled(!rc.lyxpipes.empty()); singleCloseTabButtonCB->setChecked(rc.single_close_tab_button); + if (rc.close_buffer_with_last_view == "yes") + closeLastViewCO->setCurrentIndex(0); + else if (rc.close_buffer_with_last_view == "no") + closeLastViewCO->setCurrentIndex(1); + else if (rc.close_buffer_with_last_view == "ask") + closeLastViewCO->setCurrentIndex(2); } diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index fe69318f99..3eda5409a2 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -330,6 +330,18 @@ struct GuiView::GuiViewPrivate return tabWorkArea(0); } + int countWorkAreasOf(Buffer & buf) + { + int areas = tabWorkAreaCount(); + int count = 0; + for (int i = 0; i != areas; ++i) { + TabWorkArea * twa = tabWorkArea(i); + if (twa->workArea(buf)) + ++count; + } + return count; + } + #if (QT_VERSION >= 0x040400) void setPreviewFuture(QFuture const & f) { @@ -1688,6 +1700,7 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag) break; case LFUN_BUFFER_CLOSE: + case LFUN_VIEW_CLOSE: enable = doc_buffer; break; @@ -2458,10 +2471,45 @@ bool GuiView::hideWorkArea(GuiWorkArea * wa) } +// We only want to close the buffer if it is not visible in other workareas +// of the same view, nor in other views, and if this is not a child bool GuiView::closeWorkArea(GuiWorkArea * wa) { Buffer & buf = wa->bufferView().buffer(); - return closeWorkArea(wa, !buf.parent()); + + bool last_wa = d.countWorkAreasOf(buf) == 1 + && !inOtherView(buf) && !buf.parent(); + + bool close_buffer = last_wa; + + if (last_wa) { + if (lyxrc.close_buffer_with_last_view == "yes") + ; // Nothing to do + else if (lyxrc.close_buffer_with_last_view == "no") + close_buffer = false; + else { + docstring file; + if (buf.isUnnamed()) + file = from_utf8(buf.fileName().onlyFileName()); + else + file = buf.fileName().displayName(30); + docstring const text = bformat( + _("Last view on document %1$s is being closed.\n" + "Would you like to close or hide the document?\n" + "\n" + "Hidden documents can be displayed back through\n" + "the menu: View->Hidden->...\n" + "\n" + "To remove this question, set your preference in:\n" + " Tools->Preferences->Look&Feel->UserInterface\n" + ), file); + int ret = Alert::prompt(_("Close or hide document?"), + text, 0, 1, _("&Close"), _("&Hide")); + close_buffer = (ret == 0); + } + } + + return closeWorkArea(wa, close_buffer); } @@ -3570,6 +3618,21 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr) } break; + case LFUN_VIEW_CLOSE: + if (TabWorkArea * twa = d.currentTabWorkArea()) { + closeWorkArea(twa->currentWorkArea()); + d.current_work_area_ = 0; + twa = d.currentTabWorkArea(); + // Switch to the next GuiWorkArea in the found TabWorkArea. + if (twa) { + // Make sure the work area is up to date. + setCurrentWorkArea(twa->currentWorkArea()); + } else { + setCurrentWorkArea(0); + } + } + break; + case LFUN_COMPLETION_INLINE: if (d.current_work_area_) d.current_work_area_->completer().showInline(); diff --git a/src/frontends/qt4/GuiView.h b/src/frontends/qt4/GuiView.h index bc7b9ecc1e..dff2fb63db 100644 --- a/src/frontends/qt4/GuiView.h +++ b/src/frontends/qt4/GuiView.h @@ -145,7 +145,7 @@ public: /// hides the workarea and makes sure it is clean bool hideWorkArea(GuiWorkArea * wa); - /// closes the workarea + /// closes workarea; close buffer only if no other workareas point to it bool closeWorkArea(GuiWorkArea * wa); /// closes the buffer bool closeBuffer(Buffer & buf); diff --git a/src/frontends/qt4/ui/PrefUi.ui b/src/frontends/qt4/ui/PrefUi.ui index fe50bcf0c6..17a7ca9c90 100644 --- a/src/frontends/qt4/ui/PrefUi.ui +++ b/src/frontends/qt4/ui/PrefUi.ui @@ -1,3 +1,4 @@ + PrefUi @@ -5,8 +6,8 @@ 0 0 - 413 - 408 + 604 + 559 @@ -52,20 +53,21 @@ - - - + + + &Icon Set: - + iconSetCO - - - - The icon set to use. Warning: normal size of icons may be wrong until you save the preferences and restart LyX. + + + + The icon set to use. Warning: normal size of icons may be +wrong until you save the preferences and restart LyX. @@ -259,7 +261,8 @@ - Whether to open documents in an already running instance of LyX. (Set the LyXServer pipe path and restart LyX to enable this feature) + Whether to open documents in an already running instance of LyX. +(Set the LyXServer pipe path and restart LyX to enable this feature) S&ingle instance @@ -276,6 +279,32 @@ + + + + Closing last view: + + + + + + + + Closes document + + + + + Hides document + + + + + Ask the user + + + + From fbf1794d0482120cc2d5890b0ca05329e96ad184 Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Sat, 29 Sep 2012 12:56:42 +0200 Subject: [PATCH 02/30] * sk.po --- po/sk.po | 143 ++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 98 insertions(+), 45 deletions(-) diff --git a/po/sk.po b/po/sk.po index b5c746b30b..9f01988b1e 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,15 +8,15 @@ msgid "" msgstr "" "Project-Id-Version: LyX-2.1\n" "Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n" -"POT-Creation-Date: 2012-09-28 15:56+0200\n" -"PO-Revision-Date: 2012-04-08 11:27+0100\n" +"POT-Creation-Date: 2012-09-29 11:05+0200\n" +"PO-Revision-Date: 2012-09-29 12:41+0200\n" "Last-Translator: Kornel Benko \n" "Language-Team: Slovak \n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n" "X-Language: sk_SK\n" "X-Source-Language: en_US\n" @@ -303,7 +303,7 @@ msgstr "Z&mazať" #: src/frontends/qt4/ui/BoxUi.ui:28 msgid "Check this if the box should break across pages" -msgstr "Vybrať aby rámok mohol prejsť aj na druhú stránku" +msgstr "Vybrať aby rámik mohol prejsť aj na druhú stránku" #: src/frontends/qt4/ui/BoxUi.ui:31 msgid "Allow &page breaks" @@ -372,7 +372,7 @@ msgstr "Vertikálne zarovnanie obsahu v rámku (vzťahujúce sa na základnú li #: src/frontends/qt4/ui/BoxUi.ui:144 msgid "&Box:" -msgstr "&Rámok:" +msgstr "&Rámik:" #: src/frontends/qt4/ui/BoxUi.ui:154 msgid "Co&ntent:" @@ -393,7 +393,7 @@ msgstr "&Výška:" #: src/frontends/qt4/ui/BoxUi.ui:213 msgid "Inner Bo&x:" -msgstr "V&nútorný rámok:" +msgstr "V&nútorný rámik:" #: src/frontends/qt4/ui/BoxUi.ui:229 msgid "&Decoration:" @@ -415,7 +415,7 @@ msgstr "Hodnota Šírky" #: src/frontends/qt4/ui/BoxUi.ui:269 msgid "Inner box -- needed for fixed width & line breaks" -msgstr "Vnútorný rámok -- potrebný pre pevnú šírku a lom riadkov" +msgstr "Vnútorný rámik -- potrebný pre pevnú šírku a lom riadkov" #: src/frontends/qt4/ui/BoxUi.ui:273 src/frontends/qt4/ui/HSpaceUi.ui:32 #: src/frontends/qt4/ui/ListingsUi.ui:98 @@ -1260,9 +1260,10 @@ msgstr "x" msgid "Right &top:" msgstr "Vpravo &hore:" -#: src/frontends/qt4/ui/ExternalUi.ui:514 src/frontends/qt4/ui/GraphicsUi.ui:437 +#: src/frontends/qt4/ui/ExternalUi.ui:514 +#: src/frontends/qt4/ui/GraphicsUi.ui:437 msgid "Get bounding box from the (EPS) file" -msgstr "Získať ohraničujúci rámok z (EPS) súboru" +msgstr "Získať ohraničujúci rámik z (EPS) súboru" #: src/frontends/qt4/ui/ExternalUi.ui:517 src/frontends/qt4/ui/GraphicsUi.ui:440 msgid "&Get from File" @@ -3150,7 +3151,7 @@ msgstr "&Zoskupiť prostredia odstavcov podľa kategórií" #: src/frontends/qt4/ui/PrefEditUi.ui:99 msgid "Edit Math Macros inline with a box around" -msgstr "Zobraz rámok pri editácii matematických makrov v riadku" +msgstr "Zobraz rámik pri editácii matematických makrov v riadku" #: src/frontends/qt4/ui/PrefEditUi.ui:104 msgid "Edit Math Macros inline with the name in the status bar" @@ -3947,14 +3948,6 @@ msgstr "Súbor s &užívateľským rozhraním:" msgid "&Icon Set:" msgstr "Sada &ikon:" -#: src/frontends/qt4/ui/PrefUi.ui:68 -msgid "" -"The icon set to use. Warning: normal size of icons may be\n" -"wrong until you save the preferences and restart LyX." -msgstr "" -"Sada ikon na použitie. Pozor: Normálny rozmer ikon môže byť\n" -"nevhodný až kým sa neuložia nastavenia a reštartuje LyX." - #: src/frontends/qt4/ui/PrefUi.ui:75 msgid "Automatic help" msgstr "Automatická nápoveda" @@ -4022,15 +4015,6 @@ msgstr "&Maximum posledných súborov:" msgid "&Open documents in tabs" msgstr "&Otvoriť dokumenty v paneloch" -#: src/frontends/qt4/ui/PrefUi.ui:262 -msgid "" -"Whether to open documents in an already running instance of LyX.\n" -"(Set the LyXServer pipe path and restart LyX to enable this feature)" -msgstr "" -"Či otvoriť dokumenty v už spustenej inštancii LyX-a.\n" -"(Nastavit cestu k dátovodu pre LyXServer a reštartovať LyX umožní túto " -"vlastnosť)" - #: src/frontends/qt4/ui/PrefUi.ui:265 msgid "S&ingle instance" msgstr "Jednoduchá &inštancia" @@ -4043,6 +4027,22 @@ msgstr "Dať tlačidlo \"Zavrieť\" na každý panel, alebo len jediné vľavo h msgid "&Single close-tab button" msgstr "&Jediné tlačidlo na zavretie panelov" +#: src/frontends/qt4/ui/PrefUi.ui:285 +msgid "Closing last view:" +msgstr "Pri zavieraní posledného náhľadu:" + +#: src/frontends/qt4/ui/PrefUi.ui:293 +msgid "Closes document" +msgstr "Zavrieť dokument" + +#: src/frontends/qt4/ui/PrefUi.ui:298 +msgid "Hides document" +msgstr "Skryť dokument" + +#: src/frontends/qt4/ui/PrefUi.ui:303 +msgid "Ask the user" +msgstr "Opýtať sa, čo zrobiť" + #: src/frontends/qt4/ui/PrefsUi.ui:70 src/frontends/qt4/GuiView.cpp:2649 #: src/frontends/qt4/GuiView.cpp:2656 src/frontends/qt4/GuiView.cpp:2755 msgid "&Save" @@ -4581,7 +4581,7 @@ msgstr "Zlúčiť bunky rozličných stĺpcov" #: src/frontends/qt4/ui/TabularUi.ui:556 msgid "&Multicolumn" -msgstr "Viac&stĺpcové" +msgstr "Viac-&stĺpcové" #: src/frontends/qt4/ui/TabularUi.ui:563 msgid "LaTe&X argument:" @@ -10499,11 +10499,11 @@ msgstr "Braille_zrkadlenie_vyp" #: lib/layouts/braille.module:163 msgid "Braillebox" -msgstr "BrailleRámok" +msgstr "BrailleRámik" #: lib/layouts/braille.module:167 msgid "Braille box" -msgstr "Braille rámok" +msgstr "Braille rámik" #: lib/layouts/customHeadersFooters.module:2 msgid "Custom Header/Footerlines" @@ -11261,7 +11261,7 @@ msgid "" "changed by loading one of the 'Theorems (Numbered by ...)' modules." msgstr "" "Definuje prostredie mat. viet a dôkazov používajúce rozšírenie AMS. K " -"dispozícii sú číslované a nečíslované typy. Implicitne sú vety číslované " +"dispozícii sú číslované a ne-číslované typy. Implicitne sú vety číslované " "postupne bez ohľadu na štruktúru dokumentu. To sa dá zmeniť voľbou jedného z " "'Teorémy (Číslované podľa ...)' modulu." @@ -13004,7 +13004,7 @@ msgstr "Prevziať na Úpravu" #: lib/ui/stdmenus.inc:77 msgid "Update Local Directory From Repository|d" -msgstr "Aktualizuj Lokálny Adresár Z Repositáru" +msgstr "Aktualizuj Lokálny Adresár Z Repozitáru" #: lib/ui/stdmenus.inc:78 msgid "Revert to Repository Version|v" @@ -13484,7 +13484,7 @@ msgstr "Súbor|S" #: lib/ui/stdmenus.inc:359 msgid "Box[[Menu]]" -msgstr "Rámok" +msgstr "Rámik" #: lib/ui/stdmenus.inc:362 msgid "Citation...|C" @@ -14056,7 +14056,7 @@ msgstr "Vložiť poznámku" #: lib/ui/stdtoolbars.inc:131 msgid "Insert box" -msgstr "Vložiť rámok" +msgstr "Vložiť rámik" #: lib/ui/stdtoolbars.inc:132 msgid "Insert hyperlink" @@ -14402,9 +14402,9 @@ msgstr "Vložiť Info Verzie" msgid "Use SVN file locking property" msgstr "Použiť blokovanie súborov z SVN" -#: lib/ui/stdtoolbars.inc:269 +#: lib/ui/stdtoolbars.inc:279 msgid "Update local directory from repository" -msgstr "Aktualizuj lokálny adresár z repositáru" +msgstr "Aktualizuj lokálny adresár z repozitáru" #: lib/ui/stdtoolbars.inc:272 msgid "Math Panels" @@ -18961,7 +18961,7 @@ msgstr "vložka textu phantom" #: src/Color.cpp:230 msgid "shaded box" -msgstr "tieňovaný rámok" +msgstr "tieňovaný rámik" #: src/Color.cpp:231 msgid "listings background" @@ -19957,7 +19957,7 @@ msgid "" "Show a small box around a Math Macro with the macro name when the cursor is " "inside." msgstr "" -"Zobraziť malý rámok okolo mat. makra spolu s menom makra keď je kurzor " +"Zobraziť malý rámik okolo mat. makra spolu s menom makra keď je kurzor " "vnútri." #: src/LyXRC.cpp:3145 @@ -20289,6 +20289,15 @@ msgid "" "Select to have visual bidi cursor movement, unselect for logical movement." msgstr "Vyberte pre vizuálny/logický pohyb kurzoru v dvojsmernom móde (bidi)." +#: src/LyXRC.cpp:3405 +msgid "" +"Specify whether, closing the last view of an open document, LyX should close " +"the document (yes), hide it (no), or ask the user (ask)." +msgstr "" +"Definuje čo by sa malo robiť pri zavieraní posledného náhľadu otvoreného " +"dokumentu. LyX by mal zavrieť dokument(yes), skryť ho(no), alebo pýtať sa čo " +"zrobiť(ask)." + #: src/LyXRC.cpp:3409 msgid "" "DPI (dots per inch) of your monitor is auto-detected by LyX. If that goes " @@ -23701,6 +23710,35 @@ msgstr "Premenovať a uložiť ?" msgid "&Retry" msgstr "Zopakuj" +#: src/frontends/qt4/GuiView.cpp:2497 +#, c-format +msgid "" +"Last view on document %1$s is being closed.\n" +"Would you like to close or hide the document?\n" +"\n" +"Hidden documents can be displayed back through\n" +"the menu: View->Hidden->...\n" +"\n" +"To remove this question, set your preference in:\n" +" Tools->Preferences->Look&Feel->UserInterface\n" +msgstr "" +"Posledný náhľad dokumentu %1$s sa zaviera.\n" +"Chcete ho zavrieť alebo len skryť?\n" +"\n" +"Skryté dokumenty možno zase vidieť cez\n" +"menu: Zobraziť->Skryté->...\n" +"\n" +"Na zbavenie sa tejto otázky, nastavte preferenciu v:\n" +" Nástroje Preferencie...->Vzhľad->Užívateľské Rozhranie\n" + +#: src/frontends/qt4/GuiView.cpp:2506 +msgid "Close or hide document?" +msgstr "Zavrieť alebo skryť dokument?" + +#: src/frontends/qt4/GuiView.cpp:2507 +msgid "&Hide" +msgstr "Skryť" + #: src/frontends/qt4/GuiView.cpp:2540 msgid "Close document" msgstr "Zavrieť dokument" @@ -23886,9 +23924,9 @@ msgstr " (iba pre čítanie)" msgid "Close File" msgstr "Zavrieť Súbor" -#: src/frontends/qt4/GuiWorkArea.cpp:1976 +#: src/frontends/qt4/GuiWorkArea.cpp:1996 msgid "Hide tab" -msgstr "Panel schovať" +msgstr "Panel skryť" #: src/frontends/qt4/GuiWorkArea.cpp:1978 msgid "Close tab" @@ -24177,9 +24215,9 @@ msgstr "TeX kód" msgid "Float" msgstr "Plávajúci objekt" -#: src/insets/Inset.cpp:109 src/insets/InsetBox.cpp:130 +#: src/insets/Inset.cpp:112 src/insets/InsetBox.cpp:130 msgid "Box" -msgstr "Rámok" +msgstr "Rámik" #: src/insets/Inset.cpp:111 msgid "Horizontal Space" @@ -24293,7 +24331,7 @@ msgstr "s tieňom" #: src/insets/InsetBox.cpp:72 msgid "shaded background" -msgstr "pozadie tieňovaný rámok" +msgstr "pozadie tieňovaný rámik" #: src/insets/InsetBox.cpp:73 msgid "double frame" @@ -24599,9 +24637,9 @@ msgstr "Neznámy typ registra!" msgid "All indexes" msgstr "Všetky registre" -#: src/insets/InsetIndex.cpp:456 +#: src/insets/InsetIndex.cpp:453 msgid "subindex" -msgstr "Podregister" +msgstr "Pod-register" #: src/insets/InsetInfo.cpp:119 #, c-format @@ -25586,6 +25624,21 @@ msgstr "" msgid "Unknown user" msgstr "Neznámy používateľ" +#~ msgid "" +#~ "The icon set to use. Warning: normal size of icons may be\n" +#~ "wrong until you save the preferences and restart LyX." +#~ msgstr "" +#~ "Sada ikon na použitie. Pozor: Normálny rozmer ikon môže byť\n" +#~ "nevhodný až kým sa neuložia nastavenia a reštartuje LyX." + +#~ msgid "" +#~ "Whether to open documents in an already running instance of LyX.\n" +#~ "(Set the LyXServer pipe path and restart LyX to enable this feature)" +#~ msgstr "" +#~ "Či otvoriť dokumenty v už spustenej inštancii LyX-a.\n" +#~ "(Nastavit cestu k dátovodu pre LyXServer a reštartovať LyX umožní túto " +#~ "vlastnosť)" + #~ msgid "Utopia" #~ msgstr "Utopia" From e70b3ff726dfc03989e03488cea6513a4fc9f0d1 Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Sat, 29 Sep 2012 13:01:18 +0200 Subject: [PATCH 03/30] Use view-close also in emacs.bind --- lib/bind/emacs.bind | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bind/emacs.bind b/lib/bind/emacs.bind index 125ffbce87..b124ef3def 100644 --- a/lib/bind/emacs.bind +++ b/lib/bind/emacs.bind @@ -79,7 +79,7 @@ Format 1 #\bind "C-x b" "buffer-previous" \bind "C-x d" "buffer-new" \bind "C-x g" "buffer-view ps" -\bind "C-x k" "buffer-close" +\bind "C-x k" "view-close" \bind "C-x p" "buffer-view dvi" \bind "C-x r" "buffer-update dvi" # Should have been "buffer-write-some" From d855fb759dbf9933cc0179cc3deab1a10f23b4ad Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Sat, 29 Sep 2012 14:08:36 +0200 Subject: [PATCH 04/30] Emacs.bind: Changed, since view-close(lyx) looks more like delete-window(emacs) --- lib/bind/emacs.bind | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/bind/emacs.bind b/lib/bind/emacs.bind index b124ef3def..89e3a81f90 100644 --- a/lib/bind/emacs.bind +++ b/lib/bind/emacs.bind @@ -79,7 +79,7 @@ Format 1 #\bind "C-x b" "buffer-previous" \bind "C-x d" "buffer-new" \bind "C-x g" "buffer-view ps" -\bind "C-x k" "view-close" +\bind "C-x k" "buffer-close" \bind "C-x p" "buffer-view dvi" \bind "C-x r" "buffer-update dvi" # Should have been "buffer-write-some" @@ -104,8 +104,9 @@ Format 1 #\bind "C-x C-r" "buffer-update dvi" \bind "C-x C-s" "buffer-write" \bind "C-x C-t" "buffer-update dvi" -\bind "C-Next" "buffer-next" -\bind "C-Prior" "buffer-previous" +\bind "C-Next" "buffer-next" +\bind "C-Prior" "buffer-previous" +\bind "C-x 0" "view-close" # this is "upcase-region" in emacs From 0b2c308a68d24015494c8705f24871f73983315d Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Sat, 29 Sep 2012 16:11:09 +0200 Subject: [PATCH 05/30] sort table --- src/LyXRC.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp index b7dd2250fe..0d4c9197cc 100644 --- a/src/LyXRC.cpp +++ b/src/LyXRC.cpp @@ -73,6 +73,7 @@ LexerKeyword lyxrcTags[] = { { "\\bind_file", LyXRC::RC_BINDFILE }, { "\\check_lastfiles", LyXRC::RC_CHECKLASTFILES }, { "\\chktex_command", LyXRC::RC_CHKTEX_COMMAND }, + { "\\close_buffer_with_last_view", LyXRC::RC_CLOSE_BUFFER_WITH_LAST_VIEW }, { "\\completion_cursor_text", LyXRC::RC_COMPLETION_CURSOR_TEXT }, { "\\completion_inline_delay", LyXRC::RC_COMPLETION_INLINE_DELAY }, { "\\completion_inline_dots", LyXRC::RC_COMPLETION_INLINE_DOTS }, @@ -210,7 +211,6 @@ LexerKeyword lyxrcTags[] = { { "\\viewer", LyXRC::RC_VIEWER}, { "\\viewer_alternatives", LyXRC::RC_VIEWER_ALTERNATIVES }, { "\\visual_cursor", LyXRC::RC_VISUAL_CURSOR }, - { "\\close_buffer_with_last_view", LyXRC::RC_CLOSE_BUFFER_WITH_LAST_VIEW }, { "format", LyXRC::RC_LYXRCFORMAT } }; From c9f9107a7fd481ed8c1f4e9ada54976184254b4e Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Sat, 29 Sep 2012 16:12:31 +0200 Subject: [PATCH 06/30] Fix issues with xref dialog in read-only documents (#8177) --- src/frontends/qt4/GuiRef.cpp | 38 +++++++++++++++--------------------- src/frontends/qt4/GuiRef.h | 4 ++++ 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/frontends/qt4/GuiRef.cpp b/src/frontends/qt4/GuiRef.cpp index 5082daa266..c79dcb9139 100644 --- a/src/frontends/qt4/GuiRef.cpp +++ b/src/frontends/qt4/GuiRef.cpp @@ -48,14 +48,6 @@ GuiRef::GuiRef(GuiView & lv) at_ref_ = false; - // Enabling is set in updateRefs. Disable for now in case no - // call to updateContents follows (e.g. read-only documents). - sortCB->setEnabled(false); - caseSensitiveCB->setEnabled(false); - caseSensitiveCB->setChecked(false); - refsTW->setEnabled(false); - gotoPB->setEnabled(false); - refsTW->setColumnCount(1); refsTW->header()->setVisible(false); @@ -98,19 +90,22 @@ GuiRef::GuiRef(GuiView & lv) bc().setOK(okPB); bc().setApply(applyPB); bc().setCancel(closePB); - bc().addReadOnly(refsTW); - bc().addReadOnly(sortCB); - bc().addReadOnly(caseSensitiveCB); - bc().addReadOnly(nameED); - bc().addReadOnly(referenceED); bc().addReadOnly(typeCO); - bc().addReadOnly(bufferCO); restored_buffer_ = -1; active_buffer_ = -1; } +void GuiRef::enableView(bool enable) +{ + if (!enable) + // In the opposite case, updateContents() will be called anyway. + updateContents(); + GuiDialog::enableView(enable); +} + + void GuiRef::changed_adaptor() { changed(); @@ -139,9 +134,6 @@ void GuiRef::selectionChanged() void GuiRef::refHighlighted(QTreeWidgetItem * sel) { - if (isBufferReadonly()) - return; - if (sel->childCount() > 0) { sel->setExpanded(true); return; @@ -158,7 +150,7 @@ void GuiRef::refHighlighted(QTreeWidgetItem * sel) if (at_ref_) gotoRef(); gotoPB->setEnabled(true); - if (typeAllowed()) + if (typeAllowed() && !isBufferReadonly()) typeCO->setEnabled(true); nameED->setHidden(!nameAllowed()); nameL->setHidden(!nameAllowed()); @@ -235,11 +227,13 @@ void GuiRef::updateContents() { int orig_type = typeCO->currentIndex(); - referenceED->setText(toqstr(params_["reference"])); + referenceED->clear(); + nameED->clear(); + referenceED->setText(toqstr(params_["reference"])); nameED->setText(toqstr(params_["name"])); - nameED->setHidden(!nameAllowed() && !isBufferReadonly()); - nameL->setHidden(!nameAllowed() && !isBufferReadonly()); + nameED->setHidden(!nameAllowed()); + nameL->setHidden(!nameAllowed()); // restore type settings for new insets if (params_["reference"].empty()) @@ -449,7 +443,7 @@ void GuiRef::updateRefs() FileName const & name = theBufferList().fileNames()[the_buffer]; Buffer const * buf = theBufferList().getBuffer(name); buf->getLabelList(refs_); - } + } sortCB->setEnabled(!refs_.empty()); caseSensitiveCB->setEnabled(sortCB->isEnabled() && sortCB->isChecked()); refsTW->setEnabled(!refs_.empty()); diff --git a/src/frontends/qt4/GuiRef.h b/src/frontends/qt4/GuiRef.h index e240d0e939..250d407645 100644 --- a/src/frontends/qt4/GuiRef.h +++ b/src/frontends/qt4/GuiRef.h @@ -30,6 +30,10 @@ class GuiRef : public GuiDialog, public Ui::RefUi public: GuiRef(GuiView & lv); + /// Dialog inherited methods + //@{ + void enableView(bool enable); + //@} private Q_SLOTS: void changed_adaptor(); From a72b75c50cd2017f37115af4da83502a47418db5 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sat, 29 Sep 2012 17:16:52 +0200 Subject: [PATCH 07/30] Proper naming for tab-group-close. --- RELEASE-NOTES | 2 ++ development/qmake/Resources.qrc | 2 +- lib/Makefile.am | 6 +++--- .../{close-tab-group.png => tab-group-close.png} | Bin .../{close-tab-group.png => tab-group-close.png} | Bin .../{close-tab-group.png => tab-group-close.png} | Bin lib/ui/stdcontext.inc | 2 +- lib/ui/stdmenus.inc | 2 +- src/FuncCode.h | 2 +- src/LyXAction.cpp | 6 +++--- src/frontends/qt4/GuiView.cpp | 4 ++-- 11 files changed, 14 insertions(+), 12 deletions(-) rename lib/images/classic/{close-tab-group.png => tab-group-close.png} (100%) rename lib/images/oxygen/{close-tab-group.png => tab-group-close.png} (100%) rename lib/images/{close-tab-group.png => tab-group-close.png} (100%) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 3d5d7469cd..1883dc58b2 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -79,6 +79,8 @@ The following LyX functions have been changed: to show the settings dialog. This is no longer possible and one should use inset-settings for this purpose. +- LFUN_CLOSE_TAB_GROUP_CLOSE ("close-tab-group") was renamed to + LFUN_TAB_GROUP_CLOSE ("tab-group-close"). The following LyX key bindings have been changed: diff --git a/development/qmake/Resources.qrc b/development/qmake/Resources.qrc index 13262b5d98..070769869c 100644 --- a/development/qmake/Resources.qrc +++ b/development/qmake/Resources.qrc @@ -608,7 +608,7 @@ ../../lib/images/all-changes-accept.png ../../lib/images/banner.png ../../lib/images/url-insert.png -../../lib/images/close-tab-group.png +../../lib/images/tab-group-close.png ../../lib/images/tabular-feature_delete-row.png ../../lib/images/tabular-feature_set-longtabular.png ../../lib/images/buffer-view_pdf2.png diff --git a/lib/Makefile.am b/lib/Makefile.am index 557818aaf4..80ca7e79fb 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -355,7 +355,7 @@ dist_images_DATA = \ images/changes-output.png \ images/changes-track.png \ images/closetab.png \ - images/close-tab-group.png \ + images/tab-group-close.png \ images/copy.png \ images/cut.png \ images/demote.png \ @@ -1212,7 +1212,7 @@ dist_imagesoxygen_DATA = \ images/oxygen/change-reject.png \ images/oxygen/changes-output.png \ images/oxygen/changes-track.png \ - images/oxygen/close-tab-group.png \ + images/oxygen/tab-group-close.png \ images/oxygen/closetab.png \ images/oxygen/copy.png \ images/oxygen/cut.png \ @@ -1322,7 +1322,7 @@ dist_imagesclassic_DATA = \ images/classic/changes-merge.png \ images/classic/changes-output.png \ images/classic/changes-track.png \ - images/classic/close-tab-group.png \ + images/classic/tab-group-close.png \ images/classic/copy.png \ images/classic/cut.png \ images/classic/demote.png \ diff --git a/lib/images/classic/close-tab-group.png b/lib/images/classic/tab-group-close.png similarity index 100% rename from lib/images/classic/close-tab-group.png rename to lib/images/classic/tab-group-close.png diff --git a/lib/images/oxygen/close-tab-group.png b/lib/images/oxygen/tab-group-close.png similarity index 100% rename from lib/images/oxygen/close-tab-group.png rename to lib/images/oxygen/tab-group-close.png diff --git a/lib/images/close-tab-group.png b/lib/images/tab-group-close.png similarity index 100% rename from lib/images/close-tab-group.png rename to lib/images/tab-group-close.png diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc index fb6a45d2d5..41f498288c 100644 --- a/lib/ui/stdcontext.inc +++ b/lib/ui/stdcontext.inc @@ -317,7 +317,7 @@ Menuset LanguageSelector Separator Item "Fullscreen Mode" "ui-toggle fullscreen" - OptItem "Close Current View" "close-tab-group" + OptItem "Close Current View" "tab-group-close" End diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc index 097de8e2d5..cb0093571a 100644 --- a/lib/ui/stdmenus.inc +++ b/lib/ui/stdmenus.inc @@ -330,7 +330,7 @@ Menuset Separator Item "Split View Into Left and Right Half|i" "split-view horizontal" Item "Split View Into Upper and Lower Half|e" "split-view vertical" - OptItem "Close Current View|w" "close-tab-group" + OptItem "Close Current View|w" "tab-group-close" Item "Fullscreen|l" "ui-toggle fullscreen" Submenu "Toolbars|b" "toolbars" Separator diff --git a/src/FuncCode.h b/src/FuncCode.h index d196d641af..f70d461f6d 100644 --- a/src/FuncCode.h +++ b/src/FuncCode.h @@ -51,7 +51,7 @@ enum FuncCode LFUN_SELECTION_PASTE, // JMarc 2008/12/15 LFUN_CUT, LFUN_COPY, - LFUN_CLOSE_TAB_GROUP, + LFUN_TAB_GROUP_CLOSE, LFUN_NOTE_NEXT, // 20 LFUN_INSET_TOGGLE, diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp index 929c35236b..d1248b06c3 100644 --- a/src/LyXAction.cpp +++ b/src/LyXAction.cpp @@ -2676,15 +2676,15 @@ void LyXAction::init() { LFUN_SPLIT_VIEW, "split-view", ReadOnly, Buffer }, /*! - * \var lyx::FuncCode lyx::LFUN_CLOSE_TAB_GROUP + * \var lyx::FuncCode lyx::LFUN_TAB_GROUP_CLOSE * \li Action: Close the current tab group. * \li Notion: This only closes the work areas, not the buffers themselves. The still opened buffers can be visualized in another tab group. - * \li Syntax: close-tab-group + * \li Syntax: tab-group-close * \li Origin: Abdel, 21 Feb 2008 * \endvar */ - { LFUN_CLOSE_TAB_GROUP, "close-tab-group", ReadOnly, Buffer }, + { LFUN_TAB_GROUP_CLOSE, "tab-group-close", ReadOnly, Buffer }, /*! * \var lyx::FuncCode lyx::LFUN_VIEW_CLOSE diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index 3eda5409a2..a68252186e 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -1717,7 +1717,7 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag) d.splitter_->orientation() == Qt::Horizontal); break; - case LFUN_CLOSE_TAB_GROUP: + case LFUN_TAB_GROUP_CLOSE: enable = d.tabWorkAreaCount() > 1; break; @@ -3603,7 +3603,7 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr) setCurrentWorkArea(wa); break; } - case LFUN_CLOSE_TAB_GROUP: + case LFUN_TAB_GROUP_CLOSE: if (TabWorkArea * twa = d.currentTabWorkArea()) { closeTabWorkArea(twa); d.current_work_area_ = 0; From 4083bcb62bb54ae66a53bae4aa6d1961cb315dc2 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sat, 29 Sep 2012 17:21:05 +0200 Subject: [PATCH 08/30] Note C-w binding change. --- RELEASE-NOTES | 2 ++ 1 file changed, 2 insertions(+) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 1883dc58b2..d4f1df3c49 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -88,6 +88,8 @@ The following LyX key bindings have been changed: - LFUN_MATH_MACRO_FOLD ("math-macro-fold") The binding to "C-minus" has changed to "C-S-underscore". +- The binding "C-w" was moved from "buffer-close" to "view-close". + Linux desktop file specification and scalable icon has been included into the tarball. From e9a28c8000e8a62d05e5e932d4d1e00a606d1865 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sat, 29 Sep 2012 17:33:46 +0200 Subject: [PATCH 09/30] Correct naming for view-split. --- RELEASE-NOTES | 3 +++ ...iew_horizontal.png => view-split_horizontal.png} | Bin ...it-view_vertical.png => view-split_vertical.png} | Bin ...iew_horizontal.png => view-split_horizontal.png} | Bin ...it-view_vertical.png => view-split_vertical.png} | Bin ...iew_horizontal.png => view-split_horizontal.png} | Bin ...it-view_vertical.png => view-split_vertical.png} | Bin src/FuncCode.h | 2 +- src/LyXAction.cpp | 6 +++--- src/frontends/qt4/GuiView.cpp | 4 ++-- 10 files changed, 9 insertions(+), 6 deletions(-) rename lib/images/classic/{split-view_horizontal.png => view-split_horizontal.png} (100%) rename lib/images/classic/{split-view_vertical.png => view-split_vertical.png} (100%) rename lib/images/oxygen/{split-view_horizontal.png => view-split_horizontal.png} (100%) rename lib/images/oxygen/{split-view_vertical.png => view-split_vertical.png} (100%) rename lib/images/{split-view_horizontal.png => view-split_horizontal.png} (100%) rename lib/images/{split-view_vertical.png => view-split_vertical.png} (100%) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index d4f1df3c49..6d78c3ce35 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -82,6 +82,9 @@ The following LyX functions have been changed: - LFUN_CLOSE_TAB_GROUP_CLOSE ("close-tab-group") was renamed to LFUN_TAB_GROUP_CLOSE ("tab-group-close"). +- LFUN_SPIT_VIEW ("split-view") was renamed to + LFUN_VIEW_SPLIT ("view-split"). + The following LyX key bindings have been changed: //template, remove this entry later on diff --git a/lib/images/classic/split-view_horizontal.png b/lib/images/classic/view-split_horizontal.png similarity index 100% rename from lib/images/classic/split-view_horizontal.png rename to lib/images/classic/view-split_horizontal.png diff --git a/lib/images/classic/split-view_vertical.png b/lib/images/classic/view-split_vertical.png similarity index 100% rename from lib/images/classic/split-view_vertical.png rename to lib/images/classic/view-split_vertical.png diff --git a/lib/images/oxygen/split-view_horizontal.png b/lib/images/oxygen/view-split_horizontal.png similarity index 100% rename from lib/images/oxygen/split-view_horizontal.png rename to lib/images/oxygen/view-split_horizontal.png diff --git a/lib/images/oxygen/split-view_vertical.png b/lib/images/oxygen/view-split_vertical.png similarity index 100% rename from lib/images/oxygen/split-view_vertical.png rename to lib/images/oxygen/view-split_vertical.png diff --git a/lib/images/split-view_horizontal.png b/lib/images/view-split_horizontal.png similarity index 100% rename from lib/images/split-view_horizontal.png rename to lib/images/view-split_horizontal.png diff --git a/lib/images/split-view_vertical.png b/lib/images/view-split_vertical.png similarity index 100% rename from lib/images/split-view_vertical.png rename to lib/images/view-split_vertical.png diff --git a/src/FuncCode.h b/src/FuncCode.h index f70d461f6d..ec441decf7 100644 --- a/src/FuncCode.h +++ b/src/FuncCode.h @@ -135,7 +135,7 @@ enum FuncCode LFUN_GETBUFNAME, LFUN_SERVER_GET_XY, LFUN_SERVER_SET_XY, - LFUN_SPLIT_VIEW, + LFUN_VIEW_SPLIT, LFUN_LINEATCURSOR, // 90 LFUN_SERVER_GET_LAYOUT, diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp index d1248b06c3..d8c6eec97c 100644 --- a/src/LyXAction.cpp +++ b/src/LyXAction.cpp @@ -2664,16 +2664,16 @@ void LyXAction::init() { LFUN_WINDOW_CLOSE, "window-close", NoBuffer, Buffer }, /*! - * \var lyx::FuncCode lyx::LFUN_SPLIT_VIEW + * \var lyx::FuncCode lyx::LFUN_VIEW_SPLIT * \li Action: Creates another split view of current buffer. * \li Notion: All split views act in the same way independently. - * \li Syntax: split-view + * \li Syntax: view-split * \li Params: horizontal : The work areas are laid out side by side.\n vertical : The work areas laid out vertically. * \li Origin: Abdel, 20 Feb 2008 * \endvar */ - { LFUN_SPLIT_VIEW, "split-view", ReadOnly, Buffer }, + { LFUN_VIEW_SPLIT, "view-split", ReadOnly, Buffer }, /*! * \var lyx::FuncCode lyx::LFUN_TAB_GROUP_CLOSE diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index a68252186e..953125c375 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -1708,7 +1708,7 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag) enable = theBufferList().last() != theBufferList().first(); break; - case LFUN_SPLIT_VIEW: + case LFUN_VIEW_SPLIT: if (cmd.getArg(0) == "vertical") enable = doc_buffer && (d.splitter_->count() == 1 || d.splitter_->orientation() == Qt::Vertical); @@ -3593,7 +3593,7 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr) break; } - case LFUN_SPLIT_VIEW: { + case LFUN_VIEW_SPLIT: { LASSERT(doc_buffer, break); string const orientation = cmd.getArg(0); d.splitter_->setOrientation(orientation == "vertical" From d63b137ae667ad0b857a11b9051d46861e024aab Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sat, 29 Sep 2012 17:38:15 +0200 Subject: [PATCH 10/30] Leftover from previous commit. --- lib/Makefile.am | 12 ++++++------ lib/ui/stdmenus.inc | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/Makefile.am b/lib/Makefile.am index 80ca7e79fb..d9bea52790 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -434,8 +434,8 @@ dist_images_DATA = \ images/reload.png \ images/script-insert_subscript.png \ images/script-insert_superscript.png \ - images/split-view_horizontal.png \ - images/split-view_vertical.png \ + images/view-split_horizontal.png \ + images/view-split_vertical.png \ images/standard.png \ images/tabular-feature_align-decimal.png \ images/tabular-feature_append-column.png \ @@ -1258,8 +1258,8 @@ dist_imagesoxygen_DATA = \ images/oxygen/paste.png \ images/oxygen/redo.png \ images/oxygen/reload.png \ - images/oxygen/split-view_horizontal.png \ - images/oxygen/split-view_vertical.png \ + images/oxygen/view-split_horizontal.png \ + images/oxygen/view-split_vertical.png \ images/oxygen/tabular-insert.png \ images/oxygen/textstyle-apply.png \ images/oxygen/thesaurus-entry.png \ @@ -1395,8 +1395,8 @@ dist_imagesclassic_DATA = \ images/classic/reload.png \ images/classic/script-insert_subscript.png \ images/classic/script-insert_superscript.png \ - images/classic/split-view_horizontal.png \ - images/classic/split-view_vertical.png \ + images/classic/view-split_horizontal.png \ + images/classic/view-split_vertical.png \ images/classic/tabular-feature_align-decimal.png \ images/classic/tabular-feature_append-column.png \ images/classic/tabular-feature_append-row.png \ diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc index cb0093571a..ddbab890ef 100644 --- a/lib/ui/stdmenus.inc +++ b/lib/ui/stdmenus.inc @@ -328,8 +328,8 @@ Menuset OptItem "View Master Document|M" "master-buffer-view" OptItem "Update Master Document|a" "master-buffer-update" Separator - Item "Split View Into Left and Right Half|i" "split-view horizontal" - Item "Split View Into Upper and Lower Half|e" "split-view vertical" + Item "Split View Into Left and Right Half|i" "view-split horizontal" + Item "Split View Into Upper and Lower Half|e" "view-split vertical" OptItem "Close Current View|w" "tab-group-close" Item "Fullscreen|l" "ui-toggle fullscreen" Submenu "Toolbars|b" "toolbars" From d1297047e7766993f3c93617825e1868f79a41a0 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sat, 29 Sep 2012 17:40:05 +0200 Subject: [PATCH 11/30] Move similar LFUNs to one place. --- src/LyXAction.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp index d8c6eec97c..d1dfdc3d8d 100644 --- a/src/LyXAction.cpp +++ b/src/LyXAction.cpp @@ -2675,17 +2675,6 @@ void LyXAction::init() */ { LFUN_VIEW_SPLIT, "view-split", ReadOnly, Buffer }, -/*! - * \var lyx::FuncCode lyx::LFUN_TAB_GROUP_CLOSE - * \li Action: Close the current tab group. - * \li Notion: This only closes the work areas, not the buffers themselves. - The still opened buffers can be visualized in another tab group. - * \li Syntax: tab-group-close - * \li Origin: Abdel, 21 Feb 2008 - * \endvar - */ - { LFUN_TAB_GROUP_CLOSE, "tab-group-close", ReadOnly, Buffer }, - /*! * \var lyx::FuncCode lyx::LFUN_VIEW_CLOSE * \li Action: Close the current document work area. @@ -2697,6 +2686,17 @@ void LyXAction::init() */ { LFUN_VIEW_CLOSE, "view-close", ReadOnly, Buffer }, +/*! + * \var lyx::FuncCode lyx::LFUN_TAB_GROUP_CLOSE + * \li Action: Close the current tab group. + * \li Notion: This only closes the work areas, not the buffers themselves. + The still opened buffers can be visualized in another tab group. + * \li Syntax: tab-group-close + * \li Origin: Abdel, 21 Feb 2008 + * \endvar + */ + { LFUN_TAB_GROUP_CLOSE, "tab-group-close", ReadOnly, Buffer }, + /*! * \var lyx::FuncCode lyx::LFUN_DIALOG_SHOW * \li Action: Shows hidden dialog or creates new one for a given function/inset settings etc. From 541828ebf50876780d90766d84ba01246440c9be Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sat, 29 Sep 2012 18:06:42 +0200 Subject: [PATCH 12/30] Another witch hunting case: break-paragraph -> paragraph-break. --- lib/bind/cua.bind | 2 +- lib/bind/emacs.bind | 4 ++-- lib/bind/mac.bind | 4 ++-- lib/bind/site.bind | 4 ++-- lib/bind/xemacs.bind | 4 ++-- lib/doc/Math.lyx | 2 +- lib/doc/UserGuide.lyx | 42 ++++++++++++++++++------------------ lib/doc/de/Math.lyx | 2 +- lib/doc/es/Math.lyx | 2 +- lib/doc/fr/Math.lyx | 2 +- lib/doc/fr/UserGuide.lyx | 42 ++++++++++++++++++------------------ lib/doc/id/UserGuide.lyx | 42 ++++++++++++++++++------------------ lib/doc/ja/Math.lyx | 2 +- lib/doc/ja/UserGuide.lyx | 40 +++++++++++++++++----------------- src/FuncCode.h | 2 +- src/LyXAction.cpp | 6 +++--- src/Text3.cpp | 4 ++-- src/insets/InsetBox.cpp | 2 +- src/insets/InsetCaption.cpp | 2 +- src/insets/InsetScript.cpp | 2 +- src/insets/InsetTabular.cpp | 2 +- src/mathed/InsetMathHull.cpp | 4 ++-- 22 files changed, 109 insertions(+), 109 deletions(-) diff --git a/lib/bind/cua.bind b/lib/bind/cua.bind index 6860bff84c..4d6c286e42 100644 --- a/lib/bind/cua.bind +++ b/lib/bind/cua.bind @@ -222,7 +222,7 @@ Format 1 \bind "C-Delete" "word-delete-forward" \bind "C-BackSpace" "word-delete-backward" -\bind "M-Return" "break-paragraph inverse" +\bind "M-Return" "paragraph-break inverse" \bind "C-Return" "newline-insert newline" \bind "C-S-Return" "newline-insert linebreak" \bind "C-k" "line-delete-forward" diff --git a/lib/bind/emacs.bind b/lib/bind/emacs.bind index 89e3a81f90..fd7123face 100644 --- a/lib/bind/emacs.bind +++ b/lib/bind/emacs.bind @@ -40,7 +40,7 @@ Format 1 \bind "C-h" "specialchar-insert hyphenation" \bind "C-M-minus" "specialchar-insert nobreakdash" \bind "C-i" "space-insert hfill" -\bind "C-j" "break-paragraph" +\bind "C-j" "paragraph-break" \bind "C-k" "line-delete-forward" \bind "C-l" "screen-recenter" \bind "C-m" "mark-toggle" @@ -216,7 +216,7 @@ Format 1 \bind "C-Delete" "word-delete-forward" \bind "M-d" "word-delete-forward" \bind "C-BackSpace" "word-delete-backward" -\bind "M-Return" "break-paragraph inverse" +\bind "M-Return" "paragraph-break inverse" \bind "C-Return" "newline-insert newline" \bind "C-S-Return" "newline-insert linebreak" \bind "C-S-L" "specialchar-insert ligature-break" diff --git a/lib/bind/mac.bind b/lib/bind/mac.bind index 3049a2f209..c85ec8d972 100644 --- a/lib/bind/mac.bind +++ b/lib/bind/mac.bind @@ -68,7 +68,7 @@ Format 1 # +: "Control-N" # Move down one line \bind "M-n" "down" # +: "Control-O" # Insert a new line after the cursor -\bind "M-o" "break-paragraph" +\bind "M-o" "paragraph-break" # -: "Control-P" # Move up one line # used by menu.bind - layouts # +: "Control-T" # Transpose the character behind the cursor and the character in front of the cursor @@ -347,7 +347,7 @@ Format 1 \bind "A-Delete" "word-delete-forward" \bind "A-BackSpace" "word-delete-backward" -\bind "M-Return" "break-paragraph inverse" +\bind "M-Return" "paragraph-break inverse" \bind "C-Return" "newline-insert newline" \bind "C-S-Return" "newline-insert linebreak" \bind "A-space" "command-alternatives space-insert protected ; math-space" diff --git a/lib/bind/site.bind b/lib/bind/site.bind index 3756a18792..f8f1523e2a 100644 --- a/lib/bind/site.bind +++ b/lib/bind/site.bind @@ -37,11 +37,11 @@ Format 1 \bind "Prior" "screen-up" \bind "Next" "screen-down" -\bind "Return" "break-paragraph" +\bind "Return" "paragraph-break" \bind "Delete" "char-delete-forward" \bind "BackSpace" "char-delete-backward" -\bind "KP_Enter" "break-paragraph" +\bind "KP_Enter" "paragraph-break" \bind "KP_Right" "char-right" \bind "KP_Left" "char-left" \bind "KP_Up" "up" diff --git a/lib/bind/xemacs.bind b/lib/bind/xemacs.bind index 47459464c6..90ada4faa7 100644 --- a/lib/bind/xemacs.bind +++ b/lib/bind/xemacs.bind @@ -221,7 +221,7 @@ Format 1 \bind "C-Delete" "word-delete-forward" \bind "M-d" "word-delete-forward" \bind "C-BackSpace" "word-delete-backward" -\bind "M-Return" "break-paragraph inverse" +\bind "M-Return" "paragraph-break inverse" \bind "C-Return" "newline-insert newline" \bind "C-S-Return" "newline-insert linebreak" \bind "C-S-L" "specialchar-insert ligature-break" @@ -332,7 +332,7 @@ Format 1 \bind "C-c percent" "layout Comment" -\bind "C-c Return" "break-paragraph inverse" +\bind "C-c Return" "paragraph-break inverse" # ## End AucTeX # diff --git a/lib/doc/Math.lyx b/lib/doc/Math.lyx index dc31bc48bc..0ce808048a 100644 --- a/lib/doc/Math.lyx +++ b/lib/doc/Math.lyx @@ -34760,7 +34760,7 @@ Maxima \begin_layout Standard \series bold -command-alternatives break-paragraph;math-extern maxima +command-alternatives paragraph-break;math-extern maxima \end_layout \begin_layout Standard diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx index 08c04aa7c6..b1d80ec398 100644 --- a/lib/doc/UserGuide.lyx +++ b/lib/doc/UserGuide.lyx @@ -4394,7 +4394,7 @@ Return use \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset instead. @@ -5353,7 +5353,7 @@ Standard depth, you can use \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset to break paragraphs. @@ -7199,7 +7199,7 @@ Return \family default is the \family typewriter -break-paragraph +paragraph-break \family default function, and the individual lines of an address are not paragraphs. Thus, you have to use @@ -8841,7 +8841,7 @@ List We created it by using \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset followed by @@ -8872,7 +8872,7 @@ arg "depth-increment" by hitting \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset followed by @@ -8903,7 +8903,7 @@ Standard We did this by hitting \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset , then @@ -8941,7 +8941,7 @@ Standard paragraph, also at level #4, made with just a \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset . @@ -8953,7 +8953,7 @@ arg "break-paragraph inverse" We hit \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset and changed the paragraph environment back to @@ -9003,7 +9003,7 @@ and this is level #6. Just hit \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset followed by a @@ -9021,7 +9021,7 @@ arg "depth-decrement" #4-b After another \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset followed by a @@ -9192,7 +9192,7 @@ This is level #2. We used \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset followed by @@ -9226,7 +9226,7 @@ Itemize (We got here by using \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset , then @@ -9247,7 +9247,7 @@ Itemize Here's level #4, produced using \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset , then @@ -9315,7 +9315,7 @@ don't Oh, as if you couldn't guess by now, we're just using \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset to keep the current environment and depth but create a new item. @@ -9331,7 +9331,7 @@ arg "depth-decrement" to decrease the depth after the next \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset . @@ -9372,7 +9372,7 @@ did Another \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -9395,7 +9395,7 @@ Enumerate The same thing happens if we do another \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -9526,7 +9526,7 @@ Bippitey boppitey boo! ( \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -9641,7 +9641,7 @@ blue-fish ( \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -9657,7 +9657,7 @@ arg "depth-increment" 3 times, \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -9733,7 +9733,7 @@ Quotation We will use \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset to preserve the depth. diff --git a/lib/doc/de/Math.lyx b/lib/doc/de/Math.lyx index 1f9a66edb0..be4a8d7428 100644 --- a/lib/doc/de/Math.lyx +++ b/lib/doc/de/Math.lyx @@ -34808,7 +34808,7 @@ Maxima \begin_layout Standard \series bold -command-alternatives break-paragraph;math-extern maxima +command-alternatives paragraph-break;math-extern maxima \end_layout \begin_layout Standard diff --git a/lib/doc/es/Math.lyx b/lib/doc/es/Math.lyx index 6e5fc0f7cf..a6f1a1ffd7 100644 --- a/lib/doc/es/Math.lyx +++ b/lib/doc/es/Math.lyx @@ -35284,7 +35284,7 @@ Maxima \begin_layout Standard \series bold -command-alternatives break-paragraph;math-extern maxima +command-alternatives paragraph-break;math-extern maxima \end_layout \begin_layout Section diff --git a/lib/doc/fr/Math.lyx b/lib/doc/fr/Math.lyx index 52f2819164..ec837feb55 100644 --- a/lib/doc/fr/Math.lyx +++ b/lib/doc/fr/Math.lyx @@ -35049,7 +35049,7 @@ Maxima \begin_layout Standard \series bold -command-alternatives break-paragraph;math-extern maxima +command-alternatives paragraph-break;math-extern maxima \end_layout \begin_layout Standard diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx index d373432e48..ef7df09d2b 100644 --- a/lib/doc/fr/UserGuide.lyx +++ b/lib/doc/fr/UserGuide.lyx @@ -4579,7 +4579,7 @@ Entrée que la profondeur actuels, utilisez \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset . @@ -5560,7 +5560,7 @@ Standard la profondeur d'emboîtement courante, vous pouvez utiliser \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset pour séparer les paragraphes. @@ -7486,7 +7486,7 @@ Entrée \family default est la fonction \family typewriter -break-paragraph +paragraph-break \family default , et les lignes d'une adresse, prises isolément, ne sont pas des paragraphes. Ainsi, vous vous servirez de @@ -9368,7 +9368,7 @@ Liste; Nous l'avons obtenu avec \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset suivi de @@ -9398,7 +9398,7 @@ arg "depth-increment" Nous aurions pu le créer de la même manière que le précédent, avec \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset suivi de @@ -9429,7 +9429,7 @@ Standard Nous l'avons obtenu avec \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset , puis @@ -9467,7 +9467,7 @@ Standard , également au niveau n°4, obtenu juste avec \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset . @@ -9479,7 +9479,7 @@ arg "break-paragraph inverse" Nous avons tapé \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset et remis l'environnement de paragraphe à @@ -9527,7 +9527,7 @@ pouvons Tapez \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset puis @@ -9545,7 +9545,7 @@ arg "depth-decrement" 4-b Après un autre \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset suivi de @@ -9736,7 +9736,7 @@ Voici le niveau n°2. Nous avons fait \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset suivi de @@ -9773,7 +9773,7 @@ ListePuces \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset , puis @@ -9794,7 +9794,7 @@ ListePuces Voici le niveau n°4, obtenu avec \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset , puis @@ -9856,7 +9856,7 @@ pas Au fait, vous aurez deviné que nous utilisons \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset pour conserver le même environnement et la même profondeur mais créer un @@ -9873,7 +9873,7 @@ arg "depth-decrement" pour diminuer la profondeur après le prochain \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset . @@ -9912,7 +9912,7 @@ toujours Après un autre \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset suivi de @@ -9937,7 +9937,7 @@ Gauche Nous obtenons la même chose avec une autre suite \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -10071,7 +10071,7 @@ PooPooPiDoo ! ( \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset ) @@ -10148,7 +10148,7 @@ poisson bleu ( \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset , @@ -10164,7 +10164,7 @@ arg "depth-increment" 3 fois, \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset , @@ -10241,7 +10241,7 @@ Citation Nous utilisons \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset pour préserver la profondeur. diff --git a/lib/doc/id/UserGuide.lyx b/lib/doc/id/UserGuide.lyx index 5ac69be9ac..84d28d013c 100644 --- a/lib/doc/id/UserGuide.lyx +++ b/lib/doc/id/UserGuide.lyx @@ -4537,7 +4537,7 @@ Return use \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset instead. @@ -5504,7 +5504,7 @@ Standard depth, you can use \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset to break paragraphs. @@ -7400,7 +7400,7 @@ Return \family default is the \family typewriter -break-paragraph +paragraph-break \family default function, and the individual lines of an address are not paragraphs. Thus, you have to use @@ -9038,7 +9038,7 @@ List We created it by using \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset followed by @@ -9069,7 +9069,7 @@ arg "depth-increment" by hitting \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset followed by @@ -9100,7 +9100,7 @@ Standard We did this by hitting \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset , then @@ -9138,7 +9138,7 @@ Standard paragraph, also at level #4, made with just a \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset . @@ -9150,7 +9150,7 @@ arg "break-paragraph inverse" We hit \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset and changed the paragraph environment back to @@ -9200,7 +9200,7 @@ and this is level #6. Just hit \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset followed by a @@ -9218,7 +9218,7 @@ arg "depth-decrement" #4-b After another \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset followed by a @@ -9389,7 +9389,7 @@ This is level #2. We used \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset followed by @@ -9423,7 +9423,7 @@ Itemize (We got here by using \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset , then @@ -9444,7 +9444,7 @@ Itemize Here's level #4, produced using \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset , then @@ -9512,7 +9512,7 @@ don't Oh, as if you couldn't guess by now, we're just using \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset to keep the current environment and depth but create a new item. @@ -9528,7 +9528,7 @@ arg "depth-decrement" to decrease the depth after the next \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset . @@ -9569,7 +9569,7 @@ did Another \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -9592,7 +9592,7 @@ Enumerate The same thing happens if we do another \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -9723,7 +9723,7 @@ Bippitey boppitey boo! ( \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -9838,7 +9838,7 @@ blue-fish ( \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -9854,7 +9854,7 @@ arg "depth-increment" 3 times, \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -9930,7 +9930,7 @@ Quotation We'll use \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset to preserve the depth. diff --git a/lib/doc/ja/Math.lyx b/lib/doc/ja/Math.lyx index b95526fd39..44fd4a9a1d 100644 --- a/lib/doc/ja/Math.lyx +++ b/lib/doc/ja/Math.lyx @@ -34050,7 +34050,7 @@ Maxima \series bold \lang english -command-alternatives break-paragraph;math-extern maxima +command-alternatives paragraph-break;math-extern maxima \end_layout \begin_layout Standard diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx index c7cb67dd81..2b33d637bc 100644 --- a/lib/doc/ja/UserGuide.lyx +++ b/lib/doc/ja/UserGuide.lyx @@ -6015,7 +6015,7 @@ Return \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -7895,7 +7895,7 @@ Return \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -11433,7 +11433,7 @@ Return \bar default \noun default \color inherit -break-paragraph +paragraph-break \family roman \series medium \shape up @@ -14106,7 +14106,7 @@ status collapsed \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -14211,7 +14211,7 @@ arg "depth-increment" \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -14291,7 +14291,7 @@ arg "depth-increment" \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -14416,7 +14416,7 @@ arg "depth-increment" \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -14454,7 +14454,7 @@ arg "break-paragraph inverse" \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -14591,7 +14591,7 @@ arg "break-paragraph inverse" \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -14636,7 +14636,7 @@ arg "depth-decrement" \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -14972,7 +14972,7 @@ status collapsed ここは第2階層です。 \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset の後に @@ -15052,7 +15052,7 @@ arg "depth-increment" 環境なので、ラベルが黒丸になるのです（ここに来るには、 \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset の後に @@ -15096,7 +15096,7 @@ arg "depth-increment" ここは第4階層です。 \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset の後に @@ -15260,7 +15260,7 @@ arg "depth-increment" \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -15288,7 +15288,7 @@ arg "break-paragraph inverse" \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset と押してから @@ -15394,7 +15394,7 @@ arg "depth-increment" もう一度 \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset と @@ -15438,7 +15438,7 @@ arg "depth-decrement" もう一度 \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset と @@ -15698,7 +15698,7 @@ arg "depth-increment" \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -15802,7 +15802,7 @@ arg "break-paragraph inverse" \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -16023,7 +16023,7 @@ Return 環境を使います。階層を保持するためには \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset を使うことにします。 diff --git a/src/FuncCode.h b/src/FuncCode.h index ec441decf7..9b0de53f5e 100644 --- a/src/FuncCode.h +++ b/src/FuncCode.h @@ -106,7 +106,7 @@ enum FuncCode LFUN_CHAR_DELETE_FORWARD, LFUN_CHAR_DELETE_BACKWARD, LFUN_NEWLINE_INSERT, // renamed: JSpitzm, 20080325 - LFUN_BREAK_PARAGRAPH, + LFUN_PARAGRAPH_BREAK, // 65 LFUN_QUOTE_INSERT, LFUN_ACCENT_CIRCUMFLEX, diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp index d1dfdc3d8d..9aa2ddefb3 100644 --- a/src/LyXAction.cpp +++ b/src/LyXAction.cpp @@ -1996,16 +1996,16 @@ void LyXAction::init() */ { LFUN_PARAGRAPH_GOTO, "paragraph-goto", ReadOnly | NoInternal, Edit }, /*! - * \var lyx::FuncCode lyx::LFUN_BREAK_PARAGRAPH + * \var lyx::FuncCode lyx::LFUN_PARAGRAPH_BREAK * \li Action: Breaks the current paragraph at the current location. * \li Notion: Removes the selection. - * \li Syntax: break-paragraph [] + * \li Syntax: paragraph-break [] * \li Params: : "inverse" - decreases depth by one (or change layout to default layout) when the cursor is at the end of the line. * \endvar */ - { LFUN_BREAK_PARAGRAPH, "break-paragraph", Noop, Edit }, + { LFUN_PARAGRAPH_BREAK, "paragraph-break", Noop, Edit }, /*! * \var lyx::FuncCode lyx::LFUN_PARAGRAPH_PARAMS * \li Action: Change paragraph settings. diff --git a/src/Text3.cpp b/src/Text3.cpp index beebcc5b90..78d74293d0 100644 --- a/src/Text3.cpp +++ b/src/Text3.cpp @@ -1063,7 +1063,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) } break; - case LFUN_BREAK_PARAGRAPH: + case LFUN_PARAGRAPH_BREAK: cap::replaceSelection(cur); breakParagraph(cur, cmd.argument() == "inverse"); cur.resetAnchor(); @@ -2747,7 +2747,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, flag.setOnOff(to_utf8(cmd.argument()) == cur.real_current_font.language()->lang()); break; - case LFUN_BREAK_PARAGRAPH: + case LFUN_PARAGRAPH_BREAK: enable = cur.inset().getLayout().isMultiPar(); break; diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp index 68bca75947..2e611ffd30 100644 --- a/src/insets/InsetBox.cpp +++ b/src/insets/InsetBox.cpp @@ -239,7 +239,7 @@ bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd, flag.setEnabled(true); return true; - case LFUN_BREAK_PARAGRAPH: + case LFUN_PARAGRAPH_BREAK: if ((params_.inner_box && !params_.use_makebox) || params_.type == "Shaded" || params_.type == "Framed") return InsetCollapsable::getStatus(cur, cmd, flag); diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp index e623d9d597..b1c4e08d1a 100644 --- a/src/insets/InsetCaption.cpp +++ b/src/insets/InsetCaption.cpp @@ -197,7 +197,7 @@ bool InsetCaption::getStatus(Cursor & cur, FuncRequest const & cmd, { switch (cmd.action()) { - case LFUN_BREAK_PARAGRAPH: + case LFUN_PARAGRAPH_BREAK: status.setEnabled(false); return true; diff --git a/src/insets/InsetScript.cpp b/src/insets/InsetScript.cpp index 648b910e27..2cb15a2da4 100644 --- a/src/insets/InsetScript.cpp +++ b/src/insets/InsetScript.cpp @@ -261,7 +261,7 @@ bool InsetScript::getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus & flag) const { switch (cmd.action()) { - case LFUN_BREAK_PARAGRAPH: + case LFUN_PARAGRAPH_BREAK: case LFUN_LAYOUT: case LFUN_LAYOUT_PARAGRAPH: case LFUN_MATH_DISPLAY: diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp index 840f3cbddd..6bdf72b046 100644 --- a/src/insets/InsetTabular.cpp +++ b/src/insets/InsetTabular.cpp @@ -4729,7 +4729,7 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd, } // disable in non-fixed-width cells - case LFUN_BREAK_PARAGRAPH: + case LFUN_PARAGRAPH_BREAK: // multirow does not allow paragraph breaks if (tabular.isMultiRow(cur.idx())) { status.setEnabled(false); diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp index 2055fb2c4b..1f135f54c2 100644 --- a/src/mathed/InsetMathHull.cpp +++ b/src/mathed/InsetMathHull.cpp @@ -1368,7 +1368,7 @@ void InsetMathHull::doDispatch(Cursor & cur, FuncRequest & cmd) cur.undispatched(); break; - case LFUN_BREAK_PARAGRAPH: + case LFUN_PARAGRAPH_BREAK: // just swallow this break; @@ -1570,7 +1570,7 @@ bool InsetMathHull::getStatus(Cursor & cur, FuncRequest const & cmd, // we never allow this in math, and we want to bind enter // to another actions in command-alternatives - case LFUN_BREAK_PARAGRAPH: + case LFUN_PARAGRAPH_BREAK: status.setEnabled(false); return true; case LFUN_MATH_MUTATE: { From 49a9d3ad63e9a08ae6c441e3bf76b0874f20d220 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sat, 29 Sep 2012 18:34:38 +0200 Subject: [PATCH 13/30] Kill LFUN_HFILL_INSERT zombie. --- src/FuncCode.h | 1 - src/insets/InsetScript.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/src/FuncCode.h b/src/FuncCode.h index 9b0de53f5e..1494134890 100644 --- a/src/FuncCode.h +++ b/src/FuncCode.h @@ -55,7 +55,6 @@ enum FuncCode LFUN_NOTE_NEXT, // 20 LFUN_INSET_TOGGLE, - LFUN_HFILL_INSERT, LFUN_TEXTSTYLE_APPLY, LFUN_TEXTSTYLE_UPDATE, LFUN_FONT_EMPH, diff --git a/src/insets/InsetScript.cpp b/src/insets/InsetScript.cpp index 2cb15a2da4..135962353a 100644 --- a/src/insets/InsetScript.cpp +++ b/src/insets/InsetScript.cpp @@ -272,7 +272,6 @@ bool InsetScript::getStatus(Cursor & cur, FuncRequest const & cmd, case LFUN_FLOAT_LIST_INSERT: case LFUN_FLOAT_WIDE_INSERT: case LFUN_FOOTNOTE_INSERT: - case LFUN_HFILL_INSERT: case LFUN_INDEX_PRINT: case LFUN_LISTING_INSERT: case LFUN_MARGINALNOTE_INSERT: From 074277baf1ccf8443bb3194d9c77e656fc4caa62 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sat, 29 Sep 2012 18:40:48 +0200 Subject: [PATCH 14/30] Next zombies found: LFUN_GETBUFNAME, LFUN_LINEATCURSOR, LFUN_LO?VIEW. --- src/FuncCode.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/FuncCode.h b/src/FuncCode.h index 1494134890..1e46716546 100644 --- a/src/FuncCode.h +++ b/src/FuncCode.h @@ -131,11 +131,9 @@ enum FuncCode LFUN_ACCENT_OGONEK, LFUN_SELF_INSERT, // 85 - LFUN_GETBUFNAME, LFUN_SERVER_GET_XY, LFUN_SERVER_SET_XY, LFUN_VIEW_SPLIT, - LFUN_LINEATCURSOR, // 90 LFUN_SERVER_GET_LAYOUT, LFUN_SERVER_GET_FILENAME, @@ -246,9 +244,6 @@ enum FuncCode LFUN_MATH_AMS_MATRIX, // uwestoehr 12-07-2009 // 180 LFUN_TABULAR_INSERT, // Jug 20000412 - LFUN_LOFVIEW, // Dekel 20000519 - LFUN_LOTVIEW, // Dekel 20000519 - LFUN_LOAVIEW, // Dekel 20000519 LFUN_SET_COLOR, // SLior 20000611 // 185 LFUN_MARGINALNOTE_INSERT, // Lgb 20000626 From 5d9c14a322ba05051e996f18307b7bec18d737d5 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sat, 29 Sep 2012 18:52:52 +0200 Subject: [PATCH 15/30] Realign numbering. --- src/FuncCode.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/FuncCode.h b/src/FuncCode.h index 1e46716546..6f41e7dec9 100644 --- a/src/FuncCode.h +++ b/src/FuncCode.h @@ -58,6 +58,7 @@ enum FuncCode LFUN_TEXTSTYLE_APPLY, LFUN_TEXTSTYLE_UPDATE, LFUN_FONT_EMPH, + LFUN_CLIPBOARD_PASTE_SIMPLE, // tommaso, 20111028 // 25 LFUN_FONT_BOLD, LFUN_FONT_BOLDSYMBOL, @@ -134,6 +135,8 @@ enum FuncCode LFUN_SERVER_GET_XY, LFUN_SERVER_SET_XY, LFUN_VIEW_SPLIT, + LFUN_VIEW_CLOSE, // Tommaso, 20120915 + LFUN_BUFFER_FORALL, // scottkostyshak, 20120720 // 90 LFUN_SERVER_GET_LAYOUT, LFUN_SERVER_GET_FILENAME, @@ -243,6 +246,9 @@ enum FuncCode LFUN_FOOTNOTE_INSERT, // Jug 20000307 LFUN_MATH_AMS_MATRIX, // uwestoehr 12-07-2009 // 180 + LFUN_IPA_INSERT, // spitz, 20120305 + LFUN_IN_IPA, // spitz, 20120520 + LFUN_IPAMACRO_INSERT, // spitz, 20120822 LFUN_TABULAR_INSERT, // Jug 20000412 LFUN_SET_COLOR, // SLior 20000611 // 185 @@ -444,13 +450,6 @@ enum FuncCode LFUN_SCRIPT_INSERT, // gb, 20101123 LFUN_BUFFER_EXPORT_AS, // tommaso 20111006 // 350 - LFUN_CLIPBOARD_PASTE_SIMPLE, // tommaso, 20111028 - LFUN_IPA_INSERT, // spitz, 20120305 - LFUN_BUFFER_FORALL, // scottkostyshak, 20120720 - LFUN_IN_IPA, // spitz, 20120520 - LFUN_IPAMACRO_INSERT, // spitz, 20120822 - // 355 - LFUN_VIEW_CLOSE, // Tommaso, 20120915 LFUN_LASTACTION // end of the table }; From 4fceb18ecd8f805ba8b558ca026b63ab0a498ed5 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sat, 29 Sep 2012 18:57:26 +0200 Subject: [PATCH 16/30] Recreate LFUNs.lyx once upon a time. --- lib/doc/LFUNs.lyx | 338 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 274 insertions(+), 64 deletions(-) diff --git a/lib/doc/LFUNs.lyx b/lib/doc/LFUNs.lyx index 14e9ff4150..be3d43955d 100644 --- a/lib/doc/LFUNs.lyx +++ b/lib/doc/LFUNs.lyx @@ -1,5 +1,5 @@ -#LyX 2.0 created this file. For more info see http://www.lyx.org/ -\lyxformat 413 +#LyX 2.1 created this file. For more info see http://www.lyx.org/ +\lyxformat 444 \begin_document \begin_header \textclass article @@ -22,13 +22,13 @@ \font_roman default \font_sans default \font_typewriter default +\font_math auto \font_default_family default \use_non_tex_fonts false \font_sc false \font_osf false \font_sf_scale 100 \font_tt_scale 100 - \graphics default \default_output_format default \output_sync 0 @@ -39,15 +39,21 @@ \use_hyperref false \papersize default \use_geometry true -\use_amsmath 1 -\use_esint 1 -\use_mhchem 1 -\use_mathdots 1 +\use_package amsmath 1 +\use_package amssymb 1 +\use_package esint 1 +\use_package mathdots 0 +\use_package mathtools 0 +\use_package mhchem 1 +\use_package undertilde 0 \cite_engine basic +\cite_engine_type numerical +\biblio_style plain \use_bibtopic false \use_indices false \paperorientation portrait \suppress_date false +\justification true \use_refstyle 0 \index Index \shortcut idx @@ -75,7 +81,7 @@ \begin_body \begin_layout Section* -LFUNs documentation automatically generated 2011-12-15 +LFUNs documentation automatically generated 2012-09-29 \end_layout \begin_layout Standard @@ -816,8 +822,13 @@ Syntax space-insert [] \end_layout \begin_layout Description -Params : normal, protected, thin, quad, qquad, enspace, enskip, negthinspa -ce, hfill, hfill*, dotfill, hrulefill, hspace, hspace* +Params : normal, protected, visible, thin, quad, qquad, enspace, enskip, + negthinspace, negmedspace, negthickspace, hfill, hfill*, dotfill, hrulefill, + hspace, hspace* +\begin_inset Newline newline +\end_inset + +Only in math mode: med and thick. \begin_inset Newline newline \end_inset @@ -923,7 +934,7 @@ Syntax index-insert [] \begin_layout Description Params : name of the index, if multiple indices are defined. - with an empty argument, the default index is selected. + With an empty argument, the default index is selected. \end_layout \begin_layout Description @@ -944,13 +955,71 @@ Syntax index-print [] \begin_layout Description Params : name of the index, if multiple indices are defined. - with an empty argument, the default index is selected. + With an empty argument, the default index is selected. \end_layout \begin_layout Description Origin Lgb, 27 Feb 1997 \end_layout +\begin_layout Subsection* +LFUN_IPA_INSERT +\end_layout + +\begin_layout Description +Action Inserts an IPA inset. +\end_layout + +\begin_layout Description +Syntax ipa-insert +\end_layout + +\begin_layout Description +Origin spitz, 05 Mar 2012 +\end_layout + +\begin_layout Subsection* +LFUN_IN_IPA +\end_layout + +\begin_layout Description +Action Only active in IPA inset. +\end_layout + +\begin_layout Description +Notion Dummy function which is only active in a IPA inset. + It's used to toggle the IPA toolbar if the cursor moves into an IPA inset. +\end_layout + +\begin_layout Description +Syntax in-ipa +\end_layout + +\begin_layout Description +Origin spitz, 20 May 2012 +\end_layout + +\begin_layout Subsection* +LFUN_IPAMACRO_INSERT +\end_layout + +\begin_layout Description +Action Inserts special IPA macros into the document. +\end_layout + +\begin_layout Description +Syntax ipamacro-insert +\end_layout + +\begin_layout Description +Params : tone-falling, tone-rising, tone-high-rising, tone-low-rising, + tone-high-rising-falling, deco bottomtiebar, deco toptiebar. +\end_layout + +\begin_layout Description +Origin JSpitzm, 22 Aug 2012 +\end_layout + \begin_layout Subsection* LFUN_NOMENCL_INSERT \end_layout @@ -993,7 +1062,7 @@ LFUN_NOTE_INSERT \end_layout \begin_layout Description -Action Inserts Note on the current cursor postion, move selection inside +Action Inserts Note on the current cursor position, move selection inside the inset. \end_layout @@ -1010,7 +1079,7 @@ LFUN_NOTE_NEXT \end_layout \begin_layout Description -Action Moves the cursor to the begining of next Note inset. +Action Moves the cursor to the beginning of next Note inset. \end_layout \begin_layout Description @@ -1022,7 +1091,7 @@ LFUN_PHANTOM_INSERT \end_layout \begin_layout Description -Action Inserts phantom on the current cursor postion, move selection inside +Action Inserts phantom on the current cursor position, move selection inside the inset. \end_layout @@ -1450,8 +1519,8 @@ LFUN_WORD_DELETE_BACKWARD \end_layout \begin_layout Description -Action Deletes characters to the begining of the word (usually the "C+BackSpace" - key). +Action Deletes characters to the beginning of the word (usually the "C+BackSpace +" key). \end_layout \begin_layout Description @@ -1518,7 +1587,7 @@ LFUN_WORD_FIND \end_layout \begin_layout Description -Action Search for next occurence of a string. +Action Search for next occurrence of a string. \end_layout \begin_layout Description @@ -1557,7 +1626,7 @@ Params : data is of the form " \begin_inset Newline newline \end_inset - " + " \end_layout \begin_layout Description @@ -1569,7 +1638,7 @@ LFUN_WORD_FINDADV \end_layout \begin_layout Description -Action Search for next occurence of a pattern. +Action Search for next occurrence of a pattern. \end_layout \begin_layout Description @@ -2017,7 +2086,7 @@ LFUN_LINE_BEGIN \end_layout \begin_layout Description -Action Move the cursor to the begining of the (screen) line. +Action Move the cursor to the beginning of the (screen) line. \end_layout \begin_layout Description @@ -2080,7 +2149,7 @@ LFUN_COPY \end_layout \begin_layout Description -Action Copies to the clipboard the last edit. +Action Copies the current selection to the clipboard. \end_layout \begin_layout Description @@ -2166,7 +2235,7 @@ LFUN_SELECTION_PASTE \end_layout \begin_layout Description -Action Pastes the the internal selection text in permanent selection. +Action Pastes the internal selection text in permanent selection. \end_layout \begin_layout Description @@ -2182,6 +2251,23 @@ Syntax selection-paste Origin lasgouttes, 14 Jan 2009 \end_layout +\begin_layout Subsection* +LFUN_CLIPBOARD_PASTE_SIMPLE +\end_layout + +\begin_layout Description +Action Pastes simple unformatted text from the active clipboard. +\end_layout + +\begin_layout Description +Syntax clipboard-paste-simple [] +\end_layout + +\begin_layout Description +Params : "paragraph" will cause pasting as one paragraph, i.e. + "Join lines". +\end_layout + \begin_layout Subsection* LFUN_UNDO \end_layout @@ -2482,7 +2568,7 @@ Action Toggle user-defined (=last-time used) text style. \begin_layout Description Notion This style is set via LFUN_TEXTSTYLE_UPDATE, which is automatically - trigerred when using Text Style dialog. + triggered when using Text Style dialog. \end_layout \begin_layout Description @@ -2586,7 +2672,7 @@ Action Adds database, which will be used for bibtex citations. \begin_layout Description Notion Databases are added to the first BibTeX inset (Inset->List/TOC->BibTeX - bibliography) found from the cursor postion. + bibliography) found from the cursor position. \end_layout \begin_layout Description @@ -2607,7 +2693,7 @@ Action Adds database, which will be used for bibtex citations. \begin_layout Description Notion Databases are deleted from the first BibTeX inset (Inset->List/TOC->BibTe -X bibliography) found from the cursor postion. +X bibliography) found from the cursor position. \end_layout \begin_layout Description @@ -3252,7 +3338,7 @@ Params : octave|maxima|maple|mathematica|script \begin_inset Newline newline \end_inset -where "script" stands fot the external script (normalized expression will +where "script" stands for the external script (normalized expression will be passed) \end_layout @@ -3614,6 +3700,12 @@ LFUN_PARAGRAPH_MOVE_UP Action Moves the current paragraph upwards in the document. \end_layout +\begin_layout Description +Notion Movement through the document will possibly break the paragraph-depth + (e.g. + itemize structure). +\end_layout + \begin_layout Description Syntax paragraph-move-up \end_layout @@ -3627,7 +3719,7 @@ LFUN_PARAGRAPH_UP \end_layout \begin_layout Description -Action Move the cursor to the next paragraph (or begining of the current +Action Move the cursor to the next paragraph (or beginning of the current one) in upward direction. \end_layout @@ -3644,7 +3736,7 @@ LFUN_PARAGRAPH_UP_SELECT \end_layout \begin_layout Description -Action Move the cursor and select the text to the next paragraph (or begining +Action Move the cursor and select the text to the next paragraph (or beginning of the current one) in upward direction. \end_layout @@ -3661,7 +3753,7 @@ LFUN_PARAGRAPH_DOWN \end_layout \begin_layout Description -Action Move the cursor to the next paragraph (or begining of the current +Action Move the cursor to the next paragraph (or beginning of the current one) in downward direction. \end_layout @@ -3678,7 +3770,7 @@ LFUN_PARAGRAPH_DOWN_SELECT \end_layout \begin_layout Description -Action Move the cursor and select the text to the next paragraph (or begining +Action Move the cursor and select the text to the next paragraph (or beginning of the current one) in downward direction. \end_layout @@ -3722,7 +3814,7 @@ Origin Dekel, 26 Aug 2000 \end_layout \begin_layout Subsection* -LFUN_BREAK_PARAGRAPH +LFUN_PARAGRAPH_BREAK \end_layout \begin_layout Description @@ -3734,7 +3826,7 @@ Notion Removes the selection. \end_layout \begin_layout Description -Syntax break-paragraph [] +Syntax paragraph-break [] \end_layout \begin_layout Description @@ -3830,7 +3922,7 @@ Action Updates the values inside the paragraph dialog from the paragraph. \end_layout \begin_layout Description -Notion This is internal LFUN, not to be used by users. +Notion This is an internal LFUN, not to be used by users. Called internally by LFUN_DIALOG_UPDATE. \end_layout @@ -4489,7 +4581,7 @@ Syntax inset-insert \end_layout \begin_layout Description -Params : : : . +graphics|href|include|index|index_print|label|line| +\begin_inset Newline newline +\end_inset + +listings|note|phantom|ref|space|tabular|vspace|wrap>. \end_layout \begin_layout Subsection* @@ -4649,7 +4744,7 @@ LFUN_INSET_TOGGLE \end_layout \begin_layout Description -Action Toggles the collapsable inset at cursor position, or the inset we +Action Toggles the collapsible inset at cursor position, or the inset we are currently in. \end_layout @@ -4662,7 +4757,7 @@ Params : . \begin_inset Newline newline \end_inset -open/close/toggle are for collapsable insets. +open/close/toggle are for collapsible insets. toggle is used when no argument is given. \begin_inset Newline newline \end_inset @@ -4915,7 +5010,7 @@ LFUN_BOOKMARK_GOTO \begin_layout Description Action Moves the cursor to the numbered bookmark, opening the file if necessary. - Note that bookmarsk are saved per-session, not per file. + Note that bookmarks are saved per-session, not per file. \end_layout \begin_layout Description @@ -5157,7 +5252,7 @@ Origin Abdel, 23 Oct 2006 \end_layout \begin_layout Subsection* -LFUN_SPLIT_VIEW +LFUN_VIEW_SPLIT \end_layout \begin_layout Description @@ -5165,11 +5260,11 @@ Action Creates another split view of current buffer. \end_layout \begin_layout Description -Notion All split views act in the same way indpendently. +Notion All split views act in the same way independently. \end_layout \begin_layout Description -Syntax split-view +Syntax view-split \end_layout \begin_layout Description @@ -5185,7 +5280,29 @@ Origin Abdel, 20 Feb 2008 \end_layout \begin_layout Subsection* -LFUN_CLOSE_TAB_GROUP +LFUN_VIEW_CLOSE +\end_layout + +\begin_layout Description +Action Close the current document work area. +\end_layout + +\begin_layout Description +Notion Close the current work area. + If no other work areas are showing the buffer, then close the associated + buffer as well. +\end_layout + +\begin_layout Description +Syntax view-close +\end_layout + +\begin_layout Description +Origin Tommaso, 15 Sep 2012 +\end_layout + +\begin_layout Subsection* +LFUN_TAB_GROUP_CLOSE \end_layout \begin_layout Description @@ -5193,12 +5310,12 @@ Action Close the current tab group. \end_layout \begin_layout Description -Notion This only closes the work areas, not the buffer themselves. +Notion This only closes the work areas, not the buffers themselves. The still opened buffers can be visualized in another tab group. \end_layout \begin_layout Description -Syntax close-tab-group +Syntax tab-group-close \end_layout \begin_layout Description @@ -5210,7 +5327,7 @@ LFUN_DIALOG_SHOW \end_layout \begin_layout Description -Action Shows hidden dialog or create new one for a given function/inset +Action Shows hidden dialog or creates new one for a given function/inset settings etc. \end_layout @@ -5381,7 +5498,7 @@ Action This function is called when mouse button is pressed (inside workarea). \end_layout \begin_layout Description -Notion This is internal LFUN, not to be used by users. +Notion This is an internal LFUN, not to be used by users. \end_layout \begin_layout Description @@ -5399,7 +5516,7 @@ Action This function is called when double click on mouse button is pressed \end_layout \begin_layout Description -Notion This is internal LFUN, not to be used by users. +Notion This is an internal LFUN, not to be used by users. \end_layout \begin_layout Description @@ -5417,7 +5534,7 @@ Action This function is called when triple click on mouse button is pressed \end_layout \begin_layout Description -Notion This is internal LFUN, not to be used by users. +Notion This is an internal LFUN, not to be used by users. \end_layout \begin_layout Description @@ -5434,7 +5551,7 @@ Action This function is called when mouse cursor is moving over the text. \end_layout \begin_layout Description -Notion This is internal LFUN, not to be used by users. +Notion This is an internal LFUN, not to be used by users. \end_layout \begin_layout Description @@ -5451,7 +5568,7 @@ Action This function is called when mouse button is released (inside workarea). \end_layout \begin_layout Description -Notion This is internal LFUN, not to be used by users. +Notion This is an internal LFUN, not to be used by users. \end_layout \begin_layout Description @@ -5482,7 +5599,7 @@ Action Turn on the primary keyboard map. Notion Maps were widely used in past, when X-windows didn't have nowadays keyboard support. They can be still used to maintain uniform keyboard layout across the various - plaforms. + platforms. \begin_inset Newline newline \end_inset @@ -5645,7 +5762,7 @@ LFUN_SERVER_SET_XY \begin_layout Description Action Sets the cursor position based on the editing area coordinates (similar - as clicking on that point with left mouse button). + to clicking on that point with left mouse button). \end_layout \begin_layout Description @@ -5678,7 +5795,7 @@ Notion Latex file with extension literate_extension is generated. Then LyX invokes \backslash -build_command (with a default of``make'') to generate the code and +build_command (with a default of ``make'') to generate the code and \backslash build_error_filter to process the compilation error messages. \begin_inset Newline newline @@ -5847,7 +5964,7 @@ Action Exports the current buffer (document) to the given format. \end_layout \begin_layout Description -Syntax buffer-export +Syntax buffer-export [] \end_layout \begin_layout Description @@ -5861,6 +5978,9 @@ Params is either "custom" or one of the formats which you can find In case of "custom" you will be asked for a format you want to start from and for the command that you want to apply to this format. Internally the control is then passed to LFUN_BUFFER_EXPORT_CUSTOM. + If present, this argument provides the export destination filename. + Its containing folder will also be the destination folder, where all + the needed external files will be copied. \end_layout \begin_layout Description @@ -5898,6 +6018,22 @@ Sample buffer-export-custom dvi dvips -f $$FName -o myfile.ps Origin leeming, 27 Mar 2004 \end_layout +\begin_layout Subsection* +LFUN_BUFFER_EXPORT_AS +\end_layout + +\begin_layout Description +Action Pops up a dialog for exporting the current buffer. +\end_layout + +\begin_layout Description +Syntax buffer-export-as +\end_layout + +\begin_layout Description +Origin tommaso, 6 Oct 2011 +\end_layout + \begin_layout Subsection* LFUN_BUFFER_PRINT \end_layout @@ -5944,8 +6080,8 @@ Action Import a given file as a lyx document. \begin_layout Description Notion File can be imported iff lyx file format is (transitively) reachable - via defined convertors in preferences. - Look into File->Import menu to get an idea of the currently active import + via defined converters in preferences. + Look in the File->Import menu to get an idea of the currently active import formats. \end_layout @@ -5962,7 +6098,7 @@ LFUN_BUFFER_NEW \end_layout \begin_layout Description -Action Creates a new buffer (that is, document). +Action Creates a new buffer (that is, document) and switches to it. \end_layout \begin_layout Description @@ -6019,7 +6155,7 @@ LFUN_BUFFER_SWITCH \end_layout \begin_layout Description -Action Display/switch to the given buffer. +Action Display and switch to the given buffer. \end_layout \begin_layout Description @@ -6089,7 +6225,7 @@ Action Exports the current document and put the result into the temporary \begin_layout Description Notion In case you are already viewing the exported document (see LFUN_BUFFER_VI -EW) the output will be rewriten - updated. +EW) the output will be rewritten - updated. This is useful in case your viewer is able to detect such changes (e.g. ghostview for postscript). \end_layout @@ -6143,6 +6279,80 @@ Params : New name of the buffer/file. A relative path is with respect to the original location of the buffer/file. \end_layout +\begin_layout Subsection* +LFUN_BUFFER_FORALL +\end_layout + +\begin_layout Description +Action Applies a command to all visible, hidden, or both types of buffers + in the active window. +\end_layout + +\begin_layout Description +Syntax buffer-forall [] +\end_layout + +\begin_layout Description +Params : default: visible : The command that is to be applied to the buffers. +\end_layout + +\begin_layout Description +Sample Close all Notes in all visible documents: +\begin_inset Newline newline +\end_inset + + buffer-forall inset-forall Note inset-toggle close +\begin_inset Newline newline +\end_inset + +Toggle change tracking on all documents: +\begin_inset Newline newline +\end_inset + + buffer-forall both changes-track +\begin_inset Newline newline +\end_inset + +Toggle read-only for all visible documents: +\begin_inset Newline newline +\end_inset + + buffer-forall buffer-toggle-read-only +\begin_inset Newline newline +\end_inset + +Show statistics for each document: +\begin_inset Newline newline +\end_inset + + buffer-forall both statistics +\begin_inset Newline newline +\end_inset + +Activate the branch named "Solutions" in all visible documents: +\begin_inset Newline newline +\end_inset + + buffer-forall branch-activate Solutions +\begin_inset Newline newline +\end_inset + +Export all visible documents to PDF (pdflatex): +\begin_inset Newline newline +\end_inset + + buffer-forall buffer-export pdf2 +\begin_inset Newline newline +\end_inset + + +\end_layout + +\begin_layout Description +Origin scottkostyshak, 20 Jul 2012 +\end_layout + \begin_layout Subsection* LFUN_BUFFER_WRITE_ALL \end_layout @@ -6633,8 +6843,8 @@ LFUN_CURSOR_FOLLOWS_SCROLLBAR_TOGGLE \end_layout \begin_layout Description -Action Determine whether keep cursor inside the editing window regardless - the scrollbar movement. +Action Determine whether to keep cursor inside the editing window regardless + of the scrollbar movement. \end_layout \begin_layout Description From b00766db51623b3d20ecda3898698135ef0bfe5a Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sat, 29 Sep 2012 19:20:58 +0200 Subject: [PATCH 17/30] * RELEASE-NOTES --- RELEASE-NOTES | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 6d78c3ce35..64adb50059 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -85,13 +85,17 @@ The following LyX functions have been changed: - LFUN_SPIT_VIEW ("split-view") was renamed to LFUN_VIEW_SPLIT ("view-split"). +- LFUN_BREAK_PARAGRAPH ("break-paragraph") was renamed to + LFUN_PARAGRAPH_BREAK ("paragraph-break"). + The following LyX key bindings have been changed: //template, remove this entry later on - LFUN_MATH_MACRO_FOLD ("math-macro-fold") The binding to "C-minus" has changed to "C-S-underscore". -- The binding "C-w" was moved from "buffer-close" to "view-close". +- The binding "C-w" was moved from "buffer-close" to "view-close" + (only in cua.bind). Linux desktop file specification and scalable icon has been included From a982bdc5fa3674d02c98e74f89755661a3fd2333 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sat, 29 Sep 2012 20:04:56 +0200 Subject: [PATCH 18/30] Attempt to bump prefs2prefs_lfuns.py. --- lib/scripts/prefs2prefs_lfuns.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/lib/scripts/prefs2prefs_lfuns.py b/lib/scripts/prefs2prefs_lfuns.py index 1295a7dc30..0461cc26b5 100644 --- a/lib/scripts/prefs2prefs_lfuns.py +++ b/lib/scripts/prefs2prefs_lfuns.py @@ -146,6 +146,15 @@ def Bar2bar(line): newline = btype + " \"" + mod + "bar\"" + rest return (True, newline) +def paragraph_break(line): + return simple_renaming(line, "break-paragraph", "paragraph-break") + +def tab_group_close(line): + return simple_renaming(line, "close-tab-group", "tab-group-close") + +def view_split(line): + return simple_renaming(line, "split-view", "view-split") + # # ########################################################### @@ -154,7 +163,7 @@ def Bar2bar(line): # Conversion chain conversions = [ - [ 1, [ # this will be a long list of conversions to format 1 + [ 1, [ # this will be a long list of conversions to format 1, LyX 2.0 next_inset_toggle, next_inset_modify, optional_insert, @@ -166,5 +175,10 @@ conversions = [ tabular_feature, Bar2bar ]], + [ 2, [ # list of conversions to format 2, LyX 2.1 + paragraph_break, + tab_group_close, + view_split + ]], ] From 86473d5556578639610b4e280fdcb8141c49ef2b Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sat, 29 Sep 2012 20:06:39 +0200 Subject: [PATCH 19/30] Bump LFUN format for LyX 2.1 --- src/LyXAction.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LyXAction.h b/src/LyXAction.h index cbe59b95a9..77cc5b084c 100644 --- a/src/LyXAction.h +++ b/src/LyXAction.h @@ -22,7 +22,7 @@ namespace lyx { // current LFUN format -static unsigned int const LFUN_FORMAT = 1; +static unsigned int const LFUN_FORMAT = 2; class FuncRequest; class LyXErr; From bb67e670ef1f140c7175fdd1217de607f012c81d Mon Sep 17 00:00:00 2001 From: Enrico Forestieri Date: Sun, 30 Sep 2012 00:42:55 +0200 Subject: [PATCH 20/30] Make some strings translatable again. These strings were inadvertently broken in [4985015e/lyxgit]. --- src/frontends/qt4/ui/PrefUi.ui | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/frontends/qt4/ui/PrefUi.ui b/src/frontends/qt4/ui/PrefUi.ui index 17a7ca9c90..3880c942c7 100644 --- a/src/frontends/qt4/ui/PrefUi.ui +++ b/src/frontends/qt4/ui/PrefUi.ui @@ -66,8 +66,7 @@ - The icon set to use. Warning: normal size of icons may be -wrong until you save the preferences and restart LyX. + The icon set to use. Warning: normal size of icons may be wrong until you save the preferences and restart LyX. @@ -261,8 +260,7 @@ wrong until you save the preferences and restart LyX. - Whether to open documents in an already running instance of LyX. -(Set the LyXServer pipe path and restart LyX to enable this feature) + Whether to open documents in an already running instance of LyX. (Set the LyXServer pipe path and restart LyX to enable this feature) S&ingle instance From 8134a711a49a20a2bd50fb9cfae3cab9c9dec644 Mon Sep 17 00:00:00 2001 From: Enrico Forestieri Date: Sun, 30 Sep 2012 00:46:41 +0200 Subject: [PATCH 21/30] Update it.po --- po/it.po | 658 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 360 insertions(+), 298 deletions(-) mode change 100755 => 100644 po/it.po diff --git a/po/it.po b/po/it.po old mode 100755 new mode 100644 index 183cd63ea1..11d1ca3cbb --- a/po/it.po +++ b/po/it.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: it\n" "Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n" -"POT-Creation-Date: 2012-09-26 23:30+0200\n" -"PO-Revision-Date: 2012-09-26 23:53+0100\n" +"POT-Creation-Date: 2012-09-30 00:09+0200\n" +"PO-Revision-Date: 2012-09-30 00:29+0100\n" "Last-Translator: Enrico Forestieri \n" "Language-Team: italiano \n" "Language: it\n" @@ -90,16 +90,16 @@ msgstr "&Applica" #: src/frontends/qt4/GuiDocument.cpp:2066 #: src/frontends/qt4/GuiParagraph.cpp:69 #: src/frontends/qt4/GuiParagraph.cpp:159 -#: src/frontends/qt4/GuiView.cpp:2150 -#: src/frontends/qt4/GuiView.cpp:2301 -#: src/frontends/qt4/GuiView.cpp:2316 -#: src/frontends/qt4/GuiView.cpp:2391 -#: src/frontends/qt4/GuiView.cpp:2439 -#: src/frontends/qt4/GuiView.cpp:2654 -#: src/frontends/qt4/GuiView.cpp:2661 -#: src/frontends/qt4/GuiView.cpp:2760 -#: src/frontends/qt4/GuiView.cpp:2788 -#: src/frontends/qt4/GuiView.cpp:3405 +#: src/frontends/qt4/GuiView.cpp:2163 +#: src/frontends/qt4/GuiView.cpp:2314 +#: src/frontends/qt4/GuiView.cpp:2329 +#: src/frontends/qt4/GuiView.cpp:2404 +#: src/frontends/qt4/GuiView.cpp:2452 +#: src/frontends/qt4/GuiView.cpp:2702 +#: src/frontends/qt4/GuiView.cpp:2709 +#: src/frontends/qt4/GuiView.cpp:2808 +#: src/frontends/qt4/GuiView.cpp:2836 +#: src/frontends/qt4/GuiView.cpp:3453 #: src/insets/InsetBibtex.cpp:153 msgid "&Cancel" msgstr "&Cancella" @@ -637,7 +637,7 @@ msgid "Right-to-left language support" msgstr "Supporto per i linguaggi da destra a sinistra" #: src/frontends/qt4/ui/PrefLanguageUi.ui:228 -#: src/LyXRC.cpp:3383 +#: src/LyXRC.cpp:3397 msgid "Select to enable support of right-to-left languages (e.g. Hebrew, Arabic)." msgstr "" "Da selezionare per abilitare il supporto per i linguaggi\n" @@ -803,6 +803,7 @@ msgstr "Copyright" #: src/frontends/qt4/ui/TexinfoUi.ui:58 #: src/frontends/qt4/ui/ErrorListUi.ui:60 #: src/frontends/qt4/GuiParagraph.cpp:161 +#: src/frontends/qt4/GuiView.cpp:2507 msgid "&Close" msgstr "&Chiudi" @@ -894,8 +895,8 @@ msgstr "&Modifica" #: src/frontends/qt4/ui/PrefConvertersUi.ui:209 #: src/frontends/qt4/ui/PrefShortcutsUi.ui:61 -#: src/frontends/qt4/GuiPrefs.cpp:2947 -#: src/frontends/qt4/GuiPrefs.cpp:3011 +#: src/frontends/qt4/GuiPrefs.cpp:2968 +#: src/frontends/qt4/GuiPrefs.cpp:3032 msgid "Remo&ve" msgstr "&Rimuovi" @@ -964,7 +965,7 @@ msgstr "I&nterlinea" #: src/frontends/qt4/GuiListings.cpp:152 #: src/frontends/qt4/GuiListings.cpp:159 #: src/frontends/qt4/GuiPrefs.cpp:2290 -#: src/frontends/qt4/GuiPrefs.cpp:2549 +#: src/frontends/qt4/GuiPrefs.cpp:2551 #: src/frontends/qt4/GuiPrintNomencl.cpp:47 #: src/frontends/qt4/GuiViewSource.cpp:198 msgid "Default" @@ -1021,9 +1022,9 @@ msgid "Paragraph's &Default" msgstr "&Predefinito per il paragrafo" #: src/frontends/qt4/ui/PrefsUi.ui:70 -#: src/frontends/qt4/GuiView.cpp:2654 -#: src/frontends/qt4/GuiView.cpp:2661 -#: src/frontends/qt4/GuiView.cpp:2760 +#: src/frontends/qt4/GuiView.cpp:2702 +#: src/frontends/qt4/GuiView.cpp:2709 +#: src/frontends/qt4/GuiView.cpp:2808 msgid "&Save" msgstr "&Salva" @@ -1616,7 +1617,7 @@ msgid "&PATH prefix:" msgstr "&Prefisso per PATH:" #: src/frontends/qt4/ui/PrefPathsUi.ui:51 -#: src/LyXRC.cpp:3293 +#: src/LyXRC.cpp:3307 msgid "" "Specify those directories which should be prepended to the PATH environment variable.\n" "Use the OS native format." @@ -1629,7 +1630,7 @@ msgid "TEX&INPUTS prefix:" msgstr "Prefisso per TEX&INPUTS:" #: src/frontends/qt4/ui/PrefPathsUi.ui:68 -#: src/LyXRC.cpp:3452 +#: src/LyXRC.cpp:3470 msgid "" "Specify those directories which should be prepended to the TEXINPUTS environment variable.\n" "A '.' represents the current document directory. Use the OS native format." @@ -1703,20 +1704,20 @@ msgstr "&Giù" msgid "S&elected:" msgstr "S&elezionati:" -#: src/frontends/qt4/ui/PrefUi.ui:25 +#: src/frontends/qt4/ui/PrefUi.ui:26 msgid "&User interface file:" msgstr "File interfaccia &utente:" -#: src/frontends/qt4/ui/PrefUi.ui:38 +#: src/frontends/qt4/ui/PrefUi.ui:39 #: src/frontends/qt4/ui/CompareUi.ui:83 msgid "Bro&wse..." msgstr "Sfogl&ia..." -#: src/frontends/qt4/ui/PrefUi.ui:58 +#: src/frontends/qt4/ui/PrefUi.ui:59 msgid "&Icon Set:" msgstr "Set di &icone:" -#: src/frontends/qt4/ui/PrefUi.ui:68 +#: src/frontends/qt4/ui/PrefUi.ui:69 msgid "" "The icon set to use. Warning: normal size of icons may be\n" "wrong until you save the preferences and restart LyX." @@ -1724,75 +1725,75 @@ msgstr "" "Il set di icone da usare. Attenzione: la dimensione normale delle icone può\n" "non essere corretta finché non si salvano le preferenze e si rilancia LyX." -#: src/frontends/qt4/ui/PrefUi.ui:75 +#: src/frontends/qt4/ui/PrefUi.ui:76 msgid "Automatic help" msgstr "Aiuto automatico" -#: src/frontends/qt4/ui/PrefUi.ui:93 +#: src/frontends/qt4/ui/PrefUi.ui:94 msgid "Checking this allows the automatic display of helpful comments for insets in the main work area of an edited document" msgstr "" "Consente la visualizzazione automatica di commenti utili relativi\n" "agli inserti nell'area principale del documento editato" -#: src/frontends/qt4/ui/PrefUi.ui:96 +#: src/frontends/qt4/ui/PrefUi.ui:97 msgid "&Enable tool tips in main work area" msgstr "Abili&ta commenti nell'area di lavoro principale" -#: src/frontends/qt4/ui/PrefUi.ui:106 +#: src/frontends/qt4/ui/PrefUi.ui:107 msgid "Session" msgstr "Sessione" -#: src/frontends/qt4/ui/PrefUi.ui:118 +#: src/frontends/qt4/ui/PrefUi.ui:119 msgid "Restore window layouts and &geometries" msgstr "Ripristina posizione e &geometria della finestra" -#: src/frontends/qt4/ui/PrefUi.ui:125 +#: src/frontends/qt4/ui/PrefUi.ui:126 msgid "Restore to the cursor position when the file was last closed" msgstr "" "Ripristina il cursore alla posizione in cui\n" "si trovava quando il file è stato chiuso" -#: src/frontends/qt4/ui/PrefUi.ui:128 +#: src/frontends/qt4/ui/PrefUi.ui:129 msgid "Restore cursor &positions" msgstr "Ripristina la posi&zione del cursore" -#: src/frontends/qt4/ui/PrefUi.ui:135 +#: src/frontends/qt4/ui/PrefUi.ui:136 msgid "&Load opened files from last session" msgstr "Riapri i &file aperti nell'ultima sessione" -#: src/frontends/qt4/ui/PrefUi.ui:142 +#: src/frontends/qt4/ui/PrefUi.ui:143 msgid "&Clear all session information" msgstr "&Cancella le informazioni di sessione" -#: src/frontends/qt4/ui/PrefUi.ui:165 +#: src/frontends/qt4/ui/PrefUi.ui:166 msgid "Documents" msgstr "Documenti" -#: src/frontends/qt4/ui/PrefUi.ui:174 +#: src/frontends/qt4/ui/PrefUi.ui:175 msgid "Backup original documents when saving" msgstr "C&onserva copia dei documenti originali quando si salva" -#: src/frontends/qt4/ui/PrefUi.ui:181 +#: src/frontends/qt4/ui/PrefUi.ui:182 msgid "&Backup documents, every" msgstr "Bac&kup dei documenti ogni" -#: src/frontends/qt4/ui/PrefUi.ui:198 +#: src/frontends/qt4/ui/PrefUi.ui:199 msgid "minutes" msgstr "minuti" -#: src/frontends/qt4/ui/PrefUi.ui:218 +#: src/frontends/qt4/ui/PrefUi.ui:219 msgid "&Save documents compressed by default" msgstr "Salva documenti nel formato &compresso" -#: src/frontends/qt4/ui/PrefUi.ui:225 +#: src/frontends/qt4/ui/PrefUi.ui:226 msgid "&Maximum last files:" msgstr "&Massimo numero di ultimi file:" -#: src/frontends/qt4/ui/PrefUi.ui:255 +#: src/frontends/qt4/ui/PrefUi.ui:256 msgid "&Open documents in tabs" msgstr "Apri i &documenti in linguette" -#: src/frontends/qt4/ui/PrefUi.ui:262 +#: src/frontends/qt4/ui/PrefUi.ui:263 msgid "" "Whether to open documents in an already running instance of LyX.\n" "(Set the LyXServer pipe path and restart LyX to enable this feature)" @@ -1800,18 +1801,34 @@ msgstr "" "Usa una istanza di LyX già in esecuzione per aprire i documenti.\n" "(Per attivare, specificare la \"LyXServer pipe\" e rilanciare LyX)" -#: src/frontends/qt4/ui/PrefUi.ui:265 +#: src/frontends/qt4/ui/PrefUi.ui:266 msgid "S&ingle instance" msgstr "Singo&la istanza" -#: src/frontends/qt4/ui/PrefUi.ui:272 +#: src/frontends/qt4/ui/PrefUi.ui:273 msgid "Whether to place close button on each tab or only one in the top left." msgstr "Usa un solo pulsante di chiusura in alto a destra invece che un pulsante per linguetta." -#: src/frontends/qt4/ui/PrefUi.ui:275 +#: src/frontends/qt4/ui/PrefUi.ui:276 msgid "&Single close-tab button" msgstr "Singolo &pulsante per chiusura linguette" +#: src/frontends/qt4/ui/PrefUi.ui:283 +msgid "Closing last view:" +msgstr "Chiudendo l'ultima vista:" + +#: src/frontends/qt4/ui/PrefUi.ui:291 +msgid "Closes document" +msgstr "Chiudi il documento" + +#: src/frontends/qt4/ui/PrefUi.ui:296 +msgid "Hides document" +msgstr "Nascondi il documento" + +#: src/frontends/qt4/ui/PrefUi.ui:301 +msgid "Ask the user" +msgstr "Chiedi cosa fare" + #: src/frontends/qt4/ui/HSpaceUi.ui:28 msgid "Select a fill pattern style for HFills" msgstr "Selezionare uno stile di riempimento orizzontale" @@ -4434,7 +4451,7 @@ msgid "Grou&p" msgstr "Raggru&ppa" #: src/frontends/qt4/ui/RefUi.ui:181 -#: src/frontends/qt4/GuiRef.cpp:314 +#: src/frontends/qt4/GuiRef.cpp:308 msgid "&Go to Label" msgstr "&Vai all'etichetta" @@ -4620,7 +4637,7 @@ msgid "Output &line length:" msgstr "Larghezza della &riga prodotta:" #: src/frontends/qt4/ui/PrefOutputUi.ui:37 -#: src/LyXRC.cpp:3057 +#: src/LyXRC.cpp:3071 msgid "The maximum line length of exported plain text/LaTeX/SGML files. If set to 0, paragraphs are output in a single line; if the line length is > 0, paragraphs are separated by a blank line." msgstr "" "Larghezza massima della riga per file esportati come testo/LaTeX/SGML.\n" @@ -4879,7 +4896,7 @@ msgid "Cursor &follows scrollbar" msgstr "Il cursore segue la &barra di scorrimento" #: src/frontends/qt4/ui/PrefEditUi.ui:46 -#: src/LyXRC.cpp:3110 +#: src/LyXRC.cpp:3124 msgid "Configure the width of the text cursor. Automatic zoom-controlled cursor width used when set to 0." msgstr "Configura la larghezza del cursore testo. Se zero, la larghezza viene impostata in base allo zoom." @@ -8224,7 +8241,7 @@ msgid "Key words." msgstr "Parole chiave." #: lib/layouts/aa.layout:414 -#: src/insets/InsetHyperlink.cpp:261 +#: src/insets/InsetHyperlink.cpp:274 msgid "email" msgstr "email" @@ -19074,8 +19091,8 @@ msgid "Table (CSV)" msgstr "Tabella (CSV)" #: lib/configure.py:609 -#: src/frontends/qt4/GuiView.cpp:1183 -#: src/frontends/qt4/GuiView.cpp:1184 +#: src/frontends/qt4/GuiView.cpp:1195 +#: src/frontends/qt4/GuiView.cpp:1196 #: src/mathed/MathMacroTemplate.cpp:543 msgid "LyX" msgstr "LyX" @@ -19364,9 +19381,9 @@ msgstr "Sovrascrivo il file modificato?" #: src/Buffer.cpp:2476 #: src/Exporter.cpp:50 #: src/frontends/qt4/GuiClipboard.cpp:242 -#: src/frontends/qt4/GuiView.cpp:2150 -#: src/frontends/qt4/GuiView.cpp:2316 -#: src/frontends/qt4/GuiView.cpp:2391 +#: src/frontends/qt4/GuiView.cpp:2163 +#: src/frontends/qt4/GuiView.cpp:2329 +#: src/frontends/qt4/GuiView.cpp:2404 msgid "&Overwrite" msgstr "&Sovrascrivi" @@ -19591,7 +19608,7 @@ msgstr "Il percorso della cartella del documento non può contenere spazi." #: src/Buffer.cpp:3899 #: src/Buffer.cpp:3913 -#: src/frontends/qt4/GuiView.cpp:548 +#: src/frontends/qt4/GuiView.cpp:560 msgid "Document export cancelled." msgstr "L'esportazione del documento è stata cancellata." @@ -19763,6 +19780,7 @@ msgstr "Classe del documento non disponibile" #: src/BufferParams.cpp:1765 #: src/insets/InsetCommandParams.cpp:381 +#: src/insets/InsetHyperlink.cpp:197 msgid "Uncodable characters" msgstr "Carattere intraducibili" @@ -19848,8 +19866,8 @@ msgstr "Questa porzione del documento è stata cancellata." #: src/BufferView.cpp:1050 #: src/BufferView.cpp:1959 -#: src/frontends/qt4/GuiView.cpp:3292 -#: src/frontends/qt4/GuiView.cpp:3367 +#: src/frontends/qt4/GuiView.cpp:3340 +#: src/frontends/qt4/GuiView.cpp:3415 msgid "Absolute filename expected." msgstr "È richiesto un nome file assoluto." @@ -20673,7 +20691,7 @@ msgstr "Non riesco a mostrare il file" #: src/Format.cpp:606 #: src/Format.cpp:673 -#: src/frontends/qt4/GuiView.cpp:3019 +#: src/frontends/qt4/GuiView.cpp:3067 #, c-format msgid "File does not exist: %1$s" msgstr "Il file non esiste: %1$s" @@ -20891,7 +20909,7 @@ msgid "LyX crashed!" msgstr "LyX: Errore fatale!" #: src/LyX.cpp:695 -#: src/frontends/qt4/GuiView.cpp:1018 +#: src/frontends/qt4/GuiView.cpp:1030 msgid "LyX: " msgstr "LyX: " @@ -21072,378 +21090,382 @@ msgstr "Manca il tipo di file [es. latex, ps...] dopo l'opzione --import" msgid "Missing filename for --import" msgstr "Manca il nome file per --import" -#: src/LyXRC.cpp:3049 +#: src/LyXRC.cpp:3063 msgid "Consider run-together words, such as \"diskdrive\" for \"disk drive\", as legal words?" msgstr "Considero corrette le parole composte, come \"diskdrive\" invece di \"disk drive\"?" -#: src/LyXRC.cpp:3053 +#: src/LyXRC.cpp:3067 msgid "Specify an alternate language. The default is to use the language of the document." msgstr "Specifica una lingua alternativa. L'impostazione predefinita è di usare la lingua del documento." -#: src/LyXRC.cpp:3061 +#: src/LyXRC.cpp:3075 msgid "De-select if you don't want the current selection to be replaced automatically by what you type." msgstr "Deselezionare se non si vuole che l'attuale selezione sia sostituita automaticamente da quello che si scrive." -#: src/LyXRC.cpp:3065 +#: src/LyXRC.cpp:3079 msgid "De-select if you don't want the class options to be reset to defaults after class change." msgstr "Deselezionare se non si vuole che le opzioni di classe siano impostate a quelle predefinite dopo un cambiamento di classe." -#: src/LyXRC.cpp:3069 +#: src/LyXRC.cpp:3083 msgid "The time interval between auto-saves (in seconds). 0 means no auto-save." msgstr "Intervallo di tempo tra due autosalvataggi (in secondi): 0 significa nessun autosalvataggio." -#: src/LyXRC.cpp:3076 +#: src/LyXRC.cpp:3090 msgid "The path for storing backup files. If it is an empty string, LyX will store the backup file in the same directory as the original file." msgstr "Cartella in cui conservare i file di backup. LyX conserverà i file di backup nella stessa cartella del file originale se la stringa è vuota." -#: src/LyXRC.cpp:3080 +#: src/LyXRC.cpp:3094 msgid "Define the options of bibtex (cf. man bibtex) or select an alternative compiler (e.g. mlbibtex or bibulus)." msgstr "Definire le opzioni di bibtex (vedere man bibtex) oppure selezionare un compilatore alternativo (ad esempio mlbibtex oppure bibulus)." -#: src/LyXRC.cpp:3084 +#: src/LyXRC.cpp:3098 msgid "Define the options of the bibtex program for PLaTeX (Japanese LaTeX)." msgstr "Definisce le opzioni del programma bibtex per PLaTeX (LaTeX giapponese)." -#: src/LyXRC.cpp:3088 +#: src/LyXRC.cpp:3102 msgid "Keybindings file. Can either specify an absolute path, or LyX will look in its global and local bind/ directories." msgstr "File dei tasti speciali. È possibile specificare un percorso assoluto, altrimenti LyX cercherà nelle sue cartelle bind/ sia locali che globali." -#: src/LyXRC.cpp:3092 +#: src/LyXRC.cpp:3106 msgid "Select to check whether the lastfiles still exist." msgstr "Da selezionare per controllare se esiste ancora l'elenco degli ultimi file." -#: src/LyXRC.cpp:3096 +#: src/LyXRC.cpp:3110 msgid "Define how to run chktex. E.g. \"chktex -n11 -n1 -n3 -n6 -n9 -22 -n25 -n30 -n38\" Refer to the ChkTeX documentation." msgstr "Definisce come avviare chktex. Cioè: \"chktex -n11 -n1 -n3 -n6 -n9 -22 -n25 -n30 -n38\". Fare riferimento alla documentazione di ChkTeX." -#: src/LyXRC.cpp:3106 +#: src/LyXRC.cpp:3120 msgid "LyX normally doesn't update the cursor position if you move the scrollbar. Set to true if you'd prefer to always have the cursor on screen." msgstr "Normalmente LyX non aggiorna la posizione del cursore se non muovete la barra di scorrimento. Impostare su \"vero\" se si preferisce avere sempre il cursore sullo schermo." -#: src/LyXRC.cpp:3114 +#: src/LyXRC.cpp:3128 msgid "LyX normally doesn't allow the user to scroll further than the bottom of the document. Set to true if you prefer to scroll the bottom of the document to the top of the screen" msgstr "" "Normalmente LyX non consente di far scorrere il documento oltre il suo fondo.\n" "Impostare a vero se si preferisce far scorrere il fondo del documento in cima allo schermo." -#: src/LyXRC.cpp:3118 +#: src/LyXRC.cpp:3132 msgid "Make Apple key act as Meta and Control key as Ctrl." msgstr "Tratta il tasto Apple come Meta ed il tasto Control come Ctrl." -#: src/LyXRC.cpp:3122 +#: src/LyXRC.cpp:3136 msgid "Use the Mac OS X conventions for the word-level cursor movement" msgstr "Usa convenzione Mac OS X per movimento cursore a livello di parola" -#: src/LyXRC.cpp:3126 +#: src/LyXRC.cpp:3140 msgid "Show a small box around a Math Macro with the macro name when the cursor is inside." msgstr "Visualizza una cornice attorno a una macro matematica con il nome della macro quando il cursore è all'interno." -#: src/LyXRC.cpp:3131 +#: src/LyXRC.cpp:3145 #, no-c-format msgid "This accepts the normal strftime formats; see man strftime for full details. E.g.\"%A, %e. %B %Y\"." msgstr "" "Questo accetta i normali formati strftime; vedere man strftime per tutti i dettagli.\n" "Per esempio: \"%A, %e. %B %Y\"." -#: src/LyXRC.cpp:3135 +#: src/LyXRC.cpp:3149 msgid "Command definition file. Can either specify an absolute path, or LyX will look in its global and local commands/ directories." msgstr "File di definizione comandi. È possibile specificare un percorso assoluto, altrimenti LyX cercherà nelle sue cartelle commands/ sia locali che globali." -#: src/LyXRC.cpp:3139 +#: src/LyXRC.cpp:3153 msgid "The default format used with LFUN_BUFFER_[VIEW|UPDATE]." msgstr "Il formato di default usato con LFUN_BUFFER_[VIEW|UPDATE]." -#: src/LyXRC.cpp:3143 +#: src/LyXRC.cpp:3157 msgid "Iconify the dialogs when the main window is iconified. (Affects only dialogs shown after the change has been made.)" msgstr "Minimizza i dialoghi quando è minimizzata anche la finestra principale: influenza solo i dialoghi mostrati dopo che sono stati fatti i cambiamenti." -#: src/LyXRC.cpp:3147 +#: src/LyXRC.cpp:3161 msgid "Select how LyX will display any graphics." msgstr "Scegliere come LyX mostrerà ogni grafico." -#: src/LyXRC.cpp:3151 +#: src/LyXRC.cpp:3165 msgid "The default path for your documents. An empty value selects the directory LyX was started from." msgstr "Cartella prestabilita per i documenti. Un valore vuoto seleziona la cartella da cui LyX è stato avviato." -#: src/LyXRC.cpp:3155 +#: src/LyXRC.cpp:3169 msgid "Specify additional chars that can be part of a word." msgstr "Specifica i caratteri addizionali che possono essere parte di una parola." -#: src/LyXRC.cpp:3159 +#: src/LyXRC.cpp:3173 msgid "The path that LyX will set when offering to choose an example. An empty value selects the directory LyX was started from." msgstr "È il percorso che LyX imposta quando offre di scegliere un esempio. Un valore vuoto seleziona la cartella da cui LyX è stato avviato." -#: src/LyXRC.cpp:3163 +#: src/LyXRC.cpp:3177 msgid "The font encoding used for the LaTeX2e fontenc package. T1 is highly recommended for non-English languages." msgstr "Codifica dei caratteri usata per il pacchetto LaTeX2e fontenc. La codifica T1 è altamente raccomandata per lingue diverse dall'Inglese." -#: src/LyXRC.cpp:3167 +#: src/LyXRC.cpp:3181 msgid "Disable any kerning and ligatures for text drawing on screen." msgstr "Disabilita crenatura e legature del testo reso a schermo." -#: src/LyXRC.cpp:3174 +#: src/LyXRC.cpp:3188 msgid "Define the options of makeindex (cf. man makeindex) or select an alternative compiler. E.g., using xindy/make-rules, the command string would be \"makeindex.sh -m $$lang\"." msgstr "Definire le opzioni di makeindex (vedere man makeindex) oppure selezionare un compilatore alternativo. Per esempio, usando xindy/make-rules, la stringa di comando sarebbe \"makeindex.sh -m $$lang\"." -#: src/LyXRC.cpp:3178 +#: src/LyXRC.cpp:3192 msgid "Define the options of the index program for PLaTeX (Japanese LaTeX)." msgstr "Definisce le opzioni del programma indice per PLaTeX (LaTeX giapponese)." -#: src/LyXRC.cpp:3182 +#: src/LyXRC.cpp:3196 msgid "Define the options of makeindex (cf. man makeindex) to be used for nomenclatures. This might differ from the index processing options." msgstr "Definire le opzioni per makeindex (vedere man makeindex) da usare per nomenclature. Queste possono differire dalle opzioni per l'elaborazione di indici." -#: src/LyXRC.cpp:3191 +#: src/LyXRC.cpp:3205 msgid "Use this to set the correct mapping file for your keyboard. You'll need this if you for instance want to type German documents on an American keyboard." msgstr "Serve ad impostare la mappa di tastiera corretta. Torna utile se, per esempio, si scrivono documenti in tedesco su una tastiera americana." -#: src/LyXRC.cpp:3195 +#: src/LyXRC.cpp:3209 msgid "Select if a language switching command is needed at the beginning of the document." msgstr "Da selezionare se un comando di cambio lingua è richiesto all'inizio del documento." -#: src/LyXRC.cpp:3199 +#: src/LyXRC.cpp:3213 msgid "Select if a language switching command is needed at the end of the document." msgstr "Da selezionare se un comando di cambio lingua è richiesto alla fine del documento." -#: src/LyXRC.cpp:3203 +#: src/LyXRC.cpp:3217 msgid "The LaTeX command for changing from the language of the document to another language. E.g. \\selectlanguage{$$lang} where $$lang is substituted by the name of the second language." msgstr "È il comando LaTeX per passare dalla lingua del documento ad un'altra. Cioè: \\selectlanguage{$$lang} dove $$lang deve essere sostituito con il nome della seconda lingua." -#: src/LyXRC.cpp:3207 +#: src/LyXRC.cpp:3221 msgid "The LaTeX command for changing back to the language of the document." msgstr "È il comando LaTeX per tornare alla lingua del documento." -#: src/LyXRC.cpp:3211 +#: src/LyXRC.cpp:3225 msgid "The LaTeX command for local changing of the language." msgstr "È il comando LaTeX per il cambiamento locale della lingua." -#: src/LyXRC.cpp:3215 +#: src/LyXRC.cpp:3229 msgid "De-select if you don't want the language(s) used as an argument to \\documentclass." msgstr "Deselezionare se non si vuole che le lingue siano usate come argomento in \\documentclass." -#: src/LyXRC.cpp:3219 +#: src/LyXRC.cpp:3233 msgid "The LaTeX command for loading the language package. E.g. \"\\usepackage{babel}\", \"\\usepackage{omega}\"." msgstr "È il comando LaTeX per caricare il pacchetto linguistico. Cioè: \"\\usepackage{babel}\", \"\\usepackage{omega}\"." -#: src/LyXRC.cpp:3223 +#: src/LyXRC.cpp:3237 msgid "De-select if you don't want babel to be used when the language of the document is the default language." msgstr "Deselezionare se non si vuole usare babel quando la lingua del documento è la lingua predefinita." -#: src/LyXRC.cpp:3227 +#: src/LyXRC.cpp:3241 msgid "De-select if you do not want LyX to scroll to saved position." msgstr "Deselezionare se non si vuole che LyX salti alla posizione salvata." -#: src/LyXRC.cpp:3231 +#: src/LyXRC.cpp:3245 msgid "De-select to prevent loading files opened from the last LyX session." msgstr "Deselezionare per prevenire il caricamento dei file aperti durante l'ultima sessione." -#: src/LyXRC.cpp:3235 +#: src/LyXRC.cpp:3249 msgid "De-select if you don't want LyX to create backup files." msgstr "Deselezionare se non si vuole che LyX crei file di backup." -#: src/LyXRC.cpp:3239 +#: src/LyXRC.cpp:3253 msgid "Select to control the highlighting of words with a language foreign to that of the document." msgstr "Da selezionare per controllare l'evidenziazione di parole in una lingua diversa da quella del documento." -#: src/LyXRC.cpp:3243 +#: src/LyXRC.cpp:3257 msgid "The scrolling speed of the mouse wheel." msgstr "La velocità di scorrimento della rotella del mouse." -#: src/LyXRC.cpp:3248 +#: src/LyXRC.cpp:3262 msgid "The completion popup delay." msgstr "Il ritardo del menù a comparsa con i suggerimenti." -#: src/LyXRC.cpp:3252 +#: src/LyXRC.cpp:3266 msgid "Select to display the completion popup in math mode." msgstr "Selezionare per visualizzare il menù a comparsa per i suggerimenti nel modo matematico." -#: src/LyXRC.cpp:3256 +#: src/LyXRC.cpp:3270 msgid "Select to display the completion popup in text mode." msgstr "Selezionare per visualizzare il menù a comparsa per i suggerimenti nel modo testo." -#: src/LyXRC.cpp:3260 +#: src/LyXRC.cpp:3274 msgid "Show the completion popup without delay after non-unique completion attempt." msgstr "Visualizza il menù a comparsa per i suggerimenti senza ritardo dopo un tentativo non univoco di completamento." -#: src/LyXRC.cpp:3264 +#: src/LyXRC.cpp:3278 msgid "Show a small triangle on the cursor to indicate that a completion is available." msgstr "Visualizza un piccolo triangolo sul cursore per indicare che è disponibile un suggerimento." -#: src/LyXRC.cpp:3268 +#: src/LyXRC.cpp:3282 msgid "The inline completion delay." msgstr "Il ritardo per i suggerimenti in linea." -#: src/LyXRC.cpp:3272 +#: src/LyXRC.cpp:3286 msgid "Select to display the inline completion in math mode." msgstr "Selezionare per visualizzare i suggerimenti in linea nel modo matematico." -#: src/LyXRC.cpp:3276 +#: src/LyXRC.cpp:3290 msgid "Select to display the inline completion in text mode." msgstr "Selezionare per visualizzare i suggerimenti in linea nel modo testo." -#: src/LyXRC.cpp:3280 +#: src/LyXRC.cpp:3294 msgid "Use \"...\" to shorten long completions." msgstr "Usa \"...\" per abbreviare i suggerimenti lunghi." -#: src/LyXRC.cpp:3284 +#: src/LyXRC.cpp:3298 msgid "Allow TeXMacs shorthand, like => converting to \\Rightarrow." msgstr "Consenti scorciatoie tipo TeXmacs, ad esempio => diventa \\Rightarrow" -#: src/LyXRC.cpp:3288 +#: src/LyXRC.cpp:3302 #, c-format msgid "Maximal number of lastfiles. Up to %1$d can appear in the file menu." msgstr "Massimo numero di ultimi file aperti. Nel menù ne possono apparire al massimo %1$d." -#: src/LyXRC.cpp:3299 +#: src/LyXRC.cpp:3313 msgid "Shows a typeset preview of things such as math" msgstr "Mostra un'anteprima di stampa di elementi tipo le formule matematiche" -#: src/LyXRC.cpp:3303 +#: src/LyXRC.cpp:3317 msgid "Previewed equations will have \"(#)\" labels rather than numbered ones" msgstr "Le equazioni in anteprima avranno etichette simboliche \"(#)\" invece che numeriche." -#: src/LyXRC.cpp:3307 +#: src/LyXRC.cpp:3321 msgid "Scale the preview size to suit." msgstr "Adatta la dimensione dell'anteprima." -#: src/LyXRC.cpp:3311 +#: src/LyXRC.cpp:3325 msgid "The option for specifying whether the copies should be collated." msgstr "Opzione per specificare se le copie dovranno essere collazionate." -#: src/LyXRC.cpp:3315 +#: src/LyXRC.cpp:3329 msgid "The option for specifying the number of copies to print." msgstr "Opzione per specificare il numero di copie da stampare." -#: src/LyXRC.cpp:3319 +#: src/LyXRC.cpp:3333 msgid "The default printer to print on. If none is specified, LyX will use the environment variable PRINTER." msgstr "Stampante predefinita. LyX userà la variabile d'ambiente PRINTER se non è specificata alcuna stampante." -#: src/LyXRC.cpp:3323 +#: src/LyXRC.cpp:3337 msgid "The option to print only even pages." msgstr "Opzione per stampare solo le pagine pari." -#: src/LyXRC.cpp:3327 +#: src/LyXRC.cpp:3341 msgid "Extra options to pass to printing program after everything else, but before the filename of the DVI file to be printed." msgstr "Opzioni supplementari da passare al programma di stampa dopo ogni altra cosa ma prima del nome del file DVI da stampare." -#: src/LyXRC.cpp:3331 +#: src/LyXRC.cpp:3345 msgid "Extension of printer program output file. Usually \".ps\"." msgstr "Estensione per il file di stampa prodotto. Generalmente \".ps\"." -#: src/LyXRC.cpp:3335 +#: src/LyXRC.cpp:3349 msgid "The option to print out in landscape." msgstr "Opzione per stampare in orizzontale." -#: src/LyXRC.cpp:3339 +#: src/LyXRC.cpp:3353 msgid "The option to print only odd pages." msgstr "Opzione per stampare solo le pagine dispari." -#: src/LyXRC.cpp:3343 +#: src/LyXRC.cpp:3357 msgid "The option for specifying a comma-separated list of pages to print." msgstr "Opzione per specificare un elenco di pagine da stampare, separate da virgole." -#: src/LyXRC.cpp:3347 +#: src/LyXRC.cpp:3361 msgid "Option to specify the dimensions of the print paper." msgstr "Opzione per specificare le dimensioni della carta." -#: src/LyXRC.cpp:3351 +#: src/LyXRC.cpp:3365 msgid "The option to specify paper type." msgstr "Opzione per specificare il tipo di carta." -#: src/LyXRC.cpp:3355 +#: src/LyXRC.cpp:3369 msgid "The option to reverse the order of the pages printed." msgstr "Opzione per invertire l'ordine delle pagine stampate." -#: src/LyXRC.cpp:3359 +#: src/LyXRC.cpp:3373 msgid "When set, this printer option automatically prints to a file and then calls a separate print spooling program on that file with the given name and arguments." msgstr "La stampa su file viene forzata automaticamente quando è impostata questa opzione. Dopo di che, viene invocato un programma separato di stampa su quello stesso file, con il nome e gli argomenti forniti." -#: src/LyXRC.cpp:3363 +#: src/LyXRC.cpp:3377 msgid "If you specify a printer name in the print dialog, the following argument is prepended along with the printer name after the spool command." msgstr "Il seguente argomento viene inserito dopo il comando di spool e viene preposto al nome della stampante, se tale nome è specificato nel dialogo di stampa." -#: src/LyXRC.cpp:3367 +#: src/LyXRC.cpp:3381 msgid "Option to pass to the print program to print to a file." msgstr "Opzione per stampare su file." -#: src/LyXRC.cpp:3371 +#: src/LyXRC.cpp:3385 msgid "Option to pass to the print program to print on a specific printer." msgstr "Opzione per stampare con una specifica stampante." -#: src/LyXRC.cpp:3375 +#: src/LyXRC.cpp:3389 msgid "Select for LyX to pass the name of the destination printer to your print command." msgstr "Da selezionare affinché LyX trasferisca il nome della stampante di destinazione al comando di stampa." -#: src/LyXRC.cpp:3379 +#: src/LyXRC.cpp:3393 msgid "Your favorite print program, e.g. \"dvips\", \"dvilj4\"." msgstr "Il programma di stampa preferito, cioè \"dvips\", \"dvilj4\"." -#: src/LyXRC.cpp:3387 +#: src/LyXRC.cpp:3401 msgid "Select to have visual bidi cursor movement, unselect for logical movement." msgstr "Selezionare per muovere visualmente il cursore nel modo bidirezionale, altrimenti il movimento sarà di tipo logico." -#: src/LyXRC.cpp:3391 +#: src/LyXRC.cpp:3405 +msgid "Specify whether, closing the last view of an open document, LyX should close the document (yes), hide it (no), or ask the user (ask)." +msgstr "Specifica se, chiudendo l'ultima vista di un documento, LyX deve chiudere il documento (yes), nasconderlo (no), o chiedere cosa fare (ask)." + +#: src/LyXRC.cpp:3409 msgid "DPI (dots per inch) of your monitor is auto-detected by LyX. If that goes wrong, override the setting here." msgstr "Il numero di DPI (punti per pollice) del monitor è rilevato automaticamente da LyX. Se qualcosa va storto, l'impostazione può essere modificata qui." -#: src/LyXRC.cpp:3397 +#: src/LyXRC.cpp:3415 msgid "The screen fonts used to display the text while editing." msgstr "Caratteri usati per mostrare il testo sullo schermo durante l'editing." -#: src/LyXRC.cpp:3406 +#: src/LyXRC.cpp:3424 msgid "Allow bitmap fonts to be resized. If you are using a bitmap font, selecting this option may make some fonts look blocky in LyX. Deselecting this option makes LyX use the nearest bitmap font size available, instead of scaling." msgstr "Abilita il ridimensionamento dei caratteri bitmap. Se si usa un carattere bitmap, selezionando questa opzione alcuni caratteri potrebbero apparire grossolani in LyX. Deselezionando questa opzione fa si che LyX usi la più vicina dimensione disponibile del carattere bitmap, invece di riscalarlo." -#: src/LyXRC.cpp:3410 +#: src/LyXRC.cpp:3428 msgid "The font sizes used for calculating the scaling of the screen fonts." msgstr "Sono le dimensioni usate per calcolare la scalatura dei caratteri su schermo." -#: src/LyXRC.cpp:3415 +#: src/LyXRC.cpp:3433 #, no-c-format msgid "The zoom percentage for screen fonts. A setting of 100% will make the fonts roughly the same size as on paper." msgstr "Percentuale di zoom per i caratteri su schermo. Una scelta del 100% renderà i caratteri approssimativamente della stessa dimensione di quelli su carta." -#: src/LyXRC.cpp:3419 +#: src/LyXRC.cpp:3437 msgid "Allow session manager to save and restore windows geometry." msgstr "Consente al gestore della sessione di salvare e ripristinare la posizione delle finestre." -#: src/LyXRC.cpp:3423 +#: src/LyXRC.cpp:3441 msgid "This starts the lyxserver. The pipes get an additional extension \".in\" and \".out\". Only for advanced users." msgstr "Questo avvia il lyxserver. Le pipe richiedono un estensione addizionale \".in\" e \".out\". Solo per utenti esperti." -#: src/LyXRC.cpp:3430 +#: src/LyXRC.cpp:3448 msgid "De-select if you don't want the startup banner." msgstr "Deselezionare se non si vuole l'immagine d'avvio." -#: src/LyXRC.cpp:3434 +#: src/LyXRC.cpp:3452 msgid "LyX will place its temporary directories in this path. They will be deleted when you quit LyX." msgstr "LyX creerà le sue cartelle temporanee in questa locazione. Saranno tutte eliminate alla chiusura di LyX." -#: src/LyXRC.cpp:3438 +#: src/LyXRC.cpp:3456 msgid "This is the place where the files of the thesaurus library reside." msgstr "Questo è il posto dove si trovano i file del dizionario lessicale." -#: src/LyXRC.cpp:3442 +#: src/LyXRC.cpp:3460 msgid "The path that LyX will set when offering to choose a template. An empty value selects the directory LyX was started from." msgstr "È il percorso che LyX imposta quando offre di scegliere un modello. Un valore vuoto seleziona la cartella da cui LyX è stato avviato." -#: src/LyXRC.cpp:3459 +#: src/LyXRC.cpp:3477 msgid "The UI (user interface) file. Can either specify an absolute path, or LyX will look in its global and local ui/ directories." msgstr "È il file UI (Interfaccia Utente). È possibile specificare un percorso assoluto oppure LyX cercherà nelle sue cartelle ui/ sia locali che globali." -#: src/LyXRC.cpp:3469 +#: src/LyXRC.cpp:3487 msgid "Enable use the system colors for some things like main window background and selection." msgstr "Abilita l'uso dei colori di sistema per cose tipo lo sfondo della finestra principale e della selezione." -#: src/LyXRC.cpp:3473 +#: src/LyXRC.cpp:3491 msgid "Enable the automatic appearance of tool tips in the work area." msgstr "Abilita l'apparizione automatica delle informazioni (tool tips) nell'area di lavoro." -#: src/LyXRC.cpp:3477 +#: src/LyXRC.cpp:3495 msgid "Enable the pixmap cache that might improve performance on Mac and Windows." msgstr "Abilita la cache grafica del testo (utile solo per Mac e Windows)." -#: src/LyXRC.cpp:3481 +#: src/LyXRC.cpp:3499 msgid "Specify the paper command to DVI viewer (leave empty or use \"-paper\")" msgstr "Specifica il comando carta al visualizzatore DVI (lasciare vuoto oppure usare \"-paper\")." @@ -21482,7 +21504,7 @@ msgid "(no log message)" msgstr "(nessun messaggio di registro)" #: src/LyXVC.cpp:170 -#: src/frontends/qt4/GuiView.cpp:2877 +#: src/frontends/qt4/GuiView.cpp:2925 msgid "LyX VC: Log Message" msgstr "LyX VC: messaggio del registro" @@ -21503,7 +21525,7 @@ msgid "Revert to stored version of document?" msgstr "Ripristino la versione salvata del documento?" #: src/LyXVC.cpp:224 -#: src/frontends/qt4/GuiView.cpp:3405 +#: src/frontends/qt4/GuiView.cpp:3453 msgid "&Revert" msgstr "&Ripristina" @@ -21741,7 +21763,7 @@ msgstr "Errore durante la lettura del modulo %1$s\n" #: src/VCBackend.cpp:1251 #: src/VCBackend.cpp:1257 #: src/VCBackend.cpp:1278 -#: src/frontends/qt4/GuiView.cpp:2839 +#: src/frontends/qt4/GuiView.cpp:2887 msgid "Revision control error." msgstr "Errore di controllo revisione." @@ -22003,7 +22025,7 @@ msgid "Reload saved document?" msgstr "Riapro il documento salvato?" #: src/buffer_funcs.cpp:76 -#: src/frontends/qt4/GuiView.cpp:2788 +#: src/frontends/qt4/GuiView.cpp:2836 msgid "&Reload" msgstr "&Riapri" @@ -22214,7 +22236,7 @@ msgid "About %1" msgstr "Informazioni su %1" #: src/frontends/qt4/GuiApplication.cpp:498 -#: src/frontends/qt4/GuiPrefs.cpp:3216 +#: src/frontends/qt4/GuiPrefs.cpp:3237 msgid "Preferences" msgstr "Preferenze" @@ -22410,12 +22432,12 @@ msgstr "Bibliografia BibTeX" #: src/frontends/qt4/GuiExternal.cpp:645 #: src/frontends/qt4/GuiGraphics.cpp:800 #: src/frontends/qt4/GuiInclude.cpp:333 -#: src/frontends/qt4/GuiView.cpp:1901 -#: src/frontends/qt4/GuiView.cpp:1958 -#: src/frontends/qt4/GuiView.cpp:2100 -#: src/frontends/qt4/GuiView.cpp:2222 -#: src/frontends/qt4/GuiView.cpp:2265 -#: src/frontends/qt4/GuiView.cpp:2344 +#: src/frontends/qt4/GuiView.cpp:1914 +#: src/frontends/qt4/GuiView.cpp:1971 +#: src/frontends/qt4/GuiView.cpp:2113 +#: src/frontends/qt4/GuiView.cpp:2235 +#: src/frontends/qt4/GuiView.cpp:2278 +#: src/frontends/qt4/GuiView.cpp:2357 msgid "Documents|#o#O" msgstr "Documenti|#o#O" @@ -22676,12 +22698,12 @@ msgid "Choose a filename to save the pasted graphic as" msgstr "Scegliere il nome con cui salvare l'immagine incollata" #: src/frontends/qt4/GuiClipboard.cpp:210 -#: src/frontends/qt4/GuiView.cpp:1977 -#: src/frontends/qt4/GuiView.cpp:2120 -#: src/frontends/qt4/GuiView.cpp:2136 -#: src/frontends/qt4/GuiView.cpp:2153 -#: src/frontends/qt4/GuiView.cpp:2239 -#: src/frontends/qt4/GuiView.cpp:3380 +#: src/frontends/qt4/GuiView.cpp:1990 +#: src/frontends/qt4/GuiView.cpp:2133 +#: src/frontends/qt4/GuiView.cpp:2149 +#: src/frontends/qt4/GuiView.cpp:2166 +#: src/frontends/qt4/GuiView.cpp:2252 +#: src/frontends/qt4/GuiView.cpp:3428 msgid "Canceled." msgstr "Annullato." @@ -22711,10 +22733,10 @@ msgid "Select document" msgstr "Selezione documento" #: src/frontends/qt4/GuiCompare.cpp:156 -#: src/frontends/qt4/GuiView.cpp:1905 -#: src/frontends/qt4/GuiView.cpp:1962 -#: src/frontends/qt4/GuiView.cpp:2228 -#: src/frontends/qt4/GuiView.cpp:2273 +#: src/frontends/qt4/GuiView.cpp:1918 +#: src/frontends/qt4/GuiView.cpp:1975 +#: src/frontends/qt4/GuiView.cpp:2241 +#: src/frontends/qt4/GuiView.cpp:2286 msgid "LyX Documents (*.lyx)" msgstr "Documenti LyX (*.lyx)" @@ -23959,75 +23981,75 @@ msgid "Printer" msgstr "Stampante" #: src/frontends/qt4/GuiPrefs.cpp:2506 -#: src/frontends/qt4/GuiPrefs.cpp:3259 +#: src/frontends/qt4/GuiPrefs.cpp:3280 msgid "User Interface" msgstr "Interfaccia utente" -#: src/frontends/qt4/GuiPrefs.cpp:2550 +#: src/frontends/qt4/GuiPrefs.cpp:2552 msgid "Classic" msgstr "Classico" -#: src/frontends/qt4/GuiPrefs.cpp:2551 +#: src/frontends/qt4/GuiPrefs.cpp:2553 msgid "Oxygen" msgstr "Oxygen" -#: src/frontends/qt4/GuiPrefs.cpp:2629 +#: src/frontends/qt4/GuiPrefs.cpp:2650 msgid "Control" msgstr "Controllo" -#: src/frontends/qt4/GuiPrefs.cpp:2717 +#: src/frontends/qt4/GuiPrefs.cpp:2738 msgid "Shortcuts" msgstr "Scorciatoie" -#: src/frontends/qt4/GuiPrefs.cpp:2722 +#: src/frontends/qt4/GuiPrefs.cpp:2743 msgid "Function" msgstr "Funzione" -#: src/frontends/qt4/GuiPrefs.cpp:2723 +#: src/frontends/qt4/GuiPrefs.cpp:2744 msgid "Shortcut" msgstr "Scorciatoia" -#: src/frontends/qt4/GuiPrefs.cpp:2802 +#: src/frontends/qt4/GuiPrefs.cpp:2823 msgid "Cursor, Mouse and Editing Functions" msgstr "Cursore, mouse e funzioni di redazione" -#: src/frontends/qt4/GuiPrefs.cpp:2806 +#: src/frontends/qt4/GuiPrefs.cpp:2827 msgid "Mathematical Symbols" msgstr "Simboli matematici" -#: src/frontends/qt4/GuiPrefs.cpp:2810 +#: src/frontends/qt4/GuiPrefs.cpp:2831 msgid "Document and Window" msgstr "Documento e finestra" -#: src/frontends/qt4/GuiPrefs.cpp:2814 +#: src/frontends/qt4/GuiPrefs.cpp:2835 msgid "Font, Layouts and Textclasses" msgstr "Caratteri, layout e classi" -#: src/frontends/qt4/GuiPrefs.cpp:2818 +#: src/frontends/qt4/GuiPrefs.cpp:2839 msgid "System and Miscellaneous" msgstr "Sistema e varie" -#: src/frontends/qt4/GuiPrefs.cpp:2945 -#: src/frontends/qt4/GuiPrefs.cpp:2991 +#: src/frontends/qt4/GuiPrefs.cpp:2966 +#: src/frontends/qt4/GuiPrefs.cpp:3012 msgid "Res&tore" msgstr "&Ripristina" -#: src/frontends/qt4/GuiPrefs.cpp:3102 -#: src/frontends/qt4/GuiPrefs.cpp:3109 -#: src/frontends/qt4/GuiPrefs.cpp:3129 -#: src/frontends/qt4/GuiPrefs.cpp:3148 +#: src/frontends/qt4/GuiPrefs.cpp:3123 +#: src/frontends/qt4/GuiPrefs.cpp:3130 +#: src/frontends/qt4/GuiPrefs.cpp:3150 +#: src/frontends/qt4/GuiPrefs.cpp:3169 msgid "Failed to create shortcut" msgstr "Impossibile creare la scorciatoia" -#: src/frontends/qt4/GuiPrefs.cpp:3103 +#: src/frontends/qt4/GuiPrefs.cpp:3124 msgid "Unknown or invalid LyX function" msgstr "Funzione di LyX sconosciuta o invalida." -#: src/frontends/qt4/GuiPrefs.cpp:3110 +#: src/frontends/qt4/GuiPrefs.cpp:3131 msgid "Invalid or empty key sequence" msgstr "Sequenza tasti invalida o vuota" -#: src/frontends/qt4/GuiPrefs.cpp:3130 +#: src/frontends/qt4/GuiPrefs.cpp:3151 #, c-format msgid "" "Shortcut `%1$s' is already bound to:\n" @@ -24038,35 +24060,35 @@ msgstr "" "%2$s\n" "Occorre rimuovere l'associazione prima di crearne una nuova." -#: src/frontends/qt4/GuiPrefs.cpp:3149 +#: src/frontends/qt4/GuiPrefs.cpp:3170 msgid "Can not insert shortcut to the list" msgstr "Impossibile inserire la scorciatoia nella lista" -#: src/frontends/qt4/GuiPrefs.cpp:3180 +#: src/frontends/qt4/GuiPrefs.cpp:3201 msgid "Identity" msgstr "Identità" -#: src/frontends/qt4/GuiPrefs.cpp:3389 +#: src/frontends/qt4/GuiPrefs.cpp:3410 msgid "Choose bind file" msgstr "Scelta del file delle scorciatoie" -#: src/frontends/qt4/GuiPrefs.cpp:3390 +#: src/frontends/qt4/GuiPrefs.cpp:3411 msgid "LyX bind files (*.bind)" msgstr "File delle scorciatoie di LyX (*.bind)" -#: src/frontends/qt4/GuiPrefs.cpp:3396 +#: src/frontends/qt4/GuiPrefs.cpp:3417 msgid "Choose UI file" msgstr "Scelta del file UI" -#: src/frontends/qt4/GuiPrefs.cpp:3397 +#: src/frontends/qt4/GuiPrefs.cpp:3418 msgid "LyX UI files (*.ui)" msgstr "File UI di LyX (*.ui)" -#: src/frontends/qt4/GuiPrefs.cpp:3403 +#: src/frontends/qt4/GuiPrefs.cpp:3424 msgid "Choose keyboard map" msgstr "Scelta della mappa di tastiera" -#: src/frontends/qt4/GuiPrefs.cpp:3404 +#: src/frontends/qt4/GuiPrefs.cpp:3425 msgid "LyX keyboard maps (*.kmap)" msgstr "Mappa di tastiera di LyX (*.kmap)" @@ -24110,20 +24132,20 @@ msgstr "Attivo" msgid "Cross-reference" msgstr "Riferimento" -#: src/frontends/qt4/GuiRef.cpp:306 +#: src/frontends/qt4/GuiRef.cpp:300 msgid "&Go Back" msgstr "&Torna indietro" -#: src/frontends/qt4/GuiRef.cpp:308 +#: src/frontends/qt4/GuiRef.cpp:302 msgid "Jump back" msgstr "Salta indietro" -#: src/frontends/qt4/GuiRef.cpp:316 +#: src/frontends/qt4/GuiRef.cpp:310 msgid "Jump to label" msgstr "Salta all'etichetta" -#: src/frontends/qt4/GuiRef.cpp:371 -#: src/frontends/qt4/GuiRef.cpp:390 +#: src/frontends/qt4/GuiRef.cpp:365 +#: src/frontends/qt4/GuiRef.cpp:384 msgid "" msgstr "" @@ -24558,95 +24580,95 @@ msgstr "Icone normali" msgid "Big-sized icons" msgstr "Icone grandi" -#: src/frontends/qt4/GuiView.cpp:545 +#: src/frontends/qt4/GuiView.cpp:557 #, c-format msgid "Successful export to format: %1$s" msgstr "Riuscita esportazione al formato: %1$s" -#: src/frontends/qt4/GuiView.cpp:554 +#: src/frontends/qt4/GuiView.cpp:566 #, c-format msgid "Error while exporting format: %1$s" msgstr "Errore durante l'esportazione al formato: %1$s" -#: src/frontends/qt4/GuiView.cpp:557 +#: src/frontends/qt4/GuiView.cpp:569 #, c-format msgid "Successful preview of format: %1$s" msgstr "Riuscita anteprima del formato: %1$s" -#: src/frontends/qt4/GuiView.cpp:560 +#: src/frontends/qt4/GuiView.cpp:572 #, c-format msgid "Error while previewing format: %1$s" msgstr "Errore durante l'anteprima del formato: %1$s" -#: src/frontends/qt4/GuiView.cpp:852 +#: src/frontends/qt4/GuiView.cpp:864 msgid "Exit LyX" msgstr "Uscita da LyX" -#: src/frontends/qt4/GuiView.cpp:853 +#: src/frontends/qt4/GuiView.cpp:865 msgid "LyX could not be closed because documents are being processed by LyX." msgstr "LyX non può essere chiuso perché ci sono documenti in fase di elaborazione." -#: src/frontends/qt4/GuiView.cpp:1103 +#: src/frontends/qt4/GuiView.cpp:1115 msgid "Welcome to LyX!" msgstr "Benvenuto in LyX!" -#: src/frontends/qt4/GuiView.cpp:1568 +#: src/frontends/qt4/GuiView.cpp:1580 msgid "Automatic save done." msgstr "Autosalvataggio riuscito." -#: src/frontends/qt4/GuiView.cpp:1569 +#: src/frontends/qt4/GuiView.cpp:1581 msgid "Automatic save failed!" msgstr "L'autosalvataggio non ha funzionato!" -#: src/frontends/qt4/GuiView.cpp:1615 +#: src/frontends/qt4/GuiView.cpp:1627 msgid "Command not allowed without any document open" msgstr "Il comando non è permesso senza alcun documento aperto" -#: src/frontends/qt4/GuiView.cpp:1718 +#: src/frontends/qt4/GuiView.cpp:1731 #, c-format msgid "Unknown toolbar \"%1$s\"" msgstr "Barra strumenti \"%1$s\" sconosciuta" -#: src/frontends/qt4/GuiView.cpp:1900 +#: src/frontends/qt4/GuiView.cpp:1913 msgid "Select template file" msgstr "Selezionare file modello" -#: src/frontends/qt4/GuiView.cpp:1902 -#: src/frontends/qt4/GuiView.cpp:2266 +#: src/frontends/qt4/GuiView.cpp:1915 +#: src/frontends/qt4/GuiView.cpp:2279 msgid "Templates|#T#t" msgstr "Modelli|#M#m" -#: src/frontends/qt4/GuiView.cpp:1929 +#: src/frontends/qt4/GuiView.cpp:1942 msgid "Document not loaded." msgstr "Il documento non è stato caricato." -#: src/frontends/qt4/GuiView.cpp:1957 +#: src/frontends/qt4/GuiView.cpp:1970 msgid "Select document to open" msgstr "Scegliere il documento da aprire" -#: src/frontends/qt4/GuiView.cpp:1959 -#: src/frontends/qt4/GuiView.cpp:2101 -#: src/frontends/qt4/GuiView.cpp:2223 +#: src/frontends/qt4/GuiView.cpp:1972 +#: src/frontends/qt4/GuiView.cpp:2114 +#: src/frontends/qt4/GuiView.cpp:2236 msgid "Examples|#E#e" msgstr "Esempi|#E#e" -#: src/frontends/qt4/GuiView.cpp:1963 +#: src/frontends/qt4/GuiView.cpp:1976 msgid "LyX-1.3.x Documents (*.lyx13)" msgstr "Documenti LyX-1.3.x (*.lyx13)" -#: src/frontends/qt4/GuiView.cpp:1964 +#: src/frontends/qt4/GuiView.cpp:1977 msgid "LyX-1.4.x Documents (*.lyx14)" msgstr "Documenti LyX-1.4.x (*.lyx14)" -#: src/frontends/qt4/GuiView.cpp:1965 +#: src/frontends/qt4/GuiView.cpp:1978 msgid "LyX-1.5.x Documents (*.lyx15)" msgstr "Documenti LyX-1.5.x (*.lyx15)" -#: src/frontends/qt4/GuiView.cpp:1966 +#: src/frontends/qt4/GuiView.cpp:1979 msgid "LyX-1.6.x Documents (*.lyx16)" msgstr "Documenti LyX-1.6.x (*.lyx16)" -#: src/frontends/qt4/GuiView.cpp:1991 +#: src/frontends/qt4/GuiView.cpp:2004 #: src/frontends/qt4/Validator.cpp:200 #: src/insets/ExternalSupport.cpp:368 #: src/insets/InsetBibtex.cpp:298 @@ -24655,7 +24677,7 @@ msgstr "Documenti LyX-1.6.x (*.lyx16)" msgid "Invalid filename" msgstr "Nome file non valido" -#: src/frontends/qt4/GuiView.cpp:1992 +#: src/frontends/qt4/GuiView.cpp:2005 #, c-format msgid "" "The directory in the given path\n" @@ -24666,42 +24688,42 @@ msgstr "" "%1$s\n" "non esiste." -#: src/frontends/qt4/GuiView.cpp:2008 +#: src/frontends/qt4/GuiView.cpp:2021 #, c-format msgid "Opening document %1$s..." msgstr "Sto aprendo il documento %1$s..." -#: src/frontends/qt4/GuiView.cpp:2013 +#: src/frontends/qt4/GuiView.cpp:2026 #, c-format msgid "Document %1$s opened." msgstr "Il documento %1$s è stato aperto." -#: src/frontends/qt4/GuiView.cpp:2016 +#: src/frontends/qt4/GuiView.cpp:2029 msgid "Version control detected." msgstr "Controllo versione rilevato." -#: src/frontends/qt4/GuiView.cpp:2018 +#: src/frontends/qt4/GuiView.cpp:2031 #, c-format msgid "Could not open document %1$s" msgstr "Non riesco ad aprire il documento %1$s" -#: src/frontends/qt4/GuiView.cpp:2048 +#: src/frontends/qt4/GuiView.cpp:2061 msgid "Couldn't import file" msgstr "Non riesco ad importare il file" -#: src/frontends/qt4/GuiView.cpp:2049 +#: src/frontends/qt4/GuiView.cpp:2062 #, c-format msgid "No information for importing the format %1$s." msgstr "Nessuna informazione per importare il formato %1$s." -#: src/frontends/qt4/GuiView.cpp:2096 +#: src/frontends/qt4/GuiView.cpp:2109 #, c-format msgid "Select %1$s file to import" msgstr "Scegliere il file %1$s da importare" -#: src/frontends/qt4/GuiView.cpp:2147 -#: src/frontends/qt4/GuiView.cpp:2311 -#: src/frontends/qt4/GuiView.cpp:2386 +#: src/frontends/qt4/GuiView.cpp:2160 +#: src/frontends/qt4/GuiView.cpp:2324 +#: src/frontends/qt4/GuiView.cpp:2399 #, c-format msgid "" "The document %1$s already exists.\n" @@ -24712,38 +24734,38 @@ msgstr "" "\n" "Volete davvero sovrascriverlo?" -#: src/frontends/qt4/GuiView.cpp:2149 -#: src/frontends/qt4/GuiView.cpp:2315 -#: src/frontends/qt4/GuiView.cpp:2390 +#: src/frontends/qt4/GuiView.cpp:2162 +#: src/frontends/qt4/GuiView.cpp:2328 +#: src/frontends/qt4/GuiView.cpp:2403 msgid "Overwrite document?" msgstr "Sovrascrivo il documento?" -#: src/frontends/qt4/GuiView.cpp:2158 +#: src/frontends/qt4/GuiView.cpp:2171 #, c-format msgid "Importing %1$s..." msgstr "Sto importando %1$s..." -#: src/frontends/qt4/GuiView.cpp:2161 +#: src/frontends/qt4/GuiView.cpp:2174 msgid "imported." msgstr "importato." -#: src/frontends/qt4/GuiView.cpp:2163 +#: src/frontends/qt4/GuiView.cpp:2176 msgid "file not imported!" msgstr "File non importato!" -#: src/frontends/qt4/GuiView.cpp:2188 +#: src/frontends/qt4/GuiView.cpp:2201 msgid "newfile" msgstr "newfile" -#: src/frontends/qt4/GuiView.cpp:2221 +#: src/frontends/qt4/GuiView.cpp:2234 msgid "Select LyX document to insert" msgstr "Scegliere il documento LyX da inserire" -#: src/frontends/qt4/GuiView.cpp:2263 +#: src/frontends/qt4/GuiView.cpp:2276 msgid "Choose a filename to save document as" msgstr "Scegliere il nome con cui salvare il documento" -#: src/frontends/qt4/GuiView.cpp:2296 +#: src/frontends/qt4/GuiView.cpp:2309 #, c-format msgid "" "The file\n" @@ -24758,22 +24780,22 @@ msgstr "" "Occorre chiuderlo prima di cercare di sovrascriverlo.\n" "Si vuole scegliere un nuovo nome?" -#: src/frontends/qt4/GuiView.cpp:2300 +#: src/frontends/qt4/GuiView.cpp:2313 msgid "Chosen File Already Open" msgstr "Il file scelto è già aperto" -#: src/frontends/qt4/GuiView.cpp:2301 -#: src/frontends/qt4/GuiView.cpp:2316 -#: src/frontends/qt4/GuiView.cpp:2391 -#: src/frontends/qt4/GuiView.cpp:2439 +#: src/frontends/qt4/GuiView.cpp:2314 +#: src/frontends/qt4/GuiView.cpp:2329 +#: src/frontends/qt4/GuiView.cpp:2404 +#: src/frontends/qt4/GuiView.cpp:2452 msgid "&Rename" msgstr "&Rinomina" -#: src/frontends/qt4/GuiView.cpp:2343 +#: src/frontends/qt4/GuiView.cpp:2356 msgid "Choose a filename to export the document as" msgstr "Scegliere il nome con cui esportare il documento" -#: src/frontends/qt4/GuiView.cpp:2435 +#: src/frontends/qt4/GuiView.cpp:2448 #, c-format msgid "" "The document %1$s could not be saved.\n" @@ -24784,24 +24806,53 @@ msgstr "" "\n" "Volete rinominare il documento e riprovare?" -#: src/frontends/qt4/GuiView.cpp:2438 +#: src/frontends/qt4/GuiView.cpp:2451 msgid "Rename and save?" msgstr "Rinomino e salvo?" -#: src/frontends/qt4/GuiView.cpp:2439 +#: src/frontends/qt4/GuiView.cpp:2452 msgid "&Retry" msgstr "&Riprova" -#: src/frontends/qt4/GuiView.cpp:2545 +#: src/frontends/qt4/GuiView.cpp:2497 +#, c-format +msgid "" +"Last view on document %1$s is being closed.\n" +"Would you like to close or hide the document?\n" +"\n" +"Hidden documents can be displayed back through\n" +"the menu: View->Hidden->...\n" +"\n" +"To remove this question, set your preference in:\n" +" Tools->Preferences->Look&Feel->UserInterface\n" +msgstr "" +"L'ultima vista del documento %1$s sta per essere chiusa.\n" +"Devo chiudere o nascondere il documento?\n" +"\n" +"I documenti nascosti possono essere rivisualizzati\n" +"dal menu: Vista->Nascosti->...\n" +"\n" +"Per evitare questa richiesta, impostare la preferenza in:\n" +" Strumenti->Preferenze->Aspetto grafico->Interfaccia utente\n" + +#: src/frontends/qt4/GuiView.cpp:2506 +msgid "Close or hide document?" +msgstr "Chiudere o nascondere il documento?" + +#: src/frontends/qt4/GuiView.cpp:2507 +msgid "&Hide" +msgstr "&Nascondi" + +#: src/frontends/qt4/GuiView.cpp:2593 msgid "Close document" msgstr "Chiusura del documento" -#: src/frontends/qt4/GuiView.cpp:2546 +#: src/frontends/qt4/GuiView.cpp:2594 msgid "Document could not be closed because it is being processed by LyX." msgstr "Il documento non può essere chiuso perché LyX sta ancora elaborandolo." -#: src/frontends/qt4/GuiView.cpp:2650 -#: src/frontends/qt4/GuiView.cpp:2755 +#: src/frontends/qt4/GuiView.cpp:2698 +#: src/frontends/qt4/GuiView.cpp:2803 #, c-format msgid "" "The document %1$s has not been saved yet.\n" @@ -24812,12 +24863,12 @@ msgstr "" "\n" "Volete salvare il documento?" -#: src/frontends/qt4/GuiView.cpp:2653 -#: src/frontends/qt4/GuiView.cpp:2758 +#: src/frontends/qt4/GuiView.cpp:2701 +#: src/frontends/qt4/GuiView.cpp:2806 msgid "Save new document?" msgstr "Salvo nuovo documento?" -#: src/frontends/qt4/GuiView.cpp:2658 +#: src/frontends/qt4/GuiView.cpp:2706 #, c-format msgid "" "The document %1$s has unsaved changes.\n" @@ -24828,16 +24879,16 @@ msgstr "" "\n" "Volete salvare il documento o abbandonare le modifiche?" -#: src/frontends/qt4/GuiView.cpp:2660 -#: src/frontends/qt4/GuiView.cpp:2752 +#: src/frontends/qt4/GuiView.cpp:2708 +#: src/frontends/qt4/GuiView.cpp:2800 msgid "Save changed document?" msgstr "Salvo il documento modificato?" -#: src/frontends/qt4/GuiView.cpp:2661 +#: src/frontends/qt4/GuiView.cpp:2709 msgid "&Discard" msgstr "&Abbandona" -#: src/frontends/qt4/GuiView.cpp:2749 +#: src/frontends/qt4/GuiView.cpp:2797 #, c-format msgid "" "The document %1$s has unsaved changes.\n" @@ -24848,7 +24899,7 @@ msgstr "" "\n" "Volete salvare il documento?" -#: src/frontends/qt4/GuiView.cpp:2784 +#: src/frontends/qt4/GuiView.cpp:2832 #, c-format msgid "" "Document \n" @@ -24860,89 +24911,89 @@ msgstr "" "è stato modificato dall'esterno.\n" "Lo riapro scartando le modifiche locali?" -#: src/frontends/qt4/GuiView.cpp:2787 +#: src/frontends/qt4/GuiView.cpp:2835 msgid "Reload externally changed document?" msgstr "Riapro il documento modificato esternamente?" -#: src/frontends/qt4/GuiView.cpp:2840 +#: src/frontends/qt4/GuiView.cpp:2888 msgid "Error when setting the locking property." msgstr "Errore nell'impostare l'opzione di blocco." -#: src/frontends/qt4/GuiView.cpp:2886 +#: src/frontends/qt4/GuiView.cpp:2934 msgid "Directory is not accessible." msgstr "La cartella non è accessibile." -#: src/frontends/qt4/GuiView.cpp:2962 +#: src/frontends/qt4/GuiView.cpp:3010 #, c-format msgid "Opening child document %1$s..." msgstr "Sto aprendo il documento figlio %1$s..." -#: src/frontends/qt4/GuiView.cpp:3026 +#: src/frontends/qt4/GuiView.cpp:3074 #, c-format msgid "No buffer for file: %1$s." msgstr "Nessun buffer per il file: %1$s" -#: src/frontends/qt4/GuiView.cpp:3122 +#: src/frontends/qt4/GuiView.cpp:3170 msgid "Export Error" msgstr "Errore di esportazione" -#: src/frontends/qt4/GuiView.cpp:3123 +#: src/frontends/qt4/GuiView.cpp:3171 msgid "Error cloning the Buffer." msgstr "Errore durante la clonazione del buffer." -#: src/frontends/qt4/GuiView.cpp:3231 +#: src/frontends/qt4/GuiView.cpp:3279 #, c-format msgid "Error exporting to format: %1$s" msgstr "Errore durante l'esportazione al formato: %1$s" -#: src/frontends/qt4/GuiView.cpp:3239 -#: src/frontends/qt4/GuiView.cpp:3256 +#: src/frontends/qt4/GuiView.cpp:3287 +#: src/frontends/qt4/GuiView.cpp:3304 msgid "Exporting ..." msgstr "Esportazione ..." -#: src/frontends/qt4/GuiView.cpp:3265 +#: src/frontends/qt4/GuiView.cpp:3313 msgid "Previewing ..." msgstr "Anteprima ..." -#: src/frontends/qt4/GuiView.cpp:3299 +#: src/frontends/qt4/GuiView.cpp:3347 msgid "Document not loaded" msgstr "Il documento non è stato caricato." -#: src/frontends/qt4/GuiView.cpp:3373 +#: src/frontends/qt4/GuiView.cpp:3421 msgid "Select file to insert" msgstr "Scegliere il documento da inserire" -#: src/frontends/qt4/GuiView.cpp:3377 +#: src/frontends/qt4/GuiView.cpp:3425 msgid "All Files (*)" msgstr "Tutti i file (*)" -#: src/frontends/qt4/GuiView.cpp:3401 +#: src/frontends/qt4/GuiView.cpp:3449 #, c-format msgid "Any changes will be lost. Are you sure you want to revert to the saved version of the document %1$s?" msgstr "Ogni modifica andrà persa. Siete sicuri di voler tornare alla versione salvata del documento %1$s?" -#: src/frontends/qt4/GuiView.cpp:3404 +#: src/frontends/qt4/GuiView.cpp:3452 msgid "Revert to saved document?" msgstr "Ritorno all'ultimo salvataggio?" -#: src/frontends/qt4/GuiView.cpp:3430 +#: src/frontends/qt4/GuiView.cpp:3478 msgid "Saving all documents..." msgstr "Sto salvando tutti i documenti..." -#: src/frontends/qt4/GuiView.cpp:3440 +#: src/frontends/qt4/GuiView.cpp:3488 msgid "All documents saved." msgstr "Tutti i documenti sono stati salvati" -#: src/frontends/qt4/GuiView.cpp:3540 +#: src/frontends/qt4/GuiView.cpp:3588 #, c-format msgid "%1$s unknown command!" msgstr "%1$s è un comando sconosciuto!" -#: src/frontends/qt4/GuiView.cpp:3658 +#: src/frontends/qt4/GuiView.cpp:3721 msgid "Please, preview the document first." msgstr "Occorre visualizzare il documento prima." -#: src/frontends/qt4/GuiView.cpp:3678 +#: src/frontends/qt4/GuiView.cpp:3741 msgid "Couldn't proceed." msgstr "Non posso procedere." @@ -25549,15 +25600,26 @@ msgstr "Non è necessaria alcuna conversione del file %1$s tutto sommato" msgid "Graphics file: %1$s" msgstr "File grafici: %1$s" -#: src/insets/InsetHyperlink.cpp:259 +#: src/insets/InsetHyperlink.cpp:198 +#, c-format +msgid "" +"The following characters that are used in the href inset are not\n" +"representable in the current encoding and therefore have been omitted:\n" +"%1$s." +msgstr "" +"I seguenti caratteri usati nell'inserto href non sono\n" +"rappresentabili nella codifica corrente e sono stati omessi:\n" +"%1$s." + +#: src/insets/InsetHyperlink.cpp:272 msgid "www" msgstr "www" -#: src/insets/InsetHyperlink.cpp:263 +#: src/insets/InsetHyperlink.cpp:276 msgid "file" msgstr "file" -#: src/insets/InsetHyperlink.cpp:264 +#: src/insets/InsetHyperlink.cpp:277 #, c-format msgid "Hyperlink (%1$s) to %2$s" msgstr "Hyperlink (%1$s) a %2$s" @@ -26038,11 +26100,11 @@ msgstr "Riferimento a nome" msgid "NameRef:" msgstr "NameRef:" -#: src/insets/InsetScript.cpp:343 +#: src/insets/InsetScript.cpp:342 msgid "subscript" msgstr "sottoscritto" -#: src/insets/InsetScript.cpp:353 +#: src/insets/InsetScript.cpp:352 msgid "superscript" msgstr "soprascritto" From 63c6466269b711572b57f53971c30b0c718b47e2 Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Sun, 30 Sep 2012 10:53:45 +0200 Subject: [PATCH 22/30] de.po: update --- po/de.po | 595 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 325 insertions(+), 270 deletions(-) diff --git a/po/de.po b/po/de.po index 6b9ee14a0a..3625984b8a 100644 --- a/po/de.po +++ b/po/de.po @@ -95,8 +95,8 @@ msgid "" msgstr "" "Project-Id-Version: LyX 2.1\n" "Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n" -"POT-Creation-Date: 2012-09-28 10:00+0200\n" -"PO-Revision-Date: 2012-09-28 10:03+0200\n" +"POT-Creation-Date: 2012-09-30 10:42+0200\n" +"PO-Revision-Date: 2012-09-30 10:53+0200\n" "Last-Translator: Jürgen Spitzmüller \n" "Language-Team: German \n" "Language: de\n" @@ -186,7 +186,7 @@ msgstr "Bearbeiten" msgid "Cursor &follows scrollbar" msgstr "Cursor folgt Sc&rollbar" -#: src/frontends/qt4/ui/PrefEditUi.ui:46 src/LyXRC.cpp:3110 +#: src/frontends/qt4/ui/PrefEditUi.ui:46 src/LyXRC.cpp:3124 msgid "" "Configure the width of the text cursor. Automatic zoom-controlled cursor " "width used when set to 0." @@ -473,7 +473,7 @@ msgstr "&Übernehmen" #: src/frontends/qt4/ui/ErrorListUi.ui:60 src/frontends/qt4/ui/TexinfoUi.ui:58 #: src/frontends/qt4/ui/RefUi.ui:343 src/frontends/qt4/ui/SearchUi.ui:203 #: src/frontends/qt4/ui/LogUi.ui:87 src/frontends/qt4/ui/CompareUi.ui:163 -#: src/frontends/qt4/GuiParagraph.cpp:161 +#: src/frontends/qt4/GuiParagraph.cpp:161 src/frontends/qt4/GuiView.cpp:2507 msgid "&Close" msgstr "&Schließen" @@ -731,7 +731,7 @@ msgstr "&Fremdsprachen markieren" msgid "Right-to-left language support" msgstr "Rechts-nach-links-Sprachunterstützung" -#: src/frontends/qt4/ui/PrefLanguageUi.ui:228 src/LyXRC.cpp:3383 +#: src/frontends/qt4/ui/PrefLanguageUi.ui:228 src/LyXRC.cpp:3397 msgid "" "Select to enable support of right-to-left languages (e.g. Hebrew, Arabic)." msgstr "" @@ -1248,7 +1248,7 @@ msgstr "Zeilen&abstand" #: src/frontends/qt4/GuiDocument.cpp:3510 src/frontends/qt4/GuiExternal.cpp:76 #: src/frontends/qt4/GuiGraphics.cpp:71 src/frontends/qt4/GuiIndices.cpp:57 #: src/frontends/qt4/GuiListings.cpp:152 src/frontends/qt4/GuiListings.cpp:159 -#: src/frontends/qt4/GuiPrefs.cpp:2290 src/frontends/qt4/GuiPrefs.cpp:2549 +#: src/frontends/qt4/GuiPrefs.cpp:2290 src/frontends/qt4/GuiPrefs.cpp:2551 #: src/frontends/qt4/GuiPrintNomencl.cpp:47 #: src/frontends/qt4/GuiViewSource.cpp:198 msgid "Default" @@ -1756,12 +1756,12 @@ msgstr "A&lle hinzufügen" #: src/frontends/qt4/GuiClipboard.cpp:242 #: src/frontends/qt4/GuiDocument.cpp:2066 #: src/frontends/qt4/GuiParagraph.cpp:69 -#: src/frontends/qt4/GuiParagraph.cpp:159 src/frontends/qt4/GuiView.cpp:2150 -#: src/frontends/qt4/GuiView.cpp:2301 src/frontends/qt4/GuiView.cpp:2316 -#: src/frontends/qt4/GuiView.cpp:2391 src/frontends/qt4/GuiView.cpp:2439 -#: src/frontends/qt4/GuiView.cpp:2654 src/frontends/qt4/GuiView.cpp:2661 -#: src/frontends/qt4/GuiView.cpp:2760 src/frontends/qt4/GuiView.cpp:2788 -#: src/frontends/qt4/GuiView.cpp:3405 src/insets/InsetBibtex.cpp:153 +#: src/frontends/qt4/GuiParagraph.cpp:159 src/frontends/qt4/GuiView.cpp:2163 +#: src/frontends/qt4/GuiView.cpp:2314 src/frontends/qt4/GuiView.cpp:2329 +#: src/frontends/qt4/GuiView.cpp:2404 src/frontends/qt4/GuiView.cpp:2452 +#: src/frontends/qt4/GuiView.cpp:2702 src/frontends/qt4/GuiView.cpp:2709 +#: src/frontends/qt4/GuiView.cpp:2808 src/frontends/qt4/GuiView.cpp:2836 +#: src/frontends/qt4/GuiView.cpp:3453 src/insets/InsetBibtex.cpp:153 msgid "&Cancel" msgstr "&Abbrechen" @@ -1805,7 +1805,7 @@ msgstr "&Ändern" #: src/frontends/qt4/ui/PrefShortcutsUi.ui:61 #: src/frontends/qt4/ui/PrefConvertersUi.ui:209 -#: src/frontends/qt4/GuiPrefs.cpp:2947 src/frontends/qt4/GuiPrefs.cpp:3011 +#: src/frontends/qt4/GuiPrefs.cpp:2968 src/frontends/qt4/GuiPrefs.cpp:3032 msgid "Remo&ve" msgstr "&Entfernen" @@ -2613,19 +2613,19 @@ msgstr "&Schützen:" msgid "Insert the spacing even after a line break" msgstr "Den Abstand auch nach einem Zeilenumbruch einfügen" -#: src/frontends/qt4/ui/PrefUi.ui:25 +#: src/frontends/qt4/ui/PrefUi.ui:26 msgid "&User interface file:" msgstr "&UI-Datei:" -#: src/frontends/qt4/ui/PrefUi.ui:38 src/frontends/qt4/ui/CompareUi.ui:83 +#: src/frontends/qt4/ui/PrefUi.ui:39 src/frontends/qt4/ui/CompareUi.ui:83 msgid "Bro&wse..." msgstr "Du&rchsuchen..." -#: src/frontends/qt4/ui/PrefUi.ui:58 +#: src/frontends/qt4/ui/PrefUi.ui:59 msgid "&Icon Set:" msgstr "&Symboldesign:" -#: src/frontends/qt4/ui/PrefUi.ui:68 +#: src/frontends/qt4/ui/PrefUi.ui:69 msgid "" "The icon set to use. Warning: normal size of icons may be\n" "wrong until you save the preferences and restart LyX." @@ -2633,11 +2633,11 @@ msgstr "" "Das zu verwendende Symboldesign. Um die richtige Symbolgröße\n" "angezeigt zu bekommen, müssen Sie LyX ggf. neu starten." -#: src/frontends/qt4/ui/PrefUi.ui:75 +#: src/frontends/qt4/ui/PrefUi.ui:76 msgid "Automatic help" msgstr "Automatische Hilfe" -#: src/frontends/qt4/ui/PrefUi.ui:93 +#: src/frontends/qt4/ui/PrefUi.ui:94 msgid "" "Checking this allows the automatic display of helpful comments for insets in " "the main work area of an edited document" @@ -2645,63 +2645,63 @@ msgstr "" "Zeigt hilfreiche Kommentare zu Einfügungen im Hauptarbeitsbereich des " "bearbeiteten Dokuments" -#: src/frontends/qt4/ui/PrefUi.ui:96 +#: src/frontends/qt4/ui/PrefUi.ui:97 msgid "&Enable tool tips in main work area" msgstr "&Tooltips im Hauptarbeitsbereich aktivieren" -#: src/frontends/qt4/ui/PrefUi.ui:106 +#: src/frontends/qt4/ui/PrefUi.ui:107 msgid "Session" msgstr "Sitzung" -#: src/frontends/qt4/ui/PrefUi.ui:118 +#: src/frontends/qt4/ui/PrefUi.ui:119 msgid "Restore window layouts and &geometries" msgstr "Aussehen und Größe von &Fenstern wiederherstellen" -#: src/frontends/qt4/ui/PrefUi.ui:125 +#: src/frontends/qt4/ui/PrefUi.ui:126 msgid "Restore to the cursor position when the file was last closed" msgstr "Positioniere den Cursor beim Öffnen der Datei dort, wo er zuletzt war" -#: src/frontends/qt4/ui/PrefUi.ui:128 +#: src/frontends/qt4/ui/PrefUi.ui:129 msgid "Restore cursor &positions" msgstr "&Cursor-Positionen wiederherstellen" -#: src/frontends/qt4/ui/PrefUi.ui:135 +#: src/frontends/qt4/ui/PrefUi.ui:136 msgid "&Load opened files from last session" msgstr "Ge&öffnete Dateien der letzten Sitzung laden" -#: src/frontends/qt4/ui/PrefUi.ui:142 +#: src/frontends/qt4/ui/PrefUi.ui:143 msgid "&Clear all session information" msgstr "&Lösche alle Sitzungsinformationen" -#: src/frontends/qt4/ui/PrefUi.ui:165 +#: src/frontends/qt4/ui/PrefUi.ui:166 msgid "Documents" msgstr "Dokumente" -#: src/frontends/qt4/ui/PrefUi.ui:174 +#: src/frontends/qt4/ui/PrefUi.ui:175 msgid "Backup original documents when saving" msgstr "Sichere &Originaldokumente beim Speichern" -#: src/frontends/qt4/ui/PrefUi.ui:181 +#: src/frontends/qt4/ui/PrefUi.ui:182 msgid "&Backup documents, every" msgstr "Sicherun&g der Dokumente alle" -#: src/frontends/qt4/ui/PrefUi.ui:198 +#: src/frontends/qt4/ui/PrefUi.ui:199 msgid "minutes" msgstr "Minuten" -#: src/frontends/qt4/ui/PrefUi.ui:218 +#: src/frontends/qt4/ui/PrefUi.ui:219 msgid "&Save documents compressed by default" msgstr "Dokumente &komprimiert speichern" -#: src/frontends/qt4/ui/PrefUi.ui:225 +#: src/frontends/qt4/ui/PrefUi.ui:226 msgid "&Maximum last files:" msgstr "&Maximale Anzahl letzter Dateien:" -#: src/frontends/qt4/ui/PrefUi.ui:255 +#: src/frontends/qt4/ui/PrefUi.ui:256 msgid "&Open documents in tabs" msgstr "Dokument in &Registerkarten öffnen" -#: src/frontends/qt4/ui/PrefUi.ui:262 +#: src/frontends/qt4/ui/PrefUi.ui:263 msgid "" "Whether to open documents in an already running instance of LyX.\n" "(Set the LyXServer pipe path and restart LyX to enable this feature)" @@ -2710,20 +2710,36 @@ msgstr "" "(Um dieses Feature nutzen zu können, müssen Sie einen\n" "Pfad zur LyX-Server-Weiterleitung definieren und LyX neu starten.)" -#: src/frontends/qt4/ui/PrefUi.ui:265 +#: src/frontends/qt4/ui/PrefUi.ui:266 msgid "S&ingle instance" msgstr "Ein&zelinstanz" -#: src/frontends/qt4/ui/PrefUi.ui:272 +#: src/frontends/qt4/ui/PrefUi.ui:273 msgid "Whether to place close button on each tab or only one in the top left." msgstr "" "Zeige den \"Schließen\"-Knopf nicht auf jedem Unterfenster an, sondern " "rechts in der Unterfenster-Leiste." -#: src/frontends/qt4/ui/PrefUi.ui:275 +#: src/frontends/qt4/ui/PrefUi.ui:276 msgid "&Single close-tab button" msgstr "&Globaler Knopf zum Schließen von Registerkarten" +#: src/frontends/qt4/ui/PrefUi.ui:283 +msgid "Closing last view:" +msgstr "Beim Schließen der letzten &Ansicht:" + +#: src/frontends/qt4/ui/PrefUi.ui:291 +msgid "Closes document" +msgstr "Dokument schließen" + +#: src/frontends/qt4/ui/PrefUi.ui:296 +msgid "Hides document" +msgstr "Dokument verbergen" + +#: src/frontends/qt4/ui/PrefUi.ui:301 +msgid "Ask the user" +msgstr "Nachfragen" + #: src/frontends/qt4/ui/ModulesUi.ui:60 msgid "A&vailable:" msgstr "&Verfügbar:" @@ -2749,7 +2765,7 @@ msgstr "Ausg&ewählt:" msgid "&PATH prefix:" msgstr "&PATH-Präfix:" -#: src/frontends/qt4/ui/PrefPathsUi.ui:51 src/LyXRC.cpp:3293 +#: src/frontends/qt4/ui/PrefPathsUi.ui:51 src/LyXRC.cpp:3307 msgid "" "Specify those directories which should be prepended to the PATH environment " "variable.\n" @@ -2763,7 +2779,7 @@ msgstr "" msgid "TEX&INPUTS prefix:" msgstr "TEX&INPUT-Präfix:" -#: src/frontends/qt4/ui/PrefPathsUi.ui:68 src/LyXRC.cpp:3452 +#: src/frontends/qt4/ui/PrefPathsUi.ui:68 src/LyXRC.cpp:3470 msgid "" "Specify those directories which should be prepended to the TEXINPUTS " "environment variable.\n" @@ -3117,8 +3133,8 @@ msgstr "Groß" msgid "VFill" msgstr "Variabel" -#: src/frontends/qt4/ui/PrefsUi.ui:70 src/frontends/qt4/GuiView.cpp:2654 -#: src/frontends/qt4/GuiView.cpp:2661 src/frontends/qt4/GuiView.cpp:2760 +#: src/frontends/qt4/ui/PrefsUi.ui:70 src/frontends/qt4/GuiView.cpp:2702 +#: src/frontends/qt4/GuiView.cpp:2709 src/frontends/qt4/GuiView.cpp:2808 msgid "&Save" msgstr "&Speichern" @@ -4645,7 +4661,7 @@ msgstr "Marken nach Präfix (bspw. \"sec:\") gruppieren" msgid "Grou&p" msgstr "Gru&ppieren" -#: src/frontends/qt4/ui/RefUi.ui:181 src/frontends/qt4/GuiRef.cpp:314 +#: src/frontends/qt4/ui/RefUi.ui:181 src/frontends/qt4/GuiRef.cpp:308 msgid "&Go to Label" msgstr "&Gehe zur Marke" @@ -5045,7 +5061,7 @@ msgstr "&Alle Unterdokumente einbinden" msgid "Output &line length:" msgstr "&Zeilenlänge der Ausgabe:" -#: src/frontends/qt4/ui/PrefOutputUi.ui:37 src/LyXRC.cpp:3057 +#: src/frontends/qt4/ui/PrefOutputUi.ui:37 src/LyXRC.cpp:3071 msgid "" "The maximum line length of exported plain text/LaTeX/SGML files. If set to " "0, paragraphs are output in a single line; if the line length is > 0, " @@ -18101,8 +18117,8 @@ msgstr "date-Befehl" msgid "Table (CSV)" msgstr "Tabelle (CSV)" -#: lib/configure.py:609 src/frontends/qt4/GuiView.cpp:1183 -#: src/frontends/qt4/GuiView.cpp:1184 src/mathed/MathMacroTemplate.cpp:543 +#: lib/configure.py:609 src/frontends/qt4/GuiView.cpp:1195 +#: src/frontends/qt4/GuiView.cpp:1196 src/mathed/MathMacroTemplate.cpp:543 msgid "LyX" msgstr "LyX" @@ -18398,8 +18414,8 @@ msgid "Overwrite modified file?" msgstr "Modifizierte Datei überschreiben?" #: src/Buffer.cpp:1169 src/Buffer.cpp:2476 src/Exporter.cpp:50 -#: src/frontends/qt4/GuiClipboard.cpp:242 src/frontends/qt4/GuiView.cpp:2150 -#: src/frontends/qt4/GuiView.cpp:2316 src/frontends/qt4/GuiView.cpp:2391 +#: src/frontends/qt4/GuiClipboard.cpp:242 src/frontends/qt4/GuiView.cpp:2163 +#: src/frontends/qt4/GuiView.cpp:2329 src/frontends/qt4/GuiView.cpp:2404 msgid "&Overwrite" msgstr "&Überschreiben" @@ -18634,7 +18650,7 @@ msgstr "Fehler im Dateinamen" msgid "The directory path to the document cannot contain spaces." msgstr "Der Verzeichnispfad zum Dokument darf keine Leerzeichen enthalten." -#: src/Buffer.cpp:3899 src/Buffer.cpp:3913 src/frontends/qt4/GuiView.cpp:548 +#: src/Buffer.cpp:3899 src/Buffer.cpp:3913 src/frontends/qt4/GuiView.cpp:560 msgid "Document export cancelled." msgstr "Der Export des Dokuments wurde abgebrochen." @@ -18891,7 +18907,7 @@ msgid "This portion of the document is deleted." msgstr "Dieser Teil des Dokuments wird gelöscht." #: src/BufferView.cpp:1050 src/BufferView.cpp:1959 -#: src/frontends/qt4/GuiView.cpp:3292 src/frontends/qt4/GuiView.cpp:3367 +#: src/frontends/qt4/GuiView.cpp:3340 src/frontends/qt4/GuiView.cpp:3415 msgid "Absolute filename expected." msgstr "Ein absoluter Dateipfad wird erwartet." @@ -19697,7 +19713,7 @@ msgstr "Nummer %1$s" msgid "Cannot view file" msgstr "Die Datei kann nicht betrachtet werden." -#: src/Format.cpp:606 src/Format.cpp:673 src/frontends/qt4/GuiView.cpp:3019 +#: src/Format.cpp:606 src/Format.cpp:673 src/frontends/qt4/GuiView.cpp:3067 #, c-format msgid "File does not exist: %1$s" msgstr "Die Datei existiert nicht: %1$s" @@ -19914,7 +19930,7 @@ msgstr "" msgid "LyX crashed!" msgstr "LyX ist abgestürzt!" -#: src/LyX.cpp:695 src/frontends/qt4/GuiView.cpp:1018 +#: src/LyX.cpp:695 src/frontends/qt4/GuiView.cpp:1030 msgid "LyX: " msgstr "LyX: " @@ -20110,7 +20126,7 @@ msgstr "" msgid "Missing filename for --import" msgstr "Die Option --import verlangt die Angabe eines Dateinamens" -#: src/LyXRC.cpp:3049 +#: src/LyXRC.cpp:3063 msgid "" "Consider run-together words, such as \"diskdrive\" for \"disk drive\", as " "legal words?" @@ -20118,7 +20134,7 @@ msgstr "" "Sollen zusammengeschriebene Wörter wie \"Verzeichnisname\" als korrekt " "angesehen werden?" -#: src/LyXRC.cpp:3053 +#: src/LyXRC.cpp:3067 msgid "" "Specify an alternate language. The default is to use the language of the " "document." @@ -20127,7 +20143,7 @@ msgstr "" "Rechtschreibprüfung verwendet wird. Voreingestellt ist die Sprache des " "Dokuments." -#: src/LyXRC.cpp:3061 +#: src/LyXRC.cpp:3075 msgid "" "De-select if you don't want the current selection to be replaced " "automatically by what you type." @@ -20135,7 +20151,7 @@ msgstr "" "Deaktivieren Sie diesen Schalter, wenn Sie nicht möchten, dass markierter " "Text automatisch durch Ihre Eingabe ersetzt wird." -#: src/LyXRC.cpp:3065 +#: src/LyXRC.cpp:3079 msgid "" "De-select if you don't want the class options to be reset to defaults after " "class change." @@ -20144,14 +20160,14 @@ msgstr "" "Klassenoptionen nach einem Klassenwechsel auf den Standardwert zurückgesetzt " "werden." -#: src/LyXRC.cpp:3069 +#: src/LyXRC.cpp:3083 msgid "" "The time interval between auto-saves (in seconds). 0 means no auto-save." msgstr "" "Das Zeitintervall zwischen automatischen Sicherungen (in Sekunden). 0 " "bedeutet, dass nicht automatisch gespeichert wird." -#: src/LyXRC.cpp:3076 +#: src/LyXRC.cpp:3090 msgid "" "The path for storing backup files. If it is an empty string, LyX will store " "the backup file in the same directory as the original file." @@ -20159,7 +20175,7 @@ msgstr "" "Der Pfad für Sicherungsdateien. Wird nichts angegeben, werden die Kopien im " "selben Verzeichnis wie das Original gespeichert." -#: src/LyXRC.cpp:3080 +#: src/LyXRC.cpp:3094 msgid "" "Define the options of bibtex (cf. man bibtex) or select an alternative " "compiler (e.g. mlbibtex or bibulus)." @@ -20167,12 +20183,12 @@ msgstr "" "Definieren Sie die Optionen von BibTeX (vgl. die Manpage von bibtex) oder " "wählen Sie ein alternatives Programm (z. B. mlbibtex oder bibulus)." -#: src/LyXRC.cpp:3084 +#: src/LyXRC.cpp:3098 msgid "Define the options of the bibtex program for PLaTeX (Japanese LaTeX)." msgstr "" "Definiert die Optionen des BibTeX-Prozessors für pLaTeX (japanisches LaTeX)" -#: src/LyXRC.cpp:3088 +#: src/LyXRC.cpp:3102 msgid "" "Keybindings file. Can either specify an absolute path, or LyX will look in " "its global and local bind/ directories." @@ -20181,13 +20197,13 @@ msgstr "" "absoluten Pfad angeben oder nur einen Namen. LyX sucht dann in den lokalen " "und globalen bind-Verzeichnissen." -#: src/LyXRC.cpp:3092 +#: src/LyXRC.cpp:3106 msgid "Select to check whether the lastfiles still exist." msgstr "" "Bitte aktivieren, wenn geprüft werden soll, ob die angegebenen, zuletzt " "bearbeiteten Dateien noch existieren." -#: src/LyXRC.cpp:3096 +#: src/LyXRC.cpp:3110 msgid "" "Define how to run chktex. E.g. \"chktex -n11 -n1 -n3 -n6 -n9 -22 -n25 -n30 -" "n38\" Refer to the ChkTeX documentation." @@ -20196,7 +20212,7 @@ msgstr "" "\"chktex -n11 -n1 -n3 -n6 -n9 -22 -n25 -n30 -n38\". Bitte lesen Sie die " "Dokumentation von ChkTeX." -#: src/LyXRC.cpp:3106 +#: src/LyXRC.cpp:3120 msgid "" "LyX normally doesn't update the cursor position if you move the scrollbar. " "Set to true if you'd prefer to always have the cursor on screen." @@ -20205,7 +20221,7 @@ msgstr "" "wenn Sie im Dokument scrollen. Ist dieser Schalter aktiv, wird der Cursor " "`mitgenommen'." -#: src/LyXRC.cpp:3114 +#: src/LyXRC.cpp:3128 msgid "" "LyX normally doesn't allow the user to scroll further than the bottom of the " "document. Set to true if you prefer to scroll the bottom of the document to " @@ -20214,17 +20230,17 @@ msgstr "" "Normalerweise kann nur bis zum unteren Rand des Dokuments gescrollt werden. " "Ist dieser Schalter aktiv, kann man darüber hinaus scrollen." -#: src/LyXRC.cpp:3118 +#: src/LyXRC.cpp:3132 msgid "Make Apple key act as Meta and Control key as Ctrl." msgstr "" "Mit dieser Einstellung verhält sich die Apfeltaste wie die Meta-Taste und " "die Control-Taste wie Ctlr." -#: src/LyXRC.cpp:3122 +#: src/LyXRC.cpp:3136 msgid "Use the Mac OS X conventions for the word-level cursor movement" msgstr "Mac-OS-X-Konventionen für Cursorbewegungen auf Wortebene benutzen" -#: src/LyXRC.cpp:3126 +#: src/LyXRC.cpp:3140 msgid "" "Show a small box around a Math Macro with the macro name when the cursor is " "inside." @@ -20232,7 +20248,7 @@ msgstr "" "Zeige eine kleine Box um ein Mathe-Makro mit dem Makronamen, wenn der Cursor " "innerhalb des Makros ist." -#: src/LyXRC.cpp:3131 +#: src/LyXRC.cpp:3145 #, no-c-format msgid "" "This accepts the normal strftime formats; see man strftime for full details. " @@ -20241,7 +20257,7 @@ msgstr "" "Hier sind die Formatangaben für strftime erlaubt; näheres entnehmen Sie " "bitte der man-Seite von strftime. Beispiel: \"%A, %e. %B %Y\"." -#: src/LyXRC.cpp:3135 +#: src/LyXRC.cpp:3149 msgid "" "Command definition file. Can either specify an absolute path, or LyX will " "look in its global and local commands/ directories." @@ -20250,11 +20266,11 @@ msgstr "" "absoluten Pfad angeben oder LyX sucht in seinen lokalen und globalen " "Befehlen/ Verzeichnissen." -#: src/LyXRC.cpp:3139 +#: src/LyXRC.cpp:3153 msgid "The default format used with LFUN_BUFFER_[VIEW|UPDATE]." msgstr "Das Standardformat, das LFUN_BUFFER_[VIEW|UPDATE] verwendet." -#: src/LyXRC.cpp:3143 +#: src/LyXRC.cpp:3157 msgid "" "Iconify the dialogs when the main window is iconified. (Affects only dialogs " "shown after the change has been made.)" @@ -20262,11 +20278,11 @@ msgstr "" "Dialoge werden minimiert, wenn das Hauptfenster minimiert wird (betrifft nur " "Dialoge, die nach dem Aktivieren dieser Option geöffnet werden)." -#: src/LyXRC.cpp:3147 +#: src/LyXRC.cpp:3161 msgid "Select how LyX will display any graphics." msgstr "Wählen Sie, wie LyX Grafiken darstellen soll." -#: src/LyXRC.cpp:3151 +#: src/LyXRC.cpp:3165 msgid "" "The default path for your documents. An empty value selects the directory " "LyX was started from." @@ -20274,11 +20290,11 @@ msgstr "" "Der Standard-Pfad für Ihre Dokumente. Bei einem leerem Eintrag wird das " "Verzeichnis gewählt, aus dem LyX gestartet wurde." -#: src/LyXRC.cpp:3155 +#: src/LyXRC.cpp:3169 msgid "Specify additional chars that can be part of a word." msgstr "Geben Sie Sonderzeichen an, die als Teil eines Wortes erlaubt sind." -#: src/LyXRC.cpp:3159 +#: src/LyXRC.cpp:3173 msgid "" "The path that LyX will set when offering to choose an example. An empty " "value selects the directory LyX was started from." @@ -20286,7 +20302,7 @@ msgstr "" "Der Pfad, den LyX bei der Auswahl eines Beispiels voreinstellt. Bei einem " "leeren Eintrag wird das Verzeichnis gewählt, aus dem LyX gestartet wurde." -#: src/LyXRC.cpp:3163 +#: src/LyXRC.cpp:3177 msgid "" "The font encoding used for the LaTeX2e fontenc package. T1 is highly " "recommended for non-English languages." @@ -20294,11 +20310,11 @@ msgstr "" "Die verwendete Schriftkodierung für das LaTeX2e-Paket fontenc. Für andere " "als die englische Sprache wird unbedingt T1 empfohlen." -#: src/LyXRC.cpp:3167 +#: src/LyXRC.cpp:3181 msgid "Disable any kerning and ligatures for text drawing on screen." msgstr "Kerning und Ligaturen im LyX-Arbeitsfenster deaktivieren." -#: src/LyXRC.cpp:3174 +#: src/LyXRC.cpp:3188 msgid "" "Define the options of makeindex (cf. man makeindex) or select an alternative " "compiler. E.g., using xindy/make-rules, the command string would be " @@ -20308,12 +20324,12 @@ msgstr "" "Sie ein alternatives Programm. Bei der Verwendung von xindy/make-rules würde " "der Befehl z. B. \"makeindex.sh -m $$lang\" lauten." -#: src/LyXRC.cpp:3178 +#: src/LyXRC.cpp:3192 msgid "Define the options of the index program for PLaTeX (Japanese LaTeX)." msgstr "" "Definiert die Optionen des Indexprozessors für pLaTeX (japanisches LaTeX)." -#: src/LyXRC.cpp:3182 +#: src/LyXRC.cpp:3196 msgid "" "Define the options of makeindex (cf. man makeindex) to be used for " "nomenclatures. This might differ from the index processing options." @@ -20322,7 +20338,7 @@ msgstr "" "Nomenklaturen. Die hier spezifizierten Optionen können von denen des " "Indexprozessors abweichen." -#: src/LyXRC.cpp:3191 +#: src/LyXRC.cpp:3205 msgid "" "Use this to set the correct mapping file for your keyboard. You'll need this " "if you for instance want to type German documents on an American keyboard." @@ -20331,7 +20347,7 @@ msgstr "" "können dies z. B. verwenden, um einfach deutsche Texte auf einer " "amerikanischen Tastatur zu schreiben." -#: src/LyXRC.cpp:3195 +#: src/LyXRC.cpp:3209 msgid "" "Select if a language switching command is needed at the beginning of the " "document." @@ -20339,14 +20355,14 @@ msgstr "" "Bitte aktivieren, wenn zu Beginn des Dokuments ein besonderer Befehl " "benötigt wird, um die Sprache zu aktivieren." -#: src/LyXRC.cpp:3199 +#: src/LyXRC.cpp:3213 msgid "" "Select if a language switching command is needed at the end of the document." msgstr "" "Bitte aktivieren, wenn am Ende des Dokuments ein besonderer Befehl benötigt " "wird, um die Sprache zu deaktivieren." -#: src/LyXRC.cpp:3203 +#: src/LyXRC.cpp:3217 msgid "" "The LaTeX command for changing from the language of the document to another " "language. E.g. \\selectlanguage{$$lang} where $$lang is substituted by the " @@ -20356,15 +20372,15 @@ msgstr "" "zu wechseln. Beispiel: \\selectlanguage{$$lang} wobei $$lang durch den Namen " "der zweiten Sprache ersetzt wird." -#: src/LyXRC.cpp:3207 +#: src/LyXRC.cpp:3221 msgid "The LaTeX command for changing back to the language of the document." msgstr "Der LaTeX-Befehl, um zur Sprache des Dokuments zurückzuwechseln." -#: src/LyXRC.cpp:3211 +#: src/LyXRC.cpp:3225 msgid "The LaTeX command for local changing of the language." msgstr "Der LaTeX-Befehl, um die Sprache lokal zu ändern." -#: src/LyXRC.cpp:3215 +#: src/LyXRC.cpp:3229 msgid "" "De-select if you don't want the language(s) used as an argument to " "\\documentclass." @@ -20372,7 +20388,7 @@ msgstr "" "Deaktivieren Sie diesen Schalter, wenn die Sprache nicht als Argument für " "\\documentclass verwendet werden soll." -#: src/LyXRC.cpp:3219 +#: src/LyXRC.cpp:3233 msgid "" "The LaTeX command for loading the language package. E.g. \"\\usepackage" "{babel}\", \"\\usepackage{omega}\"." @@ -20380,7 +20396,7 @@ msgstr "" "Der LaTeX-Befehl, um das Sprachpaket zu laden. Beispiel: \"\\usepackage" "{babel}\", \"\\usepackage{omega}\"." -#: src/LyXRC.cpp:3223 +#: src/LyXRC.cpp:3237 msgid "" "De-select if you don't want babel to be used when the language of the " "document is the default language." @@ -20388,25 +20404,25 @@ msgstr "" "Deaktivieren Sie diesen Schalter, wenn das Paket babel nicht verwendet " "werden soll, falls die Sprache des Dokuments die Standardsprache ist." -#: src/LyXRC.cpp:3227 +#: src/LyXRC.cpp:3241 msgid "De-select if you do not want LyX to scroll to saved position." msgstr "" "Deaktivieren Sie diesen Schalter, wenn LyX nicht zur gespeicherten Position " "springen soll." -#: src/LyXRC.cpp:3231 +#: src/LyXRC.cpp:3245 msgid "De-select to prevent loading files opened from the last LyX session." msgstr "" "Deaktivieren Sie diesen Schalter, um das Laden von Dateien zu verhindern, " "die bei der letzten LyX-Sitzung geöffnet waren." -#: src/LyXRC.cpp:3235 +#: src/LyXRC.cpp:3249 msgid "De-select if you don't want LyX to create backup files." msgstr "" "Deaktivieren Sie diesen Schalter, wenn LyX keine Sicherungsdateien erstellen " "soll." -#: src/LyXRC.cpp:3239 +#: src/LyXRC.cpp:3253 msgid "" "Select to control the highlighting of words with a language foreign to that " "of the document." @@ -20414,32 +20430,32 @@ msgstr "" "Bitte aktivieren, um Textbereiche mit einer von der Standardsprache des " "Dokuments abweichenden Sprache farblich hervorzuheben." -#: src/LyXRC.cpp:3243 +#: src/LyXRC.cpp:3257 msgid "The scrolling speed of the mouse wheel." msgstr "Die Scrollgeschwindigkeit des Mausrads." -#: src/LyXRC.cpp:3248 +#: src/LyXRC.cpp:3262 msgid "The completion popup delay." msgstr "Verzögerung des Vervollständigungs-Popup" -#: src/LyXRC.cpp:3252 +#: src/LyXRC.cpp:3266 msgid "Select to display the completion popup in math mode." msgstr "" "Wählen Sie dies, um das Vervollständigungs-Popup im Mathe-Modus anzuzeigen." -#: src/LyXRC.cpp:3256 +#: src/LyXRC.cpp:3270 msgid "Select to display the completion popup in text mode." msgstr "" "Wählen Sie dies, um das Vervollständigungs-Popup im Text-Modus anzuzeigen." -#: src/LyXRC.cpp:3260 +#: src/LyXRC.cpp:3274 msgid "" "Show the completion popup without delay after non-unique completion attempt." msgstr "" "Das Vervollständigungs-Popup wird ohne Verzögerung nach einem mehrdeutigen " "Vervollständigungs-Versuch angezeigt." -#: src/LyXRC.cpp:3264 +#: src/LyXRC.cpp:3278 msgid "" "Show a small triangle on the cursor to indicate that a completion is " "available." @@ -20447,58 +20463,58 @@ msgstr "" "Zeigt ein kleines Dreieck beim Cursor, um eine mögliche Vervollständigung " "anzudeuten" -#: src/LyXRC.cpp:3268 +#: src/LyXRC.cpp:3282 msgid "The inline completion delay." msgstr "Verzögerung der Wortvervollständigung" -#: src/LyXRC.cpp:3272 +#: src/LyXRC.cpp:3286 msgid "Select to display the inline completion in math mode." msgstr "" "Wählen Sie dies, um Inline-Vervollständigung im Mathe-Modus anzuzeigen." -#: src/LyXRC.cpp:3276 +#: src/LyXRC.cpp:3290 msgid "Select to display the inline completion in text mode." msgstr "Wählen Sie dies, um Wortvervollständigung im Text-Modus anzuzeigen." -#: src/LyXRC.cpp:3280 +#: src/LyXRC.cpp:3294 msgid "Use \"...\" to shorten long completions." msgstr "Benutze \"...\" um lange Vervollständigungen zu kürzen." -#: src/LyXRC.cpp:3284 +#: src/LyXRC.cpp:3298 msgid "Allow TeXMacs shorthand, like => converting to \\Rightarrow." msgstr "" "Erlaube TeXMacs-Shorthands (z.B. Konvertierung von => zu \\Rightarrow)." -#: src/LyXRC.cpp:3288 +#: src/LyXRC.cpp:3302 #, c-format msgid "Maximal number of lastfiles. Up to %1$d can appear in the file menu." msgstr "" "Die maximale Anzahl der zuletzt geöffneten Dateien. Bis zu %1$d können im " "'Datei'-Menü erscheinen." -#: src/LyXRC.cpp:3299 +#: src/LyXRC.cpp:3313 msgid "Shows a typeset preview of things such as math" msgstr "Zeigt eine exakte Vorschau bspw. von mathematischen Formeln" -#: src/LyXRC.cpp:3303 +#: src/LyXRC.cpp:3317 msgid "Previewed equations will have \"(#)\" labels rather than numbered ones" msgstr "" "Gleichungen werden in der Vorschau \"(#)\" anstelle von Nummern als Marken " "haben" -#: src/LyXRC.cpp:3307 +#: src/LyXRC.cpp:3321 msgid "Scale the preview size to suit." msgstr "Skaliere die Größe der Vorschau geeignet." -#: src/LyXRC.cpp:3311 +#: src/LyXRC.cpp:3325 msgid "The option for specifying whether the copies should be collated." msgstr "Die Option, um Kopien zu sortieren." -#: src/LyXRC.cpp:3315 +#: src/LyXRC.cpp:3329 msgid "The option for specifying the number of copies to print." msgstr "Die Option, um die Anzahl der zu druckenden Kopien anzugeben." -#: src/LyXRC.cpp:3319 +#: src/LyXRC.cpp:3333 msgid "" "The default printer to print on. If none is specified, LyX will use the " "environment variable PRINTER." @@ -20506,11 +20522,11 @@ msgstr "" "Standard-Drucker für den Ausdruck. Wird keiner angegeben, verwendet LyX die " "Umgebungsvariable PRINTER." -#: src/LyXRC.cpp:3323 +#: src/LyXRC.cpp:3337 msgid "The option to print only even pages." msgstr "Die Option, um ausschließlich gerade Seiten zu drucken." -#: src/LyXRC.cpp:3327 +#: src/LyXRC.cpp:3341 msgid "" "Extra options to pass to printing program after everything else, but before " "the filename of the DVI file to be printed." @@ -20519,36 +20535,36 @@ msgstr "" "zwar nach allen anderen Optionen, aber noch vor dem Namen der zu druckenden " "DVI-Datei." -#: src/LyXRC.cpp:3331 +#: src/LyXRC.cpp:3345 msgid "Extension of printer program output file. Usually \".ps\"." msgstr "Endung der Ausgabedatei des Druckprogramms. Normalerweise \".ps\"." -#: src/LyXRC.cpp:3335 +#: src/LyXRC.cpp:3349 msgid "The option to print out in landscape." msgstr "Die Option, um im Querformat zu drucken." -#: src/LyXRC.cpp:3339 +#: src/LyXRC.cpp:3353 msgid "The option to print only odd pages." msgstr "Die Option, um ausschließlich ungerade Seiten zu drucken." -#: src/LyXRC.cpp:3343 +#: src/LyXRC.cpp:3357 msgid "The option for specifying a comma-separated list of pages to print." msgstr "" "Die Option, um eine durch Kommata getrennte Liste von Seiten anzugeben." -#: src/LyXRC.cpp:3347 +#: src/LyXRC.cpp:3361 msgid "Option to specify the dimensions of the print paper." msgstr "Die Option, um die Seitengröße anzugeben." -#: src/LyXRC.cpp:3351 +#: src/LyXRC.cpp:3365 msgid "The option to specify paper type." msgstr "Die Option, um die Papierart anzugeben." -#: src/LyXRC.cpp:3355 +#: src/LyXRC.cpp:3369 msgid "The option to reverse the order of the pages printed." msgstr "Die Option, um die Reihenfolge der gedruckten Seiten umzukehren." -#: src/LyXRC.cpp:3359 +#: src/LyXRC.cpp:3373 msgid "" "When set, this printer option automatically prints to a file and then calls " "a separate print spooling program on that file with the given name and " @@ -20558,7 +20574,7 @@ msgstr "" "eine Datei, anschließend wird das angegebene Spool-Programm aufgerufen, um " "den Druckauftrag mit den angegebenen Optionen auszuführen." -#: src/LyXRC.cpp:3363 +#: src/LyXRC.cpp:3377 msgid "" "If you specify a printer name in the print dialog, the following argument is " "prepended along with the printer name after the spool command." @@ -20566,15 +20582,15 @@ msgstr "" "Falls Sie einen Druckernamen im Druck-Dialog angeben, wird er angeführt von " "diesem Argument an das Spool-Programm weitergegeben." -#: src/LyXRC.cpp:3367 +#: src/LyXRC.cpp:3381 msgid "Option to pass to the print program to print to a file." msgstr "Option, um die Druckausgabe in eine Datei umzulenken." -#: src/LyXRC.cpp:3371 +#: src/LyXRC.cpp:3385 msgid "Option to pass to the print program to print on a specific printer." msgstr "Option, um die Ausgabe auf einen angegebenen Drucker zu veranlassen." -#: src/LyXRC.cpp:3375 +#: src/LyXRC.cpp:3389 msgid "" "Select for LyX to pass the name of the destination printer to your print " "command." @@ -20582,18 +20598,28 @@ msgstr "" "Bitte aktivieren, wenn LyX beim Drucken den Namen des Standarddruckers " "explizit angeben soll." -#: src/LyXRC.cpp:3379 +#: src/LyXRC.cpp:3393 msgid "Your favorite print program, e.g. \"dvips\", \"dvilj4\"." msgstr "Ihr bevorzugtes Druckprogramm, z. B. \"dvips\", \"dvilj4\"." -#: src/LyXRC.cpp:3387 +#: src/LyXRC.cpp:3401 msgid "" "Select to have visual bidi cursor movement, unselect for logical movement." msgstr "" "Aktivieren für visuelle Cursor-Bewegung, deaktiveren für logische Cursor-" "Bewegung im bidirektionalen Modus." -#: src/LyXRC.cpp:3391 +#: src/LyXRC.cpp:3405 +msgid "" +"Specify whether, closing the last view of an open document, LyX should close " +"the document (yes), hide it (no), or ask the user (ask)." +msgstr "" +"Festlegen, ob das Schließen der letzten Ansicht eines offenen Dokuments " +"dieses " +"Dokument schließt (yes), es verbirgt (no) oder ob nachgefragt werden soll " +"(ask)." + +#: src/LyXRC.cpp:3409 msgid "" "DPI (dots per inch) of your monitor is auto-detected by LyX. If that goes " "wrong, override the setting here." @@ -20602,13 +20628,13 @@ msgstr "" "selbsttätig ermittelt. Scheitert dies, können Sie hier den korrekten Wert " "vorgeben." -#: src/LyXRC.cpp:3397 +#: src/LyXRC.cpp:3415 msgid "The screen fonts used to display the text while editing." msgstr "" "Die Bildschirmschriften, die für die Anzeige des Textes während der " "Bearbeitung verwendet werden." -#: src/LyXRC.cpp:3406 +#: src/LyXRC.cpp:3424 msgid "" "Allow bitmap fonts to be resized. If you are using a bitmap font, selecting " "this option may make some fonts look blocky in LyX. Deselecting this option " @@ -20619,13 +20645,13 @@ msgstr "" "pixelig erscheinen. Wenn Sie diese Option abwählen, verwendet LyX die " "nächstpassende Größe anstatt die Schrift zu skalieren." -#: src/LyXRC.cpp:3410 +#: src/LyXRC.cpp:3428 msgid "The font sizes used for calculating the scaling of the screen fonts." msgstr "" "Die Schriftgrößen, die für die Skalierung der Bildschirmschriften verwendet " "werden." -#: src/LyXRC.cpp:3415 +#: src/LyXRC.cpp:3433 #, no-c-format msgid "" "The zoom percentage for screen fonts. A setting of 100% will make the fonts " @@ -20634,13 +20660,13 @@ msgstr "" "Der prozentuale Vergrößerungsfaktor für die Bildschirmschriften. Ein Wert " "von 100% lässt die Zeichen etwa genauso groß erscheinen wie auf Papier." -#: src/LyXRC.cpp:3419 +#: src/LyXRC.cpp:3437 msgid "Allow session manager to save and restore windows geometry." msgstr "" "Erlaubt dem Sitzungsmanager, Größen von Fenstern zu speichern und wieder " "herzustellen." -#: src/LyXRC.cpp:3423 +#: src/LyXRC.cpp:3441 msgid "" "This starts the lyxserver. The pipes get an additional extension \".in\" and " "\".out\". Only for advanced users." @@ -20649,13 +20675,13 @@ msgstr "" "Weiterleitungen erhalten automatisch die Endungen \".in\" und \".out\". " "Diese Option ist vor allem für Fortgeschrittene interessant." -#: src/LyXRC.cpp:3430 +#: src/LyXRC.cpp:3448 msgid "De-select if you don't want the startup banner." msgstr "" "Deaktivieren Sie diesen Schalter, wenn das Start-Logo nicht angezeigt werden " "soll." -#: src/LyXRC.cpp:3434 +#: src/LyXRC.cpp:3452 msgid "" "LyX will place its temporary directories in this path. They will be deleted " "when you quit LyX." @@ -20663,12 +20689,12 @@ msgstr "" "In diesem Verzeichnis legt LyX seine temporären Dateien an. Diese werden " "gelöscht, wenn Sie LyX beenden." -#: src/LyXRC.cpp:3438 +#: src/LyXRC.cpp:3456 msgid "This is the place where the files of the thesaurus library reside." msgstr "" "Dies ist der Ort, an dem sich die Dateien des Thesaurusprogramms befinden." -#: src/LyXRC.cpp:3442 +#: src/LyXRC.cpp:3460 msgid "" "The path that LyX will set when offering to choose a template. An empty " "value selects the directory LyX was started from." @@ -20676,7 +20702,7 @@ msgstr "" "Der Pfad, den LyX bei der Auswahl einer Vorlage voreinstellt. Bei einem " "leeren Eintrag wird das Verzeichnis gewählt, aus dem LyX gestartet wurde." -#: src/LyXRC.cpp:3459 +#: src/LyXRC.cpp:3477 msgid "" "The UI (user interface) file. Can either specify an absolute path, or LyX " "will look in its global and local ui/ directories." @@ -20685,7 +20711,7 @@ msgstr "" "wird. Entweder Sie geben einen absoluten Pfad an oder LyX sucht in den " "lokalen und globalen ui-Verzeichnissen." -#: src/LyXRC.cpp:3469 +#: src/LyXRC.cpp:3487 msgid "" "Enable use the system colors for some things like main window background and " "selection." @@ -20693,18 +20719,18 @@ msgstr "" "Verwendet die Systemfarben für einige Elemente wie den Hintergrund des " "Eingabefensters und Text-Markierungen." -#: src/LyXRC.cpp:3473 +#: src/LyXRC.cpp:3491 msgid "Enable the automatic appearance of tool tips in the work area." msgstr "Automatisches Erscheinen von Tooltips im Arbeitsbereich anschalten." -#: src/LyXRC.cpp:3477 +#: src/LyXRC.cpp:3495 msgid "" "Enable the pixmap cache that might improve performance on Mac and Windows." msgstr "" "Den Pixmap-Zwischenspeicher aktivieren, der die Performanz auf Windows und " "Mac erhöhen kann." -#: src/LyXRC.cpp:3481 +#: src/LyXRC.cpp:3499 msgid "Specify the paper command to DVI viewer (leave empty or use \"-paper\")" msgstr "" "Geben Sie die Papiergrößen-Option für den DVI-Betrachter an (verwenden Sie " @@ -20743,7 +20769,7 @@ msgstr "(keine anfängliche Beschreibung)" msgid "(no log message)" msgstr "(keine Protokollmeldung)" -#: src/LyXVC.cpp:170 src/frontends/qt4/GuiView.cpp:2877 +#: src/LyXVC.cpp:170 src/frontends/qt4/GuiView.cpp:2925 msgid "LyX VC: Log Message" msgstr "LyX VK: Protokollmeldung" @@ -20764,7 +20790,7 @@ msgstr "" msgid "Revert to stored version of document?" msgstr "Zur gespeicherten Version des Dokuments zurückkehren?" -#: src/LyXVC.cpp:224 src/frontends/qt4/GuiView.cpp:3405 +#: src/LyXVC.cpp:224 src/frontends/qt4/GuiView.cpp:3453 msgid "&Revert" msgstr "&Wiederherstellen" @@ -21001,7 +21027,7 @@ msgstr "Fehler beim Lesen von Modul %1$s\n" #: src/VCBackend.cpp:821 src/VCBackend.cpp:882 src/VCBackend.cpp:943 #: src/VCBackend.cpp:951 src/VCBackend.cpp:1158 src/VCBackend.cpp:1251 #: src/VCBackend.cpp:1257 src/VCBackend.cpp:1278 -#: src/frontends/qt4/GuiView.cpp:2839 +#: src/frontends/qt4/GuiView.cpp:2887 msgid "Revision control error." msgstr "Fehler der Versionskontrolle." @@ -21266,7 +21292,7 @@ msgstr "" msgid "Reload saved document?" msgstr "Gespeichertes Dokument neu laden?" -#: src/buffer_funcs.cpp:76 src/frontends/qt4/GuiView.cpp:2788 +#: src/buffer_funcs.cpp:76 src/frontends/qt4/GuiView.cpp:2836 msgid "&Reload" msgstr "Ne&u laden" @@ -21493,7 +21519,7 @@ msgid "About %1" msgstr "Über %1" #: src/frontends/qt4/GuiApplication.cpp:498 -#: src/frontends/qt4/GuiPrefs.cpp:3216 +#: src/frontends/qt4/GuiPrefs.cpp:3237 msgid "Preferences" msgstr "Einstellungen" @@ -21708,10 +21734,10 @@ msgstr "BibTeX-Literaturverzeichnis" #: src/frontends/qt4/GuiCompare.cpp:162 src/frontends/qt4/GuiCompare.cpp:166 #: src/frontends/qt4/GuiDocument.cpp:2108 #: src/frontends/qt4/GuiExternal.cpp:645 src/frontends/qt4/GuiGraphics.cpp:800 -#: src/frontends/qt4/GuiInclude.cpp:333 src/frontends/qt4/GuiView.cpp:1901 -#: src/frontends/qt4/GuiView.cpp:1958 src/frontends/qt4/GuiView.cpp:2100 -#: src/frontends/qt4/GuiView.cpp:2222 src/frontends/qt4/GuiView.cpp:2265 -#: src/frontends/qt4/GuiView.cpp:2344 +#: src/frontends/qt4/GuiInclude.cpp:333 src/frontends/qt4/GuiView.cpp:1914 +#: src/frontends/qt4/GuiView.cpp:1971 src/frontends/qt4/GuiView.cpp:2113 +#: src/frontends/qt4/GuiView.cpp:2235 src/frontends/qt4/GuiView.cpp:2278 +#: src/frontends/qt4/GuiView.cpp:2357 msgid "Documents|#o#O" msgstr "Dokumente|#k" @@ -21963,10 +21989,10 @@ msgstr "%1$s Dateien" msgid "Choose a filename to save the pasted graphic as" msgstr "Wählen Sie einen Dateinamen, um die eingefügte Grafik zu speichern als" -#: src/frontends/qt4/GuiClipboard.cpp:210 src/frontends/qt4/GuiView.cpp:1977 -#: src/frontends/qt4/GuiView.cpp:2120 src/frontends/qt4/GuiView.cpp:2136 -#: src/frontends/qt4/GuiView.cpp:2153 src/frontends/qt4/GuiView.cpp:2239 -#: src/frontends/qt4/GuiView.cpp:3380 +#: src/frontends/qt4/GuiClipboard.cpp:210 src/frontends/qt4/GuiView.cpp:1990 +#: src/frontends/qt4/GuiView.cpp:2133 src/frontends/qt4/GuiView.cpp:2149 +#: src/frontends/qt4/GuiView.cpp:2166 src/frontends/qt4/GuiView.cpp:2252 +#: src/frontends/qt4/GuiView.cpp:3428 msgid "Canceled." msgstr "Abgebrochen." @@ -21995,9 +22021,9 @@ msgstr "Vergleiche LyX-Dateien" msgid "Select document" msgstr "Dokument wählen" -#: src/frontends/qt4/GuiCompare.cpp:156 src/frontends/qt4/GuiView.cpp:1905 -#: src/frontends/qt4/GuiView.cpp:1962 src/frontends/qt4/GuiView.cpp:2228 -#: src/frontends/qt4/GuiView.cpp:2273 +#: src/frontends/qt4/GuiCompare.cpp:156 src/frontends/qt4/GuiView.cpp:1918 +#: src/frontends/qt4/GuiView.cpp:1975 src/frontends/qt4/GuiView.cpp:2241 +#: src/frontends/qt4/GuiView.cpp:2286 msgid "LyX Documents (*.lyx)" msgstr "LyX-Dokumente (*.lyx)" @@ -23246,72 +23272,72 @@ msgstr "" msgid "Printer" msgstr "Drucker" -#: src/frontends/qt4/GuiPrefs.cpp:2506 src/frontends/qt4/GuiPrefs.cpp:3259 +#: src/frontends/qt4/GuiPrefs.cpp:2506 src/frontends/qt4/GuiPrefs.cpp:3280 msgid "User Interface" msgstr "Benutzeroberfläche" -#: src/frontends/qt4/GuiPrefs.cpp:2550 +#: src/frontends/qt4/GuiPrefs.cpp:2552 msgid "Classic" msgstr "Klassisch" -#: src/frontends/qt4/GuiPrefs.cpp:2551 +#: src/frontends/qt4/GuiPrefs.cpp:2553 msgid "Oxygen" msgstr "Oxygen" -#: src/frontends/qt4/GuiPrefs.cpp:2629 +#: src/frontends/qt4/GuiPrefs.cpp:2650 msgid "Control" msgstr "Kontrolle" -#: src/frontends/qt4/GuiPrefs.cpp:2717 +#: src/frontends/qt4/GuiPrefs.cpp:2738 msgid "Shortcuts" msgstr "Tastenkürzel" -#: src/frontends/qt4/GuiPrefs.cpp:2722 +#: src/frontends/qt4/GuiPrefs.cpp:2743 msgid "Function" msgstr "Funktion" -#: src/frontends/qt4/GuiPrefs.cpp:2723 +#: src/frontends/qt4/GuiPrefs.cpp:2744 msgid "Shortcut" msgstr "Tastenkürzel" -#: src/frontends/qt4/GuiPrefs.cpp:2802 +#: src/frontends/qt4/GuiPrefs.cpp:2823 msgid "Cursor, Mouse and Editing Functions" msgstr "Cursor-, Maus- und Bearbeitungsfunktionen" -#: src/frontends/qt4/GuiPrefs.cpp:2806 +#: src/frontends/qt4/GuiPrefs.cpp:2827 msgid "Mathematical Symbols" msgstr "Mathematische Symbole" -#: src/frontends/qt4/GuiPrefs.cpp:2810 +#: src/frontends/qt4/GuiPrefs.cpp:2831 msgid "Document and Window" msgstr "Dokument und Arbeitsbereich" -#: src/frontends/qt4/GuiPrefs.cpp:2814 +#: src/frontends/qt4/GuiPrefs.cpp:2835 msgid "Font, Layouts and Textclasses" msgstr "Schriften, Absatzformate und Textklassen" -#: src/frontends/qt4/GuiPrefs.cpp:2818 +#: src/frontends/qt4/GuiPrefs.cpp:2839 msgid "System and Miscellaneous" msgstr "System und Verschiedenes" -#: src/frontends/qt4/GuiPrefs.cpp:2945 src/frontends/qt4/GuiPrefs.cpp:2991 +#: src/frontends/qt4/GuiPrefs.cpp:2966 src/frontends/qt4/GuiPrefs.cpp:3012 msgid "Res&tore" msgstr "Zurüc&ksetzen" -#: src/frontends/qt4/GuiPrefs.cpp:3102 src/frontends/qt4/GuiPrefs.cpp:3109 -#: src/frontends/qt4/GuiPrefs.cpp:3129 src/frontends/qt4/GuiPrefs.cpp:3148 +#: src/frontends/qt4/GuiPrefs.cpp:3123 src/frontends/qt4/GuiPrefs.cpp:3130 +#: src/frontends/qt4/GuiPrefs.cpp:3150 src/frontends/qt4/GuiPrefs.cpp:3169 msgid "Failed to create shortcut" msgstr "Erstellen des Tastenkürzels fehlgeschlagen" -#: src/frontends/qt4/GuiPrefs.cpp:3103 +#: src/frontends/qt4/GuiPrefs.cpp:3124 msgid "Unknown or invalid LyX function" msgstr "Unbekannte oder ungültige LyX-Funktion." -#: src/frontends/qt4/GuiPrefs.cpp:3110 +#: src/frontends/qt4/GuiPrefs.cpp:3131 msgid "Invalid or empty key sequence" msgstr "Ungültige oder leere Tastensequenz" -#: src/frontends/qt4/GuiPrefs.cpp:3130 +#: src/frontends/qt4/GuiPrefs.cpp:3151 #, c-format msgid "" "Shortcut `%1$s' is already bound to:\n" @@ -23321,35 +23347,35 @@ msgstr "" "Tastenkürzel `%1$s' ist bereits mit %2$s belegt\n" " Sie müssen die Belegung erst entfernen bevor Sie eine neue setzen können." -#: src/frontends/qt4/GuiPrefs.cpp:3149 +#: src/frontends/qt4/GuiPrefs.cpp:3170 msgid "Can not insert shortcut to the list" msgstr "Kann Tastenkürzel nicht in Liste einfügen" -#: src/frontends/qt4/GuiPrefs.cpp:3180 +#: src/frontends/qt4/GuiPrefs.cpp:3201 msgid "Identity" msgstr "Identität" -#: src/frontends/qt4/GuiPrefs.cpp:3389 +#: src/frontends/qt4/GuiPrefs.cpp:3410 msgid "Choose bind file" msgstr "Wählen Sie eine Tastaturkürzel-Datei" -#: src/frontends/qt4/GuiPrefs.cpp:3390 +#: src/frontends/qt4/GuiPrefs.cpp:3411 msgid "LyX bind files (*.bind)" msgstr "LyX-Tastaturkürzel-Dateien (*.bind)" -#: src/frontends/qt4/GuiPrefs.cpp:3396 +#: src/frontends/qt4/GuiPrefs.cpp:3417 msgid "Choose UI file" msgstr "Wählen Sie eine 'UI'-Datei" -#: src/frontends/qt4/GuiPrefs.cpp:3397 +#: src/frontends/qt4/GuiPrefs.cpp:3418 msgid "LyX UI files (*.ui)" msgstr "LyX-UI-Dateien (*.ui)" -#: src/frontends/qt4/GuiPrefs.cpp:3403 +#: src/frontends/qt4/GuiPrefs.cpp:3424 msgid "Choose keyboard map" msgstr "Wählen Sie eine Tastaturtabelle" -#: src/frontends/qt4/GuiPrefs.cpp:3404 +#: src/frontends/qt4/GuiPrefs.cpp:3425 msgid "LyX keyboard maps (*.kmap)" msgstr "LyX-Tastaturtabellen (*.kmap)" @@ -23393,19 +23419,19 @@ msgstr "Aktiv" msgid "Cross-reference" msgstr "Querverweis" -#: src/frontends/qt4/GuiRef.cpp:306 +#: src/frontends/qt4/GuiRef.cpp:300 msgid "&Go Back" msgstr "&Gehe zurück" -#: src/frontends/qt4/GuiRef.cpp:308 +#: src/frontends/qt4/GuiRef.cpp:302 msgid "Jump back" msgstr "Springe zurück" -#: src/frontends/qt4/GuiRef.cpp:316 +#: src/frontends/qt4/GuiRef.cpp:310 msgid "Jump to label" msgstr "Springe zur Marke" -#: src/frontends/qt4/GuiRef.cpp:371 src/frontends/qt4/GuiRef.cpp:390 +#: src/frontends/qt4/GuiRef.cpp:365 src/frontends/qt4/GuiRef.cpp:384 msgid "" msgstr "" @@ -23841,101 +23867,101 @@ msgstr "Normale Symbole" msgid "Big-sized icons" msgstr "Große Symbole" -#: src/frontends/qt4/GuiView.cpp:545 +#: src/frontends/qt4/GuiView.cpp:557 #, c-format msgid "Successful export to format: %1$s" msgstr "Export in das Format %1$s erfolgreich" -#: src/frontends/qt4/GuiView.cpp:554 +#: src/frontends/qt4/GuiView.cpp:566 #, c-format msgid "Error while exporting format: %1$s" msgstr "Fehler beim Export in das Formats %1$s" -#: src/frontends/qt4/GuiView.cpp:557 +#: src/frontends/qt4/GuiView.cpp:569 #, c-format msgid "Successful preview of format: %1$s" msgstr "Erfolgreiche Vorschau des Formats %1$s" -#: src/frontends/qt4/GuiView.cpp:560 +#: src/frontends/qt4/GuiView.cpp:572 #, c-format msgid "Error while previewing format: %1$s" msgstr "Fehler bei der Vorschau des Formats %1$s" -#: src/frontends/qt4/GuiView.cpp:852 +#: src/frontends/qt4/GuiView.cpp:864 msgid "Exit LyX" msgstr "LyX beenden" -#: src/frontends/qt4/GuiView.cpp:853 +#: src/frontends/qt4/GuiView.cpp:865 msgid "LyX could not be closed because documents are being processed by LyX." msgstr "" "LyX konnte nicht geschlossen werden, da gerade Dokumente von LyX verarbeitet " "werden." -#: src/frontends/qt4/GuiView.cpp:1103 +#: src/frontends/qt4/GuiView.cpp:1115 msgid "Welcome to LyX!" msgstr "Willkommen bei LyX!" -#: src/frontends/qt4/GuiView.cpp:1568 +#: src/frontends/qt4/GuiView.cpp:1580 msgid "Automatic save done." msgstr "Automatische Speicherung abgeschlossen." -#: src/frontends/qt4/GuiView.cpp:1569 +#: src/frontends/qt4/GuiView.cpp:1581 msgid "Automatic save failed!" msgstr "Die automatische Speicherung ist fehlgeschlagen!" -#: src/frontends/qt4/GuiView.cpp:1615 +#: src/frontends/qt4/GuiView.cpp:1627 msgid "Command not allowed without any document open" msgstr "Dieser Befehl ist nur bei geöffnetem Dokument möglich" -#: src/frontends/qt4/GuiView.cpp:1718 +#: src/frontends/qt4/GuiView.cpp:1731 #, c-format msgid "Unknown toolbar \"%1$s\"" msgstr "Unbekannte Werkzeugleiste \"%1$s\"" -#: src/frontends/qt4/GuiView.cpp:1900 +#: src/frontends/qt4/GuiView.cpp:1913 msgid "Select template file" msgstr "Wählen Sie eine Vorlagendatei" -#: src/frontends/qt4/GuiView.cpp:1902 src/frontends/qt4/GuiView.cpp:2266 +#: src/frontends/qt4/GuiView.cpp:1915 src/frontends/qt4/GuiView.cpp:2279 msgid "Templates|#T#t" msgstr "Vorlagen|#V" -#: src/frontends/qt4/GuiView.cpp:1929 +#: src/frontends/qt4/GuiView.cpp:1942 msgid "Document not loaded." msgstr "Dokument nicht geladen." -#: src/frontends/qt4/GuiView.cpp:1957 +#: src/frontends/qt4/GuiView.cpp:1970 msgid "Select document to open" msgstr "Wählen Sie das zu öffnende Dokument" -#: src/frontends/qt4/GuiView.cpp:1959 src/frontends/qt4/GuiView.cpp:2101 -#: src/frontends/qt4/GuiView.cpp:2223 +#: src/frontends/qt4/GuiView.cpp:1972 src/frontends/qt4/GuiView.cpp:2114 +#: src/frontends/qt4/GuiView.cpp:2236 msgid "Examples|#E#e" msgstr "Beispiele|#B" -#: src/frontends/qt4/GuiView.cpp:1963 +#: src/frontends/qt4/GuiView.cpp:1976 msgid "LyX-1.3.x Documents (*.lyx13)" msgstr "LyX-1.3.x-Dokumente (*.lyx13)" -#: src/frontends/qt4/GuiView.cpp:1964 +#: src/frontends/qt4/GuiView.cpp:1977 msgid "LyX-1.4.x Documents (*.lyx14)" msgstr "LyX-1.4.x-Dokumente (*.lyx14)" -#: src/frontends/qt4/GuiView.cpp:1965 +#: src/frontends/qt4/GuiView.cpp:1978 msgid "LyX-1.5.x Documents (*.lyx15)" msgstr "LyX-1.5.x-Dokumente (*.lyx15)" -#: src/frontends/qt4/GuiView.cpp:1966 +#: src/frontends/qt4/GuiView.cpp:1979 msgid "LyX-1.6.x Documents (*.lyx16)" msgstr "LyX-1.6.x-Dokumente (*.lyx16)" -#: src/frontends/qt4/GuiView.cpp:1991 src/frontends/qt4/Validator.cpp:200 +#: src/frontends/qt4/GuiView.cpp:2004 src/frontends/qt4/Validator.cpp:200 #: src/insets/ExternalSupport.cpp:368 src/insets/InsetBibtex.cpp:298 #: src/insets/InsetGraphics.cpp:596 src/insets/InsetInclude.cpp:541 msgid "Invalid filename" msgstr "Ungültiger Dateiname" -#: src/frontends/qt4/GuiView.cpp:1992 +#: src/frontends/qt4/GuiView.cpp:2005 #, c-format msgid "" "The directory in the given path\n" @@ -23946,41 +23972,41 @@ msgstr "" "%1$s\n" "existiert nicht." -#: src/frontends/qt4/GuiView.cpp:2008 +#: src/frontends/qt4/GuiView.cpp:2021 #, c-format msgid "Opening document %1$s..." msgstr "Öffne Dokument %1$s..." -#: src/frontends/qt4/GuiView.cpp:2013 +#: src/frontends/qt4/GuiView.cpp:2026 #, c-format msgid "Document %1$s opened." msgstr "Dokument %1$s ist geöffnet." -#: src/frontends/qt4/GuiView.cpp:2016 +#: src/frontends/qt4/GuiView.cpp:2029 msgid "Version control detected." msgstr "Versionskontrolle erkannt." -#: src/frontends/qt4/GuiView.cpp:2018 +#: src/frontends/qt4/GuiView.cpp:2031 #, c-format msgid "Could not open document %1$s" msgstr "Das Dokument %1$s konnte nicht geöffnet werden" -#: src/frontends/qt4/GuiView.cpp:2048 +#: src/frontends/qt4/GuiView.cpp:2061 msgid "Couldn't import file" msgstr "Die Datei konnte nicht importiert werden" -#: src/frontends/qt4/GuiView.cpp:2049 +#: src/frontends/qt4/GuiView.cpp:2062 #, c-format msgid "No information for importing the format %1$s." msgstr "Keine Informationen vorhanden, um das Format %1$s zu importieren." -#: src/frontends/qt4/GuiView.cpp:2096 +#: src/frontends/qt4/GuiView.cpp:2109 #, c-format msgid "Select %1$s file to import" msgstr "Wählen Sie die einzufügende %1$s-Datei" -#: src/frontends/qt4/GuiView.cpp:2147 src/frontends/qt4/GuiView.cpp:2311 -#: src/frontends/qt4/GuiView.cpp:2386 +#: src/frontends/qt4/GuiView.cpp:2160 src/frontends/qt4/GuiView.cpp:2324 +#: src/frontends/qt4/GuiView.cpp:2399 #, c-format msgid "" "The document %1$s already exists.\n" @@ -23991,37 +24017,37 @@ msgstr "" "\n" "Möchten Sie dieses Dokument überschreiben?" -#: src/frontends/qt4/GuiView.cpp:2149 src/frontends/qt4/GuiView.cpp:2315 -#: src/frontends/qt4/GuiView.cpp:2390 +#: src/frontends/qt4/GuiView.cpp:2162 src/frontends/qt4/GuiView.cpp:2328 +#: src/frontends/qt4/GuiView.cpp:2403 msgid "Overwrite document?" msgstr "Dokument überschreiben?" -#: src/frontends/qt4/GuiView.cpp:2158 +#: src/frontends/qt4/GuiView.cpp:2171 #, c-format msgid "Importing %1$s..." msgstr "Importiere %1$s..." -#: src/frontends/qt4/GuiView.cpp:2161 +#: src/frontends/qt4/GuiView.cpp:2174 msgid "imported." msgstr "wurde eingefügt." -#: src/frontends/qt4/GuiView.cpp:2163 +#: src/frontends/qt4/GuiView.cpp:2176 msgid "file not imported!" msgstr "Datei wurde nicht importiert!" -#: src/frontends/qt4/GuiView.cpp:2188 +#: src/frontends/qt4/GuiView.cpp:2201 msgid "newfile" msgstr "Neues_Dokument" -#: src/frontends/qt4/GuiView.cpp:2221 +#: src/frontends/qt4/GuiView.cpp:2234 msgid "Select LyX document to insert" msgstr "Wählen Sie das einzufügende LyX-Dokument" -#: src/frontends/qt4/GuiView.cpp:2263 +#: src/frontends/qt4/GuiView.cpp:2276 msgid "Choose a filename to save document as" msgstr "Wählen Sie einen Dateinamen für das Dokument" -#: src/frontends/qt4/GuiView.cpp:2296 +#: src/frontends/qt4/GuiView.cpp:2309 #, c-format msgid "" "The file\n" @@ -24036,20 +24062,20 @@ msgstr "" "Bitte schließen Sie sie, wenn Sie sie überschreiben möchten.\n" "Möchten Sie statt dessen einen neuen Dateinamen wählen?" -#: src/frontends/qt4/GuiView.cpp:2300 +#: src/frontends/qt4/GuiView.cpp:2313 msgid "Chosen File Already Open" msgstr "Ausgewählte Datei bereits geöffnet" -#: src/frontends/qt4/GuiView.cpp:2301 src/frontends/qt4/GuiView.cpp:2316 -#: src/frontends/qt4/GuiView.cpp:2391 src/frontends/qt4/GuiView.cpp:2439 +#: src/frontends/qt4/GuiView.cpp:2314 src/frontends/qt4/GuiView.cpp:2329 +#: src/frontends/qt4/GuiView.cpp:2404 src/frontends/qt4/GuiView.cpp:2452 msgid "&Rename" msgstr "&Umbenennen" -#: src/frontends/qt4/GuiView.cpp:2343 +#: src/frontends/qt4/GuiView.cpp:2356 msgid "Choose a filename to export the document as" msgstr "Wählen Sie einen Dateinamen für das exportierte Dokument" -#: src/frontends/qt4/GuiView.cpp:2435 +#: src/frontends/qt4/GuiView.cpp:2448 #, c-format msgid "" "The document %1$s could not be saved.\n" @@ -24060,25 +24086,55 @@ msgstr "" "\n" "Möchten Sie das Dokument umbenennen und erneut versuchen?" -#: src/frontends/qt4/GuiView.cpp:2438 +#: src/frontends/qt4/GuiView.cpp:2451 msgid "Rename and save?" msgstr "Umbenennen und speichern?" -#: src/frontends/qt4/GuiView.cpp:2439 +#: src/frontends/qt4/GuiView.cpp:2452 msgid "&Retry" msgstr "&Wiederholen" -#: src/frontends/qt4/GuiView.cpp:2545 +#: src/frontends/qt4/GuiView.cpp:2497 +#, c-format +msgid "" +"Last view on document %1$s is being closed.\n" +"Would you like to close or hide the document?\n" +"\n" +"Hidden documents can be displayed back through\n" +"the menu: View->Hidden->...\n" +"\n" +"To remove this question, set your preference in:\n" +" Tools->Preferences->Look&Feel->UserInterface\n" +msgstr "" +"Die letzte Ansicht des Dokuments %1$s wird geschlossen.\n" +"Möchten Sie das Dokument schließen oder verbergen?\n" +"\n" +"Verborgene Dokumente können über das Menü \n" +"(Ansicht > Versteckt > ...) wieder angezeigt werden.\n" +"\n" +"Wenn Sie nicht mehr gefragt werden möchten, ändern Sie\n" +"die Voreinstellung in Werkzeuge > Einstellungen ... >\n" +"Aussehen & Handhabung > Benutzeroberfläche." + +#: src/frontends/qt4/GuiView.cpp:2506 +msgid "Close or hide document?" +msgstr "Dokument schließen oder verbergen?" + +#: src/frontends/qt4/GuiView.cpp:2507 +msgid "&Hide" +msgstr "&Verbergen" + +#: src/frontends/qt4/GuiView.cpp:2593 msgid "Close document" msgstr "Dokument schließen" -#: src/frontends/qt4/GuiView.cpp:2546 +#: src/frontends/qt4/GuiView.cpp:2594 msgid "Document could not be closed because it is being processed by LyX." msgstr "" "Dokument konnte nicht geschlossen werden, da es gerade von LyX verarbeitet " "wird." -#: src/frontends/qt4/GuiView.cpp:2650 src/frontends/qt4/GuiView.cpp:2755 +#: src/frontends/qt4/GuiView.cpp:2698 src/frontends/qt4/GuiView.cpp:2803 #, c-format msgid "" "The document %1$s has not been saved yet.\n" @@ -24089,11 +24145,11 @@ msgstr "" "\n" "Möchten Sie das Dokument speichern?" -#: src/frontends/qt4/GuiView.cpp:2653 src/frontends/qt4/GuiView.cpp:2758 +#: src/frontends/qt4/GuiView.cpp:2701 src/frontends/qt4/GuiView.cpp:2806 msgid "Save new document?" msgstr "Neues Dokument speichern?" -#: src/frontends/qt4/GuiView.cpp:2658 +#: src/frontends/qt4/GuiView.cpp:2706 #, c-format msgid "" "The document %1$s has unsaved changes.\n" @@ -24104,15 +24160,15 @@ msgstr "" "sind nicht gespeichert.\n" "Möchten Sie das Dokument speichern oder die Änderungen verwerfen?" -#: src/frontends/qt4/GuiView.cpp:2660 src/frontends/qt4/GuiView.cpp:2752 +#: src/frontends/qt4/GuiView.cpp:2708 src/frontends/qt4/GuiView.cpp:2800 msgid "Save changed document?" msgstr "Geändertes Dokument speichern?" -#: src/frontends/qt4/GuiView.cpp:2661 +#: src/frontends/qt4/GuiView.cpp:2709 msgid "&Discard" msgstr "&Verwerfen" -#: src/frontends/qt4/GuiView.cpp:2749 +#: src/frontends/qt4/GuiView.cpp:2797 #, c-format msgid "" "The document %1$s has unsaved changes.\n" @@ -24123,7 +24179,7 @@ msgstr "" "\n" "Möchten Sie das Dokument speichern?" -#: src/frontends/qt4/GuiView.cpp:2784 +#: src/frontends/qt4/GuiView.cpp:2832 #, c-format msgid "" "Document \n" @@ -24135,62 +24191,62 @@ msgstr "" "wurde extern verändert. Wollen Sie es erneut laden?\n" "Alle lokalen Veränderungen werden dann verworfen." -#: src/frontends/qt4/GuiView.cpp:2787 +#: src/frontends/qt4/GuiView.cpp:2835 msgid "Reload externally changed document?" msgstr "Extern geändertes Dokument neu laden?" -#: src/frontends/qt4/GuiView.cpp:2840 +#: src/frontends/qt4/GuiView.cpp:2888 msgid "Error when setting the locking property." msgstr "Fehler beim Setzen der Dateisperrung." -#: src/frontends/qt4/GuiView.cpp:2886 +#: src/frontends/qt4/GuiView.cpp:2934 msgid "Directory is not accessible." msgstr "Das Verzeichnis ist nicht lesbar." -#: src/frontends/qt4/GuiView.cpp:2962 +#: src/frontends/qt4/GuiView.cpp:3010 #, c-format msgid "Opening child document %1$s..." msgstr "Öffne Unterdokument %1$s..." -#: src/frontends/qt4/GuiView.cpp:3026 +#: src/frontends/qt4/GuiView.cpp:3074 #, c-format msgid "No buffer for file: %1$s." msgstr "Kein Pufferspeicher für Datei: %1$s." -#: src/frontends/qt4/GuiView.cpp:3122 +#: src/frontends/qt4/GuiView.cpp:3170 msgid "Export Error" msgstr "Exportfehler" -#: src/frontends/qt4/GuiView.cpp:3123 +#: src/frontends/qt4/GuiView.cpp:3171 msgid "Error cloning the Buffer." msgstr "Fehler beim Klonen des Pufferspeichers." -#: src/frontends/qt4/GuiView.cpp:3231 +#: src/frontends/qt4/GuiView.cpp:3279 #, c-format msgid "Error exporting to format: %1$s" msgstr "Fehler beim Exportieren in Format: %1$s" -#: src/frontends/qt4/GuiView.cpp:3239 src/frontends/qt4/GuiView.cpp:3256 +#: src/frontends/qt4/GuiView.cpp:3287 src/frontends/qt4/GuiView.cpp:3304 msgid "Exporting ..." msgstr "Exportiere ..." -#: src/frontends/qt4/GuiView.cpp:3265 +#: src/frontends/qt4/GuiView.cpp:3313 msgid "Previewing ..." msgstr "Generiere Vorschau ..." -#: src/frontends/qt4/GuiView.cpp:3299 +#: src/frontends/qt4/GuiView.cpp:3347 msgid "Document not loaded" msgstr "Dokument nicht geladen." -#: src/frontends/qt4/GuiView.cpp:3373 +#: src/frontends/qt4/GuiView.cpp:3421 msgid "Select file to insert" msgstr "Wählen Sie das einzufügende Dokument" -#: src/frontends/qt4/GuiView.cpp:3377 +#: src/frontends/qt4/GuiView.cpp:3425 msgid "All Files (*)" msgstr "Alle Dateien (*)" -#: src/frontends/qt4/GuiView.cpp:3401 +#: src/frontends/qt4/GuiView.cpp:3449 #, c-format msgid "" "Any changes will be lost. Are you sure you want to revert to the saved " @@ -24199,28 +24255,28 @@ msgstr "" "Alle Änderungen gehen verloren. Sind Sie sicher, dass Sie zur gespeicherten " "Version des Dokuments %1$s zurückkehren möchten?" -#: src/frontends/qt4/GuiView.cpp:3404 +#: src/frontends/qt4/GuiView.cpp:3452 msgid "Revert to saved document?" msgstr "Gespeichertes Dokument wiederherstellen?" -#: src/frontends/qt4/GuiView.cpp:3430 +#: src/frontends/qt4/GuiView.cpp:3478 msgid "Saving all documents..." msgstr "Speichere alle Dokumente..." -#: src/frontends/qt4/GuiView.cpp:3440 +#: src/frontends/qt4/GuiView.cpp:3488 msgid "All documents saved." msgstr "Alle Dokumente wurden gespeichert" -#: src/frontends/qt4/GuiView.cpp:3540 +#: src/frontends/qt4/GuiView.cpp:3588 #, c-format msgid "%1$s unknown command!" msgstr "LFUN_UI_TOGGLE %1$s unbekannter Befehl!" -#: src/frontends/qt4/GuiView.cpp:3658 +#: src/frontends/qt4/GuiView.cpp:3721 msgid "Please, preview the document first." msgstr "Bitte geben Sie das Dokument zunächst aus." -#: src/frontends/qt4/GuiView.cpp:3678 +#: src/frontends/qt4/GuiView.cpp:3741 msgid "Couldn't proceed." msgstr "Konnte nicht fortfahren." @@ -24826,8 +24882,7 @@ msgid "" "%1$s." msgstr "" "Die folgenden Zeichen, die in der Hyperlink-Einfügung verwendet werden, sind " -"in " -"der\n" +"in der\n" "aktuellen Zeichenkodierung nicht darstellbar und wurden daher weggelassen:\n" "%1$s." @@ -25332,11 +25387,11 @@ msgstr "Referenz auf Namen" msgid "NameRef:" msgstr "NameRef:" -#: src/insets/InsetScript.cpp:343 +#: src/insets/InsetScript.cpp:342 msgid "subscript" msgstr "Tiefgestellt" -#: src/insets/InsetScript.cpp:353 +#: src/insets/InsetScript.cpp:352 msgid "superscript" msgstr "Hochgestellt" From 066e35fc9dd7819c9d8ae9239cd16335cca1bd23 Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Sun, 30 Sep 2012 10:55:41 +0200 Subject: [PATCH 23/30] de.po: missing \n --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 3625984b8a..25015cde51 100644 --- a/po/de.po +++ b/po/de.po @@ -24114,7 +24114,7 @@ msgstr "" "\n" "Wenn Sie nicht mehr gefragt werden möchten, ändern Sie\n" "die Voreinstellung in Werkzeuge > Einstellungen ... >\n" -"Aussehen & Handhabung > Benutzeroberfläche." +"Aussehen & Handhabung > Benutzeroberfläche.\n" #: src/frontends/qt4/GuiView.cpp:2506 msgid "Close or hide document?" From e26635bfb9ef8323be56efdcda02c5edbb3b3c82 Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Sun, 30 Sep 2012 14:59:24 +0200 Subject: [PATCH 24/30] UI for separate control of master/child branch state (#7642, part of #7643) --- RELEASE-NOTES | 6 ++++ lib/ui/stdcontext.inc | 2 ++ src/BufferView.cpp | 24 ++++++++++---- src/FuncCode.h | 2 ++ src/LyXAction.cpp | 21 ++++++++++++ src/insets/InsetBranch.cpp | 68 +++++++++++++++++++++++++------------- src/insets/InsetBranch.h | 4 +-- 7 files changed, 96 insertions(+), 31 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 64adb50059..7b483d07c1 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -53,6 +53,12 @@ To set the default language and paper size for new documents, use the The following new LyX functions have been introduced: +- LFUN_BRANCH_MASTER_ACTIVATE : + LFUN_BRANCH_MASTER_DEACTIVATE : + Activates or deactivates a branch in a master document from within + a child (as opposed to the existing LFUN_BRANCH_[DE]ACTIVATE, which + toggle the branch in the document itself). + - LFUN_BUFFER_EXPORT_AS Equivalent to the new -export-to command-line switch (see above). diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc index 41f498288c..d250afa745 100644 --- a/lib/ui/stdcontext.inc +++ b/lib/ui/stdcontext.inc @@ -441,6 +441,8 @@ Menuset Menu "context-branch" OptItem "Activate Branch|A" "branch-activate" OptItem "Deactivate Branch|e" "branch-deactivate" + OptItem "Activate Branch in Master|M" "branch-master-activate" + OptItem "Deactivate Branch in Master|v" "branch-master-deactivate" End # diff --git a/src/BufferView.cpp b/src/BufferView.cpp index 98b84c8fa9..07ad2c93ab 100644 --- a/src/BufferView.cpp +++ b/src/BufferView.cpp @@ -1188,8 +1188,13 @@ bool BufferView::getStatus(FuncRequest const & cmd, FuncStatus & flag) // handle their dispatch here, for reasons explained there, so we'll // handle this here, too, for consistency. case LFUN_BRANCH_ACTIVATE: - case LFUN_BRANCH_DEACTIVATE: { - BranchList const & branchList = buffer().params().branchlist(); + case LFUN_BRANCH_DEACTIVATE: + case LFUN_BRANCH_MASTER_ACTIVATE: + case LFUN_BRANCH_MASTER_DEACTIVATE: { + bool const master = (cmd.action() == LFUN_BRANCH_MASTER_ACTIVATE + || cmd.action() == LFUN_BRANCH_MASTER_DEACTIVATE); + BranchList const & branchList = master ? buffer().masterBuffer()->params().branchlist() + : buffer().params().branchlist(); docstring const branchName = cmd.argument(); flag.setEnabled(!branchName.empty() && branchList.find(branchName)); break; @@ -1969,15 +1974,21 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) // So, if this does get fixed, this code can be moved back to Buffer.cpp, // and the corresponding code in getStatus() should be moved back, too. case LFUN_BRANCH_ACTIVATE: - case LFUN_BRANCH_DEACTIVATE: { - BranchList & branch_list = buffer().params().branchlist(); + case LFUN_BRANCH_DEACTIVATE: + case LFUN_BRANCH_MASTER_ACTIVATE: + case LFUN_BRANCH_MASTER_DEACTIVATE: { + bool const master = (cmd.action() == LFUN_BRANCH_MASTER_ACTIVATE + || cmd.action() == LFUN_BRANCH_MASTER_DEACTIVATE); + Buffer * buf = master ? const_cast(buffer().masterBuffer()) + : &buffer(); + docstring const branch_name = cmd.argument(); // the case without a branch name is handled elsewhere if (branch_name.empty()) { dispatched = false; break; } - Branch * branch = branch_list.find(branch_name); + Branch * branch = buf->params().branchlist().find(branch_name); if (!branch) { LYXERR0("Branch " << branch_name << " does not exist."); dr.setError(true); @@ -1986,7 +1997,8 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) dr.setMessage(msg); break; } - bool activate = cmd.action() == LFUN_BRANCH_ACTIVATE; + bool activate = (cmd.action() == LFUN_BRANCH_ACTIVATE + || cmd.action() == LFUN_BRANCH_MASTER_ACTIVATE); if (branch->isSelected() != activate) { branch->setSelected(activate); cur.recordUndoFullDocument(); diff --git a/src/FuncCode.h b/src/FuncCode.h index 6f41e7dec9..c5749c3753 100644 --- a/src/FuncCode.h +++ b/src/FuncCode.h @@ -450,6 +450,8 @@ enum FuncCode LFUN_SCRIPT_INSERT, // gb, 20101123 LFUN_BUFFER_EXPORT_AS, // tommaso 20111006 // 350 + LFUN_BRANCH_MASTER_ACTIVATE, // spitz 20120930 + LFUN_BRANCH_MASTER_DEACTIVATE, // spitz 20120930 LFUN_LASTACTION // end of the table }; diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp index 9aa2ddefb3..998b79d2fc 100644 --- a/src/LyXAction.cpp +++ b/src/LyXAction.cpp @@ -3525,6 +3525,27 @@ void LyXAction::init() * \endvar */ { LFUN_BRANCH_DEACTIVATE, "branch-deactivate", AtPoint, Buffer }, +/*! + * \var lyx::FuncCode lyx::LFUN_BRANCH_MASTER_ACTIVATE + * \li Action: Activate the branch in the master buffer. + * \li Syntax: branch-master-activate + * \li Params: : The branch to activate + * \li Sample: lyx -x "branch-activate answers" -e pdf2 finalexam.lyx \n + could be used to export a pdf with the answers branch included + without one's having to open LyX and activate the branch manually. + * \li Origin: spitz, 30 Sep 2012 + * \endvar + */ + { LFUN_BRANCH_MASTER_ACTIVATE, "branch-master-activate", AtPoint, Buffer }, +/*! + * \var lyx::FuncCode lyx::LFUN_BRANCH_MASTER_DEACTIVATE + * \li Action: De-activate the branch in the master buffer. + * \li Syntax: branch-master-deactivate + * \li Params: : The branch to deactivate + * \li Origin: spitz, 30 Sep 2012 + * \endvar + */ + { LFUN_BRANCH_MASTER_DEACTIVATE, "branch-master-deactivate", AtPoint, Buffer }, /*! * \var lyx::FuncCode lyx::LFUN_BRANCHES_RENAME diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp index 6ab2fb79e7..6407fb6389 100644 --- a/src/insets/InsetBranch.cpp +++ b/src/insets/InsetBranch.cpp @@ -64,8 +64,14 @@ void InsetBranch::read(Lexer & lex) docstring InsetBranch::toolTip(BufferView const & bv, int, int) const { - docstring const status = isBranchSelected() ? + docstring const masterstatus = isBranchSelected() ? _("active") : _("non-active"); + docstring const childstatus = isBranchSelected(true) ? + _("active") : _("non-active"); + docstring const status = (masterstatus == childstatus) ? + masterstatus : + support::bformat(_("master: %1$s, child: %2$s"), + masterstatus, childstatus); docstring const heading = support::bformat(_("Branch (%1$s): %2$s"), status, params_.branch); if (isOpen(bv)) @@ -79,10 +85,13 @@ docstring const InsetBranch::buttonLabel(BufferView const & bv) const docstring s = _("Branch: ") + params_.branch; Buffer const & realbuffer = *buffer().masterBuffer(); BranchList const & branchlist = realbuffer.params().branchlist(); - if (!branchlist.find(params_.branch) - && buffer().params().branchlist().find(params_.branch)) + bool const inmaster = branchlist.find(params_.branch); + bool const inchild = buffer().params().branchlist().find(params_.branch); + if (!inmaster && inchild) s = _("Branch (child only): ") + params_.branch; - else if (!branchlist.find(params_.branch)) + else if (inmaster && !inchild) + s = _("Branch (master only): ") + params_.branch; + else if (!inmaster) s = _("Branch (undefined): ") + params_.branch; if (!params_.branch.empty()) { // FIXME UNICODE @@ -90,7 +99,12 @@ docstring const InsetBranch::buttonLabel(BufferView const & bv) const if (c == Color_none) s = _("Undef: ") + s; } - s = char_type(isBranchSelected() ? 0x2714 : 0x2716) + s; + bool const master_selected = isBranchSelected(); + bool const child_selected = isBranchSelected(true); + docstring symb = docstring(1, char_type(master_selected ? 0x2714 : 0x2716)); + if (inchild && master_selected != child_selected) + symb += char_type(child_selected ? 0x2714 : 0x2716); + s = symb + s; if (decoration() == InsetLayout::CLASSIC) return isOpen(bv) ? s : getNewLabel(s); else @@ -125,26 +139,26 @@ void InsetBranch::doDispatch(Cursor & cur, FuncRequest & cmd) break; } case LFUN_BRANCH_ACTIVATE: - case LFUN_BRANCH_DEACTIVATE: { - Buffer * buf = const_cast(buffer().masterBuffer()); - // is the branch in our master buffer? - bool branch_in_master = (buf != &buffer()); + case LFUN_BRANCH_DEACTIVATE: + case LFUN_BRANCH_MASTER_ACTIVATE: + case LFUN_BRANCH_MASTER_DEACTIVATE: { + bool const master = (cmd.action() == LFUN_BRANCH_MASTER_ACTIVATE + || cmd.action() == LFUN_BRANCH_MASTER_DEACTIVATE); + Buffer * buf = master ? const_cast(buffer().masterBuffer()) + : &buffer(); Branch * our_branch = buf->params().branchlist().find(params_.branch); - if (branch_in_master && !our_branch) { - // child only? - our_branch = buffer().params().branchlist().find(params_.branch); - if (!our_branch) - break; - branch_in_master = false; - } - bool const activate = (cmd.action() == LFUN_BRANCH_ACTIVATE); + if (!our_branch) + break; + + bool const activate = (cmd.action() == LFUN_BRANCH_ACTIVATE + || cmd.action() == LFUN_BRANCH_MASTER_ACTIVATE); if (our_branch->isSelected() != activate) { // FIXME If the branch is in the master document, we cannot - // call recordUndo..., becuase the master may be hidden, and + // call recordUndo..., because the master may be hidden, and // the code presently assumes that hidden documents can never // be dirty. See GuiView::closeBufferAll(), for example. - if (!branch_in_master) + if (!master) buffer().undo().recordUndoFullDocument(cur); our_branch->setSelected(activate); cur.forceBufferUpdate(); @@ -174,11 +188,19 @@ bool InsetBranch::getStatus(Cursor & cur, FuncRequest const & cmd, break; case LFUN_BRANCH_ACTIVATE: - flag.setEnabled(!isBranchSelected()); + flag.setEnabled(!isBranchSelected(true)); break; case LFUN_BRANCH_DEACTIVATE: - flag.setEnabled(isBranchSelected()); + flag.setEnabled(isBranchSelected(true)); + break; + + case LFUN_BRANCH_MASTER_ACTIVATE: + flag.setEnabled(buffer().parent() && !isBranchSelected()); + break; + + case LFUN_BRANCH_MASTER_DEACTIVATE: + flag.setEnabled(buffer().parent() && isBranchSelected()); break; case LFUN_INSET_TOGGLE: @@ -195,9 +217,9 @@ bool InsetBranch::getStatus(Cursor & cur, FuncRequest const & cmd, } -bool InsetBranch::isBranchSelected() const +bool InsetBranch::isBranchSelected(bool const child) const { - Buffer const & realbuffer = *buffer().masterBuffer(); + Buffer const & realbuffer = child ? buffer() : *buffer().masterBuffer(); BranchList const & branchlist = realbuffer.params().branchlist(); Branch const * ourBranch = branchlist.find(params_.branch); diff --git a/src/insets/InsetBranch.h b/src/insets/InsetBranch.h index 6cc64ec8b2..6588bc61b3 100644 --- a/src/insets/InsetBranch.h +++ b/src/insets/InsetBranch.h @@ -88,9 +88,9 @@ private: void setParams(InsetBranchParams const & params) { params_ = params; } /** \returns true if params_.branch is listed as 'selected' in - \c buffer. This handles the case of child documents. + \c buffer. \p child only checks within child documents. */ - bool isBranchSelected() const; + bool isBranchSelected(bool const child = false) const; /*! * Is the content of this inset part of the output document? * From ccd3ecf1e9482b2c8ff8346b5dafc2cbae6949a8 Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Sun, 30 Sep 2012 15:03:07 +0200 Subject: [PATCH 25/30] Fix tex2lyx path handling for relative file names The input and output file names of tex2lyx may be relative. In this case, getMasterFilePath() and getParentFilePath() return relative paths as well. Now the file name translation logic for all kinds of included files can cope with that. --- src/tex2lyx/text.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp index b3604b77f5..53836804b2 100644 --- a/src/tex2lyx/text.cpp +++ b/src/tex2lyx/text.cpp @@ -1839,8 +1839,10 @@ void fix_relative_filename(string & name) if (FileName::isAbsolute(name)) return; - name = to_utf8(makeRelPath(from_utf8(makeAbsPath(name, getMasterFilePath()).absFileName()), - from_utf8(getParentFilePath()))); + string const absMaster = makeAbsPath(getMasterFilePath()).absFileName(); + string const absParent = makeAbsPath(getParentFilePath()).absFileName(); + string const abs = makeAbsPath(name, absMaster).absFileName(); + name = to_utf8(makeRelPath(from_utf8(abs), from_utf8(absParent))); } @@ -2531,7 +2533,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer, skip_braces(p); p.get_token(); string name = normalize_filename(p.verbatim_item()); - string const path = getMasterFilePath(); + string const path = makeAbsPath(getMasterFilePath()).absFileName(); // We want to preserve relative / absolute filenames, // therefore path is only used for testing // The file extension is in every case ".tex". @@ -2758,7 +2760,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer, opts["clip"] = string(); string name = normalize_filename(p.verbatim_item()); - string const path = getMasterFilePath(); + string const path = makeAbsPath(getMasterFilePath()).absFileName(); // We want to preserve relative / absolute filenames, // therefore path is only used for testing if (!makeAbsPath(name, path).exists()) { @@ -3723,7 +3725,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer, name += p.get_token().asInput(); context.check_layout(os); string filename(normalize_filename(p.getArg('{', '}'))); - string const path = getMasterFilePath(); + string const path = makeAbsPath(getMasterFilePath()).absFileName(); // We want to preserve relative / absolute filenames, // therefore path is only used for testing if ((t.cs() == "include" || t.cs() == "input") && @@ -4183,7 +4185,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer, vector keys; split_map(arg, opts, keys); string name = normalize_filename(p.verbatim_item()); - string const path = getMasterFilePath(); + string const path = makeAbsPath(getMasterFilePath()).absFileName(); // We want to preserve relative / absolute filenames, // therefore path is only used for testing if (!makeAbsPath(name, path).exists()) { @@ -4248,7 +4250,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer, else if (t.cs() == "loadgame") { p.skip_spaces(); string name = normalize_filename(p.verbatim_item()); - string const path = getMasterFilePath(); + string const path = makeAbsPath(getMasterFilePath()).absFileName(); // We want to preserve relative / absolute filenames, // therefore path is only used for testing if (!makeAbsPath(name, path).exists()) { From 484844e663ca41d8efc49ae3e540022feaf56839 Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Sun, 30 Sep 2012 15:24:52 +0200 Subject: [PATCH 26/30] * sk.po --- po/sk.po | 61 +++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 21 deletions(-) diff --git a/po/sk.po b/po/sk.po index 9f01988b1e..239d5f0b1e 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: LyX-2.1\n" "Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n" -"POT-Creation-Date: 2012-09-29 11:05+0200\n" -"PO-Revision-Date: 2012-09-29 12:41+0200\n" +"POT-Creation-Date: 2012-09-30 15:04+0200\n" +"PO-Revision-Date: 2012-09-30 15:14+0200\n" "Last-Translator: Kornel Benko \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -3948,6 +3948,14 @@ msgstr "Súbor s &užívateľským rozhraním:" msgid "&Icon Set:" msgstr "Sada &ikon:" +#: src/frontends/qt4/ui/PrefUi.ui:69 +msgid "" +"The icon set to use. Warning: normal size of icons may be\n" +"wrong until you save the preferences and restart LyX." +msgstr "" +"Sada ikon na použitie. Pozor: Normálny rozmer ikon môže byť\n" +"nevhodný až kým sa neuložia nastavenia a reštartuje LyX." + #: src/frontends/qt4/ui/PrefUi.ui:75 msgid "Automatic help" msgstr "Automatická nápoveda" @@ -4015,6 +4023,15 @@ msgstr "&Maximum posledných súborov:" msgid "&Open documents in tabs" msgstr "&Otvoriť dokumenty v paneloch" +#: src/frontends/qt4/ui/PrefUi.ui:263 +msgid "" +"Whether to open documents in an already running instance of LyX.\n" +"(Set the LyXServer pipe path and restart LyX to enable this feature)" +msgstr "" +"Či otvoriť dokumenty v už spustenej inštancii LyX-a.\n" +"(Nastavit cestu k dátovodu pre LyXServer a reštartovať LyX umožní túto " +"vlastnosť)" + #: src/frontends/qt4/ui/PrefUi.ui:265 msgid "S&ingle instance" msgstr "Jednoduchá &inštancia" @@ -12846,13 +12863,21 @@ msgstr "Info Dokumentu" msgid "Copy Text|o" msgstr "Kopíruj Text" -#: lib/ui/stdcontext.inc:441 lib/ui/stdcontext.inc:461 +#: lib/ui/stdcontext.inc:442 lib/ui/stdcontext.inc:464 msgid "Activate Branch|A" -msgstr "Aktivuj Vetvu|A" +msgstr "Aktivuj vetvu|A" -#: lib/ui/stdcontext.inc:442 lib/ui/stdcontext.inc:462 +#: lib/ui/stdcontext.inc:443 lib/ui/stdcontext.inc:465 msgid "Deactivate Branch|e" -msgstr "Dezaktivuj Vetvu|e" +msgstr "Dezaktivuj vetvu|e" + +#: lib/ui/stdcontext.inc:444 +msgid "Activate Branch in Master|M" +msgstr "Aktivuj vetvu v hlavnom dokumente|H" + +#: lib/ui/stdcontext.inc:445 +msgid "Deactivate Branch in Master|v" +msgstr "Dezaktivuj vetvu v hlavnom dokumente|v" #: lib/ui/stdcontext.inc:451 msgid "Insert Reference at Cursor Position|I" @@ -24355,6 +24380,11 @@ msgstr "aktívna" msgid "non-active" msgstr "ne-aktívna" +#: src/insets/InsetBranch.cpp:73 +#, c-format +msgid "master: %1$s, child: %2$s" +msgstr "hlavný dokument:%1$s, potomok: %2$s" + #: src/insets/InsetBranch.cpp:70 #, c-format msgid "Branch (%1$s): %2$s" @@ -24368,6 +24398,10 @@ msgstr "Vetva: " msgid "Branch (child only): " msgstr "Vetva (len potomok): " +#: src/insets/InsetBranch.cpp:93 +msgid "Branch (master only): " +msgstr "Vetva (len hlavný dokument): " + #: src/insets/InsetBranch.cpp:86 msgid "Branch (undefined): " msgstr "Vetva (ne-definovaná): " @@ -25624,21 +25658,6 @@ msgstr "" msgid "Unknown user" msgstr "Neznámy používateľ" -#~ msgid "" -#~ "The icon set to use. Warning: normal size of icons may be\n" -#~ "wrong until you save the preferences and restart LyX." -#~ msgstr "" -#~ "Sada ikon na použitie. Pozor: Normálny rozmer ikon môže byť\n" -#~ "nevhodný až kým sa neuložia nastavenia a reštartuje LyX." - -#~ msgid "" -#~ "Whether to open documents in an already running instance of LyX.\n" -#~ "(Set the LyXServer pipe path and restart LyX to enable this feature)" -#~ msgstr "" -#~ "Či otvoriť dokumenty v už spustenej inštancii LyX-a.\n" -#~ "(Nastavit cestu k dátovodu pre LyXServer a reštartovať LyX umožní túto " -#~ "vlastnosť)" - #~ msgid "Utopia" #~ msgstr "Utopia" From 6f4b2dd4b073bb3848cdee097a54d264b23d1c51 Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Sun, 30 Sep 2012 16:12:52 +0200 Subject: [PATCH 27/30] Whitespace --- src/insets/InsetBranch.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp index 6407fb6389..f9d302554f 100644 --- a/src/insets/InsetBranch.cpp +++ b/src/insets/InsetBranch.cpp @@ -143,16 +143,16 @@ void InsetBranch::doDispatch(Cursor & cur, FuncRequest & cmd) case LFUN_BRANCH_MASTER_ACTIVATE: case LFUN_BRANCH_MASTER_DEACTIVATE: { bool const master = (cmd.action() == LFUN_BRANCH_MASTER_ACTIVATE - || cmd.action() == LFUN_BRANCH_MASTER_DEACTIVATE); + || cmd.action() == LFUN_BRANCH_MASTER_DEACTIVATE); Buffer * buf = master ? const_cast(buffer().masterBuffer()) - : &buffer(); + : &buffer(); Branch * our_branch = buf->params().branchlist().find(params_.branch); if (!our_branch) break; bool const activate = (cmd.action() == LFUN_BRANCH_ACTIVATE - || cmd.action() == LFUN_BRANCH_MASTER_ACTIVATE); + || cmd.action() == LFUN_BRANCH_MASTER_ACTIVATE); if (our_branch->isSelected() != activate) { // FIXME If the branch is in the master document, we cannot // call recordUndo..., because the master may be hidden, and From fab7d426087903d68bd432efb88c26a0ead0c172 Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Sun, 30 Sep 2012 16:27:11 +0200 Subject: [PATCH 28/30] Whitespace --- src/BufferView.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/BufferView.cpp b/src/BufferView.cpp index 07ad2c93ab..bb5ed50387 100644 --- a/src/BufferView.cpp +++ b/src/BufferView.cpp @@ -1192,9 +1192,9 @@ bool BufferView::getStatus(FuncRequest const & cmd, FuncStatus & flag) case LFUN_BRANCH_MASTER_ACTIVATE: case LFUN_BRANCH_MASTER_DEACTIVATE: { bool const master = (cmd.action() == LFUN_BRANCH_MASTER_ACTIVATE - || cmd.action() == LFUN_BRANCH_MASTER_DEACTIVATE); + || cmd.action() == LFUN_BRANCH_MASTER_DEACTIVATE); BranchList const & branchList = master ? buffer().masterBuffer()->params().branchlist() - : buffer().params().branchlist(); + : buffer().params().branchlist(); docstring const branchName = cmd.argument(); flag.setEnabled(!branchName.empty() && branchList.find(branchName)); break; @@ -1978,9 +1978,9 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) case LFUN_BRANCH_MASTER_ACTIVATE: case LFUN_BRANCH_MASTER_DEACTIVATE: { bool const master = (cmd.action() == LFUN_BRANCH_MASTER_ACTIVATE - || cmd.action() == LFUN_BRANCH_MASTER_DEACTIVATE); + || cmd.action() == LFUN_BRANCH_MASTER_DEACTIVATE); Buffer * buf = master ? const_cast(buffer().masterBuffer()) - : &buffer(); + : &buffer(); docstring const branch_name = cmd.argument(); // the case without a branch name is handled elsewhere @@ -1998,7 +1998,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) break; } bool activate = (cmd.action() == LFUN_BRANCH_ACTIVATE - || cmd.action() == LFUN_BRANCH_MASTER_ACTIVATE); + || cmd.action() == LFUN_BRANCH_MASTER_ACTIVATE); if (branch->isSelected() != activate) { branch->setSelected(activate); cur.recordUndoFullDocument(); From 3588f2f69675df8dbf829800b0ed6e4a455c68b4 Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Sun, 30 Sep 2012 17:32:00 +0200 Subject: [PATCH 29/30] Context menu item to add unknown branch (rest of #7643) --- lib/ui/stdcontext.inc | 1 + src/LyXAction.cpp | 6 +++--- src/insets/InsetBranch.cpp | 17 +++++++++++++++-- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc index d250afa745..3d6faf0e1e 100644 --- a/lib/ui/stdcontext.inc +++ b/lib/ui/stdcontext.inc @@ -443,6 +443,7 @@ Menuset OptItem "Deactivate Branch|e" "branch-deactivate" OptItem "Activate Branch in Master|M" "branch-master-activate" OptItem "Deactivate Branch in Master|v" "branch-master-deactivate" + OptItem "Add Unknown Branch|w" "branch-add" End # diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp index 998b79d2fc..1a49bd4e28 100644 --- a/src/LyXAction.cpp +++ b/src/LyXAction.cpp @@ -3501,7 +3501,7 @@ void LyXAction::init() * \li Origin: spitz, 7 Jul 2009 * \endvar */ - { LFUN_BRANCH_ADD, "branch-add", Noop, Buffer }, + { LFUN_BRANCH_ADD, "branch-add", AtPoint, Buffer }, /*! @@ -3536,7 +3536,7 @@ void LyXAction::init() * \li Origin: spitz, 30 Sep 2012 * \endvar */ - { LFUN_BRANCH_MASTER_ACTIVATE, "branch-master-activate", AtPoint, Buffer }, + { LFUN_BRANCH_MASTER_ACTIVATE, "branch-master-activate", AtPoint, Buffer }, /*! * \var lyx::FuncCode lyx::LFUN_BRANCH_MASTER_DEACTIVATE * \li Action: De-activate the branch in the master buffer. @@ -3545,7 +3545,7 @@ void LyXAction::init() * \li Origin: spitz, 30 Sep 2012 * \endvar */ - { LFUN_BRANCH_MASTER_DEACTIVATE, "branch-master-deactivate", AtPoint, Buffer }, + { LFUN_BRANCH_MASTER_DEACTIVATE, "branch-master-deactivate", AtPoint, Buffer }, /*! * \var lyx::FuncCode lyx::LFUN_BRANCHES_RENAME diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp index f9d302554f..e966de29ea 100644 --- a/src/insets/InsetBranch.cpp +++ b/src/insets/InsetBranch.cpp @@ -23,6 +23,7 @@ #include "FuncRequest.h" #include "FuncStatus.h" #include "Lexer.h" +#include "LyX.h" #include "OutputParams.h" #include "output_xhtml.h" #include "TextClass.h" @@ -165,6 +166,9 @@ void InsetBranch::doDispatch(Cursor & cur, FuncRequest & cmd) } break; } + case LFUN_BRANCH_ADD: + lyx::dispatch(FuncRequest(LFUN_BRANCH_ADD, params_.branch)); + break; case LFUN_INSET_TOGGLE: if (cmd.argument() == "assign") setStatus(cur, isBranchSelected() ? Open : Collapsed); @@ -182,13 +186,20 @@ void InsetBranch::doDispatch(Cursor & cur, FuncRequest & cmd) bool InsetBranch::getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus & flag) const { + bool const known_branch = + buffer().params().branchlist().find(params_.branch); + switch (cmd.action()) { case LFUN_INSET_MODIFY: flag.setEnabled(true); break; case LFUN_BRANCH_ACTIVATE: - flag.setEnabled(!isBranchSelected(true)); + flag.setEnabled(known_branch && !isBranchSelected(true)); + break; + + case LFUN_BRANCH_ADD: + flag.setEnabled(!known_branch); break; case LFUN_BRANCH_DEACTIVATE: @@ -196,7 +207,9 @@ bool InsetBranch::getStatus(Cursor & cur, FuncRequest const & cmd, break; case LFUN_BRANCH_MASTER_ACTIVATE: - flag.setEnabled(buffer().parent() && !isBranchSelected()); + flag.setEnabled(buffer().parent() + && buffer().masterBuffer()->params().branchlist().find(params_.branch) + && !isBranchSelected()); break; case LFUN_BRANCH_MASTER_DEACTIVATE: From 31c7ccd4b3a8f75358ff29e96da8a1e6ac30bb9d Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Sun, 30 Sep 2012 18:36:22 +0200 Subject: [PATCH 30/30] Trigger preview when inserting preview inset on selection --- src/Text3.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Text3.cpp b/src/Text3.cpp index 78d74293d0..b114cf242e 100644 --- a/src/Text3.cpp +++ b/src/Text3.cpp @@ -294,7 +294,12 @@ static bool doInsertInset(Cursor & cur, Text * text, // Merge multiple paragraphs -- hack while (cur.lastpit() > 0) mergeParagraph(bparams, cur.text()->paragraphs(), 0); + Cursor old = cur; cur.leaveInset(*inset); + if (cmd.action() == LFUN_PREVIEW_INSERT + || cmd.action() == LFUN_IPA_INSERT) + // trigger preview + notifyCursorLeavesOrEnters(old, cur); } } else { cur.leaveInset(*inset);