UserGuide.lyx: describe the new paste modes

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index be6fb36f8da393bb58b83c25343bf6bed2b220ef..363acf5917c97ec4d73a9242d4b3b12f8899be93 100644 (file)
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -554,7 +554,17 @@ File
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-New 
+New, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "buffer-new"
+\end_inset
+
+ or
+\family sans
+ 

 \begin_inset Info
 type  "icon"
 arg   "buffer-new"
 \begin_inset Info
 type  "icon"
 arg   "buffer-new"


@@ -574,13 +584,31 @@ from
 \begin_inset space ~
 \end_inset
 
 \begin_inset space ~
 \end_inset
 

-Template
+Template, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "buffer-new-template"
+\end_inset
+
+

 \end_layout
 
 \begin_layout Itemize
 
 \family sans
 \end_layout
 
 \begin_layout Itemize
 
 \family sans

-Open 
+Open, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "file-open"
+\end_inset
+
+ or
+\family sans
+ 

 \begin_inset Info
 type  "icon"
 arg   "file-open"
 \begin_inset Info
 type  "icon"
 arg   "file-open"


@@ -592,16 +620,22 @@ arg   "file-open"
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-Close
+Open
+\begin_inset space ~
+\end_inset
+
+Recent

 \end_layout
 
 \begin_layout Itemize
 
 \family sans
 \end_layout
 
 \begin_layout Itemize
 
 \family sans

-Save 
+Close, 
+\family default
+

 \begin_inset Info
 \begin_inset Info

-type  "icon"
-arg   "buffer-write"
+type  "shortcut"
+arg   "view-close"

 \end_inset
 
 
 \end_inset
 
 


@@ -610,53 +644,71 @@ arg   "buffer-write"
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-Save
-\begin_inset space ~
+Save, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "buffer-write"

 \end_inset
 
 \end_inset
 

-As
+ or
+\family sans
+ 
+\begin_inset Info
+type  "icon"
+arg   "buffer-write"
+\end_inset
+
+

 \end_layout
 
 \begin_layout Itemize
 
 \family sans
 \end_layout
 
 \begin_layout Itemize
 
 \family sans

-Revert
+Save

 \begin_inset space ~
 \end_inset
 
 \begin_inset space ~
 \end_inset
 

-to
-\begin_inset space ~
+As, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "buffer-write-as"

 \end_inset
 
 \end_inset
 

-saved
+

 \end_layout
 
 \begin_layout Itemize
 
 \family sans
 \end_layout
 
 \begin_layout Itemize
 
 \family sans

-Version
+Revert

 \begin_inset space ~
 \end_inset
 
 \begin_inset space ~
 \end_inset
 

-Control
-\end_layout
-
-\begin_layout Itemize
+to
+\begin_inset space ~
+\end_inset

 
 

-\family sans
-Import
+saved

 \end_layout
 
 \begin_layout Itemize
 
 \family sans
 \end_layout
 
 \begin_layout Itemize
 
 \family sans

-Export
-\end_layout
+Print, 
+\family default

 
 

-\begin_layout Itemize
+\begin_inset Info
+type  "shortcut"
+arg   "dialog-show print"
+\end_inset

 
 

+ or

 \family sans
 \family sans

-Print 
+ 

 \begin_inset Info
 type  "icon"
 arg   "dialog-show print"
 \begin_inset Info
 type  "icon"
 arg   "dialog-show print"


@@ -668,7 +720,15 @@ arg   "dialog-show print"
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-Exit
+Exit, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "lyx-quit"
+\end_inset
+
+

 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard


@@ -707,7 +767,7 @@ reference "sec:Document-Classes"
 
 \begin_layout Standard
 \begin_inset Note Greyedout
 
 \begin_layout Standard
 \begin_inset Note Greyedout

-status collapsed
+status open

 
 \begin_layout Plain Layout
 
 
 \begin_layout Plain Layout
 


@@ -852,7 +912,31 @@ Edit
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-Cut 
+Cut
+\family default
+
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+Cut
+\end_layout
+
+\end_inset
+
+
+\family sans
+, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "cut"
+\end_inset
+
+ or
+\family sans
+ 

 \family default
 
 \begin_inset Info
 \family default
 
 \begin_inset Info


@@ -866,7 +950,31 @@ arg   "cut"
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-Copy 
+Copy
+\family default
+
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+Copy
+\end_layout
+
+\end_inset
+
+
+\family sans
+, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "cut"
+\end_inset
+
+ or
+\family sans
+ 

 \family default
 
 \begin_inset Info
 \family default
 
 \begin_inset Info


@@ -880,7 +988,27 @@ arg   "copy"
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-Paste 
+Paste
+\family default
+
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+Paste
+\end_layout
+
+\end_inset
+
+, 
+\begin_inset Info
+type  "shortcut"
+arg   "cut"
+\end_inset
+
+ or
+\family sans
+ 

 \family default
 
 \begin_inset Info
 \family default
 
 \begin_inset Info


@@ -922,30 +1050,70 @@ Find
 \begin_inset space ~
 \end_inset
 
 \begin_inset space ~
 \end_inset
 

-Replace 
+Replace

 \family default
 
 \family default
 

-\begin_inset Info
-type  "icon"
-arg   "dialog-show findreplace"
-\end_inset
+\begin_inset Index idx
+status collapsed

 
 

+\begin_layout Plain Layout

 
 

+\family sans
+Find

 \end_layout
 
 \end_layout
 

-\begin_layout Standard
-The first three are self-explanatory.
- 
+\end_inset
+
+

 \begin_inset Index idx
 status collapsed
 
 \begin_layout Plain Layout
 \begin_inset Index idx
 status collapsed
 
 \begin_layout Plain Layout

-Paste
+
+\family sans
+Replace

 \end_layout
 
 \end_inset
 
 \end_layout
 
 \end_inset
 

-You can also copy text between LyX and other programs by cut, copy and paste.
+
+\family sans
+, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "dialog-show findreplaceadv"
+\end_inset
+
+ or
+\family sans
+ 
+\family default
+
+\begin_inset Info
+type  "icon"
+arg   "dialog-show findreplace"
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+The first three are self-explanatory.
+ You can also copy text between LyX and other programs by 
+\family sans
+Cut
+\family default
+, 
+\family sans
+Copy
+\family default
+ and 
+\family sans
+Paste
+\family default
+.

  
 \family sans
 Cut
  
 \family sans
 Cut


@@ -955,17 +1123,16 @@ Cut
 Copy
 \family default
  put text in two versions into the clipboard (formatted and unformatted),
 Copy
 \family default
  put text in two versions into the clipboard (formatted and unformatted),

