SF.net SVN: geany:[5805] branches/sm
statc at users.sourceforge.net
statc at xxxxx
Sat May 21 08:52:12 UTC 2011
Revision: 5805
http://geany.svn.sourceforge.net/geany/?rev=5805&view=rev
Author: statc
Date: 2011-05-21 08:52:12 +0000 (Sat, 21 May 2011)
Log Message:
-----------
Merge trunk (revisions 5621..5640)
Conflicts:
src/Makefile.am
src/main.c
wscript
Modified Paths:
--------------
branches/sm/ChangeLog
branches/sm/configure.ac
branches/sm/data/filetypes.vala
branches/sm/doc/geany.html
branches/sm/doc/geany.txt
branches/sm/geany.glade
branches/sm/plugins/classbuilder.c
branches/sm/plugins/filebrowser.c
branches/sm/plugins/saveactions.c
branches/sm/plugins/splitwindow.c
branches/sm/po/ChangeLog
branches/sm/po/de.po
branches/sm/src/Makefile.am
branches/sm/src/callbacks.c
branches/sm/src/callbacks.h
branches/sm/src/dialogs.c
branches/sm/src/document.c
branches/sm/src/document.h
branches/sm/src/editor.c
branches/sm/src/editor.h
branches/sm/src/encodings.c
branches/sm/src/filetypes.c
branches/sm/src/geanyentryaction.c
branches/sm/src/highlighting.c
branches/sm/src/interface.c
branches/sm/src/interface.h
branches/sm/src/keybindings.c
branches/sm/src/keyfile.c
branches/sm/src/log.c
branches/sm/src/main.c
branches/sm/src/makefile.win32
branches/sm/src/plugins.c
branches/sm/src/printing.c
branches/sm/src/project.c
branches/sm/src/search.c
branches/sm/src/sidebar.c
branches/sm/src/socket.c
branches/sm/src/toolbar.c
branches/sm/src/tools.c
branches/sm/src/ui_utils.c
branches/sm/src/ui_utils.h
branches/sm/src/utils.c
branches/sm/src/utils.h
branches/sm/src/vte.c
branches/sm/wscript
Modified: branches/sm/ChangeLog
===================================================================
--- branches/sm/ChangeLog 2011-05-21 08:50:00 UTC (rev 5804)
+++ branches/sm/ChangeLog 2011-05-21 08:52:12 UTC (rev 5805)
@@ -1,3 +1,41 @@
+2011-03-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/makefile.win32, src/main.c, src/Makefile.am, configure.ac,
+ wscript:
+ Initialize GLib's Gthread system early at startup in case any
+ plugins need it.
+
+
+2011-03-26 Colomban Wendling <colomban(at)geany(dot)org>
+
+ * src/sidebar.c:
+ Fix the sidebar popup menu to properly use the currently selected item
+ rather than the previous one.
+ Also change the hack used for the selection to be updated in the input
+ handlers to call the GtkTreeView's handler manually rather than doing
+ the actual job in IDLE callbacks for the TreeView's handler to have run.
+ * doc/geany.html, doc/geany.txt, geany.glade, src/document.c,
+ src/editor.h, src/interface.c, src/interface.h, src/keyfile.c,
+ src/project.c:
+ Add possibility to detect the indentation width from the file content
+ (not supported if indentation type is tabs only).
+ * plugins/splitwindow.c:
+ Enable code folding in splitview window (based on a patch by Matthew
+ Brush, thanks! - closes #3097780).
+ Fix confusing terminology in Split Window plugin menu labels (patch
+ by Matthew Brush - closes #2796316).
+ Don't unsplit when closing the displayed document but rather pick the
+ new current one if any.
+
+
+2011-03-25 Colomban Wendling <colomban(at)geany(dot)org>
+
+ * data/filetypes.vala:
+ Update Vala keywords (based on a patch from Matthew Brush, thanks).
+ * data/document.c:
+ Small code cleanups.
+
+
2011-03-24 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* plugins/filebrowser.c:
@@ -2,2 +40,8 @@
Add history to filter entry.
+ * src/keybindings.c, src/vte.c:
+ Add fixed shortcuts for VTE copy (Ctrl-Shift-C) and paste
+ (Ctrl-Shift-V).
+ * src/keybindings.c:
+ Make VTE copy/paste shortcuts work if 'Override Geany
+ keybindings' is not set.
@@ -8,6 +52,17 @@
* doc/geany.txt, doc/geany.html:
Update the documentation to talk about real-time tag parsing.
+ * doc/geany.txt, doc/geany.html, src/callbacks.c, src/callbacks.h,
+ src/document.c, src/document.h, src/geanyentryaction.c,
+ src/search.c, src/toolbar.c, src/ui_utils.c, src/ui_utils.h:
+ Make Shift-Enter in search dialog and toolbar search entries search
+ backwards.
+ * plugins/filebrowser.c, plugins/saveactions.c, src/callbacks.c,
+ src/dialogs.c, src/document.c, src/document.h, src/editor.c,
+ src/encodings.c, src/filetypes.c, src/highlighting.c, src/log.c,
+ src/main.c, src/plugins.c, src/printing.c, src/project.c, src/search.c,
+ src/socket.c, src/toolbar.c, src/utils.c, src/utils.h:
+ Improve usage of G_LIKELY() and G_UNLIKELY() macros.
2011-03-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: branches/sm/configure.ac
===================================================================
--- branches/sm/configure.ac 2011-05-21 08:50:00 UTC (rev 5804)
+++ branches/sm/configure.ac 2011-05-21 08:52:12 UTC (rev 5805)
@@ -146,6 +146,11 @@
if test $have_gio = 1 ; then
AC_DEFINE(HAVE_GIO, 1, [Whether GIO is available])
fi
+# GTHREAD checks
+gthread_modules="gthread-2.0"
+PKG_CHECK_MODULES(GTHREAD, [$gthread_modules])
+AC_SUBST(GTHREAD_CFLAGS)
+AC_SUBST(GTHREAD_LIBS)
# --disable-deprecated switch for GTK2 purification
AC_ARG_ENABLE(deprecated, [ --disable-deprecated Disable deprecated GTK functions. ],
Modified: branches/sm/data/filetypes.vala
===================================================================
--- branches/sm/data/filetypes.vala 2011-05-21 08:50:00 UTC (rev 5804)
+++ branches/sm/data/filetypes.vala 2011-05-21 08:52:12 UTC (rev 5805)
@@ -26,10 +26,10 @@
[keywords]
# all items must be in one line
-primary=else if switch case default break continue return for foreach in do while is try catch finally throw namespace interface class struct enum signal errordomain construct callback get set base const static var weak virtual abstract override inline extern public protected private delegate out ref lock using true false null generic new delete base this value typeof sizeof throws requires ensures void bool char uchar int uint short ushort long ulong size_t ssize_t int8 uint8 int16 uint16 int32 uint32 int64 uint64 float double unichar string constpointer time_t
+primary=abstract as async base bool break callback case catch char class const constpointer construct continue default delegate delete do double dynamic else ensures enum errordomain extern false finally float for foreach generic get global if in inline int int16 int32 int64 int8 interface internal is lock long namespace new null out override owned private protected public ref requires return set sealed short signal size_t sizeof ssize_t static string struct switch this throw throws time_t true try typeof uchar uint uint16 uint32 uint64 uint8 ulong unichar unowned ushort using value var virtual void weak while yield
#secondary=
-# these are some doxygen keywords (incomplete)
-docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union
+# these are some doxygen and valadoc keywords (incomplete)
+docComment=attention author brief bug class code date def deprecated enum example exception file fn inheritDoc link namespace note param remarks return see since struct throw throws todo typedef union var version warning
[lexer_properties]
styling.within.preprocessor=1
Modified: branches/sm/doc/geany.html
===================================================================
--- branches/sm/doc/geany.html 2011-05-21 08:50:00 UTC (rev 5804)
+++ branches/sm/doc/geany.html 2011-05-21 08:52:12 UTC (rev 5805)
@@ -1578,7 +1578,8 @@
<h4><a class="toc-backref" href="#id60">Search bar</a></h4>
<p>The quickest way to find some text is to use the search bar entry in
the toolbar. This performs a case-insensitive search in the current
-document whilst you type. Pressing Enter will search again.</p>
+document whilst you type. Pressing Enter will search again, and pressing
+Shift-Enter will search backwards.</p>
</div>
</div>
<div class="section" id="find">
@@ -2337,6 +2338,12 @@
<h4><a class="toc-backref" href="#id105">Indentation group</a></h4>
<p>See <a class="reference internal" href="#indentation">Indentation</a> for more information.</p>
<dl class="docutils">
+<dt>Width</dt>
+<dd>The width of a single indent size in spaces. By default the indent
+size is equivalent to 4 spaces.</dd>
+<dt>Detect width from file</dt>
+<dd>Try to detect and set the indent width based on file content, when
+a file is opened.</dd>
<dt>Type</dt>
<dd><p class="first">When Geany inserts indentation, whether to use:</p>
<ul class="simple">
@@ -2347,10 +2354,7 @@
<p class="last">The <em>Tabs and Spaces</em> indent type is also known as <em>Soft tab
support</em> in some other editors.</p>
</dd>
-<dt>Width</dt>
-<dd>The width of a single indent size in spaces. By default the indent
-size is equivalent to 4 spaces.</dd>
-<dt>Detect from file</dt>
+<dt>Detect type from file</dt>
<dd>Try to detect and set the indent type based on file content, when
a file is opened.</dd>
<dt>Auto-indent mode</dt>
@@ -6483,7 +6487,7 @@
<div class="footer">
<hr class="footer" />
<a class="reference external" href="geany.txt">View document source</a>.
-Generated on: 2011-03-24 02:06 UTC.
+Generated on: 2011-03-26 17:15 UTC.
Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
Modified: branches/sm/doc/geany.txt
===================================================================
--- branches/sm/doc/geany.txt 2011-05-21 08:50:00 UTC (rev 5804)
+++ branches/sm/doc/geany.txt 2011-05-21 08:52:12 UTC (rev 5805)
@@ -1167,7 +1167,8 @@
``````````
The quickest way to find some text is to use the search bar entry in
the toolbar. This performs a case-insensitive search in the current
-document whilst you type. Pressing Enter will search again.
+document whilst you type. Pressing Enter will search again, and pressing
+Shift-Enter will search backwards.
Find
^^^^
@@ -1992,6 +1993,14 @@
See `Indentation`_ for more information.
+Width
+ The width of a single indent size in spaces. By default the indent
+ size is equivalent to 4 spaces.
+
+Detect width from file
+ Try to detect and set the indent width based on file content, when
+ a file is opened.
+
Type
When Geany inserts indentation, whether to use:
@@ -2002,11 +2011,7 @@
The *Tabs and Spaces* indent type is also known as *Soft tab
support* in some other editors.
-Width
- The width of a single indent size in spaces. By default the indent
- size is equivalent to 4 spaces.
-
-Detect from file
+Detect type from file
Try to detect and set the indent type based on file content, when
a file is opened.
Modified: branches/sm/geany.glade
===================================================================
--- branches/sm/geany.glade 2011-05-21 08:50:00 UTC (rev 5804)
+++ branches/sm/geany.glade 2011-05-21 08:52:12 UTC (rev 5805)
@@ -6171,16 +6171,16 @@
<child>
<widget class="GtkTable" id="table13">
<property name="visible">True</property>
- <property name="n_rows">6</property>
+ <property name="n_rows">7</property>
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
<property name="row_spacing">3</property>
<property name="column_spacing">24</property>
<child>
- <widget class="GtkLabel" id="label183">
+ <widget class="GtkLabel" id="label222">
<property name="visible">True</property>
- <property name="label" translatable="yes">Auto-indent mode:</property>
+ <property name="label" translatable="yes">Width:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -6198,37 +6198,39 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combo_auto_indent_mode">
+ <widget class="GtkSpinButton" id="spin_indent_width">
<property name="visible">True</property>
- <property name="items" translatable="yes">None
-Basic
-Current chars
-Match braces</property>
- <property name="add_tearoffs">False</property>
- <property name="focus_on_click">True</property>
+ <property name="tooltip" translatable="yes">The width in chars of a single indent</property>
+ <property name="can_focus">True</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">0</property>
+ <property name="numeric">True</property>
+ <property name="update_policy">GTK_UPDATE_IF_VALID</property>
+ <property name="snap_to_ticks">False</property>
+ <property name="wrap">True</property>
+ <property name="adjustment">1 1 99 1 10 0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">fill</property>
- <property name="y_options">fill</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label200">
+ <widget class="GtkLabel" id="label183">
<property name="visible">True</property>
- <property name="label" translatable="yes">Type:</property>
+ <property name="label" translatable="yes">Auto-indent mode:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -6246,69 +6248,62 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label222">
+ <widget class="GtkComboBox" id="combo_auto_indent_mode">
<property name="visible">True</property>
- <property name="label" translatable="yes">Width:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
+ <property name="items" translatable="yes">None
+Basic
+Current chars
+Match braces</property>
+ <property name="add_tearoffs">False</property>
+ <property name="focus_on_click">True</property>
</widget>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
<property name="x_options">fill</property>
- <property name="y_options"></property>
+ <property name="y_options">fill</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="spin_indent_width">
+ <widget class="GtkCheckButton" id="check_detect_indent_type">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">The width in chars of a single indent</property>
+ <property name="tooltip" translatable="yes">Whether to detect the indentation type from file contents when a file is opened</property>
<property name="can_focus">True</property>
- <property name="climb_rate">1</property>
- <property name="digits">0</property>
- <property name="numeric">True</property>
- <property name="update_policy">GTK_UPDATE_IF_VALID</property>
- <property name="snap_to_ticks">False</property>
- <property name="wrap">True</property>
- <property name="adjustment">1 1 99 1 10 0</property>
+ <property name="label" translatable="yes">Detect type from file</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radio_indent_spaces">
+ <widget class="GtkRadioButton" id="radio_indent_both">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Use spaces when inserting indentation</property>
+ <property name="tooltip" translatable="yes">Use spaces if the total indent is less than the tab width, otherwise use both</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Spaces</property>
+ <property name="label" translatable="yes">T_abs and spaces</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -6319,67 +6314,67 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radio_indent_tabs">
+ <widget class="GtkRadioButton" id="radio_indent_spaces">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Use one tab per indent</property>
+ <property name="tooltip" translatable="yes">Use spaces when inserting indentation</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Tabs</property>
+ <property name="label" translatable="yes">_Spaces</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
- <property name="group">radio_indent_spaces</property>
+ <property name="group">radio_indent_both</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radio_indent_both">
+ <widget class="GtkRadioButton" id="radio_indent_tabs">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Use spaces if the total indent is less than the tab width, otherwise use both</property>
+ <property name="tooltip" translatable="yes">Use one tab per indent</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">T_abs and spaces</property>
+ <property name="label" translatable="yes">_Tabs</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
- <property name="group">radio_indent_spaces</property>
+ <property name="group">radio_indent_both</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="check_detect_indent">
+ <widget class="GtkCheckButton" id="check_detect_indent_width">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Whether to detect the indentation type from file contents when a file is opened</property>
+ <property name="tooltip" translatable="yes">Whether to detect the indentation width from file contents when a file is opened</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Detect from file</property>
+ <property name="label" translatable="yes">Detect width from file</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -6390,12 +6385,40 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkLabel" id="label200">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Type:</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -10161,16 +10184,16 @@
<widget class="GtkTable" id="table17">
<property name="border_width">6</property>
<property name="visible">True</property>
- <property name="n_rows">6</property>
+ <property name="n_rows">7</property>
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
<property name="row_spacing">3</property>
<property name="column_spacing">24</property>
<child>
- <widget class="GtkLabel" id="label228">
+ <widget class="GtkLabel" id="label230">
<property name="visible">True</property>
- <property name="label" translatable="yes">Auto-indent mode:</property>
+ <property name="label" translatable="yes">Width:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -10188,37 +10211,39 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combo_auto_indent_mode">
+ <widget class="GtkSpinButton" id="spin_indent_width">
<property name="visible">True</property>
- <property name="items" translatable="yes">None
-Basic
-Current chars
-Match braces</property>
- <property name="add_tearoffs">False</property>
- <property name="focus_on_click">True</property>
+ <property name="tooltip" translatable="yes">The width in chars of a single indent</property>
+ <property name="can_focus">True</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">0</property>
+ <property name="numeric">True</property>
+ <property name="update_policy">GTK_UPDATE_IF_VALID</property>
+ <property name="snap_to_ticks">False</property>
+ <property name="wrap">True</property>
+ <property name="adjustment">1 1 99 1 10 0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">fill</property>
- <property name="y_options">fill</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label229">
+ <widget class="GtkLabel" id="label228">
<property name="visible">True</property>
- <property name="label" translatable="yes">Type:</property>
+ <property name="label" translatable="yes">Auto-indent mode:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -10236,69 +10261,62 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label230">
+ <widget class="GtkComboBox" id="combo_auto_indent_mode">
<property name="visible">True</property>
- <property name="label" translatable="yes">Width:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
+ <property name="items" translatable="yes">None
+Basic
+Current chars
+Match braces</property>
+ <property name="add_tearoffs">False</property>
+ <property name="focus_on_click">True</property>
</widget>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
<property name="x_options">fill</property>
- <property name="y_options"></property>
+ <property name="y_options">fill</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="spin_indent_width">
+ <widget class="GtkCheckButton" id="check_detect_indent_type">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">The width in chars of a single indent</property>
+ <property name="tooltip" translatable="yes">Whether to detect the indentation type from file contents when a file is opened</property>
<property name="can_focus">True</property>
- <property name="climb_rate">1</property>
- <property name="digits">0</property>
- <property name="numeric">True</property>
- <property name="update_policy">GTK_UPDATE_IF_VALID</property>
- <property name="snap_to_ticks">False</property>
- <property name="wrap">True</property>
- <property name="adjustment">1 1 99 1 10 0</property>
+ <property name="label" translatable="yes">Detect type from file</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radio_indent_spaces">
+ <widget class="GtkRadioButton" id="radio_indent_both">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Use spaces when inserting indentation</property>
+ <property name="tooltip" translatable="yes">Use spaces if the total indent is less than the tab width, otherwise use both</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Spaces</property>
+ <property name="label" translatable="yes">T_abs and spaces</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -10309,67 +10327,95 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radio_indent_tabs">
+ <widget class="GtkRadioButton" id="radio_indent_spaces">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Use one tab per indent</property>
+ <property name="tooltip" translatable="yes">Use spaces when inserting indentation</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Tabs</property>
+ <property name="label" translatable="yes">_Spaces</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
- <property name="group">radio_indent_spaces</property>
+ <property name="group">radio_indent_both</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radio_indent_both">
+ <widget class="GtkRadioButton" id="radio_indent_tabs">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Use spaces if the total indent is less than the tab width, otherwise use both</property>
+ <property name="tooltip" translatable="yes">Use one tab per indent</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">T_abs and spaces</property>
+ <property name="label" translatable="yes">_Tabs</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
- <property name="group">radio_indent_spaces</property>
+ <property name="group">radio_indent_both</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="check_detect_indent">
+ <widget class="GtkLabel" id="label229">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Whether to detect the indentation type from file contents when a file is opened</property>
+ <property name="label" translatable="yes">Type:</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkCheckButton" id="check_detect_indent_width">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Whether to detect the indentation width from file contents when a file is opened</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Detect from file</property>
+ <property name="label" translatable="yes">Detect width from file</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -10380,8 +10426,8 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
@@ -10670,4 +10716,17 @@
</child>
</widget>
+<widget class="GtkCheckButton" id="checkbutton3">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Whether to detect the indentation type from file contents when a file is opened</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Detect from file</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+</widget>
+
</glade-interface>
Modified: branches/sm/plugins/classbuilder.c
===================================================================
--- branches/sm/plugins/classbuilder.c 2011-05-21 08:50:00 UTC (rev 5804)
+++ branches/sm/plugins/classbuilder.c 2011-05-21 08:52:12 UTC (rev 5805)
@@ -201,7 +201,7 @@
{fileheader}\n\
{namespace_decl}\n\
{base_include}\n\
-{abstract_decl}class {class_name}{base_decl}{implements_decl}\n\{\n\
+{abstract_decl}class {class_name}{base_decl}{implements_decl}\n{\n\
{singleton_impl}\
{constructor_impl}\
{destructor_impl}\n\
@@ -356,7 +356,7 @@
}
/* Creates a new option label, indented on the left */
-GtkWidget *cc_option_label_new(const gchar *text)
+static GtkWidget *cc_option_label_new(const gchar *text)
{
GtkWidget *align;
GtkWidget *label;
@@ -373,10 +373,8 @@
/* Attaches a new section label at the specified table row, optionally
* padded at the top, and returns the new label. */
-GtkWidget *cc_table_attach_section_label(GtkWidget *table,
- const gchar *text,
- gint row,
- gboolean top_padding)
+static GtkWidget *cc_table_attach_section_label(GtkWidget *table, const gchar *text,
+ gint row, gboolean top_padding)
{
gchar *markup;
GtkWidget *label, *align;
@@ -401,9 +399,7 @@
/* Attach a new option label at the specified table row and returns
* the label */
-GtkWidget *cc_table_attach_option_label(GtkWidget *table,
- const gchar *text,
- gint row)
+static GtkWidget *cc_table_attach_option_label(GtkWidget *table, const gchar *text, gint row)
{
GtkWidget *opt_label = cc_option_label_new(text);
gtk_table_attach(GTK_TABLE(table), opt_label,
@@ -416,9 +412,7 @@
* The label associated with the widget is set as data on the entry
* with the "label" key, if access to it is needed later. The entry
* widget is returned. */
-GtkWidget *cc_table_attach_option_entry(GtkWidget *table,
- const gchar *text,
- gint row)
+static GtkWidget *cc_table_attach_option_entry(GtkWidget *table, const gchar *text, gint row)
{
GtkWidget *label;
GtkWidget *entry;
@@ -431,7 +425,7 @@
return entry;
}
-void show_dialog_create_class(gint type)
+static void show_dialog_create_class(gint type)
{
CreateClassDialog *cc_dlg;
GtkWidget *main_box, *table, *label, *hdr_hbox;
Modified: branches/sm/plugins/filebrowser.c
===================================================================
--- branches/sm/plugins/filebrowser.c 2011-05-21 08:50:00 UTC (rev 5804)
+++ branches/sm/plugins/filebrowser.c 2011-05-21 08:52:12 UTC (rev 5805)
@@ -123,7 +123,7 @@
{
gsize len;
- if (! NZV(base_name))
+ if (G_UNLIKELY(! NZV(base_name)))
return FALSE;
#ifdef G_OS_WIN32
Modified: branches/sm/plugins/saveactions.c
===================================================================
--- branches/sm/plugins/saveactions.c 2011-05-21 08:50:00 UTC (rev 5804)
+++ branches/sm/plugins/saveactions.c 2011-05-21 08:52:12 UTC (rev 5805)
@@ -91,7 +91,7 @@
{
gchar *tmp;
- if (! NZV(utf8_dir))
+ if (G_UNLIKELY(! NZV(utf8_dir)))
return FALSE;
tmp = utils_get_locale_from_utf8(utf8_dir);
Modified: branches/sm/plugins/splitwindow.c
===================================================================
--- branches/sm/plugins/splitwindow.c 2011-05-21 08:50:00 UTC (rev 5804)
+++ branches/sm/plugins/splitwindow.c 2011-05-21 08:52:12 UTC (rev 5805)
@@ -73,10 +73,11 @@
ScintillaObject *sci; /* new editor widget */
GtkWidget *vbox;
GtkWidget *name_label;
+ gint handler_id;
}
EditWindow;
-static EditWindow edit_window = {NULL, NULL, NULL, NULL};
+static EditWindow edit_window = {NULL, NULL, NULL, NULL, 0 };
static void on_unsplit(GtkMenuItem *menuitem, gpointer user_data);
@@ -103,6 +104,25 @@
}
+static void on_sci_notify (ScintillaObject *sci, gint param, SCNotification *notif, gpointer data)
+{
+ gint line;
+
+ switch (notif->nmhdr.code)
+ {
+ case SCN_MARGINCLICK:
+ if (notif->margin == 2)
+ {
+ line = sci_get_line_from_position(sci, notif->position);
+ scintilla_send_message(sci, SCI_TOGGLEFOLD, line, 0);
+ }
+ break;
+
+ default: break;
+ }
+}
+
+
static void sync_to_current(ScintillaObject *sci, ScintillaObject *current)
{
gpointer sdoc;
@@ -119,7 +139,6 @@
/* override some defaults */
set_line_numbers(sci, geany->editor_prefs->show_linenumber_margin);
scintilla_send_message(sci, SCI_SETMARGINWIDTHN, 1, 0 ); /* hide marker margin (no commands) */
- scintilla_send_message(sci, SCI_SETMARGINWIDTHN, 2, 0 ); /* hide fold margin (no toggle callback) */
}
@@ -127,6 +146,12 @@
{
editwin->editor = editor;
+ if (editwin->handler_id > 0 && editwin->sci != NULL)
+ {
+ g_signal_handler_disconnect(editwin->sci, editwin->handler_id);
+ editwin->handler_id = 0;
+ }
+
/* first destroy any widget, otherwise its signals will have an
* invalid document as user_data */
if (editwin->sci != NULL)
@@ -138,6 +163,12 @@
sync_to_current(editwin->sci, editor->sci);
+ if (geany->editor_prefs->folding)
+ editwin->handler_id = g_signal_connect(editwin->sci, "sci-notify",
+ G_CALLBACK(on_sci_notify), NULL);
+ else
+ scintilla_send_message(editwin->sci, SCI_SETMARGINWIDTHN, 2, 0);
+
gtk_label_set_text(GTK_LABEL(editwin->name_label), DOC_FILENAME(editor->document));
}
@@ -174,14 +205,14 @@
static GtkWidget *ui_tool_button_new(const gchar *stock_id, const gchar *label, const gchar *tooltip)
{
GtkToolItem *item;
- gchar *dup = NULL;
+ gchar *dupl = NULL;
if (stock_id && !label)
{
label = ui_get_stock_label(stock_id);
}
- dup = utils_str_remove_chars(g_strdup(label), "_");
- label = dup;
+ dupl = utils_str_remove_chars(g_strdup(label), "_");
+ label = dupl;
item = gtk_tool_button_new(NULL, label);
if (stock_id)
@@ -192,7 +223,7 @@
if (tooltip)
ui_widget_set_tooltip_text(GTK_WIDGET(item), tooltip);
- g_free(dup);
+ g_free(dupl);
return GTK_WIDGET(item);
}
@@ -332,6 +363,12 @@
gtk_widget_reparent(notebook,
ui_lookup_widget(geany->main_widgets->window, "vbox1"));
+ if (edit_window.sci != NULL && edit_window.handler_id > 0)
+ {
+ g_signal_handler_disconnect(edit_window.sci, edit_window.handler_id);
+ edit_window.handler_id = 0;
+ }
+
gtk_widget_destroy(pane);
edit_window.editor = NULL;
edit_window.sci = NULL;
@@ -372,12 +409,12 @@
gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_items.main), menu);
menu_items.horizontal = item =
- gtk_menu_item_new_with_mnemonic(_("_Horizontally"));
+ gtk_menu_item_new_with_mnemonic(_("_Side by Side"));
g_signal_connect(item, "activate", G_CALLBACK(on_split_horizontally), NULL);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
menu_items.vertical = item =
- gtk_menu_item_new_with_mnemonic(_("_Vertically"));
+ gtk_menu_item_new_with_mnemonic(_("_Top and Bottom"));
g_signal_connect(item, "activate", G_CALLBACK(on_split_vertically), NULL);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
@@ -401,11 +438,31 @@
}
+static gboolean do_select_current(gpointer data)
+{
+ GeanyDocument *doc;
+
+ /* guard out for the unlikely case we get called after another unsplitting */
+ if (plugin_state == STATE_UNSPLIT)
+ return FALSE;
+
+ doc = document_get_current();
+ if (DOC_VALID(doc))
+ set_editor(&edit_window, doc->editor);
+ else
+ on_unsplit(NULL, NULL);
+
+ return FALSE;
+}
+
+
static void on_document_close(GObject *obj, GeanyDocument *doc, gpointer user_data)
{
- /* remove the split window because the document won't exist anymore */
if (doc->editor == edit_window.editor)
- on_unsplit(NULL, NULL);
+ {
+ /* select current or unsplit in IDLE time, so the tab has changed */
+ g_idle_add(do_select_current, NULL);
+ }
}
Modified: branches/sm/po/ChangeLog
===================================================================
--- branches/sm/po/ChangeLog 2011-05-21 08:50:00 UTC (rev 5804)
+++ branches/sm/po/ChangeLog 2011-05-21 08:52:12 UTC (rev 5805)
@@ -1,3 +1,8 @@
+2011-03-27 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
+
+ * de.po: Update of German translation.
+
+
2011-03-22 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
* sl.po: Fix of a typo inside Slovenian translation. Thanks to Jože Klepec.
Modified: branches/sm/po/de.po
===================================================================
--- branches/sm/po/de.po 2011-05-21 08:50:00 UTC (rev 5804)
+++ branches/sm/po/de.po 2011-05-21 08:52:12 UTC (rev 5805)
@@ -11,8 +11,8 @@
msgstr ""
"Project-Id-Version: geany 0.20\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 20:08+0100\n"
-"PO-Revision-Date: 2011-03-06 20:14+0100\n"
+"POT-Creation-Date: 2011-03-27 13:18+0200\n"
+"PO-Revision-Date: 2011-03-27 13:18+0100\n"
"Last-Translator: Frank Lanitz <frank at frank.uvena.de>\n"
"Language-Team: German <geany-i18n at uvena.de>\n"
"Language: de\n"
@@ -28,9 +28,7 @@
msgid "A fast and lightweight IDE using GTK2"
msgstr "Eine kleine und schnelle Entwicklungsumgebung für GTK2"
-#: ../geany.desktop.in.h:2
-#: ../src/interface.c:310
-#: ../src/interface.c:1814
+#: ../geany.desktop.in.h:2 ../src/interface.c:310 ../src/interface.c:1814
msgid "Geany"
msgstr "Geany"
@@ -64,8 +62,7 @@
msgid "maintainer"
msgstr "Hauptentwickler"
-#: ../src/about.c:289
-#: ../src/about.c:297
+#: ../src/about.c:289 ../src/about.c:297
msgid "developer"
msgstr "Entwickler"
@@ -87,8 +84,11 @@
#: ../src/about.c:365
#, c-format
-msgid "Some of the many contributors (for a more detailed list, see the file %s):"
-msgstr "Einige der vielen Leute, die an Geany mitgearbeitet haben (eine detailliertere Liste findet sich in der Datei %s):"
+msgid ""
+"Some of the many contributors (for a more detailed list, see the file %s):"
+msgstr ""
+"Einige der vielen Leute, die an Geany mitgearbeitet haben (eine "
+"detailliertere Liste findet sich in der Datei %s):"
#: ../src/about.c:391
msgid "Credits"
@@ -99,8 +99,12 @@
msgstr "Lizenz"
#: ../src/about.c:414
-msgid "License text could not be found, please visit http://www.gnu.org/licenses/gpl-2.0.txt to view it online."
-msgstr "Der Lizenztext konnte nicht gefunden werden. Bitte besuchen Sie http://www.gnu.org/licenses/gpl-2.0.txt um die Lizenz online zu lesen."
+msgid ""
+"License text could not be found, please visit http://www.gnu.org/licenses/"
+"gpl-2.0.txt to view it online."
+msgstr ""
+"Der Lizenztext konnte nicht gefunden werden. Bitte besuchen Sie http://www."
+"gnu.org/licenses/gpl-2.0.txt um die Lizenz online zu lesen."
#. fall back to %d
#: ../src/build.c:655
@@ -117,9 +121,7 @@
msgid "%s (in directory: %s)"
msgstr "%s (im Verzeichnis: %s)"
-#: ../src/build.c:739
-#: ../src/build.c:961
-#: ../src/search.c:1524
+#: ../src/build.c:739 ../src/build.c:961 ../src/search.c:1542
#, c-format
msgid "Process failed (%s)"
msgstr "Prozess fehlgeschlagen (%s)"
@@ -135,13 +137,20 @@
msgstr "Konnte »%s« nicht ausführen (Start-Script konnte nicht erzeugt werden)"
#: ../src/build.c:890
-msgid "Could not execute the file in the VTE because it probably contains a command."
-msgstr "Konnte die Datei nicht in der VTE ausführen. Eventuell steht bereits ein Befehl auf der Kommandozeile."
+msgid ""
+"Could not execute the file in the VTE because it probably contains a command."
+msgstr ""
+"Konnte die Datei nicht in der VTE ausführen. Eventuell steht bereits ein "
+"Befehl auf der Kommandozeile."
#: ../src/build.c:928
#, c-format
-msgid "Could not find terminal \"%s\" (check path for Terminal tool setting in Preferences)"
-msgstr "Konnte das Terminalprogramm »%s« nicht finden (Pfad zum Terminalprogramm in den Einstellungen überprüfen)"
+msgid ""
+"Could not find terminal \"%s\" (check path for Terminal tool setting in "
+"Preferences)"
+msgstr ""
+"Konnte das Terminalprogramm »%s« nicht finden (Pfad zum Terminalprogramm in "
+"den Einstellungen überprüfen)"
#: ../src/build.c:1101
msgid "Compilation failed."
@@ -157,7 +166,9 @@
#: ../src/build.c:1275
msgid "Enter custom text here, all entered text is appended to the command."
-msgstr "Hier kann freier Text eingefügt werden, welcher an das Kommando angefügt wird."
+msgstr ""
+"Hier kann freier Text eingefügt werden, welcher an das Kommando angefügt "
+"wird."
#: ../src/build.c:1353
msgid "_Next Error"
@@ -171,8 +182,7 @@
msgid "_Set Build Commands"
msgstr "_Kommandos zum Erstellen konfigurieren"
-#: ../src/build.c:1649
-#: ../src/toolbar.c:374
+#: ../src/build.c:1649 ../src/toolbar.c:374
msgid "Build the current file"
msgstr "Kompiliert die aktuelle Datei"
@@ -193,8 +203,7 @@
msgid "Process could not be stopped (%s)."
msgstr "Der Prozess konnte nicht angehalten werden (%s)."
-#: ../src/build.c:1711
-#: ../src/build.c:1723
+#: ../src/build.c:1711 ../src/build.c:1723
msgid "No more build errors."
msgstr "Keine weiteren Fehlermeldungen."
@@ -203,13 +212,11 @@
msgid "Set menu item label"
msgstr "Bezeichnung für den Menüeintrag definieren"
-#: ../src/build.c:1845
-#: ../src/symbols.c:737
+#: ../src/build.c:1845 ../src/symbols.c:737
msgid "Label"
msgstr "Label"
-#: ../src/build.c:1846
-#: ../src/symbols.c:732
+#: ../src/build.c:1846 ../src/symbols.c:732
msgid "Command"
msgstr "Kommando"
@@ -225,8 +232,7 @@
msgid "Click to set menu item label"
msgstr "Klicken, um die Bezeichnung für den Menüeintrag zu definieren"
-#: ../src/build.c:1975
-#: ../src/build.c:1977
+#: ../src/build.c:1975 ../src/build.c:1977
#, c-format
msgid "%s Commands"
msgstr "Kommandos für %s"
@@ -235,8 +241,7 @@
msgid "No Filetype"
msgstr "Kein Dateityp"
-#: ../src/build.c:1985
-#: ../src/build.c:2020
+#: ../src/build.c:1985 ../src/build.c:2020
msgid "Error Regular Expression:"
msgstr "Regulärer Ausdruck für Fehlermeldungen:"
@@ -246,7 +251,9 @@
#: ../src/build.c:2045
msgid "Note: Item 2 opens a dialog and appends the response to the command."
-msgstr "Notiz: Element 2 öffnet ein Dialog und fügt das Ergebnis am Ende des Kommandos an"
+msgstr ""
+"Notiz: Element 2 öffnet ein Dialog und fügt das Ergebnis am Ende des "
+"Kommandos an"
#: ../src/build.c:2054
msgid "Execute Commands"
@@ -254,8 +261,12 @@
#: ../src/build.c:2066
#, c-format
-msgid "%d, %e, %f, %p are substituted in command and directory fields, see manual for details."
-msgstr "%d, %e, %f, %p werden innerhalb der Kommando- und Verzeichnisfelder ersetzt - Details gibt es in der Dokumentation."
+msgid ""
+"%d, %e, %f, %p are substituted in command and directory fields, see manual "
+"for details."
+msgstr ""
+"%d, %e, %f, %p werden innerhalb der Kommando- und Verzeichnisfelder ersetzt "
+"- Details gibt es in der Dokumentation."
#: ../src/build.c:2226
msgid "Set Build Commands"
@@ -266,34 +277,25 @@
msgstr "_Kompilieren"
#. build the code
-#: ../src/build.c:2444
-#: ../src/build.c:2706
-#: ../src/interface.c:1223
+#: ../src/build.c:2444 ../src/build.c:2706 ../src/interface.c:1223
msgid "_Build"
msgstr "_Erstellen"
-#: ../src/build.c:2451
-#: ../src/build.c:2481
-#: ../src/build.c:2674
+#: ../src/build.c:2451 ../src/build.c:2481 ../src/build.c:2674
msgid "_Execute"
msgstr "_Ausführen"
#. build the code with make custom
-#: ../src/build.c:2496
-#: ../src/build.c:2672
-#: ../src/build.c:2726
+#: ../src/build.c:2496 ../src/build.c:2672 ../src/build.c:2726
msgid "Make Custom _Target"
msgstr "Make (eigenes _Target)"
#. build the code with make object
-#: ../src/build.c:2498
-#: ../src/build.c:2673
-#: ../src/build.c:2734
+#: ../src/build.c:2498 ../src/build.c:2673 ../src/build.c:2734
msgid "Make _Object"
msgstr "Make _Objekt-Datei"
-#: ../src/build.c:2500
-#: ../src/build.c:2671
+#: ../src/build.c:2500 ../src/build.c:2671
msgid "_Make"
msgstr "_Make"
@@ -318,10 +320,8 @@
msgstr[0] "%d Datei gespeichert."
msgstr[1] "%d Dateien gespeichert."
-#: ../src/callbacks.c:490
-#: ../src/document.c:2999
-#: ../src/interface.c:381
-#: ../src/sidebar.c:695
+#: ../src/callbacks.c:490 ../src/document.c:2900 ../src/interface.c:381
+#: ../src/sidebar.c:687
msgid "_Reload"
msgstr "_Neu laden"
@@ -334,75 +334,69 @@
msgid "Are you sure you want to reload '%s'?"
msgstr "Möchten Sie »%s« wirklich neu laden?"
-#: ../src/callbacks.c:1196
-#: ../src/keybindings.c:425
+#: ../src/callbacks.c:1210 ../src/keybindings.c:425
msgid "Go to Line"
msgstr "Gehe zu Zeile"
-#: ../src/callbacks.c:1197
+#: ../src/callbacks.c:1211
msgid "Enter the line you want to go to:"
msgstr "Geben Sie die Zeile an, zu der Sie springen möchten:"
-#: ../src/callbacks.c:1291
-#: ../src/callbacks.c:1316
-msgid "Please set the filetype for the current file before using this function."
+#: ../src/callbacks.c:1305 ../src/callbacks.c:1332
+msgid ""
+"Please set the filetype for the current file before using this function."
msgstr "Bitte legen Sie den Dateityp fest, bevor Sie diese Funktion benutzen."
-#: ../src/callbacks.c:1424
-#: ../src/ui_utils.c:619
+#: ../src/callbacks.c:1448 ../src/ui_utils.c:619
msgid "dd.mm.yyyy"
msgstr "TT.MM.JJJJ"
-#: ../src/callbacks.c:1426
-#: ../src/ui_utils.c:620
+#: ../src/callbacks.c:1450 ../src/ui_utils.c:620
msgid "mm.dd.yyyy"
msgstr "MM.TT.JJJJ"
-#: ../src/callbacks.c:1428
-#: ../src/ui_utils.c:621
+#: ../src/callbacks.c:1452 ../src/ui_utils.c:621
msgid "yyyy/mm/dd"
msgstr "JJJJ/MM/TT"
-#: ../src/callbacks.c:1430
-#: ../src/ui_utils.c:630
+#: ../src/callbacks.c:1454 ../src/ui_utils.c:630
msgid "dd.mm.yyyy hh:mm:ss"
msgstr "TT.MM.JJJJ HH:MM:SS"
-#: ../src/callbacks.c:1432
-#: ../src/ui_utils.c:631
+#: ../src/callbacks.c:1456 ../src/ui_utils.c:631
msgid "mm.dd.yyyy hh:mm:ss"
msgstr "MM.TT.JJJJ HH:MM:SS"
-#: ../src/callbacks.c:1434
-#: ../src/ui_utils.c:632
+#: ../src/callbacks.c:1458 ../src/ui_utils.c:632
msgid "yyyy/mm/dd hh:mm:ss"
msgstr "JJJJ/MM/TT HH:MM:SS"
-#: ../src/callbacks.c:1436
-#: ../src/ui_utils.c:641
+#: ../src/callbacks.c:1460 ../src/ui_utils.c:641
msgid "_Use Custom Date Format"
msgstr "Benutze selbst erstelltes _Datumsformat"
-#: ../src/callbacks.c:1440
+#: ../src/callbacks.c:1464
msgid "Custom Date Format"
msgstr "Benutzerdefiniertes Datumsformat"
-#: ../src/callbacks.c:1441
-msgid "Enter here a custom date and time format. You can use any conversion specifiers which can be used with the ANSI C strftime function."
-msgstr "Hier kann ein benutzerdefiniertes Datumsformat eingegeben werden. Dabei funktionieren alle Platzhalter der ANSI C Funktion »strftime«."
+#: ../src/callbacks.c:1465
+msgid ""
+"Enter here a custom date and time format. You can use any conversion "
+"specifiers which can be used with the ANSI C strftime function."
+msgstr ""
+"Hier kann ein benutzerdefiniertes Datumsformat eingegeben werden. Dabei "
+"funktionieren alle Platzhalter der ANSI C Funktion »strftime«."
-#: ../src/callbacks.c:1462
+#: ../src/callbacks.c:1488
msgid "Date format string could not be converted (possibly too long)."
-msgstr "Das Datenformat konnte nicht umgewandelt werden. Eventuell ist es zu lang."
+msgstr ""
+"Das Datenformat konnte nicht umgewandelt werden. Eventuell ist es zu lang."
-#: ../src/callbacks.c:1688
-#: ../src/callbacks.c:1698
+#: ../src/callbacks.c:1716 ../src/callbacks.c:1726
msgid "No more message items."
msgstr "Keine weiteren Nachrichten."
-#: ../src/dialogs.c:178
-#: ../src/interface.c:3912
-#: ../src/interface.c:5553
+#: ../src/dialogs.c:178 ../src/interface.c:5716
msgid "Detect from file"
msgstr "Aus Datei lesen"
@@ -426,31 +420,27 @@
msgid "Middle Eastern"
msgstr "Nahöstlich"
-#: ../src/dialogs.c:191
-#: ../src/encodings.c:120
-#: ../src/encodings.c:121
-#: ../src/encodings.c:122
-#: ../src/encodings.c:123
-#: ../src/encodings.c:124
-#: ../src/encodings.c:125
-#: ../src/encodings.c:126
-#: ../src/encodings.c:127
+#: ../src/dialogs.c:191 ../src/encodings.c:120 ../src/encodings.c:121
+#: ../src/encodings.c:122 ../src/encodings.c:123 ../src/encodings.c:124
+#: ../src/encodings.c:125 ../src/encodings.c:126 ../src/encodings.c:127
msgid "Unicode"
msgstr "Unicode"
-#: ../src/dialogs.c:239
-#: ../src/dialogs.c:324
+#: ../src/dialogs.c:239 ../src/dialogs.c:324
msgid "Open File"
msgstr "Datei öffnen"
-#: ../src/dialogs.c:243
-#: ../src/interface.c:873
+#: ../src/dialogs.c:243 ../src/interface.c:873
msgid "_View"
msgstr "_Ansicht"
#: ../src/dialogs.c:246
-msgid "Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only."
-msgstr "Öffnet die Datei schreibgeschützt. Bei Auswahl mehrerer Dateien, werden alle schreibgeschützt geöffnet."
+msgid ""
+"Opens the file in read-only mode. If you choose more than one file to open, "
+"all files will be opened read-only."
+msgstr ""
+"Öffnet die Datei schreibgeschützt. Bei Auswahl mehrerer Dateien, werden alle "
+"schreibgeschützt geöffnet."
#: ../src/dialogs.c:268
msgid "Detect by file extension"
@@ -471,11 +461,16 @@
#: ../src/dialogs.c:384
msgid ""
-"Explicitly defines an encoding for the file, if it would not be detected. This is useful when you know that the encoding of a file cannot be detected correctly by Geany.\n"
-"Note if you choose multiple files, they will all be opened with the chosen encoding."
+"Explicitly defines an encoding for the file, if it would not be detected. "
+"This is useful when you know that the encoding of a file cannot be detected "
+"correctly by Geany.\n"
+"Note if you choose multiple files, they will all be opened with the chosen "
+"encoding."
msgstr ""
-"Definiert explizit eine bestimmte Zeichenkodierung, wenn sie nicht automatisch erkannt werden kann.\n"
-"Beachten Sie: Wenn Sie mehrere Dateien auswählen, werden alle mit der gewählten Zeichenkodierung geöffnet."
+"Definiert explizit eine bestimmte Zeichenkodierung, wenn sie nicht "
+"automatisch erkannt werden kann.\n"
+"Beachten Sie: Wenn Sie mehrere Dateien auswählen, werden alle mit der "
+"gewählten Zeichenkodierung geöffnet."
#. line 2 with filetype combo
#: ../src/dialogs.c:391
@@ -484,11 +479,15 @@
#: ../src/dialogs.c:401
msgid ""
-"Explicitly defines a filetype for the file, if it would not be detected by filename extension.\n"
-"Note if you choose multiple files, they will all be opened with the chosen filetype."
+"Explicitly defines a filetype for the file, if it would not be detected by "
+"filename extension.\n"
+"Note if you choose multiple files, they will all be opened with the chosen "
+"filetype."
msgstr ""
-"Definiert explizit einen bestimmten Dateityp, wenn er nicht durch die Dateiendung erkannt werden kann.\n"
-"Beachten Sie: Wenn Sie mehrere Dateien auswählen, werden alle mit dem gewählten Dateityp geöffnet."
+"Definiert explizit einen bestimmten Dateityp, wenn er nicht durch die "
+"Dateiendung erkannt werden kann.\n"
+"Beachten Sie: Wenn Sie mehrere Dateien auswählen, werden alle mit dem "
+"gewählten Dateityp geöffnet."
#: ../src/dialogs.c:480
msgid "Overwrite?"
@@ -498,8 +497,7 @@
msgid "Filename already exists!"
msgstr "Der Dateiname existiert bereits!"
-#: ../src/dialogs.c:513
-#: ../src/dialogs.c:642
+#: ../src/dialogs.c:513 ../src/dialogs.c:642
msgid "Save File"
msgstr "Datei speichern"
@@ -516,28 +514,27 @@
msgstr "_Datei in einem neuen Reiter öffnen"
#: ../src/dialogs.c:533
-msgid "Keep the current unsaved document open and open the newly saved file in a new tab"
-msgstr "Lässt das ungesicherte Dokument geöffnet und öffnet das gesicherte in einem neuen Reiter."
+msgid ""
+"Keep the current unsaved document open and open the newly saved file in a "
+"new tab"
+msgstr ""
+"Lässt das ungesicherte Dokument geöffnet und öffnet das gesicherte in einem "
+"neuen Reiter."
-#: ../src/dialogs.c:660
-#: ../src/win32.c:681
+#: ../src/dialogs.c:660 ../src/win32.c:681
msgid "Error"
msgstr "Fehler"
-#: ../src/dialogs.c:663
-#: ../src/dialogs.c:1543
-#: ../src/win32.c:687
+#: ../src/dialogs.c:663 ../src/dialogs.c:1543 ../src/win32.c:687
#: ../src/win32.c:746
msgid "Question"
msgstr "Frage"
-#: ../src/dialogs.c:666
-#: ../src/win32.c:693
+#: ../src/dialogs.c:666 ../src/win32.c:693
msgid "Warning"
msgstr "Warnung"
-#: ../src/dialogs.c:669
-#: ../src/win32.c:699
+#: ../src/dialogs.c:669 ../src/win32.c:699
msgid "Information"
msgstr "Information"
@@ -559,24 +556,21 @@
msgstr "Schriftart auswählen"
#: ../src/dialogs.c:1157
-msgid "An error occurred or file information could not be retrieved (e.g. from a new file)."
-msgstr "Es ist ein Fehler aufgetreten oder Datei-Informationen konnten nicht gelesen werden (z.B. bei einer neuen, noch nicht gespeicherten Datei)."
+msgid ""
+"An error occurred or file information could not be retrieved (e.g. from a "
+"new file)."
+msgstr ""
+"Es ist ein Fehler aufgetreten oder Datei-Informationen konnten nicht gelesen "
+"werden (z.B. bei einer neuen, noch nicht gespeicherten Datei)."
-#: ../src/dialogs.c:1176
-#: ../src/dialogs.c:1177
-#: ../src/dialogs.c:1178
-#: ../src/dialogs.c:1184
-#: ../src/dialogs.c:1185
-#: ../src/dialogs.c:1186
-#: ../src/symbols.c:1980
-#: ../src/symbols.c:2001
-#: ../src/symbols.c:2053
+#: ../src/dialogs.c:1176 ../src/dialogs.c:1177 ../src/dialogs.c:1178
+#: ../src/dialogs.c:1184 ../src/dialogs.c:1185 ../src/dialogs.c:1186
+#: ../src/symbols.c:1980 ../src/symbols.c:2001 ../src/symbols.c:2053
#: ../src/ui_utils.c:244
msgid "unknown"
msgstr "unbekannt"
-#: ../src/dialogs.c:1191
-#: ../src/symbols.c:887
+#: ../src/dialogs.c:1191 ../src/symbols.c:887
msgid "Properties"
msgstr "Eigenschaften"
@@ -604,8 +598,7 @@
msgid "<b>Encoding:</b>"
msgstr "<b>Kodierung:</b>"
-#: ../src/dialogs.c:1290
-#: ../src/ui_utils.c:248
+#: ../src/dialogs.c:1290 ../src/ui_utils.c:248
msgid "(with BOM)"
msgstr "(mit BOM)"
@@ -667,58 +660,67 @@
msgid "New file \"%s\" opened."
msgstr "Neue Datei »%s« geöffnet."
-#: ../src/document.c:967
-#: ../src/document.c:1485
+#: ../src/document.c:845 ../src/document.c:1370
#, c-format
msgid "Could not open file %s (%s)"
msgstr "Konnte Datei »%s« nicht öffnen (%s)."
-#: ../src/document.c:997
+#: ../src/document.c:865
#, c-format
+msgid "The file \"%s\" is not valid %s."
+msgstr "Die Datei »%s« ist kein gültiges %s."
+
+#: ../src/document.c:871
+#, c-format
msgid ""
-"The file \"%s\" could not be opened properly and has been truncated. This can occur if the file contains a NULL byte. Be aware that saving it can cause data loss.\n"
+"The file \"%s\" does not look like a text file or the file encoding is not "
+"supported."
+msgstr ""
+"Die Datei »%s« scheint keine Textdatei zu sein, oder die Zeichenkodierung "
+"wird nicht unterstützt."
+
+#: ../src/document.c:881
+#, c-format
+msgid ""
+"The file \"%s\" could not be opened properly and has been truncated. This "
+"can occur if the file contains a NULL byte. Be aware that saving it can "
+"cause data loss.\n"
"The file was set to read-only."
msgstr ""
-"Die Datei »%s« konnte nicht ordnungsgemäß geladen werden und wurde eventuell abgeschnitten. Dies passiert beispielsweise, wenn die Datei ein »NULL-Byte« enthält und kann zu Datenverlust beim Speichern führen!\n"
+"Die Datei »%s« konnte nicht ordnungsgemäß geladen werden und wurde eventuell "
+"abgeschnitten. Dies passiert beispielsweise, wenn die Datei ein »NULL-Byte« "
+"enthält und kann zu Datenverlust beim Speichern führen!\n"
"Die Datei wird schreibgeschützt geöffnet."
-#. For translators: the second wildcard is an encoding name, e.g.
-#. * The file \"test.txt\" is not valid UTF-8.
-#: ../src/document.c:1023
-#, c-format
-msgid "The file \"%s\" is not valid %s."
-msgstr "Die Datei »%s« ist kein gültiges %s."
-
-#: ../src/document.c:1033
-#, c-format
-msgid "The file \"%s\" does not look like a text file or the file encoding is not supported."
-msgstr "Die Datei »%s« scheint keine Textdatei zu sein, oder die Zeichenkodierung wird nicht unterstützt."
-
-#: ../src/document.c:1184
+#: ../src/document.c:1090
msgid "Spaces"
msgstr "Leerzeichen"
-#: ../src/document.c:1187
+#: ../src/document.c:1093
msgid "Tabs"
msgstr "Tabulatoren"
-#: ../src/document.c:1190
+#: ../src/document.c:1096
msgid "Tabs and Spaces"
msgstr "Tabulatoren und Leerzeichen"
#. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs
#. * and Spaces), the second one is the filename
-#: ../src/document.c:1195
+#: ../src/document.c:1101
#, c-format
msgid "Setting %s indentation mode for %s."
msgstr "Setze Einrückungsmodus %s für »%s«."
-#: ../src/document.c:1248
-#: ../src/document.c:1858
+#: ../src/document.c:1111
+#, c-format
+msgid "Setting indentation width to %d for %s."
+msgstr "Setze Einrückungsbreite auf %d für »%s«."
+
+#: ../src/document.c:1145 ../src/document.c:1743
msgid "Invalid filename"
msgstr "Ungültiger Dateiname"
-#: ../src/document.c:1363
+#: ../src/document.c:1260
#, c-format
msgid "File %s reloaded."
msgstr "Datei »%s« neu geladen."
@@ -726,25 +728,29 @@
#. For translators: this is the status window message for opening a file. %d is the number
#. * of the newly opened file, %s indicates whether the file is opened read-only
#. * (it is replaced with the string ", read-only").
-#: ../src/document.c:1368
+#: ../src/document.c:1265
#, c-format
msgid "File %s opened(%d%s)."
msgstr "Datei »%s« geöffnet (%d%s)."
-#: ../src/document.c:1370
+#: ../src/document.c:1267
msgid ", read-only"
msgstr ", schreibgeschützt"
-#: ../src/document.c:1579
+#: ../src/document.c:1464
msgid "Error renaming file."
msgstr "Fehler beim Umbenennen der Datei."
-#: ../src/document.c:1666
+#: ../src/document.c:1551
#, c-format
-msgid "An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved."
-msgstr "Beim Konvertieren der Datei von UTF-8 nach »%s« ist ein Fehler aufgetreten. Die Datei wird <i>nicht</i> gespeichert."
+msgid ""
+"An error occurred while converting the file from UTF-8 in \"%s\". The file "
+"remains unsaved."
+msgstr ""
+"Beim Konvertieren der Datei von UTF-8 nach »%s« ist ein Fehler aufgetreten. "
+"Die Datei wird <i>nicht</i> gespeichert."
-#: ../src/document.c:1688
+#: ../src/document.c:1573
#, c-format
msgid ""
"Error message: %s\n"
@@ -753,33 +759,35 @@
"Fehlermeldung: %s\n"
"Der Fehler trat bei »%s« (Zeile: %d, Spalte: %d) auf."
-#: ../src/document.c:1693
+#: ../src/document.c:1578
#, c-format
msgid "Error message: %s."
msgstr "Fehlermeldung: %s."
-#: ../src/document.c:1743
+#: ../src/document.c:1628
#, c-format
msgid "Failed to open file '%s' for writing: fopen() failed: %s"
-msgstr "Konnte Datei »%s« nicht zum Schreiben öffnen: fopen() fehlgeschlagen: %s"
+msgstr ""
+"Konnte Datei »%s« nicht zum Schreiben öffnen: fopen() fehlgeschlagen: %s"
-#: ../src/document.c:1761
+#: ../src/document.c:1646
#, c-format
msgid "Failed to write file '%s': fwrite() failed: %s"
-msgstr "Konnte Datei »%s« nicht zum Schreiben öffnen: fwrite() fehlgeschlagen: %s"
+msgstr ""
+"Konnte Datei »%s« nicht zum Schreiben öffnen: fwrite() fehlgeschlagen: %s"
-#: ../src/document.c:1775
+#: ../src/document.c:1660
#, c-format
msgid "Failed to close file '%s': fclose() failed: %s"
-msgstr "Konnte Datei »%s« nicht zum Schreiben öffnen: fclose() fehlgeschlagen: %s"
+msgstr ""
+"Konnte Datei »%s« nicht zum Schreiben öffnen: fclose() fehlgeschlagen: %s"
-#: ../src/document.c:1858
-#: ../src/document.c:1923
+#: ../src/document.c:1743 ../src/document.c:1808
#, c-format
msgid "Error saving file (%s)."
msgstr "Fehler beim Speichern der Datei (%s)."
-#: ../src/document.c:1928
+#: ../src/document.c:1813
#, c-format
msgid ""
"%s\n"
@@ -790,76 +798,74 @@
"\n"
"Die Datei ist möglicherweise nicht vollständig auf der Festplatte gespeichert"
-#: ../src/document.c:1930
+#: ../src/document.c:1815
msgid "Error saving file."
msgstr "Fehler beim Speichern der Datei."
-#: ../src/document.c:1954
+#: ../src/document.c:1839
#, c-format
msgid "File %s saved."
msgstr "Datei »%s« wurde gespeichert."
-#: ../src/document.c:2022
-#: ../src/document.c:2079
-#: ../src/document.c:2087
+#: ../src/document.c:1916 ../src/document.c:1973 ../src/document.c:1981
#, c-format
msgid "\"%s\" was not found."
msgstr "»%s« wurde nicht gefunden."
-#: ../src/document.c:2087
+#: ../src/document.c:1981
msgid "Wrap search and find again?"
msgstr "Suche vom Dokumentanfang bzw. -ende neu beginnen?"
-#: ../src/document.c:2166
-#: ../src/search.c:1185
-#: ../src/search.c:1229
-#: ../src/search.c:1920
-#: ../src/search.c:1921
+#: ../src/document.c:2060 ../src/search.c:1203 ../src/search.c:1247
+#: ../src/search.c:1938 ../src/search.c:1939
#, c-format
msgid "No matches found for \"%s\"."
msgstr "Keine Treffer für »%s« gefunden."
-#: ../src/document.c:2177
-#: ../src/document.c:2186
+#: ../src/document.c:2071 ../src/document.c:2080
#, c-format
msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"."
msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"."
msgstr[0] "%s: %d mal wurde »%s« mit »%s« ersetzt."
msgstr[1] "%s: %d mal wurde »%s« mit »%s« ersetzt."
-#: ../src/document.c:3000
+#: ../src/document.c:2901
msgid "Do you want to reload it?"
msgstr "Möchten Sie die Datei neu laden?"
-#: ../src/document.c:3001
+#: ../src/document.c:2902
#, c-format
msgid ""
"The file '%s' on the disk is more recent than\n"
"the current buffer."
-msgstr "Die Datei »%s« auf dem Datenträger ist aktueller als die momentan geöffnete Version."
+msgstr ""
+"Die Datei »%s« auf dem Datenträger ist aktueller als die momentan geöffnete "
+"Version."
-#: ../src/document.c:3019
+#: ../src/document.c:2920
msgid "Close _without saving"
msgstr "Schließen _ohne Speichern"
-#: ../src/document.c:3022
+#: ../src/document.c:2923
msgid "Try to resave the file?"
msgstr "Versuchen die Datei erneut zu speichern?"
-#: ../src/document.c:3023
+#: ../src/document.c:2924
#, c-format
msgid "File \"%s\" was not found on disk!"
msgstr "»%s« wurde nicht auf dem Datenträger gefunden."
-#: ../src/editor.c:4362
+#: ../src/editor.c:4382
msgid "Enter Tab Width"
msgstr "Tabulatorbreite:"
-#: ../src/editor.c:4363
+#: ../src/editor.c:4383
msgid "Enter the amount of spaces which should be replaced by a tab character."
-msgstr "Geben Sie die Anzahl der Leerzeichen an, welche durch den Tabulator ersetzt werden sollen."
+msgstr ""
+"Geben Sie die Anzahl der Leerzeichen an, welche durch den Tabulator ersetzt "
+"werden sollen."
-#: ../src/editor.c:4513
+#: ../src/editor.c:4533
#, c-format
msgid "Warning: non-standard hard tab width: %d != 8!"
msgstr "Achtung: Keine gewöhnliche harte Tabulatorbreite:: %d != 8!"
@@ -868,8 +874,7 @@
msgid "Celtic"
msgstr "Keltisch"
-#: ../src/encodings.c:76
-#: ../src/encodings.c:77
+#: ../src/encodings.c:76 ../src/encodings.c:77
msgid "Greek"
msgstr "Griechisch"
@@ -881,31 +886,22 @@
msgid "South European"
msgstr "Südeuropäisch"
-#: ../src/encodings.c:80
-#: ../src/encodings.c:81
-#: ../src/encodings.c:82
+#: ../src/encodings.c:80 ../src/encodings.c:81 ../src/encodings.c:82
#: ../src/encodings.c:83
msgid "Western"
msgstr "Westlich"
-#: ../src/encodings.c:85
-#: ../src/encodings.c:86
-#: ../src/encodings.c:87
+#: ../src/encodings.c:85 ../src/encodings.c:86 ../src/encodings.c:87
msgid "Baltic"
msgstr "Baltisch"
-#: ../src/encodings.c:88
-#: ../src/encodings.c:89
-#: ../src/encodings.c:90
+#: ../src/encodings.c:88 ../src/encodings.c:89 ../src/encodings.c:90
msgid "Central European"
msgstr "Mitteleuropäisch"
#. ISO-IR-111 not available on Windows
-#: ../src/encodings.c:91
-#: ../src/encodings.c:92
-#: ../src/encodings.c:94
-#: ../src/encodings.c:95
-#: ../src/encodings.c:96
+#: ../src/encodings.c:91 ../src/encodings.c:92 ../src/encodings.c:94
+#: ../src/encodings.c:95 ../src/encodings.c:96
msgid "Cyrillic"
msgstr "Kyrillisch"
@@ -921,16 +917,12 @@
msgid "Romanian"
msgstr "Rumänisch"
-#: ../src/encodings.c:101
-#: ../src/encodings.c:102
-#: ../src/encodings.c:103
+#: ../src/encodings.c:101 ../src/encodings.c:102 ../src/encodings.c:103
msgid "Arabic"
msgstr "Arabisch"
#. not available at all, ?
-#: ../src/encodings.c:104
-#: ../src/encodings.c:106
-#: ../src/encodings.c:107
+#: ../src/encodings.c:104 ../src/encodings.c:106 ../src/encodings.c:107
msgid "Hebrew"
msgstr "Hebräisch"
@@ -950,42 +942,30 @@
msgid "Thai"
msgstr "Thai"
-#: ../src/encodings.c:113
-#: ../src/encodings.c:114
-#: ../src/encodings.c:115
+#: ../src/encodings.c:113 ../src/encodings.c:114 ../src/encodings.c:115
msgid "Turkish"
msgstr "Türkisch"
-#: ../src/encodings.c:116
-#: ../src/encodings.c:117
-#: ../src/encodings.c:118
+#: ../src/encodings.c:116 ../src/encodings.c:117 ../src/encodings.c:118
msgid "Vietnamese"
msgstr "Vietnamesisch"
#. maybe not available on Linux
-#: ../src/encodings.c:129
-#: ../src/encodings.c:130
-#: ../src/encodings.c:131
+#: ../src/encodings.c:129 ../src/encodings.c:130 ../src/encodings.c:131
#: ../src/encodings.c:133
msgid "Chinese Simplified"
msgstr "Chinesisch, vereinfacht"
-#: ../src/encodings.c:134
-#: ../src/encodings.c:135
-#: ../src/encodings.c:136
+#: ../src/encodings.c:134 ../src/encodings.c:135 ../src/encodings.c:136
msgid "Chinese Traditional"
msgstr "Chinesisch, traditionell"
-#: ../src/encodings.c:137
-#: ../src/encodings.c:138
-#: ../src/encodings.c:139
+#: ../src/encodings.c:137 ../src/encodings.c:138 ../src/encodings.c:139
#: ../src/encodings.c:140
msgid "Japanese"
msgstr "Japanisch"
-#: ../src/encodings.c:141
-#: ../src/encodings.c:142
-#: ../src/encodings.c:143
+#: ../src/encodings.c:141 ../src/encodings.c:142 ../src/encodings.c:143
#: ../src/encodings.c:144
msgid "Korean"
msgstr "Koreanisch"
@@ -1018,11 +998,8 @@
msgid "_Unicode"
msgstr "_Unicode"
-#: ../src/filetypes.c:80
-#: ../src/filetypes.c:162
-#: ../src/filetypes.c:176
-#: ../src/filetypes.c:184
-#: ../src/filetypes.c:198
+#: ../src/filetypes.c:80 ../src/filetypes.c:162 ../src/filetypes.c:176
+#: ../src/filetypes.c:184 ../src/filetypes.c:198
#, c-format
msgid "%s source file"
msgstr "%s Quelldatei"
@@ -1032,10 +1009,8 @@
msgid "%s file"
msgstr "%s Quelldatei"
-#: ../src/filetypes.c:99
-#: ../src/filetypes.c:1560
-#: ../src/interface.c:3855
-#: ../src/interface.c:5496
+#: ../src/filetypes.c:99 ../src/filetypes.c:1645 ../src/interface.c:3874
+#: ../src/interface.c:5524
msgid "None"
msgstr "Keiner"
@@ -1072,41 +1047,37 @@
msgid "%s script file"
msgstr "%s Skript Datei"
-#: ../src/filetypes.c:668
+#: ../src/filetypes.c:667
msgid "_Programming Languages"
msgstr "_Kompilersprachen"
-#: ../src/filetypes.c:669
+#: ../src/filetypes.c:668
msgid "_Scripting Languages"
msgstr "_Interpretersprachen"
-#: ../src/filetypes.c:670
+#: ../src/filetypes.c:669
msgid "_Markup Languages"
msgstr "_Markup-Sprachen"
-#: ../src/filetypes.c:671
+#: ../src/filetypes.c:670
msgid "M_iscellaneous Languages"
msgstr "_Sonstige Sprachen"
-#: ../src/filetypes.c:672
+#: ../src/filetypes.c:671
msgid "_Custom Filetypes"
msgstr "_Benutzerdefinierte Dateitypen"
-#: ../src/filetypes.c:1288
-#: ../src/win32.c:105
+#: ../src/filetypes.c:1373 ../src/win32.c:105
msgid "All Source"
msgstr "Alle Quellen"
#. create meta file filter "All files"
-#: ../src/filetypes.c:1313
-#: ../src/project.c:293
-#: ../src/win32.c:95
-#: ../src/win32.c:143
-#: ../src/win32.c:145
+#: ../src/filetypes.c:1398 ../src/project.c:293 ../src/win32.c:95
+#: ../src/win32.c:143 ../src/win32.c:145
msgid "All files"
msgstr "Alle Dateien"
-#: ../src/filetypes.c:1371
+#: ../src/filetypes.c:1456
#, c-format
msgid "Bad regex for filetype %s: %s"
msgstr "Schlechter RegEx für Dateityp %s: %s"
@@ -1115,10 +1086,8 @@
msgid "untitled"
msgstr "unbenannt"
-#: ../src/highlighting.c:3621
-#: ../src/main.c:815
-#: ../src/socket.c:165
-#: ../src/templates.c:315
+#: ../src/highlighting.c:3621 ../src/main.c:817 ../src/socket.c:165
+#: ../src/templates.c:327
#, c-format
msgid "Could not find file '%s'."
msgstr "Konnte die Datei »%s« nicht finden."
@@ -1139,8 +1108,7 @@
msgid "New (with _Template)"
msgstr "Neu (aus _Vorlage)"
-#: ../src/interface.c:352
-#: ../src/interface.c:2346
+#: ../src/interface.c:352 ../src/interface.c:2346
msgid "Open Selected F_ile"
msgstr "_Markierte Datei öffnen"
@@ -1156,14 +1124,9 @@
msgid "R_eload As"
msgstr "N_eu laden als"
-#: ../src/interface.c:400
-#: ../src/interface.c:635
-#: ../src/interface.c:694
-#: ../src/interface.c:708
-#: ../src/interface.c:1088
-#: ../src/interface.c:1098
-#: ../src/interface.c:2311
-#: ../src/interface.c:2325
+#: ../src/interface.c:400 ../src/interface.c:635 ../src/interface.c:694
+#: ../src/interface.c:708 ../src/interface.c:1088 ../src/interface.c:1098
+#: ../src/interface.c:2311 ../src/interface.c:2325
msgid "invisible"
msgstr "unsichtbar"
@@ -1171,18 +1134,15 @@
msgid "Page Set_up"
msgstr "Seiteneigensc_haften"
-#: ../src/interface.c:434
-#: ../src/notebook.c:257
+#: ../src/interface.c:434 ../src/notebook.c:257
msgid "Close Ot_her Documents"
msgstr "_Inaktive Dateien schließen"
-#: ../src/interface.c:442
-#: ../src/notebook.c:262
+#: ../src/interface.c:442 ../src/notebook.c:262
msgid "C_lose All"
msgstr "_Alle schließen"
-#: ../src/interface.c:459
-#: ../src/interface.c:2241
+#: ../src/interface.c:459 ../src/interface.c:2241
msgid "_Edit"
msgstr "_Bearbeiten"
@@ -1190,58 +1150,47 @@
msgid "_Commands"
msgstr "_Kommandos"
-#: ../src/interface.c:516
-#: ../src/keybindings.c:311
+#: ../src/interface.c:516 ../src/keybindings.c:311
msgid "_Cut Current Line(s)"
msgstr "Aktuelle Zeile(n) _ausschneiden"
-#: ../src/interface.c:524
-#: ../src/keybindings.c:308
+#: ../src/interface.c:524 ../src/keybindings.c:308
msgid "_Copy Current Line(s)"
msgstr "Aktuelle Zeile(n) _kopieren"
-#: ../src/interface.c:532
-#: ../src/keybindings.c:263
+#: ../src/interface.c:532 ../src/keybindings.c:263
msgid "_Delete Current Line(s)"
msgstr "Aktuelle Zeile(n) _löschen"
-#: ../src/interface.c:536
-#: ../src/keybindings.c:260
+#: ../src/interface.c:536 ../src/keybindings.c:260
msgid "_Duplicate Line or Selection"
msgstr "_Zeile oder Auswahl duplizieren"
-#: ../src/interface.c:545
-#: ../src/keybindings.c:321
+#: ../src/interface.c:545 ../src/keybindings.c:321
msgid "_Select Current Line(s)"
msgstr "Aktuelle Zeile(n) a_uswählen"
-#: ../src/interface.c:549
-#: ../src/keybindings.c:324
+#: ../src/interface.c:549 ../src/keybindings.c:324
msgid "_Select Current Paragraph"
msgstr "Aktuellen Absatz au_swählen"
-#: ../src/interface.c:558
-#: ../src/keybindings.c:363
+#: ../src/interface.c:558 ../src/keybindings.c:363
msgid "_Send Selection to Terminal"
msgstr "_Auswahl an Terminal senden"
-#: ../src/interface.c:562
-#: ../src/interface.c:2245
+#: ../src/interface.c:562 ../src/interface.c:2245
msgid "_Format"
msgstr "_Format"
-#: ../src/interface.c:569
-#: ../src/keybindings.c:365
+#: ../src/interface.c:569 ../src/keybindings.c:365
msgid "_Reflow Lines/Block"
msgstr "_Neuformatieren der Zeile/des Abschnitts"
-#: ../src/interface.c:573
-#: ../src/keybindings.c:335
+#: ../src/interface.c:573 ../src/keybindings.c:335
msgid "T_oggle Case of Selection"
msgstr "_Groß- und Kleinschreibung für die Auswahl tauschen"
-#: ../src/interface.c:577
-#: ../src/keybindings.c:270
+#: ../src/interface.c:577 ../src/keybindings.c:270
msgid "_Transpose Current Line"
msgstr "Aktuelle Zeile _tauschen"
@@ -1265,8 +1214,7 @@
msgid "_Decrease Indent"
msgstr "Einzug _verringern"
-#: ../src/interface.c:619
-#: ../src/keybindings.c:354
+#: ../src/interface.c:619 ../src/keybindings.c:354
msgid "_Smart Line Indent"
msgstr "Intelligentes _Einrücken"
@@ -1278,49 +1226,39 @@
msgid "I_nsert Comments"
msgstr "K_ommentare einfügen"
-#: ../src/interface.c:654
-#: ../src/interface.c:2260
+#: ../src/interface.c:654 ../src/interface.c:2260
msgid "Insert _ChangeLog Entry"
msgstr "_ChangeLog-Eintrag hinzufügen"
-#: ../src/interface.c:658
-#: ../src/interface.c:2264
+#: ../src/interface.c:658 ../src/interface.c:2264
msgid "Insert _Function Description"
msgstr "_Funktionsbeschreibung einfügen"
-#: ../src/interface.c:662
-#: ../src/interface.c:2268
+#: ../src/interface.c:662 ../src/interface.c:2268
msgid "Insert _Multiline Comment"
msgstr "_Mehrzeiligen Kommentar einfügen"
-#: ../src/interface.c:671
-#: ../src/interface.c:2283
+#: ../src/interface.c:671 ../src/interface.c:2283
msgid "Insert File _Header"
msgstr "_Dateikopf einfügen"
-#: ../src/interface.c:675
-#: ../src/interface.c:2287
+#: ../src/interface.c:675 ../src/interface.c:2287
msgid "Insert _GPL Notice"
msgstr "_GPL-Hinweis einfügen"
-#: ../src/interface.c:679
-#: ../src/interface.c:2291
+#: ../src/interface.c:679 ../src/interface.c:2291
msgid "Insert _BSD License Notice"
msgstr "_BSD-Lizenz-Hinweis einfügen"
-#: ../src/interface.c:683
-#: ../src/interface.c:2300
+#: ../src/interface.c:683 ../src/interface.c:2300
msgid "Insert Dat_e"
msgstr "_Datum einfügen"
-#: ../src/interface.c:697
-#: ../src/interface.c:2314
+#: ../src/interface.c:697 ../src/interface.c:2314
msgid "_Insert \"include <...>\""
msgstr "\"include <...>\" ei_nfügen"
-#: ../src/interface.c:711
-#: ../src/interface.c:2333
-#: ../src/keybindings.c:374
+#: ../src/interface.c:711 ../src/interface.c:2333 ../src/keybindings.c:374
msgid "_Insert Alternative White Space"
msgstr "Alternatives _Leerzeichen einfügen"
@@ -1328,13 +1266,11 @@
msgid "Preference_s"
msgstr "E_instellungen"
-#: ../src/interface.c:728
-#: ../src/keybindings.c:387
+#: ../src/interface.c:728 ../src/keybindings.c:387
msgid "P_lugin Preferences"
msgstr "Plugin-_Einstellungen"
-#: ../src/interface.c:736
-#: ../src/interface.c:2337
+#: ../src/interface.c:736 ../src/interface.c:2337
msgid "_Search"
msgstr "_Suchen"
@@ -1350,8 +1286,7 @@
msgid "Find in F_iles"
msgstr "In _Dateien suchen"
-#: ../src/interface.c:768
-#: ../src/search.c:614
+#: ../src/interface.c:768 ../src/search.c:620
msgid "_Replace"
msgstr "_Ersetzen"
@@ -1363,13 +1298,11 @@
msgid "Pr_evious Message"
msgstr "V_orherige Nachricht"
-#: ../src/interface.c:802
-#: ../src/keybindings.c:434
+#: ../src/interface.c:802 ../src/keybindings.c:434
msgid "_Go to Next Marker"
msgstr "Zur _nächsten Markierung springen"
-#: ../src/interface.c:806
-#: ../src/keybindings.c:437
+#: ../src/interface.c:806 ../src/keybindings.c:437
msgid "_Go to Previous Marker"
msgstr "Zur _vorherigen Markierung springen"
@@ -1377,39 +1310,31 @@
msgid "_Go to Line"
msgstr "_Gehe zu Zeile"
-#: ../src/interface.c:823
-#: ../src/interface.c:2272
-#: ../src/interface.c:3531
+#: ../src/interface.c:823 ../src/interface.c:2272 ../src/interface.c:3532
msgid "_More"
msgstr "_Weitere"
-#: ../src/interface.c:830
-#: ../src/keybindings.c:399
+#: ../src/interface.c:830 ../src/keybindings.c:399
msgid "Find Next _Selection"
msgstr "Auswahl _vorwärts im Dokument finden "
-#: ../src/interface.c:834
-#: ../src/keybindings.c:401
+#: ../src/interface.c:834 ../src/keybindings.c:401
msgid "Find Pre_vious Selection"
msgstr "Auswahl _rückwärts im Dokument finden"
-#: ../src/interface.c:843
-#: ../src/interface.c:2354
+#: ../src/interface.c:843 ../src/interface.c:2354
msgid "Find _Usage"
msgstr "_Auftreten finden"
-#: ../src/interface.c:847
-#: ../src/interface.c:2362
+#: ../src/interface.c:847 ../src/interface.c:2362
msgid "Find _Document Usage"
msgstr "_Auftreten im Dokument finden"
-#: ../src/interface.c:856
-#: ../src/keybindings.c:416
+#: ../src/interface.c:856 ../src/keybindings.c:416
msgid "_Mark All"
msgstr "_Alles markieren"
-#: ../src/interface.c:865
-#: ../src/interface.c:2370
+#: ../src/interface.c:865 ../src/interface.c:2370
msgid "Go to _Tag Definition"
msgstr "Gehe zur _Tagdefinition"
@@ -1441,11 +1366,8 @@
msgid "Show Side_bar"
msgstr "Seiten_leiste anzeigen"
-#: ../src/interface.c:916
-#: ../src/interface.c:4302
-#: ../src/interface.c:5637
-#: ../src/keybindings.c:253
-#: ../src/prefs.c:1557
+#: ../src/interface.c:916 ../src/interface.c:4310 ../src/interface.c:5654
+#: ../src/keybindings.c:253 ../src/prefs.c:1557
msgid "Editor"
msgstr "Editor"
@@ -1489,21 +1411,15 @@
msgid "In_dent Type"
msgstr "Art der _Einrückung"
-#: ../src/interface.c:990
-#: ../src/interface.c:3894
-#: ../src/interface.c:5535
+#: ../src/interface.c:990 ../src/interface.c:3904 ../src/interface.c:5554
msgid "_Tabs"
msgstr "_Tabulatoren"
-#: ../src/interface.c:996
-#: ../src/interface.c:3885
-#: ../src/interface.c:5526
+#: ../src/interface.c:996 ../src/interface.c:3895 ../src/interface.c:5545
msgid "_Spaces"
msgstr "_Leerzeichen"
#: ../src/interface.c:1002
-#: ../src/interface.c:3903
-#: ../src/interface.c:5544
msgid "T_abs and Spaces"
msgstr "Tabulatoren _und Leerzeichen"
@@ -1655,8 +1571,7 @@
msgid "Load Ta_gs"
msgstr "_Tags laden"
-#: ../src/interface.c:1271
-#: ../src/interface.c:1278
+#: ../src/interface.c:1271 ../src/interface.c:1278
msgid "_Help"
msgstr "_Hilfe"
@@ -1672,8 +1587,7 @@
msgid "_Debug Messages"
msgstr "_Debug-Meldungen"
-#: ../src/interface.c:1333
-#: ../src/sidebar.c:132
+#: ../src/interface.c:1333 ../src/sidebar.c:124
msgid "Symbols"
msgstr "Symbole"
@@ -1713,178 +1627,236 @@
msgid "Conte_xt Action"
msgstr "_Kontextaktion"
-#: ../src/interface.c:2907
-#: ../src/keybindings.c:384
+#: ../src/interface.c:2908 ../src/keybindings.c:384
msgid "Preferences"
msgstr "Einstellungen"
-#: ../src/interface.c:2943
+#: ../src/interface.c:2944
msgid "Load files from the last session"
msgstr "Dateien aus der letzten Sitzung laden"
-#: ../src/interface.c:2946
+#: ../src/interface.c:2947
msgid "Opens at startup the files from the last session"
msgstr "Lädt die geöffneten Dateien aus der letzten Sitzung"
-#: ../src/interface.c:2948
+#: ../src/interface.c:2949
msgid "Load virtual terminal support"
msgstr "Die Virtual Terminal Emulation (VTE) laden"
-#: ../src/interface.c:2950
-msgid "Whether the virtual terminal emulation (VTE) should be loaded at startup, disable it if you do not need it"
-msgstr "Stellt ein, ob die Virtual Terminal Emulation beim Starten geladen werden soll oder nicht. Wenn sie nicht benötigt wird, sollte diese Option deaktiviert werden."
+#: ../src/interface.c:2951
+msgid ""
+"Whether the virtual terminal emulation (VTE) should be loaded at startup, "
+"disable it if you do not need it"
+msgstr ""
+"Stellt ein, ob die Virtual Terminal Emulation beim Starten geladen werden "
+"soll oder nicht. Wenn sie nicht benötigt wird, sollte diese Option "
+"deaktiviert werden."
-#: ../src/interface.c:2952
+#: ../src/interface.c:2953
msgid "Enable plugin support"
msgstr "Plugins aktivieren"
-#: ../src/interface.c:2956
+#: ../src/interface.c:2957
msgid "<b>Startup</b>"
msgstr "<b>Starten</b>"
-#: ../src/interface.c:2975
+#: ../src/interface.c:2976
msgid "Save window position and geometry"
msgstr "Fensterposition und -größe speichern"
-#: ../src/interface.c:2978
+#: ../src/interface.c:2979
msgid "Saves the window position and geometry and restores it at the start"
-msgstr "Speichert die Fensterposition und die Fenstergröße und stellt sie beim nächsten Start wieder her."
+msgstr ""
+"Speichert die Fensterposition und die Fenstergröße und stellt sie beim "
+"nächsten Start wieder her."
-#: ../src/interface.c:2980
+#: ../src/interface.c:2981
msgid "Confirm exit"
msgstr "Beenden bestätigen"
-#: ../src/interface.c:2983
+#: ../src/interface.c:2984
msgid "Shows a confirmation dialog on exit"
msgstr "Zeigt einen Bestätigungsdialog vor dem Beenden"
-#: ../src/interface.c:2985
+#: ../src/interface.c:2986
msgid "<b>Shutdown</b>"
msgstr "<b>Beenden </b>"
-#: ../src/interface.c:3006
+#: ../src/interface.c:3007
msgid "Startup path:"
msgstr "Startpfad:"
-#: ../src/interface.c:3018
-msgid "Path to start in when opening or saving files. Must be an absolute path. Leave blank to use the current working directory."
-msgstr "Startpfad, wenn Dateien geöffnet oder gespeichert werden sollen. Der Pfad muss absolut sein. Um das aktuelle Arbeitsverzeichnis zu benutzen, lassen Sie das Feld leer."
+#: ../src/interface.c:3019
+msgid ""
+"Path to start in when opening or saving files. Must be an absolute path. "
+"Leave blank to use the current working directory."
+msgstr ""
+"Startpfad, wenn Dateien geöffnet oder gespeichert werden sollen. Der Pfad "
+"muss absolut sein. Um das aktuelle Arbeitsverzeichnis zu benutzen, lassen "
+"Sie das Feld leer."
-#: ../src/interface.c:3031
+#: ../src/interface.c:3032
msgid "Project files:"
msgstr "Projektdateien:"
-#: ../src/interface.c:3043
+#: ../src/interface.c:3044
msgid "Path to start in when opening project files"
msgstr "Pfad zum Öffnen von Projektdateien"
-#: ../src/interface.c:3056
+#: ../src/interface.c:3057
msgid "Extra plugin path:"
msgstr "Zusätzlicher Pluginpfad"
-#: ../src/interface.c:3068
-msgid "Geany looks by default in the global installation path and in the configuration directory. The path entered here will be searched additionally for plugins. Leave blank to disable."
-msgstr "Geany schaut standardmäßig im Installationsverzeichnis und im Konfigurationsverzeichnis nach Plugins. Ein Pfad, der hier eingegeben wird, wird zusätzlich bei der Suche nach Plugins berücksichtigt. Das Feld wird ignoriert, falls es leer ist."
+#: ../src/interface.c:3069
+msgid ""
+"Geany looks by default in the global installation path and in the "
+"configuration directory. The path entered here will be searched additionally "
+"for plugins. Leave blank to disable."
+msgstr ""
+"Geany schaut standardmäßig im Installationsverzeichnis und im "
+"Konfigurationsverzeichnis nach Plugins. Ein Pfad, der hier eingegeben wird, "
+"wird zusätzlich bei der Suche nach Plugins berücksichtigt. Das Feld wird "
+"ignoriert, falls es leer ist."
-#: ../src/interface.c:3081
+#: ../src/interface.c:3082
msgid "<b>Paths</b>"
msgstr "<b>Pfade</b>"
-#: ../src/interface.c:3086
+#: ../src/interface.c:3087
msgid "Startup"
msgstr "Starten & Beenden"
-#: ../src/interface.c:3109
+#: ../src/interface.c:3110
msgid "Beep on errors or when compilation has finished"
msgstr "Bei Fehlern oder beendeter Kompilierung Piepton ausgeben"
-#: ../src/interface.c:3112
-msgid "Whether to beep if an error occurred or when the compilation process has finished"
-msgstr "Legt fest, ob bei einem Fehler oder bei beendeter Kompilierung ein Piepton ausgegeben werden soll"
+#: ../src/interface.c:3113
+msgid ""
+"Whether to beep if an error occurred or when the compilation process has "
+"finished"
+msgstr ""
+"Legt fest, ob bei einem Fehler oder bei beendeter Kompilierung ein Piepton "
+"ausgegeben werden soll"
-#: ../src/interface.c:3114
+#: ../src/interface.c:3115
msgid "Switch to status message list at new message"
msgstr "Bei neuen Meldungen zu den Statusmeldungen wechseln"
-#: ../src/interface.c:3117
-msgid "Switch to the status message tab (in the notebook window at the bottom) if a new status message arrives"
-msgstr "Wechselt automatisch zu dem Reiter mit den Statusmeldungen im Infobereich, wenn eine neue Statusmeldung vorliegt"
+#: ../src/interface.c:3118
+msgid ""
+"Switch to the status message tab (in the notebook window at the bottom) if a "
+"new status message arrives"
+msgstr ""
+"Wechselt automatisch zu dem Reiter mit den Statusmeldungen im Infobereich, "
+"wenn eine neue Statusmeldung vorliegt"
-#: ../src/interface.c:3119
+#: ../src/interface.c:3120
msgid "Suppress status messages in the status bar"
msgstr "Meldungen in der Statuszeile unterdrücken"
-#: ../src/interface.c:3122
-msgid "Removes all messages from the status bar. The messages are still displayed in the status messages window."
-msgstr "Entfernt alle Nachrichten aus der Statuszeile. Die Nachrichten sind weiterhin über den »Status«-Reiter im Infobereich abrufbar."
+#: ../src/interface.c:3123
+msgid ""
+"Removes all messages from the status bar. The messages are still displayed "
+"in the status messages window."
+msgstr ""
+"Entfernt alle Nachrichten aus der Statuszeile. Die Nachrichten sind "
+"weiterhin über den »Status«-Reiter im Infobereich abrufbar."
-#: ../src/interface.c:3124
+#: ../src/interface.c:3125
msgid "Auto-focus widgets (focus follows mouse)"
msgstr "Autofokus (Der Fokus folgt der Maus)"
-#: ../src/interface.c:3127
-msgid "Gives the focus automatically to widgets below the mouse cursor. Works for the main editor widget, the scribble, the toolbar search and goto line fields and the VTE."
-msgstr "Wenn diese Option aktiviert ist, gibt Geany dem Fenster den Fokus, über dem sich im Moment der Zeiger der Maus befindet. Diese Option funktioniert für das Hauptfenster, das Notizbuch, den Such- und Springe-zu-Feldern in der Werkzeugliste sowie für das integrierte Terminal."
+#: ../src/interface.c:3128
+msgid ""
+"Gives the focus automatically to widgets below the mouse cursor. Works for "
+"the main editor widget, the scribble, the toolbar search and goto line "
+"fields and the VTE."
+msgstr ""
+"Wenn diese Option aktiviert ist, gibt Geany dem Fenster den Fokus, über dem "
+"sich im Moment der Zeiger der Maus befindet. Diese Option funktioniert für "
+"das Hauptfenster, das Notizbuch, den Such- und Springe-zu-Feldern in der "
+"Werkzeugliste sowie für das integrierte Terminal."
-#: ../src/interface.c:3129
+#: ../src/interface.c:3130
msgid "Use Windows File Open/Save dialogs"
msgstr "Benutze den Windows Datei öffnen/speichern Dialog"
-#: ../src/interface.c:3132
-msgid "Defines whether to use the native Windows File Open/Save dialogs or whether to use the GTK default dialogs"
-msgstr "Bestimmt, ob der native Windows Datei öffnen/speichern anstelle des GTK-Dialogs genutzt werden soll."
+#: ../src/interface.c:3133
+msgid ""
+"Defines whether to use the native Windows File Open/Save dialogs or whether "
+"to use the GTK default dialogs"
+msgstr ""
+"Bestimmt, ob der native Windows Datei öffnen/speichern anstelle des GTK-"
+"Dialogs genutzt werden soll."
-#: ../src/interface.c:3134
-#: ../src/interface.c:3370
-#: ../src/interface.c:4512
+#: ../src/interface.c:3135 ../src/interface.c:3371 ../src/interface.c:4520
msgid "<b>Miscellaneous</b>"
msgstr "<b>Sonstiges</b>"
-#: ../src/interface.c:3153
+#: ../src/interface.c:3154
msgid "Always wrap search and hide the Find dialog"
msgstr "Das vollständige Dokument durchsuchen und den Suchen-Dialog schließen"
-#: ../src/interface.c:3156
-msgid "Always wrap search around the document and hide the Find dialog after clicking Find Next/Previous"
-msgstr "Immer das vollständige Dokument durchsuchen und den Suchen-Dialog nach Klicken auf Nächstes/Vorheriges schließen"
+#: ../src/interface.c:3157
+msgid ""
+"Always wrap search around the document and hide the Find dialog after "
+"clicking Find Next/Previous"
+msgstr ""
+"Immer das vollständige Dokument durchsuchen und den Suchen-Dialog nach "
+"Klicken auf Nächstes/Vorheriges schließen"
-#: ../src/interface.c:3158
+#: ../src/interface.c:3159
msgid "Use the current word under the cursor for Find dialogs"
msgstr "Aktuelle Cursorposition zur Suche heranziehen"
-#: ../src/interface.c:3161
-msgid "Use current word under the cursor when opening the Find, Find in Files or Replace dialog and there is no selection"
-msgstr "Bestimmt das aktuelle Wort zum Suchen & Ersetzen anhand der Cursorposition"
+#: ../src/interface.c:3162
+msgid ""
+"Use current word under the cursor when opening the Find, Find in Files or "
+"Replace dialog and there is no selection"
+msgstr ""
+"Bestimmt das aktuelle Wort zum Suchen & Ersetzen anhand der Cursorposition"
-#: ../src/interface.c:3163
+#: ../src/interface.c:3164
msgid "Use the current file's directory for Find in Files"
msgstr "Verzeichnis der aktuellen Datei für »In Dateien suchen« benutzen"
-#: ../src/interface.c:3167
+#: ../src/interface.c:3168
msgid "<b>Search</b>"
msgstr "<b>Suche</b>"
-#: ../src/interface.c:3186
+#: ../src/interface.c:3187
msgid "Use project-based session files"
msgstr "Sitzung im Projekt speichern und wieder öffnen"
-#: ../src/interface.c:3189
-msgid "Whether to store a project's session files and open them when re-opening the project"
-msgstr "Speichert die geöffneten Dateien (aktuelle Sitzung) zusammen mit dem Projekt und öffnet diese Dateien wieder wenn das Projekt geöffnet wird"
+#: ../src/interface.c:3190
+msgid ""
+"Whether to store a project's session files and open them when re-opening the "
+"project"
+msgstr ""
+"Speichert die geöffneten Dateien (aktuelle Sitzung) zusammen mit dem Projekt "
+"und öffnet diese Dateien wieder wenn das Projekt geöffnet wird"
-#: ../src/interface.c:3191
+#: ../src/interface.c:3192
msgid "Store project file inside the project base directory"
msgstr "Projektdatei innerhalb des Projektbasisverzeichnis erstellen"
-#: ../src/interface.c:3194
-msgid "When enabled, a project file is stored by default inside the project base directory when creating new projects instead of one directory above the base directory. You can still change the path of the project file in the New Project dialog."
-msgstr "Wenn diese Option eingeschaltet ist, wird beim Erzeugen eines neuen Projekts die Projektdatei standardmäßig innerhalb des Basisverzeichnis des Projekts angelegt, ansonsten wird die Datei ein Verzeichnis über dem Basisverzeichnis angelegt. Der Pfad kann im »Neues Projekt«-Dialog geändert werden."
+#: ../src/interface.c:3195
+msgid ""
+"When enabled, a project file is stored by default inside the project base "
+"directory when creating new projects instead of one directory above the base "
+"directory. You can still change the path of the project file in the New "
+"Project dialog."
+msgstr ""
+"Wenn diese Option eingeschaltet ist, wird beim Erzeugen eines neuen Projekts "
+"die Projektdatei standardmäßig innerhalb des Basisverzeichnis des Projekts "
+"angelegt, ansonsten wird die Datei ein Verzeichnis über dem Basisverzeichnis "
+"angelegt. Der Pfad kann im »Neues Projekt«-Dialog geändert werden."
-#: ../src/interface.c:3196
+#: ../src/interface.c:3197
msgid "<b>Projects</b>"
msgstr "<b>Projekte</b>"
-#: ../src/interface.c:3201
+#: ../src/interface.c:3202
msgid "Miscellaneous"
msgstr "Sonstiges"
@@ -1892,973 +1864,1121 @@
#. * corresponding chapter in the documentation, comparing translatable
#. * strings is easy to break. Maybe attach an identifying string to the
#. * tab label object.
-#: ../src/interface.c:3205
-#: ../src/prefs.c:1551
+#: ../src/interface.c:3206 ../src/prefs.c:1551
msgid "General"
msgstr "Allgemein"
-#: ../src/interface.c:3246
+#: ../src/interface.c:3247
msgid "Show symbol list"
msgstr "Symbolliste anzeigen"
-#: ../src/interface.c:3249
+#: ../src/interface.c:3250
msgid "Toggle the symbol list on and off"
msgstr "Blendet die Symbolliste ein und aus"
-#: ../src/interface.c:3251
+#: ../src/interface.c:3252
msgid "Show documents list"
msgstr "Dokumentenliste anzeigen"
-#: ../src/interface.c:3254
+#: ../src/interface.c:3255
msgid "Toggle the documents list on and off"
msgstr "Blendet die Dokumentenliste ein und aus"
-#: ../src/interface.c:3256
+#: ../src/interface.c:3257
msgid "Show sidebar"
msgstr "Seitenleiste anzeigen"
-#: ../src/interface.c:3264
+#: ../src/interface.c:3265
msgid "Position:"
msgstr "Position:"
-#: ../src/interface.c:3268
-#: ../src/interface.c:3424
-#: ../src/interface.c:3485
-#: ../src/interface.c:3503
-#: ../src/interface.c:3521
+#: ../src/interface.c:3269 ../src/interface.c:3425 ../src/interface.c:3486
+#: ../src/interface.c:3504 ../src/interface.c:3522
msgid "Left"
msgstr "Links"
-#: ../src/interface.c:3275
-#: ../src/interface.c:3432
-#: ../src/interface.c:3486
-#: ../src/interface.c:3504
-#: ../src/interface.c:3522
+#: ../src/interface.c:3276 ../src/interface.c:3433 ../src/interface.c:3487
+#: ../src/interface.c:3505 ../src/interface.c:3523
msgid "Right"
msgstr "Rechts"
-#: ../src/interface.c:3281
+#: ../src/interface.c:3282
msgid "<b>Sidebar</b>"
msgstr "<b>Seitenleiste</b>"
-#: ../src/interface.c:3302
+#: ../src/interface.c:3303
msgid "Symbol list:"
msgstr "Symbolliste:"
-#: ../src/interface.c:3309
-#: ../src/interface.c:3472
+#: ../src/interface.c:3310 ../src/interface.c:3473
msgid "Message window:"
msgstr "Meldungsfenster:"
-#: ../src/interface.c:3316
-#: ../src/interface.c:3508
+#: ../src/interface.c:3317 ../src/interface.c:3509
msgid "Editor:"
msgstr "Editor:"
-#: ../src/interface.c:3328
+#: ../src/interface.c:3329
msgid "Sets the font for the message window"
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list