GNOME.org
 

[vinagre] Update help for UI string changes

commit 48fb232e320f71b6a5df6b31c1adc8db2ebdd642
Author: Ekaterina Gerasimova <kittykat3756 googlemail com>
Date:   Sun Apr 17 16:26:05 2011 +0200

    Update help for UI string changes
    
    Update strings to correspond to updates in Vinagre. Add line breaks to
    keep lines to 80 columns wide. Minor improvements to wording.

 help/C/bookmarks.page                              |   38 ++++++++++++------
 help/C/connect.page                                |   42 ++++++++++++++-----
 ...e-panel.png => vinagre-bookmarks-side-pane.png} |  Bin 16594 -> 16594 bytes
 help/C/preferences.page                            |   15 ++++++-
 help/C/using.page                                  |   33 ++++++++++++----
 help/Makefile.am                                   |    2 +-
 6 files changed, 95 insertions(+), 35 deletions(-)
---
diff --git a/help/C/bookmarks.page b/help/C/bookmarks.page
index 9f517a1..ec5be00 100755
--- a/help/C/bookmarks.page
+++ b/help/C/bookmarks.page
@@ -20,42 +20,56 @@
 
 <section id="bookmarks-using">
   <title>Using bookmarks</title>
-<p>Bookmarks are shortcuts to machines which you access frequently. They are visible in the side panel or in the <gui>Bookmarks</gui> menu.</p>
+<p>Bookmarks are shortcuts to machines which you access frequently. They are
+visible in the side pane or in the <gui>Bookmarks</gui> menu.</p>
 <figure>
-  <title>Bookmarks in the side panel</title>
-  <media type="image" mime="image/png" src="figures/vinagre-bookmarks-side-panel.png"/>
+  <title>Bookmarks in the side pane</title>
+  <media type="image" mime="image/png" src="figures/vinagre-bookmarks-side-pane.png"/>
 </figure>
-<p>As you hover the mouse over the bookmarks, a tooltip will show you the hostname for the connection. To connect to a machine, just double click on an entry.</p>
+<p>As you hover the mouse over a bookmark, a tooltip will show you the hostname
+for the connection. To connect to a machine, double click on an entry.</p>
 </section>
 
 <section id="bookmarks-add">
   <title>Create a new bookmark</title>
-<p>To bookmark the currently viewed connection, choose <guiseq><gui>Bookmarks</gui><gui>Add to bookmarks</gui></guiseq> (<keyseq><key>Ctrl</key><key>D</key></keyseq>). The <gui>Bookmarks</gui> dialog is displayed. Enter the name for the connection, and choose any other options you may want to use, then click <gui>Save</gui>.</p>
+<p>To bookmark the currently viewed connection, choose
+<guiseq><gui>Bookmarks</gui><gui>Add Bookmark</gui></guiseq>. The
+<gui>Bookmark</gui> dialog is displayed. Enter the name for the connection, and
+choose any other options you may want to use, then click <gui>Save</gui>.</p>
 <figure>
-  <title>The saving to Bookmarks dialog</title>
+  <title>The <gui>Bookmark</gui> dialog</title>
   <media type="image" mime="image/png" src="figures/vinagre-saving-bookmarks.png"/>
 </figure>
 <note>
-  <p>You can use folders to organize your bookmarks. To create a folder, right click on the side panel and choose the option <gui>New folder</gui> in the context menu.</p>
+<p>You can use folders to organize your bookmarks. To create a folder, right
+click on the side pane and choose the option <gui>New Folder</gui> in the
+context menu.</p>
 </note>
 </section>
 
 <section id="bookmarks-edit">
   <title>Edit bookmark properties</title>
-<p>To edit a bookmark's properties, such as its name and host, right click on the bookmark in the side pane and choose <gui>Edit bookmark</gui> from the context menu.</p>
+<p>To edit a bookmark's properties, such as its name and host, right click on
+the bookmark in the side pane and choose <gui>Edit Bookmark</gui> from the
+context menu.</p>
 <figure>
-  <title>Context menu option to edit a bookmark</title>
+  <title>Context menu options</title>
   <media type="image" mime="image/png" src="figures/vinagre-editing-bookmarks.png"/>
 </figure>
 <note>
-  <p>You can also edit a folder in the same way.</p>
+<p>You can also edit a folder in the same way.</p>
 </note>
 </section>
 
 <section id="bookmarks-remove">
   <title>Remove a bookmark</title>
