[geany/geany] e61bba: Reword "replace by tabs/spaces" as "replace with"
Matt Copperwaite
git-noreply at xxxxx
Mon May 5 03:09:13 UTC 2014
Branch: refs/heads/master
Author: Matt Copperwaite <mattcopp+git at gmail.com>
Committer: Colomban Wendling <ban at herbesfolles.org>
Date: Mon, 05 May 2014 03:09:13 UTC
Commit: e61bba1bc36e1fc801685a23f0ea47d7f31aa293
https://github.com/geany/geany/commit/e61bba1bc36e1fc801685a23f0ea47d7f31aa293
Log Message:
-----------
Reword "replace by tabs/spaces" as "replace with"
Modified Paths:
--------------
data/geany.glade
doc/geany.html
doc/geany.txt
src/document.c
src/keybindings.c
Modified: data/geany.glade
10 lines changed, 5 insertions(+), 5 deletions(-)
===================================================================
@@ -4530,12 +4530,12 @@
</child>
<child>
<object class="GtkCheckButton" id="check_replace_tabs">
- <property name="label" translatable="yes">Replace tabs by space</property>
+ <property name="label" translatable="yes">Replace tabs with space</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Replaces all tabs in document by spaces</property>
+ <property name="tooltip_text" translatable="yes">Replaces all tabs in document with spaces</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -7162,7 +7162,7 @@
</child>
<child>
<object class="GtkCheckButton" id="check_replace_tabs1">
- <property name="label" translatable="yes">Replace tabs by space</property>
+ <property name="label" translatable="yes">Replace tabs with space</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -9540,7 +9540,7 @@
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Replace Tabs by Spaces</property>
+ <property name="label" translatable="yes">Replace Tabs with _Spaces</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_replace_tabs_activate" swapped="no"/>
</object>
@@ -9550,7 +9550,7 @@
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Replace Spaces b_y Tabs...</property>
+ <property name="label" translatable="yes">Replace Spaces with _Tabs...</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_replace_spaces_activate" swapped="no"/>
</object>
Modified: doc/geany.html
8 lines changed, 4 insertions(+), 4 deletions(-)
===================================================================
@@ -2701,7 +2701,7 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2>
<p class="last">This does not apply to Diff documents, e.g. patch files.</p>
</div>
</dd>
-<dt>Replace tabs by space</dt>
+<dt>Replace tabs with space</dt>
<dd><p class="first">Replace all tabs in the document with the equivalent number of spaces.</p>
<div class="note last">
<p class="first admonition-title">Note</p>
@@ -4117,7 +4117,7 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2>
<tr><td>Increase indent</td>
<td>Ctrl-I</td>
<td>Indents the current line or selection by one tab
-or by spaces in the amount of the tab width
+or with spaces in the amount of the tab width
setting.</td>
</tr>
<tr><td>Decrease indent</td>
@@ -4552,11 +4552,11 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2>
<td> </td>
<td>See <a class="reference internal" href="#cloning-documents">Cloning documents</a>.</td>
</tr>
-<tr><td>Replace tabs by space</td>
+<tr><td>Replace tabs with space</td>
<td> </td>
<td>Replaces all tabs with the right amount of spaces.</td>
</tr>
-<tr><td>Replace spaces by tabs</td>
+<tr><td>Replace spaces with tabs</td>
<td> </td>
<td>Replaces leading spaces with tab characters.</td>
</tr>
Modified: doc/geany.txt
8 lines changed, 4 insertions(+), 4 deletions(-)
===================================================================
@@ -2365,7 +2365,7 @@ Strip trailing spaces
.. note::
This does not apply to Diff documents, e.g. patch files.
-Replace tabs by space
+Replace tabs with spaces
Replace all tabs in the document with the equivalent number of spaces.
.. note::
@@ -3473,7 +3473,7 @@ Toggle line commentation Ctrl-E Comments a line if it
a comment if the line is commented.
Increase indent Ctrl-I Indents the current line or selection by one tab
- or by spaces in the amount of the tab width
+ or with spaces in the amount of the tab width
setting.
Decrease indent Ctrl-U Removes one tab or the amount of spaces of
@@ -3707,9 +3707,9 @@ Action Default shortcut Description
==================================== ==================== ==================================================
Clone See `Cloning documents`_.
-Replace tabs by space Replaces all tabs with the right amount of spaces.
+Replace tabs with space Replaces all tabs with the right amount of spaces.
-Replace spaces by tabs Replaces leading spaces with tab characters.
+Replace spaces with tabs Replaces leading spaces with tab characters.
Toggle current fold Toggles the folding state of the current code block.
Modified: src/document.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -1687,7 +1687,7 @@ static gchar *save_doc(GeanyDocument *doc, const gchar *locale_filename,
* Also shows the Save As dialog if necessary.
* If the file is not modified, this function may do nothing unless @a force is set to @c TRUE.
*
- * Saving may include replacing tabs by spaces,
+ * Saving may include replacing tabs with spaces,
* stripping trailing spaces and adding a final new line at the end of the file, depending
* on user preferences. Then the @c "document-before-save" signal is emitted,
* allowing plugins to modify the document before it is saved, and data is
@@ -1729,7 +1729,7 @@ gboolean document_save_file(GeanyDocument *doc, gboolean force)
return FALSE;
fp = project_get_file_prefs();
- /* replaces tabs by spaces but only if the current file is not a Makefile */
+ /* replaces tabs with spaces but only if the current file is not a Makefile */
if (fp->replace_tabs && doc->file_type->id != GEANY_FILETYPES_MAKE)
editor_replace_tabs(doc->editor);
/* strip trailing spaces */
Modified: src/keybindings.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -567,9 +567,9 @@ static void init_default_kb(void)
add_kb(group, GEANY_KEYS_DOCUMENT_CLONE, NULL,
0, 0, "menu_clone", _("_Clone"), "clone1");
add_kb(group, GEANY_KEYS_DOCUMENT_REPLACETABS, NULL,
- 0, 0, "menu_replacetabs", _("Replace tabs by space"), "menu_replace_tabs");
+ 0, 0, "menu_replacetabs", _("Replace tabs with space"), "menu_replace_tabs");
add_kb(group, GEANY_KEYS_DOCUMENT_REPLACESPACES, NULL,
- 0, 0, "menu_replacespaces", _("Replace spaces by tabs"), "menu_replace_spaces");
+ 0, 0, "menu_replacespaces", _("Replace spaces with tabs"), "menu_replace_spaces");
add_kb(group, GEANY_KEYS_DOCUMENT_TOGGLEFOLD, NULL,
0, 0, "menu_togglefold", _("Toggle current fold"), NULL);
add_kb(group, GEANY_KEYS_DOCUMENT_FOLDALL, NULL,
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
More information about the Commits
mailing list