- so that the recieving program may choose the most suitable form.
+ so that other programs can choose the most suitable form.

  
 \family sans
 Paste
 \family default
  supports formatted and unformatted text as well, and additionally graphics.
  
 \family sans
 Paste
 \family default
  supports formatted and unformatted text as well, and additionally graphics.

- It will try to interpret the clipboard contents in an intelligent way,
- e.g.
- if the clipboard contains text as in comma separated values format (CSV),
- and the cursor is inside a table, the text will be placed into individual
- cells according to the separators.
+ It tries to interpret the clipboard contents in an intelligent way.
+ For example if the clipboard contains text in the format of comma separated
+ values (CSV) and the cursor is inside a table, the text will be pasted
+ into individual cells.

  The submenu of 
 \family sans
 Paste
  The submenu of 
 \family sans
 Paste


@@ -975,12 +1142,13 @@ Paste
 Recent
 \family default
  shows you a list with the last strings you have pasted.
 Recent
 \family default
  shows you a list with the last strings you have pasted.

+ You can insert one at the current cursor position by clicking on a list
+ entry.

 \end_layout
 
 \begin_layout Standard
 The submenu 
 \family sans
 \end_layout
 
 \begin_layout Standard
 The submenu 
 \family sans

-Edit\SpecialChar \menuseparator

 Paste
 \begin_inset space ~
 \end_inset
 Paste
 \begin_inset space ~
 \end_inset


@@ -989,9 +1157,13 @@ Special
 \family default
  contains optional items for specific formats, depending on the clipboard
  contents.
 \family default
  contains optional items for specific formats, depending on the clipboard
  contents.

- These include HTML, LaTeX, Linkback PDF
+ These include HTML, LaTeX, Linkback
+\begin_inset space ~
+\end_inset
+
+PDF

 \begin_inset Foot
 \begin_inset Foot

-status open
+status collapsed

 
 \begin_layout Plain Layout
 OS X only
 
 \begin_layout Plain Layout
 OS X only


@@ -1001,12 +1173,18 @@ OS X only
 
 , PDF, PNG, JPEG and EMF.
  These menu items are useful if the clipboard contains the same contents
 
 , PDF, PNG, JPEG and EMF.
  These menu items are useful if the clipboard contains the same contents

- in different formats, and you want to select one format explicitly (e.g.
- some programs put an image into the clipboard both as graphics contents,
- and as a short text which is often meaningless).
- The menu item 
+ in different formats, and you want to select one format explicitly.
+ (E.
+\begin_inset space \thinspace{}
+\end_inset
+
+g.
+\begin_inset space \space{}
+\end_inset
+
+some programs put an image into the clipboard as graphics and as a short
+ text which is often meaningless.) The menu item 

 \family sans
 \family sans

-Edit\SpecialChar \menuseparator

 Paste
 \begin_inset space ~
 \end_inset
 Paste
 \begin_inset space ~
 \end_inset


@@ -1028,13 +1206,12 @@ Lines
 \family default
  is equivalent to 
 \family sans
 \family default
  is equivalent to 
 \family sans

-Edit\SpecialChar \menuseparator

 Paste
 \family default
 , with the only difference that it acts on text only.
  It will insert the text in the clipboard so that the whole text is inserted
  as one paragraph.
 Paste
 \family default
 , with the only difference that it acts on text only.
  It will insert the text in the clipboard so that the whole text is inserted
  as one paragraph.

- A new paragraph is started when there is a blank line in the file.
+ A new paragraph is only started when there is a blank line in the text.

  Without 
 \family sans
 Join
  Without 
 \family sans
 Join


@@ -1043,11 +1220,12 @@ Join
 
 Lines
 \family default
 
 Lines
 \family default

-, the text is inserted as Paragraphs, where the line breaks of the text
- will start a new paragraph.
+ the text is inserted as paragraphs where the line breaks of the text will
+ start a new paragraph.
+ This is for example useful to copy contents of tables from webpages to
+ a table in LyX.

  The items 
 \family sans
  The items 
 \family sans

-Edit\SpecialChar \menuseparator

 Paste
 \begin_inset space ~
 \end_inset
 Paste
 \begin_inset space ~
 \end_inset


@@ -1065,7 +1243,6 @@ Lines
 \family default
  and 
 \family sans
 \family default
  and 
 \family sans

-Edit\SpecialChar \menuseparator

 Paste
 \begin_inset space ~
 \end_inset
 Paste
 \begin_inset space ~
 \end_inset


@@ -1074,31 +1251,10 @@ Special\SpecialChar \menuseparator
 Selection
 \family default
  paste from the primary selection.
 Selection
 \family default
  paste from the primary selection.

- It contains the currently selected text.
- This works across different programs if LyX runs on the X Window system
- (usually if LyX is compiled for unix or cygwin), otherwise it is LyX internal.
+ This is normally the currently selected text.

 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-Replace
-\end_layout
-
-\end_inset
-
-
-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-Find
-\end_layout
-
-\end_inset
-

 The 
 \family sans
 Edit\SpecialChar \menuseparator
 The 
 \family sans
 Edit\SpecialChar \menuseparator

diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 4c0fa3ab26cf846d85ad229aadb47cb2617a3b6c..e568065c5c667828bd5536018cc8e6f58f4120be 100644 (file)
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -601,14 +601,14 @@ Datei
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-Neu (Strg+N)
+Neu, Strg+N

 \family default
  oder 
 \family default
  oder 

-\begin_inset Graphics
-       filename ../../images/buffer-new.png
-       scale 85
-       groupId Icon
+\family sans

 
 

+\begin_inset Info
+type  "icon"
+arg   "buffer-new"

 \end_inset
 
 
 \end_inset
 
 


@@ -621,20 +621,20 @@ Neu von
 \family default
  
 \family sans
 \family default
  
 \family sans

-Vorlage (Strg+Umschalt+N)
+Vorlage, Strg+Umschalt+N

 \end_layout
 
 \begin_layout Itemize
 
 \family sans
 \end_layout
 
 \begin_layout Itemize
 
 \family sans

-Öffnen (Strg+O)
+Öffnen, Strg+O

 \family default
  oder 
 \family default
  oder 

-\begin_inset Graphics
-       filename ../../images/file-open.png
-       scale 85
-       groupId Icon
+\family sans

 
 

+\begin_inset Info
+type  "icon"
+arg   "file-open"

 \end_inset
 
 
 \end_inset
 
 


@@ -643,20 +643,20 @@ Vorlage (Strg+Umschalt+N)
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-Schließen (Strg+W)
+Schließen, Strg+W

 \end_layout
 
 \begin_layout Itemize
 
 \family sans
 \end_layout
 
 \begin_layout Itemize
 
 \family sans