-<p>To remove a bookmark, right click on the bookmark in the side pane and choose <gui>Remove from bookmarks</gui> from the context menu.</p>
-<note><p>You can also remove a folder in the same way. Note that removing a folder will remove all the bookmarks inside it. A confirmation dialog will be shown.</p></note>
+<p>Right click on the bookmark in the side pane, and choose
+<gui>Remove From Bookmarks</gui> in the context menu to remove a bookmark.</p>
+<note>
+<p>You can also remove a folder in the same way. Note that removing a folder
+will remove all the folders and bookmarks inside it. A confirmation dialog will
+be shown.</p>
+</note>
 </section>
 
 </page>
diff --git a/help/C/connect.page b/help/C/connect.page
index 6c7cc51..63936da 100755
--- a/help/C/connect.page
+++ b/help/C/connect.page
@@ -6,6 +6,7 @@
   <info>
     <link type="guide" xref="index"/>
     <link type="seealso" xref="bookmarks"/>
+    <link type="seealso" xref="using"/>
     <title type="sort">1</title>
     <desc>Learn about connecting to another computer with Vinagre.</desc>
     <credit type="author">
@@ -20,37 +21,56 @@
 <title>Connecting to other computers</title>
 
 <section id="connect">
-<title>Establishing a connection</title>
-<p>To connect to a remote computer, choose <guiseq><gui>Machine</gui><gui>Connect</gui></guiseq> (<keyseq><key>Ctrl</key><key>N</key></keyseq>). The connection dialog is displayed. Choose the <gui>Protocol</gui> and the <gui>Host</gui> for the connection and click the <gui>Connect</gui> button. You will be presented with some other options, depending on which protocol you have selected.</p>
+  <title>Establishing a connection</title>
+<p>To connect to a remote computer, choose <guiseq><gui>Remote</gui>
+<gui>Connect</gui></guiseq>. The connection dialog is displayed. Choose the
+<gui>Protocol</gui> and the <gui>Host</gui> for the connection and click the
+<gui>Connect</gui> button. You will be presented with some other options,
+depending on which protocol you have selected.</p>
 <figure>
   <title>Connect dialog</title>
   <media type="image" mime="image/png" src="figures/vinagre-connect-dialog.png"/>
 </figure>
-<p>You can also use the <gui>Find</gui> button to browse available computers on the local network.</p>
+<p>You can also use the <gui>Find</gui> button to browse available computers on
+the local network.</p>
 <note>
-<p>The availabity of the <gui>Find</gui> button depends on the protocol you have selected. <app>Vinagre</app> relies on <app>Avahi</app> to browse for machines on your local network. Also, note that <app>Vinagre</app> can be compiled without <app>Avahi</app> support. In this case, this button will not be displayed.</p>
+<p>The availabity of the <gui>Find</gui> button depends on the protocol you have
+selected. <app>Vinagre</app> relies on <app>Avahi</app> to browse for machines
+on your local network. Also, note that <app>Vinagre</app> can be compiled
+without <app>Avahi</app> support. In this case, this button will not be
+displayed.</p>
 </note>
-<p>Some machines may require a secure connection. In this case, an authentication dialog will be displayed asking for the credentials. The type of credentials depends on the server, it may be a password and a username. If you check <gui>Remember this credential</gui>, <app>Vinagre</app> will store the information using <app>GNOME Keyring</app>.</p>
+<p>Some machines may require a secure connection: an authentication dialog will
+be displayed, asking for the credentials. The type of credentials depend on the
+remote host, it may be a password and a username. If you select <gui>Remember
+this credential</gui>, <app>Vinagre</app> will store the information using
+<app>GNOME Keyring</app>.</p>
 <figure>
   <title>Authentication dialog</title>
   <media type="image" mime="image/png" src="figures/vinagre-auth-needed.png"/>
 </figure>
-<p>If the connection has been used previously, you can also access it through <guiseq><gui>Machine</gui><gui>Recent connections</gui></guiseq></p>
+<p>If the connection has been used previously, you can also access it through
+<guiseq><gui>Remote</gui><gui>Recent Connections</gui></guiseq></p>
 </section>
 
 <section id="connect-opening-file">
