[QGIS Commit] r14184 - in docs/branches/1.5.0/russian/user_guide: .
features_at_a_glance_screenies grass_integration_screenies
operating_system_icons plugins_diagram_overlay_images
plugins_oracle_raster_images print_composer_screenies
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Thu Sep 2 14:30:55 EDT 2010
Author: alexbruy
Date: 2010-09-02 18:30:55 +0000 (Thu, 02 Sep 2010)
New Revision: 14184
Modified:
docs/branches/1.5.0/russian/user_guide/
docs/branches/1.5.0/russian/user_guide/core_plugins.tex
docs/branches/1.5.0/russian/user_guide/external_plugins.tex
docs/branches/1.5.0/russian/user_guide/features_at_a_glance.tex
docs/branches/1.5.0/russian/user_guide/features_at_a_glance_screenies/
docs/branches/1.5.0/russian/user_guide/foreword.tex
docs/branches/1.5.0/russian/user_guide/grass_integration_screenies/grass_digitizing_category.png
docs/branches/1.5.0/russian/user_guide/grass_integration_screenies/grasslogo.png
docs/branches/1.5.0/russian/user_guide/help_and_support.tex
docs/branches/1.5.0/russian/user_guide/operating_system_icons/
docs/branches/1.5.0/russian/user_guide/plugins.tex
docs/branches/1.5.0/russian/user_guide/plugins_diagram_overlay_images/
docs/branches/1.5.0/russian/user_guide/plugins_evis.tex
docs/branches/1.5.0/russian/user_guide/plugins_mapserver_export.tex
docs/branches/1.5.0/russian/user_guide/plugins_oracle_raster_images/
docs/branches/1.5.0/russian/user_guide/plugins_table_manager.tex
docs/branches/1.5.0/russian/user_guide/print_composer.tex
docs/branches/1.5.0/russian/user_guide/print_composer_screenies/
docs/branches/1.5.0/russian/user_guide/qgis_style.sty
docs/branches/1.5.0/russian/user_guide/user_guide.tex
Log:
merge manual fixes from trunk
Property changes on: docs/branches/1.5.0/russian/user_guide
___________________________________________________________________
Added: svn:mergeinfo
+ /docs/trunk/english_us/user_guide:14097-14183
Property changes on: docs/branches/1.5.0/russian/user_guide/core_plugins.tex
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: docs/branches/1.5.0/russian/user_guide/external_plugins.tex
===================================================================
--- docs/branches/1.5.0/russian/user_guide/external_plugins.tex 2010-09-02 16:15:25 UTC (rev 14183)
+++ docs/branches/1.5.0/russian/user_guide/external_plugins.tex 2010-09-02 18:30:55 UTC (rev 14184)
@@ -20,6 +20,8 @@
but they are also part of the QGIS sources, and are automatically loaded and
enabled inside the QGIS Plugin Manager (see Section~\ref{sec:load_external_plugin}).}
+%%FIXME: URL to Download
+
You will find an up-to-date list of 'Official' plugins in the Official QGIS
Repository at \url{http://qgis.osgeo.org/download/plugins.html}. This list is
also available automatically from the \filename{Plugins installer}
@@ -29,7 +31,7 @@
\begin{table}[H]
\centering
\begin{tabular}{|l|l|p{8cm}|}
-\hline \textbf{Icône} & \textbf{Extension externe} & \textbf{Description}\\
+\hline \textbf{Icon} & \textbf{External Plugin} & \textbf{Description}\\
\hline
\includegraphics[width=0.7cm]{zoom2point_icon}
& Zoom To Point \index{plugins!Zoom To Point} & Zooms to a coordinate
Modified: docs/branches/1.5.0/russian/user_guide/features_at_a_glance.tex
===================================================================
--- docs/branches/1.5.0/russian/user_guide/features_at_a_glance.tex 2010-09-02 16:15:25 UTC (rev 14183)
+++ docs/branches/1.5.0/russian/user_guide/features_at_a_glance.tex 2010-09-02 18:30:55 UTC (rev 14184)
@@ -1192,7 +1192,7 @@
docked Window on the left side of the canvas.
There are 4 possible screens in this GPS tracking window
-(see Figure \ref{fig:gpstrack_live}).
+(see Figure \ref{fig:gpstrack_live} and Figure \ref{fig:gpstrack_options}).
\begin{description}
\item[(a)] \includegraphics[width=0.5cm,clip=true]{mActionToggleEditing}
@@ -1202,7 +1202,7 @@
\item[(c)] \includegraphics[width=0.5cm,clip=true]{gpstrack_polarchart}
GPS polar screen showing number and polar position of satellites
\item[(d)] \includegraphics[width=0.5cm,clip=true]{mActionOptions}
-GPS options screen (see figure \ref{fig:gpstrack_options}).
+GPS options screen (see Figure \ref{fig:gpstrack_options}).
\end{description}
With a plugged in GPS receiver (has to be supported by your operating system)
@@ -1220,6 +1220,7 @@
\subfloat[GPS signal strenght]{\label{subfig:gpstrack_stren}\includegraphics[clip=true, width=0.3\textwidth]{gpstrack_stren}}
\hspace{0.33cm}
\subfloat[GPS polar window]{\label{subfig:gpstrack_polar}\includegraphics[clip=true, width=0.3\textwidth]{gpstrack_polar}} \\
+\caption{Live GPS tracking \nixcaption} \label{fig:gpstrack_live}
\end{figure}
\subsection{Position coordinates}
Property changes on: docs/branches/1.5.0/russian/user_guide/features_at_a_glance_screenies
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: docs/branches/1.5.0/russian/user_guide/foreword.tex
===================================================================
--- docs/branches/1.5.0/russian/user_guide/foreword.tex 2010-09-02 16:15:25 UTC (rev 14183)
+++ docs/branches/1.5.0/russian/user_guide/foreword.tex 2010-09-02 18:30:55 UTC (rev 14184)
@@ -2,8 +2,9 @@
\mainmatter
\pagestyle{scrheadings}
\addchap{Foreword}\label{label_forward}
+\pagenumbering{arabic}
+\setcounter{page}{1}
-
% when the revision of a section has been finalized,
% comment out the following line:
% \updatedisclaimer
Property changes on: docs/branches/1.5.0/russian/user_guide/grass_integration_screenies/grass_digitizing_category.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: docs/branches/1.5.0/russian/user_guide/grass_integration_screenies/grasslogo.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: docs/branches/1.5.0/russian/user_guide/help_and_support.tex
===================================================================
--- docs/branches/1.5.0/russian/user_guide/help_and_support.tex 2010-09-02 16:15:25 UTC (rev 14183)
+++ docs/branches/1.5.0/russian/user_guide/help_and_support.tex 2010-09-02 18:30:55 UTC (rev 14184)
@@ -71,7 +71,7 @@
\url{irc.freenode.net}. Please wait around for a response to your question as many
folks on the channel are doing other things and it may take a while for them to
notice your question. Commercial support for QGIS is also available.
-Check the website \url{http://qgis.org/content/view/90/91} for more information.
+Check the website \url{http://qgis.org/en/commercial-support.html} for more information.
If you missed a discussion on IRC, not a problem! We log all discussion so you can
easily catch up. Just go to \url{http://logs.qgis.org} and read the IRC-logs.
Property changes on: docs/branches/1.5.0/russian/user_guide/operating_system_icons
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: docs/branches/1.5.0/russian/user_guide/plugins.tex
===================================================================
--- docs/branches/1.5.0/russian/user_guide/plugins.tex 2010-09-02 16:15:25 UTC (rev 14183)
+++ docs/branches/1.5.0/russian/user_guide/plugins.tex 2010-09-02 18:30:55 UTC (rev 14184)
@@ -8,7 +8,7 @@
QGIS has been designed with a plugin architecture.
This allows new features/functions to be easily added to the application.
-Many of the features in QGIS are actually implemented as \textbf{core}
+Many of the features in QGIS are actually implemented as either \textbf{core}
or \textbf{external} plugins.\index{plugins!types}
\begin{itemize}[label=--]
@@ -154,7 +154,7 @@
In addition, you may specify the type of plugins that are displayed by the \filename{Plugin Installer}. Under \textit{Allowed plugins}, you can specify whether you would like to:
\begin{itemize}[label=--]
-\item Only show plugins from the official repository
+\item Only show plugins from the official repository,
\item Show all plugins except those marked as experimental,
\item or Show all plugins, even those marked as experimental.
\end{itemize}
Property changes on: docs/branches/1.5.0/russian/user_guide/plugins.tex
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: docs/branches/1.5.0/russian/user_guide/plugins_diagram_overlay_images
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: docs/branches/1.5.0/russian/user_guide/plugins_evis.tex
===================================================================
--- docs/branches/1.5.0/russian/user_guide/plugins_evis.tex 2010-09-02 16:15:25 UTC (rev 14183)
+++ docs/branches/1.5.0/russian/user_guide/plugins_evis.tex 2010-09-02 18:30:55 UTC (rev 14184)
@@ -49,7 +49,7 @@
\begin{figure}[ht]
\centering
\includegraphics[clip=true, width=12cm]{evisdisplay}
- \caption{\label{evisdisplay}The \emph{eVis} display window \wincaption}
+ \caption{The \emph{eVis} display window \wincaption}\label{evisdisplay}
\end{figure}
\begin{itemize}[label=--]
@@ -76,7 +76,7 @@
\begin{figure}[ht]
\centering
\includegraphics[clip=true, width=12cm]{evisoptions}
- \caption{\label{evisoptions}The \emph{eVis} Options window \wincaption}
+ \caption{The \emph{eVis} Options window \wincaption}\label{evisoptions}
\end{figure}
\begin{itemize}[label=--]
@@ -116,7 +116,7 @@
\begin{figure}[htp]
\centering
\includegraphics[clip=true, width=12cm]{evisexternal}
- \caption{\label{evisexternal}The \emph{eVis} External Applications window \wincaption}
+ \caption{The \emph{eVis} External Applications window \wincaption}\label{evisexternal}
\end{figure}
\begin{itemize}[label=--]
@@ -136,10 +136,10 @@
the photograph is available on a web server. Examples of the different approaches are listed in
Table \ref{tab:evis_examples}.
-\begin{table}[htp]\label{tab:evis_examples}\index{plugins!evis}
+\begin{table}[htp]\index{plugins!evis}
\centering
\caption{Example format using absolute path, relative path, and a
-URL}\medskip
+URL}\label{tab:evis_examples}\medskip
\begin{tabular}{|p{0.55in}|p{0.55in}|p{4.7in}|p{0.7in}|}
\hline \textbf{X} & \textbf{Y} & \textbf{FILE} & \textbf{BEARING}\\
\hline 780596 & 1784017 & \filename{C:\textbackslash Workshop\textbackslash
@@ -254,7 +254,7 @@
\begin{figure}[ht]
\centering
\includegraphics[clip=true, width=12cm]{evisdatabase}
- \caption{\label{evisdatabase}The \emph{eVis} Database connection window \wincaption}
+ \caption{The \emph{eVis} Database connection window \wincaption}\label{evisdatabase}
\end{figure}
\begin{itemize}[label=--]
@@ -293,7 +293,7 @@
\begin{figure}[ht]
\centering
\includegraphics[clip=true, width=12cm]{evissql_query}
- \caption{\label{evissql_query}The \emph{eVis} SQL query tab \wincaption}
+ \caption{The \emph{eVis} SQL query tab \wincaption}\label{evissql_query}
\end{figure}
\begin{itemize}[label=--]
@@ -349,7 +349,7 @@
\begin{figure}[htp]
\centering
\includegraphics[clip=true, width=10cm]{evispredefined}
- \caption{\label{evispredefined}The \emph{eVis} Perdefined queries tab \wincaption}
+ \caption{The \emph{eVis} Perdefined queries tab \wincaption}\label{evispredefined}
\end{figure}
\begin{itemize}[label=--]
Property changes on: docs/branches/1.5.0/russian/user_guide/plugins_mapserver_export.tex
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: docs/branches/1.5.0/russian/user_guide/plugins_oracle_raster_images
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: docs/branches/1.5.0/russian/user_guide/plugins_table_manager.tex
===================================================================
--- docs/branches/1.5.0/russian/user_guide/plugins_table_manager.tex 2010-09-02 16:15:25 UTC (rev 14183)
+++ docs/branches/1.5.0/russian/user_guide/plugins_table_manager.tex 2010-09-02 18:30:55 UTC (rev 14184)
@@ -20,4 +20,4 @@
Therefore click the menu \mainmenuopt{Plugins} >
\mainmenuopt{Manage Plugins}, select \dropmenuopt{Table Manager} and click
\button{OK}. A new \toolbtntwo{tableManagerIcon}{Table Manager} icon occurs
-in the toolbar. icon appears in the toolbar menu.
+in the toolbar.
Modified: docs/branches/1.5.0/russian/user_guide/print_composer.tex
===================================================================
--- docs/branches/1.5.0/russian/user_guide/print_composer.tex 2010-09-02 16:15:25 UTC (rev 14183)
+++ docs/branches/1.5.0/russian/user_guide/print_composer.tex 2010-09-02 18:30:55 UTC (rev 14184)
@@ -292,7 +292,7 @@
\begin{itemize}[label=--]
\item Here you can define color and outline width for the element frame, set
-a background color and opacity for the map canvas. The \button{Position}
+a background color and opacity for the label. The \button{Position}
button opens the \dialog{Set items position} dialog and allows to set the map
canvas position using reference points or coordinates. Furthermore you can
select or unselect to display the element frame with the \checkbox{Show
@@ -338,7 +338,7 @@
\begin{itemize}[label=--]
\item Here you can define color and outline width for the element frame, set
-a background color and opacity for the map canvas. The \button{Position}
+a background color and opacity for the picture. The \button{Position}
button opens the \dialog{Set items position} dialog and allows to set the map
canvas position using reference points or coordinates. Furthermore you can
select or unselect to display the element frame with the \checkbox{Show
@@ -380,9 +380,9 @@
\begin{itemize}[label=--]
\item The legend items window lists all legend items and allows to change
item order, edit layer names, remove and restore items of the list. After
-changing the symbology in the QGIS main window you can click on update to
+changing the symbology in the QGIS main window you can click on \button{Update} to
adapt the changes in the legend element of the print composer. The item oder
-can be changed using the Up and Down buttons or with Drag and Drop
+can be changed using the \button{Up} and \button{Down} buttons or with Drag and Drop
functionality.
\end{itemize}
@@ -393,7 +393,7 @@
\begin{itemize}[label=--]
\item Here you can define color and outline width for the element frame, set
-a background color and opacity for the map canvas. The \button{Position}
+a background color and opacity for the legend. The \button{Position}
button opens the \dialog{Set items position} dialog and allows to set the map
canvas position using reference points or coordinates. Furthermore you can
select or unselect to display the element frame with the \checkbox{Show
@@ -436,7 +436,7 @@
\begin{itemize}[label=--]
\item Here you can define color and outline width for the element frame, set
-a background color and opacity for the map canvas. The \button{Position}
+a background color and opacity for the scalebar. The \button{Position}
button opens the \dialog{Set items position} dialog and allows to set the map
canvas position using reference points or coordinates. Furthermore you can
select or unselect to display the element frame with the \checkbox{Show
@@ -448,7 +448,7 @@
For map navigation the print composer provides 4 general tools:
\begin{itemize}[label=--]
-\item \toolbtntwo{mActionZoomOut}{Zoom in},
+\item \toolbtntwo{mActionZoomIn}{Zoom in},
\item \toolbtntwo{mActionZoomOut}{Zoom out},
\item \toolbtntwo{mActionZoomFullExtent}{Zoom to full extend} and
\item \toolbtntwo{mActionDraw}{Refresh the view}, if you find the view in an
@@ -511,7 +511,7 @@
\begin{itemize}[label=--]
\item Here you can define color and outline width for the element frame, set
-a background color and opacity for the map canvas. The \button{Position}
+a background color and opacity for the table. The \button{Position}
button opens the \dialog{Set items position} dialog and allows to set the map
canvas position using reference points or coordinates. Furthermore you can
select or unselect to display the element frame with the \checkbox{Show
Property changes on: docs/branches/1.5.0/russian/user_guide/print_composer.tex
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: docs/branches/1.5.0/russian/user_guide/print_composer_screenies
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: docs/branches/1.5.0/russian/user_guide/qgis_style.sty
===================================================================
--- docs/branches/1.5.0/russian/user_guide/qgis_style.sty 2010-09-02 16:15:25 UTC (rev 14183)
+++ docs/branches/1.5.0/russian/user_guide/qgis_style.sty 2010-09-02 18:30:55 UTC (rev 14184)
@@ -2,19 +2,25 @@
% % !TEX encoding = utf8
% !TEX TS-program = pdflatex
+%%% Start with roman page numbers and change in section foreword
+\pagenumbering{roman}
%%% encoding, utf8 should work for any localization
\usepackage[utf8]{inputenc}
\usepackage[T1]{fontenc}
-
%%% font settings
\usepackage{helvet}
\renewcommand{\sfdefault}{phv} % switch \sf to Helvetica T1
\renewcommand*{\familydefault}{\sfdefault}
\usepackage{numprint}
-% hypertext links
+%%% spacing and paragraph style
+\renewcommand{\baselinestretch}{1.1}
+\parskip1.5ex
+\parindent 0pt
+
+%%% hypertext links
\usepackage[bookmarks=true, pdftitle={QGIS User Guide}, pdfauthor={QGIS Project}, pdfsubject={QGIS User Guide}, breaklinks=true, colorlinks=true, linkcolor=blue, urlcolor=red]{hyperref}
%%% images
Modified: docs/branches/1.5.0/russian/user_guide/user_guide.tex
===================================================================
--- docs/branches/1.5.0/russian/user_guide/user_guide.tex 2010-09-02 16:15:25 UTC (rev 14183)
+++ docs/branches/1.5.0/russian/user_guide/user_guide.tex 2010-09-02 18:30:55 UTC (rev 14184)
@@ -57,8 +57,8 @@
\input{plugins_quick_print}
\input{other_core_plugins}
\input{external_plugins}
-\input{plugins_table_manager}
-\input{plugins_raster_algebra}
+%\input{plugins_table_manager}
+%\input{plugins_raster_algebra}
%end of plugin docs
\input{help_and_support}
\appendix
More information about the QGIS-commit
mailing list