-Speichern (Strg+S)
+Speichern, Strg+S

 \family default
  oder 
 \family default
  oder 

-\begin_inset Graphics
-       filename ../../images/buffer-write.png
-       scale 85
-       groupId Icon
+\family sans

 
 

+\begin_inset Info
+type  "icon"
+arg   "buffer-write"

 \end_inset
 
 
 \end_inset
 
 


@@ -669,7 +669,7 @@ Speichern
 \family default
  
 \family sans
 \family default
  
 \family sans

-unter (Strg+Umschalt+S)
+unter, Strg+Umschalt+S

 \end_layout
 
 \begin_layout Itemize
 \end_layout
 
 \begin_layout Itemize


@@ -687,14 +687,14 @@ Speicherung wieder herstellen
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-Drucken (Strg+P)
+Drucken, Strg+P

 \family default
  oder 
 \family default
  oder 

-\begin_inset Graphics
-       filename ../../images/dialog-show_print.png
-       scale 85
-       groupId Icon
+\family sans

 
 

+\begin_inset Info
+type  "icon"
+arg   "dialog-show print"

 \end_inset
 
 
 \end_inset
 
 


@@ -703,7 +703,7 @@ Drucken (Strg+P)
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-Beenden (Strg+Q)
+Beenden, Strg+Q

 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard


@@ -858,11 +858,9 @@ Ausschneiden
 , Strg+X
 \family default
  oder 
 , Strg+X
 \family default
  oder 

-\begin_inset Graphics
-       filename ../../images/cut.png
-       scale 85
-       groupId Icon
-
+\begin_inset Info
+type  "icon"
+arg   "cut"

 \end_inset
 
 
 \end_inset
 
 


@@ -888,11 +886,9 @@ Kopieren
 , Strg+C
 \family default
  oder 
 , Strg+C
 \family default
  oder 

-\begin_inset Graphics
-       filename ../../images/copy.png
-       scale 85
-       groupId Icon
-
+\begin_inset Info
+type  "icon"
+arg   "copy"

 \end_inset
 
 
 \end_inset
 
 


@@ -918,11 +914,9 @@ Einfugen@Einfügen
 Strg+V
 \family default
  oder 
 Strg+V
 \family default
  oder 

-\begin_inset Graphics
-       filename ../../images/paste.png
-       scale 85
-       groupId Icon
-
+\begin_inset Info
+type  "icon"
+arg   "paste"

 \end_inset
 
 
 \end_inset
 
 


@@ -988,11 +982,9 @@ Ersetzen
  Strg+F
 \family default
  oder 
  Strg+F
 \family default
  oder 

-\begin_inset Graphics
-       filename ../../images/dialog-show_findreplace.png
-       scale 85
-       groupId Icon
-
+\begin_inset Info
+type  "icon"
+arg   "dialog-show findreplace"

 \end_inset
 
 
 \end_inset
 
 


@@ -1000,9 +992,46 @@ Ersetzen
 
 \begin_layout Standard
 Die ersten drei sind selbsterklärend.
 
 \begin_layout Standard
 Die ersten drei sind selbsterklärend.

- Unter 
+ Sie können auch Text zwischen LyX und anderen Programmen durch 
+\family sans
+Ausschneiden
+\family default
+,
+\family sans
+ Kopieren
+\family default
+ und 
+\family sans
+Einfügen
+\family default
+ kopieren.
+ 
+\family sans
+Ausschneiden
+\family default
+ und 
+\family sans
+Kopieren
+\family default
+ laden Text in zwei Versionen in die Zwischenablage (formatiert und unformatiert
+), so dass andere Programme die geeignete Version wählen kann.
+ 
+\family sans
+Einfügen
+\family default
+ unterstützt ebenfalls formatierten und unformatierten Text und zusätzlich
+ Bilder.
+ Es wird versucht, die Einfügung intelligent zu interpretieren.
+ Wenn z.
+\begin_inset space \thinspace{}
+\end_inset
+
+B.
+ die Zwischenablage Text im Format CSV enthält und sich der Cursor in einer
+ Tabelle befindet, wird versucht den Text in separate Tabellenzellen zu
+ kopieren.
+ Das Submenü 

 \family sans
 \family sans

-Bearbeiten\SpecialChar \menuseparator

 Einfügen
 \begin_inset space \space{}
 \end_inset
 Einfügen
 \begin_inset space \space{}
 \end_inset


@@ -1013,11 +1042,117 @@ Einfügen
 
 Auswahl)
 \family default
 
 Auswahl)
 \family default

- finden Sie eine Liste der letzten eingefügten Textstücke.
+ listet die zuletzt eingefügten Textstücke auf.

  Durch anklicken können Sie eins davon an der momentanen Cursorposition
  einfügen.
 \end_layout
 
  Durch anklicken können Sie eins davon an der momentanen Cursorposition
  einfügen.
 \end_layout
 

+\begin_layout Standard
+Das Untermenü 
+\family sans
+Bearbeiten\SpecialChar \menuseparator
+Einfügen
+\begin_inset space \space{}
+\end_inset
+
+(speziell)
+\family default
+ enthält Einträge für spezielle Formate, abhängig vom Inhalt der Zwischenablage.
+ Dies können HTML, LaTeX, Linkback
+\begin_inset space ~
+\end_inset
+
+PDF
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+nur OS X
+\end_layout
+
+\end_inset
+
+, PDF, PNG, JPEG und EMF sein.
+ Diese Menüeinträge sind nützlich wenn die Zwischenablage denselben Inhalt
+ in verschiedenen Formaten enthält und man explizit ein bestimmtes Format
+ einfügen möchte.
+ (Zum Beispiel kopieren einige Programme Bilder als Grafik und als kryptischen
+ Text in die Zwischenablage).
+ Das Menü 
+\family sans
+Einfügen
+\begin_inset space \space{}
+\end_inset
+
+(speziell)\SpecialChar \menuseparator
+Einfacher
+\begin_inset space ~
+\end_inset
+
+Text,
+\begin_inset space \thinspace{}
+\end_inset
+
+Zeilen
+\begin_inset space ~
+\end_inset
+
+verbinden
+\family default
+ ist äquivalent zu 
+\family sans
+Einfügen
+\family default
+, mit dem einzigen Unterschied dass es nur Text einfügt.
+ Es fügt den Text aus der Zwischenablage so ein, dass der komplette Text
+ einen Absatz bildet.
+ Ein neuer Absatz wird nur begonnen wenn der Text eine Leerzeile enthält.
+ Ohne 
+\family sans
+Zeilen
+\begin_inset space ~
+\end_inset
+
+verbinden
+\family default
+ wird der Text als Absätze eingefügt, wobei die Zeilenumbrüche des Texts
+ einen neuen Absatz beginnen.
+ Dies ist z.
+\begin_inset space \thinspace{}
+\end_inset
+
+B.
+ nützlich um Inhalte von Tabellen aus Webseiten in Tabellen von LyX einzufügen.
+ Die Untermenüs 
+\family sans
+Einfügen
+\begin_inset space \space{}
+\end_inset
+
+(speziell)\SpecialChar \menuseparator
+Auswahl,
+\begin_inset space \thinspace{}
+\end_inset
+
+Zeilen
+\begin_inset space ~
+\end_inset
+
+verbinden
+\family default
+ und 
+\family sans
+Einfügen
+\begin_inset space \space{}
+\end_inset
+
+(speziell)\SpecialChar \menuseparator
+Auswahl
+\family default
+ fügen von der aktuellen Auswahl ein.
+ Dies ist normalerweise der aktuell ausgewählte Text.
+\end_layout
+

 \begin_layout Standard
 
 \family sans
 \begin_layout Standard
 
 \family sans

diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index a69b24db6d53420bfd7b73a1c56a222ad9096170..411cb8c2dd8331a4f4bb1f19d40e62c9be418cce 100644 (file)
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -518,7 +518,17 @@ Archivo
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-Nuevo 
+Nuevo, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "buffer-new"
+\end_inset
+
+ o
+\family sans
+ 

 \begin_inset Info
 type  "icon"
 arg   "buffer-new"
 \begin_inset Info
 type  "icon"
 arg   "buffer-new"


@@ -538,13 +548,31 @@ desde
 \begin_inset space ~
 \end_inset
 
 \begin_inset space ~
 \end_inset
 

-plantilla
+plantilla, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "buffer-new-template"
+\end_inset
+
+

 \end_layout
 
 \begin_layout Itemize
 
 \family sans
 \end_layout
 
 \begin_layout Itemize
 
 \family sans

-Abrir 
+Abrir, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "file-open"
+\end_inset
+
+ o
+\family sans
+ 

 \begin_inset Info
 type  "icon"
 arg   "file-open"
 \begin_inset Info
 type  "icon"
 arg   "file-open"


@@ -566,13 +594,31 @@ reciente
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-Cerrar
+Cerrar, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "view-close"
+\end_inset
+
+

 \end_layout
 
 \begin_layout Itemize
 
 \family sans
 \end_layout
 
 \begin_layout Itemize
 
 \family sans

-Guardar 
+Guardar, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "buffer-write"
+\end_inset
+
+ o
+\family sans
+ 

 \begin_inset Info
 type  "icon"
 arg   "buffer-write"
 \begin_inset Info
 type  "icon"
 arg   "buffer-write"


@@ -588,56 +634,48 @@ Guardar
 \begin_inset space ~
 \end_inset
 
 \begin_inset space ~
 \end_inset
 

-como
-\end_layout
-
-\begin_layout Itemize
+como, 
+\family default

 
 

-\family sans
-Revertir
-\begin_inset space ~
+\begin_inset Info
+type  "shortcut"
+arg   "buffer-write-as"

 \end_inset
 
 \end_inset
 

-al
-\begin_inset space ~
-\end_inset

 
 

-guardado

 \end_layout
 
 \begin_layout Itemize
 
 \family sans
 \end_layout
 
 \begin_layout Itemize
 
 \family sans

-Control
+Revertir

 \begin_inset space ~
 \end_inset
 
 \begin_inset space ~
 \end_inset
 

-de
+al

 \begin_inset space ~
 \end_inset
 
 \begin_inset space ~
 \end_inset
 

-versiones
-\end_layout
-
-\begin_layout Itemize
-
-\family sans
-Importar
+guardado

 \end_layout
 
 \begin_layout Itemize
 
 \family sans
 \end_layout
 
 \begin_layout Itemize
 
 \family sans

-Exportar
-\end_layout
+Imprimir, 
+\family default

 
 

-\begin_layout Itemize
+\begin_inset Info
+type  "shortcut"
+arg   "dialog-show print"
+\end_inset

 
 

+ o

 \family sans
 \family sans

-Imprimir 
+ 

 \begin_inset Info
 type  "icon"
 \begin_inset Info
 type  "icon"

-arg   "buffer-write"
+arg   "dialog-show print"

 \end_inset
 
 
 \end_inset
 
 


@@ -646,27 +684,15 @@ arg   "buffer-write"
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-Ventana
-\begin_inset space ~
-\end_inset
-
-nueva
-\end_layout
-
-\begin_layout Itemize
+Salir, 
+\family default

 
 

-\family sans
-Cerrar
-\begin_inset space ~
+\begin_inset Info
+type  "shortcut"
+arg   "lyx-quit"

 \end_inset
 
 \end_inset
 

-ventana
-\end_layout
-
-\begin_layout Itemize

 
 

-\family sans
-Salir

 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard


@@ -836,7 +862,33 @@ Editar
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-Cortar 
+Cortar
+\family default
+
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+
+\family sans
+Cortar
+\end_layout
+
+\end_inset
+
+
+\family sans
+, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "cut"
+\end_inset
+
+ o
+\family sans
+ 

 \family default
 
 \begin_inset Info
 \family default
 
 \begin_inset Info


@@ -850,7 +902,33 @@ arg   "cut"
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-Copiar 
+Copiar
+\family default
+
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+
+\family sans
+Copiar
+\end_layout
+
+\end_inset
+
+
+\family sans
+, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "cut"
+\end_inset
+
+ o
+\family sans
+ 

 \family default
 
 \begin_inset Info
 \family default
 
 \begin_inset Info


@@ -864,7 +942,29 @@ arg   "copy"
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-Pegar 
+Pegar
+\family default
+
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+
+\family sans
+Pegar
+\end_layout
+
+\end_inset
+
+, 
+\begin_inset Info
+type  "shortcut"
+arg   "cut"
+\end_inset
+
+ o
+\family sans
+ 

 \family default
 
 \begin_inset Info
 \family default
 
 \begin_inset Info


@@ -906,32 +1006,90 @@ y
 \begin_inset space ~
 \end_inset
 
 \begin_inset space ~
 \end_inset
 

-reemplazar 
+reemplazar

 \family default
 
 \family default
 

-\begin_inset Info
-type  "icon"
-arg   "dialog-show findreplace"
-\end_inset
-
+\begin_inset Index idx
+status collapsed

 
 

+\begin_layout Plain Layout
+Reemplazar

 \end_layout
 
 \end_layout
 

