Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/geany/geany
Browse files Browse the repository at this point in the history
  • Loading branch information
giuspen committed Feb 20, 2016
2 parents 31b7a2d + 2f55540 commit 21dfbd0
Show file tree
Hide file tree
Showing 53 changed files with 4,863 additions and 4,863 deletions.
2 changes: 1 addition & 1 deletion NEWS
@@ -1,7 +1,7 @@
Geany 1.27 (unreleased)

Internationalization
* Updated translations: it
* Updated translations: de, it, ja, lt, pt


Geany 1.26 (November 15, 2015)
Expand Down
2 changes: 1 addition & 1 deletion data/filetypes.rust
Expand Up @@ -60,7 +60,7 @@ context_action_cmd=
[indentation]
#width=4
# 0 is spaces, 1 is tabs, 2 is tab & spaces
#type=1
#type=0

[build-menu]
FT_00_LB=Compile
Expand Down
8 changes: 4 additions & 4 deletions data/geany.glade
Expand Up @@ -500,7 +500,7 @@
</child>
<child>
<object class="GtkImageMenuItem" id="goto_tag_definition2">
<property name="label" translatable="yes">Go to _Tag Definition</property>
<property name="label" translatable="yes">Go to Symbol Defini_tion</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
Expand Down Expand Up @@ -7283,7 +7283,7 @@
<object class="GtkMenuItem" id="goto_tag_definition1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Go to _Tag Definition</property>
<property name="label" translatable="yes">Go to Symbol Defini_tion</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_goto_tag_definition1" swapped="no"/>
</object>
Expand All @@ -7292,7 +7292,7 @@
<object class="GtkMenuItem" id="goto_tag_declaration1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Go to T_ag Declaration</property>
<property name="label" translatable="yes">Go to Symbol Decl_aration</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_goto_tag_declaration1" swapped="no"/>
</object>
Expand Down Expand Up @@ -8049,7 +8049,7 @@
<object class="GtkMenuItem" id="load_tags1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Load Ta_gs...</property>
<property name="label" translatable="yes">Load Ta_gs File...</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_load_tags1_activate" swapped="no"/>
</object>
Expand Down
177 changes: 88 additions & 89 deletions doc/geany.txt

Large diffs are not rendered by default.

0 comments on commit 21dfbd0

Please sign in to comment.