-<title>Opening a remote connection file</title>
-<p>Some hosts distribute remote connection files (generally ending with suffix <file>.vnc</file>) instead of using a host address and port. To open a remote connection file, choose <guiseq><gui>Machine</gui><gui>Open</gui></guiseq> (<keyseq><key>Ctrl</key><key>O</key></keyseq>). The file choser dialog is displayed. Select the file you want to open, then click on the <gui>Open</gui> button.</p>
+  <title>Opening a remote connection file</title>
+<p>Some hosts distribute remote connection files (generally ending with suffix
+<file>.vnc</file>) instead of using a host address and port. To open a remote
+connection file, choose <guiseq><gui>Remote</gui><gui>Open</gui></guiseq>. The
+file choser dialog is displayed. Select the file you want to open, then click
+the <gui>Open</gui> button.</p>
 <note style="tip">
-<p>You can also double-click on a remote connection file in <app>Nautilus</app> to open it with <app>Vinagre</app>.</p>
+<p>You can also double-click on a remote connection file in <app>Nautilus</app>
+to open it with <app>Vinagre</app>.</p>
 </note>
 </section>
 
 <!-- TODO: "Reverse Connections..." -->
 
 <section id="close">
-<title>Closing a connection</title>
-<p>To close a connection, choose <guiseq><gui>Machine</gui><gui>Close</gui></guiseq>.</p>
+  <title>Closing a connection</title>
+<p>To close a connection, choose <guiseq><gui>Remote</gui><gui>Close</gui></guiseq>.</p>
 </section>
 
 </page>
diff --git a/help/C/figures/vinagre-bookmarks-side-panel.png b/help/C/figures/vinagre-bookmarks-side-pane.png
similarity index 100%
rename from help/C/figures/vinagre-bookmarks-side-panel.png
rename to help/C/figures/vinagre-bookmarks-side-pane.png
diff --git a/help/C/preferences.page b/help/C/preferences.page
index 0c636a5..e06ef00 100755
--- a/help/C/preferences.page
+++ b/help/C/preferences.page
@@ -5,6 +5,7 @@
 
   <info>
     <link type="guide" xref="index"/>
+    <link type="seealso" xref="using"/>
     <title type="sort">4</title>
     <desc>Configuration options in Vinagre.</desc>
     <credit type="author">
@@ -17,15 +18,23 @@
   </info>
 
 <title>Preferences</title>
-<p>To configure <app>Vinagre</app>, choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>. The <gui>Preferences</gui> dialog contains the following items:</p>
+<p>To configure <app>Vinagre</app>, choose <guiseq><gui>Edit</gui>
+<gui>Preferences</gui></guiseq>. The <gui>Preferences</gui> dialog contains the
+following items:</p>
 <terms>
   <item>
     <title><gui>Always show tabs</gui></title>
-    <p>Select this option to make the tabs always visible, even when only one connection is active.</p>
+    <p>Select this option to make the display area tabs always visible, even
+when only one connection is active.</p>
   </item>
   <item>
     <title><gui>Allow keyboard shortcuts</gui></title>
-    <p>Select this option to enable keyboard shortcuts, like <gui>Ctrl+D</gui>, and menu accelerators, like <gui>Alt+M</gui>. This means that <app>Vinagre</app> will catch those key combinations, instead of sending them to the remote machine. This option is <gui>disabled</gui> by default because most of the time, you will be working on a remote machine.</p>
+    <p>Select this option to enable keyboard shortcuts, like
+<keyseq><key>Ctrl</key><key>D</key></keyseq>, menu accelerators and mnemonics,
+like <keyseq><key>Alt</key><key>M</key></keyseq>. This means that
+<app>Vinagre</app> will catch those key combinations, instead of sending them to
+the remote machine. This option is disabled by default because most
+of the time, you will be working on a remote machine.</p>
   </item>
 </terms>
 
diff --git a/help/C/using.page b/help/C/using.page
index d543bb3..3152d9d 100644
--- a/help/C/using.page
+++ b/help/C/using.page
@@ -20,33 +20,50 @@
 <title>Using Vinagre</title>
 
 <section id="fullscreen">
-<title>Using Fullscreen mode</title>
-<p>Choose <guiseq><gui>View</gui><gui>Fullscreen</gui></guiseq>, or press corresponding toolbar button, to view the display area in Fullscreen mode.</p>
+<title>Using fullscreen mode</title>
+<p>Choose <guiseq><gui>View</gui><gui>Fullscreen</gui></guiseq>, or press the
+corresponding toolbar button, to view the display area in fullscreen mode.</p>
 <note>