-\begin_layout Standard
-Los tres primeros son evidentes.
- 
+\end_inset
+
+

 \begin_inset Index idx
 status collapsed
 
 \begin_layout Plain Layout
 \begin_inset Index idx
 status collapsed
 
 \begin_layout Plain Layout

-Pegar
+Encontrar

 \end_layout
 
 \end_inset
 
 \end_layout
 
 \end_inset
 

-También puedes copiar texto entre LyX y otros programas con cortar, copiar
- y pegar.
- El submenú 
+
+\family sans
+, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "dialog-show findreplaceadv"
+\end_inset
+
+ o
+\family sans
+ 
+\family default
+
+\begin_inset Info
+type  "icon"
+arg   "dialog-show findreplace"
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+Los tres primeros son evidentes.
+ 
+\lang english
+You can also copy text between LyX and other programs by 
+\family sans
+Cut
+\family default
+, 
+\family sans
+Copy
+\family default
+ and 
+\family sans
+Paste
+\family default
+.
+ 
+\family sans
+Cut
+\family default
+ and 
+\family sans
+Copy
+\family default
+ put text in two versions into the clipboard (formatted and unformatted),
+ so that other programs can choose the most suitable form.
+ 
+\family sans
+Paste
+\family default
+ supports formatted and unformatted text as well, and additionally graphics.
+ It tries to interpret the clipboard contents in an intelligent way.
+ For example if the clipboard contains text in the format of comma separated
+ values (CSV) and the cursor is inside a table, the text will be pasted
+ into individual cells.
+ 
+\lang spanish
+El submenú 

 \family sans
 Pegar
 \begin_inset space ~
 \family sans
 Pegar
 \begin_inset space ~


@@ -940,75 +1098,138 @@ Pegar
 reciente
 \family default
  muestra una lista con los últimos términos copiados.
 reciente
 \family default
  muestra una lista con los últimos términos copiados.

+
+\lang english
+ You can insert one at the current cursor position by clicking on a list
+ entry.

 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-Con el menú 
+
+\lang english
+The submenu 

 \family sans
 \family sans

-Editar\SpecialChar \menuseparator
+\lang spanish

 Pegado
 \begin_inset space ~
 \end_inset
 
 Pegado
 \begin_inset space ~
 \end_inset
 

-Especial\SpecialChar \menuseparator
-Texto
+especial
+\family default
+\lang english
+ contains optional items for specific formats, depending on the clipboard
+ contents.
+ These include HTML, LaTeX, Linkback

 \begin_inset space ~
 \end_inset
 
 \begin_inset space ~
 \end_inset
 

-simple 
-\family default
-el texto del portapapeles se inserta como párrafos, de manera que cada salto
- de línea del texto inicia un párrafo nuevo.
- El menú 
+PDF
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+
+\lang english
+OS X only
+\end_layout
+
+\end_inset
+
+, PDF, PNG, JPEG and EMF.
+ These menu items are useful if the clipboard contains the same contents
+ in different formats, and you want to select one format explicitly.
+ (E.
+\begin_inset space \thinspace{}
+\end_inset
+
+g.
+\begin_inset space \space{}
+\end_inset
+
+some programs put an image into the clipboard as graphics and as a short
+ text which is often meaningless.) The menu item 

 \family sans
 \family sans

-Editar\SpecialChar \menuseparator
+\lang spanish

 Pegado
 \begin_inset space ~
 \end_inset
 
 Pegado
 \begin_inset space ~
 \end_inset
 

-Especial\SpecialChar \menuseparator
-Texto
+especial\SpecialChar \menuseparator
+
+\lang english
+Plain

 \begin_inset space ~
 \end_inset
 
 \begin_inset space ~
 \end_inset
 

-simple,
+Text,
+\begin_inset space \thinspace{}
+\end_inset
+
+Join

 \begin_inset space ~
 \end_inset
 
 \begin_inset space ~
 \end_inset
 

-líneas
+Lines
+\family default
+ is equivalent to 
+\family sans
+\lang spanish
+Pegar
+\family default
+\lang english
+, with the only difference that it acts on text only.
+ It will insert the text in the clipboard so that the whole text is inserted
+ as one paragraph.
+ A new paragraph is only started when there is a blank line in the text.
+ Without 
+\family sans
+Join

 \begin_inset space ~
 \end_inset
 
 \begin_inset space ~
 \end_inset
 

-juntas
+Lines

 \family default
 \family default

- insertará todo el texto del portapapeles como 
-\emph on
-un solo
-\emph default
- párrafo.
- Si en el texto hay una línea en blanco se iniciará un nuevo párrafo.
-\end_layout
+ the text is inserted as paragraphs where the line breaks of the text will
+ start a new paragraph.
+ This is for example useful to copy contents of tables from webpages to
+ a table in LyX.
+ The items 
+\family sans
+\lang spanish
+Pegado
+\begin_inset space ~
+\end_inset

 
 

-\begin_layout Standard
-\begin_inset Index idx
-status collapsed
+especial\SpecialChar \menuseparator

 
 

-\begin_layout Plain Layout
-Reemplazar
-\end_layout
+\lang english
+Selection,
+\begin_inset space \thinspace{}
+\end_inset

 
 

+Join
+\begin_inset space ~

 \end_inset
 
 \end_inset
 

+Lines
+\family default
+ and 
+\family sans
+\lang spanish
+Pegado
+\begin_inset space ~
+\end_inset

 
 

-\begin_inset Index idx
-status collapsed
+especial\SpecialChar \menuseparator

 
 

-\begin_layout Plain Layout
-Encontrar
+\lang english
+Selection
+\family default
+ paste from the primary selection.
+ This is normally the currently selected text.

 \end_layout
 
 \end_layout
 

-\end_inset
-
+\begin_layout Standard

 La opción 
 \family sans
 Editar\SpecialChar \menuseparator
 La opción 
 \family sans
 Editar\SpecialChar \menuseparator

diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index bf6e3be671ca72550a0ca29c6f2dd05d56a1431c..03a0e8219293ea80d55b60212349ec326ef7fe28 100644 (file)
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -682,7 +682,17 @@ Fichier
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-Nouveau 
+Nouveau, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "buffer-new"
+\end_inset
+
+ ou
+\family sans
+ 

 \begin_inset Info
 type  "icon"
 arg   "buffer-new"
 \begin_inset Info
 type  "icon"
 arg   "buffer-new"


@@ -702,13 +712,31 @@ avec
 \begin_inset space ~
 \end_inset
 
 \begin_inset space ~
 \end_inset
 

-modèle
+modèle, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "buffer-new-template"
+\end_inset
+
+

 \end_layout
 
 \begin_layout Itemize
 
 \family sans
 \end_layout
 
 \begin_layout Itemize
 
 \family sans

-Ouvrir 
+Ouvrir, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "file-open"
+\end_inset
+
+ ou
+\family sans
+ 

 \begin_inset Info
 type  "icon"
 arg   "file-open"
 \begin_inset Info
 type  "icon"
 arg   "file-open"


@@ -730,13 +758,31 @@ récents
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-Fermer
+Fermer, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "view-close"
+\end_inset
+
+

 \end_layout
 
 \begin_layout Itemize
 
 \family sans
 \end_layout
 
 \begin_layout Itemize
 
 \family sans

-Enregistrer 
+Enregistrer, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "buffer-write"
+\end_inset
+
+ ou
+\family sans
+ 

 \begin_inset Info
 type  "icon"
 arg   "buffer-write"
 \begin_inset Info
 type  "icon"
 arg   "buffer-write"


@@ -752,7 +798,15 @@ Enregistrer
 \begin_inset space ~
 \end_inset
 
 \begin_inset space ~
 \end_inset
 

-sous
+sous, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "buffer-write-as"
+\end_inset
+
+

 \end_layout
 
 \begin_layout Itemize
 \end_layout
 
 \begin_layout Itemize


@@ -786,33 +840,17 @@ sauvegarde
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-Contrôle
-\begin_inset space ~
-\end_inset
+Imprimer, 
+\family default

 
 

-de
-\begin_inset space ~
+\begin_inset Info
+type  "shortcut"
+arg   "dialog-show print"

 \end_inset
 
 \end_inset
 

-version
-\end_layout
-
-\begin_layout Itemize
-
-\family sans
-Importer
-\end_layout
-
-\begin_layout Itemize
-
-\family sans
-Exporter
-\end_layout
-
-\begin_layout Itemize
-
+ ou

 \family sans
 \family sans

-Imprimer 
+ 

 \begin_inset Info
 type  "icon"
 arg   "dialog-show print"
 \begin_inset Info
 type  "icon"
 arg   "dialog-show print"


@@ -824,27 +862,15 @@ arg   "dialog-show print"
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-Nouvelle fenêtre
-\end_layout
-
-\begin_layout Itemize
-
-\family sans
-Fermer
-\begin_inset space ~
-\end_inset
+Quitter, 
+\family default

 
 

-la
-\begin_inset space ~
+\begin_inset Info
+type  "shortcut"
+arg   "lyx-quit"

 \end_inset
 
 \end_inset
 

-fenêtre
-\end_layout

 
 

-\begin_layout Itemize
-
-\family sans
-Quitter

 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard


@@ -1058,7 +1084,33 @@ Comme vous pouvez vous y attendre, le menu
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-Couper 
+Couper
+\family default
+
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+
+\family sans
+Couper
+\end_layout
+
+\end_inset
+
+
+\family sans
+, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "cut"
+\end_inset
+
+ ou
+\family sans
+ 

 \family default
 
 \begin_inset Info
 \family default
 
 \begin_inset Info


@@ -1072,7 +1124,33 @@ arg   "cut"
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-Copier 
+Copier
+\family default
+
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+
+\family sans
+Copier
+\end_layout
+
+\end_inset
+
+
+\family sans
+, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "cut"
+\end_inset
+
+ ou
+\family sans
+ 

 \family default
 
 \begin_inset Info
 \family default
 
 \begin_inset Info


@@ -1086,7 +1164,29 @@ arg   "copy"
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-Coller 
+Coller
+\family default
+
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+
+\family sans
+Coller
+\end_layout
+
+\end_inset
+
+, 
+\begin_inset Info
+type  "shortcut"
+arg   "cut"
+\end_inset
+
+ ou
+\family sans
+ 

 \family default
 
 \begin_inset Info
 \family default
 
 \begin_inset Info


@@ -1136,7 +1236,45 @@ et
 \begin_inset space ~
 \end_inset
 
 \begin_inset space ~
 \end_inset
 

-Remplacer 
+Remplacer
+\family default
+
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+
+\family sans
+Rechercher
+\end_layout
+
+\end_inset
+
+
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+
+\family sans
+Remplacer
+\end_layout
+
+\end_inset
+
+
+\family sans
+, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "dialog-show findreplaceadv"
+\end_inset
+
+ ou
+\family sans
+ 

 \family default
 
 \begin_inset Info
 \family default
 
 \begin_inset Info


@@ -1149,8 +1287,46 @@ arg   "dialog-show findreplace"
 
 \begin_layout Standard
 Les trois premières s'expliquent d'elles-mêmes.
 
 \begin_layout Standard
 Les trois premières s'expliquent d'elles-mêmes.

- Vous pouvez aussi copier du texte entre LyX et d'autres programmes par
- coupé-copié-collé.
+ 
+\lang english
+You can also copy text between LyX and other programs by
+\lang french
+ 
+\family sans
+Couper
+\family default
+, 
+\family sans
+Copier
+\family default
+ et 
+\family sans
+Coller
+\family default
+.
+ 
+\family sans
+Couper
+\family default
+ et 
+\family sans
+Copier
+\family default
+ 
+\lang english
+put text in two versions into the clipboard (formatted and unformatted),
+ so that other programs can choose the most suitable form.
+ 
+\family sans
+Paste
+\family default
+ supports formatted and unformatted text as well, and additionally graphics.
+ It tries to interpret the clipboard contents in an intelligent way.
+ For example if the clipboard contains text in the format of comma separated
+ values (CSV) and the cursor is inside a table, the text will be pasted
+ into individual cells.
+
+\lang french

  Le sous-menu 
 \family sans
 Coller
  Le sous-menu 
 \family sans
 Coller


@@ -1169,46 +1345,135 @@ Récente
 \family default
  vous montre une liste des dernières chaînes de caractères que vous avez
  collé.
 \family default
  vous montre une liste des dernières chaînes de caractères que vous avez
  collé.

+ 
+\lang english
+You can insert one at the current cursor position by clicking on a list
+ entry.

 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-Le menu 
+
+\lang english
+The submenu 

 \family sans
 \family sans

-Édition\SpecialChar \menuseparator
-Collage
+\lang french
+Coller

 \begin_inset space ~
 \end_inset
 
 \begin_inset space ~
 \end_inset
 

-spécial\SpecialChar \menuseparator
-Texte
+Spécial
+\family default
+\lang english
+ contains optional items for specific formats, depending on the clipboard
+ contents.
+ These include HTML, LaTeX, Linkback

 \begin_inset space ~
 \end_inset
 
 \begin_inset space ~
 \end_inset
 