-<p>While in Fullscreen mode, move the mouse to the centre-top of the screen to display a hidden toolbar, which has a <gui>Leave Fullscreen</gui> button, <gui>Disconnect</gui> and other options.</p>
+<p>While in fullscreen mode, move the mouse to the top-center of the screen to
+display a hidden toolbar, which has a <gui>Leave Fullscreen</gui> button,
+<gui>Disconnect</gui> and other options.</p>
 </note>
 </section>
 
 <section id="screenshot">
 <title>Taking a screenshot</title>
-<p>Choose <guiseq><gui>Remote</gui><gui>Take screenshot</gui></guiseq>, or press the <gui>Take Screenshot</gui> button in the toolbar, to take a screenshot of the current remote desktop. The <gui>Save Screenshot</gui> dialog is displayed, click the <gui>Save</gui> button to save the screenshot.</p>
+<p>Choose <guiseq><gui>Remote</gui><gui>Take screenshot</gui></guiseq>, or press
+the <gui>Take Screenshot</gui> button in the toolbar, to take a screenshot of
+the current remote desktop. The <gui>Save Screenshot</gui> dialog is displayed.
+Choose a filename and click the <gui>Save</gui> button to save the screenshot.</p>
 </section>
 
 <section id="scaling">
 <title>Scaling a remote desktop</title>
-<p>Choose <guiseq><gui>View</gui><gui>Scaling</gui></guiseq>, or press the <gui>Scaling</gui> toolbar button, to scale the remote desktop to the current display area size.</p>
+<p>Choose <guiseq><gui>View</gui><gui>Scaling</gui></guiseq>, or click the
+<gui>Scaling</gui> toolbar button, to scale the remote desktop to fill the
+current display area.</p>
 <note>
-<p>You can constrain the aspect ratio of the remote desktop inside the display area by selecting <guiseq><gui>View</gui><gui>Keep Aspect Ratio</gui></guiseq>, or deselect the option to stretch the remote desktop to fill the available space.</p>
+<p>Select <guiseq><gui>View</gui><gui>Keep Aspect Ratio</gui></guiseq> to
+contrain the aspect ratio of the remote desktop inside the display area, or
+deselect the option to stretch the remote desktop to fill the available space.</p>
 </note>
 </section>
 
 <section id="view-only">
 <title>Using view only mode</title>
-<p>Some protocols allow you to enable a <gui>View Only</gui> mode. Choose <guiseq><gui>View</gui><gui>View Only</gui></guiseq> or press the corresponding toolbar button to enable this mode.</p>
+<p>Some protocols allow you to enable a <gui>View Only</gui> mode. Choose
+<guiseq><gui>View</gui><gui>View Only</gui></guiseq> or click the corresponding
+toolbar button to enable this mode.</p>
 </section>
 
 <section id="ctrl-alt-delete">
 <title>Sending <keyseq><key>Ctrl</key><key>Alt</key><key>Delete</key></keyseq></title>
-<p><keyseq><key>Ctrl</key><key>Alt</key><key>Delete</key></keyseq> is the only key combination which will not be automatically sent to the remote desktop. Choose <guiseq><gui>Remote</gui><gui>Send Ctrl-Alt-Delete</gui></guiseq>, or use the corresponding toolbar button, to send this key combination.</p>
+<p>When the <gui>Allow keyboard shortcuts</gui> option is disabled in the
+preferences, <keyseq><key>Ctrl</key><key>Alt</key><key>Delete</key></keyseq> is
+the only key combination which will not be sent to the remote desktop. Choose
+<guiseq><gui>Remote</gui><gui>Send Ctrl-Alt-Delete</gui></guiseq>, or use the
+corresponding toolbar button, to send this key combination.</p>
 </section>
+
 </page>
diff --git a/help/Makefile.am b/help/Makefile.am
index 6d47f3d..c8db6fa 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -6,7 +6,7 @@ DOC_ID = $(PACKAGE_TARNAME)
 DOC_FIGURES = \
 	figures/vinagre-screenshot.png	\
 	figures/vinagre-auth-needed.png	\
-	figures/vinagre-bookmarks-side-panel.png	\
+	figures/vinagre-bookmarks-side-pane.png \
 	figures/vinagre-connect-dialog.png	\
 	figures/vinagre-editing-bookmarks.png	\
 	figures/vinagre-saving-bookmarks.png
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]