-brut
+PDF
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+
+\lang english
+OS X only
+\end_layout
+
+\end_inset
+
+, PDF, PNG, JPEG and EMF.
+ These menu items are useful if the clipboard contains the same contents
+ in different formats, and you want to select one format explicitly.
+ (E.
+\begin_inset space \thinspace{}
+\end_inset
+
+g.
+\begin_inset space \space{}
+\end_inset
+
+some programs put an image into the clipboard as graphics and as a short
+ text which is often meaningless.) The menu item 
+\family sans
+\lang french
+Coller

 \begin_inset space ~
 \end_inset
 
 \begin_inset space ~
 \end_inset
 

-par
+Spécial\SpecialChar \menuseparator
+
+\lang english
+Plain

 \begin_inset space ~
 \end_inset
 
 \begin_inset space ~
 \end_inset
 

-lignes
+Text,
+\begin_inset space \thinspace{}
+\end_inset
+
+Join
+\begin_inset space ~
+\end_inset
+
+Lines

 \family default
 \family default

- va insérer le texte du presse-papier de façon à ce qu'il ne forme qu'
-\emph on
-un seul
-\emph default
- paragraphe.
- Avec 
+ is equivalent to 

 \family sans
 \family sans

-Texte
+\lang french
+Coller
+\family default
+\lang english
+, with the only difference that it acts on text only.
+ It will insert the text in the clipboard so that the whole text is inserted
+ as one paragraph.
+ A new paragraph is only started when there is a blank line in the text.
+ Without 
+\family sans
+Join

 \begin_inset space ~
 \end_inset
 
 \begin_inset space ~
 \end_inset
 

-brut
+Lines
+\family default
+ the text is inserted as paragraphs where the line breaks of the text will
+ start a new paragraph.
+ This is for example useful to copy contents of tables from webpages to
+ a table in LyX.
+ The items 
+\family sans
+\lang french
+Coller
+\begin_inset space ~
+\end_inset
+
+Spécial\SpecialChar \menuseparator
+Sélection
+\lang english
+,
+\begin_inset space \thinspace{}
+\end_inset
+
+Join
+\begin_inset space ~
+\end_inset
+
+Lines

 \family default
 \family default

- seul, le texte est inséré comme une suite de paragraphes, chaque saut de
- ligne commençant un nouveau paragraphe.
+ and
+\lang french
+ 
+\family sans
+Coller
+\begin_inset space ~
+\end_inset
+
+Spécial\SpecialChar \menuseparator
+Sélection
+\family default
+\lang english
+ paste from the primary selection.
+ This is normally the currently selected text.

 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index 8c8f210c63b31fb94770ba663523596da32e72d5..10389410bf045d45db429948b4fbd8fbe229fbc4 100644 (file)
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -554,7 +554,17 @@ status collapsed
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-新規 
+新規, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "buffer-new"
+\end_inset
+
+ or
+\family sans
+ 

 \begin_inset Info
 type  "icon"
 arg   "buffer-new"
 \begin_inset Info
 type  "icon"
 arg   "buffer-new"


@@ -566,13 +576,31 @@ arg   "buffer-new"
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-新規(ひな型使用)
+新規(ひな型使用), 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "buffer-new-template"
+\end_inset
+
+

 \end_layout
 
 \begin_layout Itemize
 
 \family sans
 \end_layout
 
 \begin_layout Itemize
 
 \family sans

-開く 
+開く, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "file-open"
+\end_inset
+
+ or
+\family sans
+ 

 \begin_inset Info
 type  "icon"
 arg   "file-open"
 \begin_inset Info
 type  "icon"
 arg   "file-open"


@@ -584,13 +612,31 @@ arg   "file-open"
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-閉じる
+閉じる, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "view-close"
+\end_inset
+
+

 \end_layout
 
 \begin_layout Itemize
 
 \family sans
 \end_layout
 
 \begin_layout Itemize
 
 \family sans

-保存 
+保存, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "buffer-write"
+\end_inset
+
+ or
+\family sans
+ 

 \begin_inset Info
 type  "icon"
 arg   "buffer-write"
 \begin_inset Info
 type  "icon"
 arg   "buffer-write"


@@ -602,37 +648,37 @@ arg   "buffer-write"
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-名前を付けて保存
-\end_layout
-
-\begin_layout Itemize
+名前を付けて保存, 
+\family default

 
 

-\family sans
-保存済み文書に復帰
-\end_layout
+\begin_inset Info
+type  "shortcut"
+arg   "buffer-write-as"
+\end_inset

 
 

-\begin_layout Itemize

 
 

-\family sans
-バージョン管理

 \end_layout
 
 \begin_layout Itemize
 
 \family sans
 \end_layout
 
 \begin_layout Itemize
 
 \family sans

-読み込み
+保存済み文書に復帰

 \end_layout
 
 \begin_layout Itemize
 
 \family sans
 \end_layout
 
 \begin_layout Itemize
 
 \family sans

-書き出し
-\end_layout
+印刷, 
+\family default

 
 

-\begin_layout Itemize
+\begin_inset Info
+type  "shortcut"
+arg   "dialog-show print"
+\end_inset

 
 

+ or

 \family sans
 \family sans

-印刷 
+ 

 \begin_inset Info
 type  "icon"
 arg   "dialog-show print"
 \begin_inset Info
 type  "icon"
 arg   "dialog-show print"


@@ -644,7 +690,15 @@ arg   "dialog-show print"
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-終了
+終了, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "lyx-quit"
+\end_inset
+
+

 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard


@@ -665,7 +719,7 @@ reference "sec:文書クラス"
 
 \begin_layout Standard
 \begin_inset Note Greyedout
 
 \begin_layout Standard
 \begin_inset Note Greyedout

-status collapsed
+status open

 
 \begin_layout Plain Layout
 【註】「既定ファイル」や「無題」、「下書き」というファイル名のファイルはありません。LyXにファイルを開くか新しいファイルを作るのを知らせるまでは、大きな何もな
 
 \begin_layout Plain Layout
 【註】「既定ファイル」や「無題」、「下書き」というファイル名のファイルはありません。LyXにファイルを開くか新しいファイルを作るのを知らせるまでは、大きな何もな


@@ -749,7 +803,33 @@ name "sec:基本的な編集機能"
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-切り取り 
+切り取り
+\family default
+
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+
+\lang english
+Cut
+\end_layout
+
+\end_inset
+
+
+\family sans
+, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "cut"
+\end_inset
+
+ or
+\family sans
+ 

 \family default
 
 \begin_inset Info
 \family default
 
 \begin_inset Info


@@ -763,7 +843,33 @@ arg   "cut"
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-コピー 
+コピー
+\family default
+
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+
+\lang english
+Copy
+\end_layout
+
+\end_inset
+
+
+\family sans
+, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "cut"
+\end_inset
+
+ or
+\family sans
+ 

 \family default
 
 \begin_inset Info
 \family default
 
 \begin_inset Info


@@ -777,7 +883,27 @@ arg   "copy"
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-貼り付け 
+貼り付け
+\family default
+
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+はりつけ@貼り付け
+\end_layout
+
+\end_inset
+
+, 
+\begin_inset Info
+type  "shortcut"
+arg   "cut"
+\end_inset
+
+ or
+\family sans
+ 

 \family default
 
 \begin_inset Info
 \family default
 
 \begin_inset Info


@@ -803,69 +929,212 @@ arg   "paste"
 \begin_layout Itemize
 
 \family sans
 \begin_layout Itemize
 
 \family sans

-検索／置換 
+検索／置換

 \family default
 
 \family default
 

-\begin_inset Info
-type  "icon"
-arg   "dialog-show findreplace"
-\end_inset
-
+\begin_inset Index idx
+status collapsed

 
 

+\begin_layout Plain Layout
+ちかん@置換

 \end_layout
 
 \end_layout
 

-\begin_layout Standard
-はじめの3つに関しては自明でしょう。
+\end_inset
+
+

 \begin_inset Index idx
 status collapsed
 
 \begin_layout Plain Layout
 \begin_inset Index idx
 status collapsed
 
 \begin_layout Plain Layout

-ã\81¯ã\82\8aã\81¤ã\81\91@è²¼ã\82\8aä»\98ã\81\91
+ã\81\91ã\82\93ã\81\95ã\81\8f@æ¤\9cç´¢

 \end_layout
 
 \end_inset
 
 \end_layout
 
 \end_inset
 

-また、LyXと他のプログラムの間でも、切り取り・コピー・貼り付けを使って、文字列をコピーすることができます。
+

 \family sans
 \family sans

-直近のものを貼り付け
+, 
+\family default
+
+\begin_inset Info
+type  "shortcut"
+arg   "dialog-show findreplaceadv"
+\end_inset
+
+ or
+\family sans
+ 

 \family default
 \family default

-サブメニューには、最近貼り付けを行った文字列の一覧が表示されます。
+
+\begin_inset Info
+type  "icon"
+arg   "dialog-show findreplace"
+\end_inset
+
+

 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-
+はじめの3つに関しては自明でしょう。
+\lang english
+You can also copy text between LyX and other programs by 

 \family sans
 \family sans

-編集\SpecialChar \menuseparator
-特別な貼り付け\SpecialChar \menuseparator
-平文(行を連結して)
+Cut
+\family default
+, 
+\family sans
+Copy
+\family default
+ and 
+\family sans
+Paste
+\family default
+.
+ 
+\family sans
+Cut
+\family default
+ and 
+\family sans
+Copy
+\family default
+ put text in two versions into the clipboard (formatted and unformatted),
+ so that other programs can choose the most suitable form.
+ 
+\family sans
+Paste

 \family default
 \family default

-メニューは、クリップボード中の文字列を、文字列全体を一段落として挿入します。ファイルに空白行がある状態の場合には、新しい段落が挿入されます。
+ supports formatted and unformatted text as well, and additionally graphics.
+ It tries to interpret the clipboard contents in an intelligent way.
+ For example if the clipboard contains text in the format of comma separated
+ values (CSV) and the cursor is inside a table, the text will be pasted
+ into individual cells.
+ The submenu of 

 \family sans
 \family sans

-平文(行を連結しないで)
+Paste
+\begin_inset space ~
+\end_inset
+
+Recent

 \family default
 \family default

-では、文字列中の改行を新しい段落の開始と解釈して、複数の段落として挿入します。
+ shows you a list with the last strings you have pasted.
+ You can insert one at the current cursor position by clicking on a list
+ entry.

 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-\begin_inset Index idx
+
+\lang english
+The submenu 
+\family sans
+Paste
+\begin_inset space ~
+\end_inset
+
+Special
+\family default
+ contains optional items for specific formats, depending on the clipboard
+ contents.
+ These include HTML, LaTeX, Linkback
+\begin_inset space ~
+\end_inset
+
+PDF
+\begin_inset Foot

 status collapsed
 
 \begin_layout Plain Layout
 status collapsed
 
 \begin_layout Plain Layout

-ちかん@置換
+
+\lang english
+OS X only

 \end_layout
 
 \end_inset
 
 \end_layout
 
 \end_inset
 

+, PDF, PNG, JPEG and EMF.
+ These menu items are useful if the clipboard contains the same contents
+ in different formats, and you want to select one format explicitly.
+ (E.
+\begin_inset space \thinspace{}
+\end_inset

 
 

-\begin_inset Index idx
-status collapsed
+g.
+\begin_inset space \space{}
+\end_inset

 
 

-\begin_layout Plain Layout
-けんさく@検索
-\end_layout
+some programs put an image into the clipboard as graphics and as a short
+ text which is often meaningless.) The menu item 
+\family sans
+Paste
+\begin_inset space ~
+\end_inset
+
+Special\SpecialChar \menuseparator
+Plain
+\begin_inset space ~
+\end_inset

 
 

+Text,
+\begin_inset space \thinspace{}

 \end_inset
 
 \end_inset
 

+Join
+\begin_inset space ~
+\end_inset
+
+Lines
+\family default
+ is equivalent to 
+\family sans
+Paste
+\family default
+, with the only difference that it acts on text only.
+ It will insert the text in the clipboard so that the whole text is inserted
+ as one paragraph.
+ A new paragraph is only started when there is a blank line in the text.
+ Without 
+\family sans
+Join
+\begin_inset space ~
+\end_inset
+
+Lines
+\family default
+ the text is inserted as paragraphs where the line breaks of the text will
+ start a new paragraph.
+ This is for example useful to copy contents of tables from webpages to
+ a table in LyX.
+ The items 
+\family sans
+Paste
+\begin_inset space ~
+\end_inset
+
+Special\SpecialChar \menuseparator
+Selection,
+\begin_inset space \thinspace{}
+\end_inset
+
+Join
+\begin_inset space ~
+\end_inset
+
+Lines
+\family default
+ and 
+\family sans
+Paste
+\begin_inset space ~
+\end_inset
+
+Special\SpecialChar \menuseparator
+Selection
+\family default
+ paste from the primary selection.
+ This is normally the currently selected text.
+\end_layout
+
+\begin_layout Standard

 
 \family sans
 編集\SpecialChar \menuseparator
 
 \family sans
 編集\SpecialChar \menuseparator