Permalink
Browse files

Merge remote-tracking branch 'origin/master' into tm/tree-refactoring

Conflicts:
	makefile.win32
	src/makefile.win32
  • Loading branch information...
2 parents 928de3d + 40ab39d commit c72dce06a55594247cad232d78bec9868f585587 @ntrel ntrel committed Jul 4, 2012
Showing with 14,491 additions and 15,087 deletions.
  1. +2 −6,875 ChangeLog
  2. +6,875 −0 ChangeLog.pre-1-22
  3. +13 −7 Makefile.am
  4. +26 −7 NEWS
  5. +1 −1 README
  6. +1 −1 README.Packagers
  7. +8 −8 THANKS
  8. +1 −1 configure.ac
  9. +0 −1 data/colorschemes/alt.conf
  10. +2 −2 data/filetypes.Genie.conf
  11. +1 −1 data/filetypes.ada
  12. +1 −1 data/filetypes.asm
  13. +4 −3 data/filetypes.c
  14. +0 −1 data/filetypes.common
  15. +2 −2 data/filetypes.cpp
  16. +1 −0 data/filetypes.css
  17. +3 −0 data/filetypes.d
  18. +5 −5 data/filetypes.perl
  19. +2 −2 data/filetypes.sh
  20. +2 −2 data/filetypes.vala
  21. +1 −1 doc/geany.1.in
  22. +25 −17 doc/geany.html
  23. +18 −12 doc/geany.txt
  24. +17 −16 doc/making-a-release
  25. +1 −1 doc/plugins.dox
  26. +2 −2 doc/pluginsignals.c
  27. +2 −2 doc/pluginsymbols.c
  28. +9 −5 geany.nsi
  29. +3 −3 geany_private.rc
  30. +1 −4 m4/geany-i18n.m4
  31. +33 −24 makefile.win32
  32. +1 −1 plugins/Makefile.am
  33. +2 −2 plugins/classbuilder.c
  34. +2 −2 plugins/demoplugin.c
  35. +2 −2 plugins/export.c
  36. +2 −2 plugins/filebrowser.c
  37. +2 −2 plugins/geanyplugin.h
  38. +3 −3 plugins/htmlchars.c
  39. +2 −2 plugins/saveactions.c
  40. +2 −2 plugins/splitwindow.c
  41. +840 −1,025 po/de.po
  42. +10 −11 po/es.po
  43. +759 −1,001 po/fr.po
  44. +724 −983 po/hu.po
  45. +4 −5 po/it.po
  46. +222 −224 po/kk.po
  47. +215 −228 po/pt_BR.po
  48. +301 −301 po/sv.po
  49. +213 −230 po/tr.po
  50. +1,358 −1,373 po/zh_CN.po
  51. +150 −1,054 scintilla/gtk/PlatGTK.cxx
  52. +48 −94 scintilla/gtk/ScintillaGTK.cxx
  53. +8 −0 scintilla/include/ILexer.h
  54. +77 −119 scintilla/include/Platform.h
  55. +130 −0 scintilla/include/SciLexer.h
  56. +29 −2 scintilla/include/Scintilla.h
  57. +224 −9 scintilla/include/Scintilla.iface
  58. +1 −0 scintilla/lexers/LexAda.cxx
  59. +1 −5 scintilla/lexers/LexAsm.cxx
  60. +9 −2 scintilla/lexers/LexBash.cxx
  61. +1 −5 scintilla/lexers/LexBasic.cxx
  62. +30 −20 scintilla/lexers/LexCPP.cxx
  63. +204 −24 scintilla/lexers/LexCSS.cxx
  64. +1 −5 scintilla/lexers/LexD.cxx
  65. +19 −12 scintilla/lexers/LexHTML.cxx
  66. +1 −0 scintilla/lexers/LexNsis.cxx
  67. +25 −8 scintilla/lexers/LexOthers.cxx
  68. +20 −0 scintilla/lexers/LexPascal.cxx
  69. +2 −7 scintilla/lexers/LexPerl.cxx
  70. +2 −4 scintilla/lexers/LexRuby.cxx
  71. +128 −35 scintilla/lexers/LexSQL.cxx
  72. +0 −3 scintilla/lexers/LexVHDL.cxx
  73. +1 −1 scintilla/lexlib/LexAccessor.h
  74. +2 −2 scintilla/lexlib/PropSetSimple.cxx
  75. +14 −5 scintilla/scintilla_changes.patch
  76. +7 −4 scintilla/src/AutoComplete.cxx
  77. +2 −1 scintilla/src/AutoComplete.h
  78. +34 −29 scintilla/src/CallTip.cxx
  79. +12 −11 scintilla/src/CallTip.h
  80. +8 −0 scintilla/src/CellBuffer.cxx
  81. +2 −0 scintilla/src/CellBuffer.h
  82. +2 −2 scintilla/src/Decoration.cxx
  83. +155 −126 scintilla/src/Document.cxx
  84. +8 −3 scintilla/src/Document.h
  85. +590 −509 scintilla/src/Editor.cxx
  86. +16 −18 scintilla/src/Editor.h
  87. +3 −0 scintilla/src/FontQuality.h
  88. +5 −9 scintilla/src/Indicator.cxx
  89. +1 −1 scintilla/src/Indicator.h
  90. +82 −86 scintilla/src/LineMarker.cxx
  91. +18 −17 scintilla/src/LineMarker.h
  92. +39 −24 scintilla/src/PerLine.cxx
  93. +1 −0 scintilla/src/PerLine.h
  94. +9 −9 scintilla/src/PositionCache.cxx
  95. +7 −7 scintilla/src/PositionCache.h
  96. +25 −11 scintilla/src/ScintillaBase.cxx
  97. +0 −2 scintilla/src/ScintillaBase.h
  98. +18 −0 scintilla/src/SplitVector.h
  99. +18 −20 scintilla/src/Style.cxx
  100. +8 −10 scintilla/src/Style.h
  101. +117 −0 scintilla/src/UniConversion.cxx
  102. +15 −0 scintilla/src/UniConversion.h
  103. +73 −93 scintilla/src/ViewStyle.cxx
  104. +23 −23 scintilla/src/ViewStyle.h
  105. +6 −38 scintilla/src/XPM.cxx
  106. +3 −7 scintilla/src/XPM.h
  107. +1 −1 scintilla/version.txt
  108. +87 −0 scripts/update-scintilla.sh
  109. +3 −2 src/about.c
  110. +2 −2 src/about.h
  111. +2 −2 src/build.c
  112. +2 −2 src/build.h
  113. +2 −2 src/callbacks.c
  114. +2 −2 src/callbacks.h
  115. +2 −2 src/dialogs.c
  116. +2 −2 src/dialogs.h
  117. +2 −2 src/document.c
  118. +2 −2 src/document.h
  119. +2 −2 src/documentprivate.h
  120. +3 −3 src/editor.c
  121. +2 −2 src/editor.h
  122. +2 −2 src/encodings.c
  123. +2 −2 src/encodings.h
  124. +2 −2 src/filetypes.c
  125. +2 −2 src/filetypes.h
  126. +2 −2 src/filetypesprivate.h
  127. +2 −2 src/gb.c
  128. +3 −3 src/geany.h
  129. +2 −2 src/geanyentryaction.c
  130. +2 −2 src/geanyentryaction.h
  131. +2 −2 src/geanymenubuttonaction.c
  132. +2 −2 src/geanymenubuttonaction.h
  133. +2 −2 src/geanyobject.c
  134. +2 −2 src/geanyobject.h
  135. +2 −2 src/geanywraplabel.c
  136. +2 −2 src/geanywraplabel.h
  137. +6 −4 src/highlighting.c
  138. +2 −2 src/highlighting.h
  139. +5 −3 src/highlightingmappings.h
  140. +2 −2 src/images.c
  141. +8 −3 src/keybindings.c
  142. +3 −2 src/keybindings.h
  143. +2 −2 src/keyfile.c
  144. +2 −2 src/keyfile.h
  145. +2 −2 src/log.c
  146. +2 −2 src/log.h
  147. +2 −2 src/main.c
  148. +2 −2 src/main.h
  149. +6 −5 src/makefile.win32
  150. +2 −2 src/msgwindow.c
  151. +2 −2 src/msgwindow.h
  152. +2 −2 src/navqueue.c
  153. +2 −2 src/navqueue.h
  154. +2 −2 src/notebook.c
  155. +2 −2 src/notebook.h
  156. +2 −2 src/plugindata.h
  157. +2 −2 src/pluginprivate.h
  158. +2 −2 src/plugins.c
  159. +2 −2 src/plugins.h
  160. +2 −2 src/pluginutils.c
  161. +2 −2 src/pluginutils.h
  162. +2 −2 src/prefs.c
  163. +2 −2 src/prefs.h
  164. +2 −2 src/printing.c
  165. +2 −2 src/printing.h
  166. +2 −2 src/project.c
  167. +2 −2 src/project.h
  168. +2 −2 src/projectprivate.h
  169. +2 −2 src/sciwrappers.c
  170. +2 −2 src/sciwrappers.h
  171. +2 −2 src/search.c
  172. +2 −2 src/search.h
  173. +2 −2 src/sidebar.c
  174. +2 −2 src/sidebar.h
  175. +2 −2 src/socket.c
  176. +2 −2 src/socket.h
  177. +2 −2 src/stash.c
  178. +2 −2 src/stash.h
  179. +2 −2 src/support.h
  180. +3 −2 src/symbols.c
  181. +2 −2 src/symbols.h
  182. +2 −2 src/templates.c
  183. +2 −2 src/templates.h
  184. +2 −2 src/toolbar.c
  185. +2 −2 src/toolbar.h
  186. +2 −2 src/tools.c
  187. +2 −2 src/tools.h
  188. +3 −3 src/ui_utils.c
  189. +2 −2 src/ui_utils.h
  190. +2 −2 src/utils.c
  191. +2 −2 src/utils.h
  192. +2 −2 src/vte.c
  193. +2 −2 src/vte.h
  194. +2 −2 src/win32.c
  195. +2 −2 src/win32.h
  196. +42 −16 tagmanager/ctags/c.c
  197. +1 −1 win32-config.h
  198. +3 −3 wscript
View
6,877 ChangeLog
2 additions, 6,875 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
6,875 ChangeLog.pre-1-22
6,875 additions, 0 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
20 Makefile.am
@@ -34,6 +34,7 @@ EXTRA_DIST = \
geany.pc.in \
geany.spec \
ChangeLog.pre-0-17 \
+ ChangeLog.pre-1-22 \
HACKING \
README.I18N \
README.Packagers \
@@ -85,21 +86,26 @@ install-data-only:
done
-BZIP2_ENV =--best
+dist-hook:
+ @if test -d "$(top_srcdir)/.git"; then \
+ echo ' GEN ChangeLog'; \
+ ( cd "$(top_srcdir)" && \
+ echo '# Generated by Makefile. Do not edit.' && echo && \
+ git log --stat 0.21.0.. ) > ChangeLog.tmp \
+ && mv -f ChangeLog.tmp "$(distdir)/ChangeLog" \
+ || ( rm -f ChangeLog.tmp ; \
+ echo 'Failed to generate ChangeLog' >&2 ); \
+ else \
+ echo 'A git clone is required to generate a ChangeLog' >&2; \
+ fi
-dist-bzip2: distdir
- BZIP2=$(BZIP2_ENV) $(AMTAR) --bzip2 -chof $(distdir).tar.bz2 $(distdir)
- -rm -rf $(distdir)
sign:
if test -f $(PACKAGE)-$(VERSION).tar.gz; then \
gpg --detach-sign --digest-algo SHA512 $(PACKAGE)-$(VERSION).tar.gz; fi
if test -f $(PACKAGE)-$(VERSION).tar.bz2; then \
gpg --detach-sign --digest-algo SHA512 $(PACKAGE)-$(VERSION).tar.bz2; fi
-deb:
- dpkg-buildpackage -rfakeroot
-
rpm: dist
rpmbuild -ta $(distdir).tar.gz
View
33 NEWS
@@ -1,33 +1,50 @@
-Geany 1.22 (unreleased)
+Geany 1.23 (unreleased)
+
+ Editor
+ * Update Scintilla to version 3.2.0.
+
+
+Geany 1.22 (June 18, 2012)
General
* Bump dependencies to GTK >= 2.16 and GLib >= 2.20.
* Switch to Glade 3 and dynamically loaded XML UI description.
* Rewrite theming support for better flexibility.
* Add support for opening files read-only from the command line.
* Always load the default session if configured to do so.
- * Make all filetypes use named styles to simplify colour scheme
+ * Make all filetypes use named styles to simplify color scheme
authoring.
* Make 'Replace Spaces by Tabs' only match leading spaces to
preserve alignment.
+ Possibly incompatible changes
+ * Theming and filetype style changes mean old filetypes and color
+ schemes are not compatible with this version of Geany.
+ * There are some default keybinding changes but these will only
+ apply to newly created configurations.
+ * Changes to the "project-dialog*" signals may affect plugins.
+
Bug fixes
* Fix escaping of session file paths (#3425969).
* Fix closing when minimized under Windows (#3421282).
* Properly handle remote URIs received through drag 'n drop
(#2966770, #3479567).
* Fix build with bleeding-edge GLib (#3483388).
- * Fix colour scheme selection in Ubuntu Unity (#3479674).
+ * Fix color scheme selection in Ubuntu Unity (#3479674).
* Fix very slow regex tag parsing on Windows (e.g. for HTML).
* Fix detecting a changed file on disk when opening from
the command-line (Windows).
* Fix quick search entry behavior on Windows.
+ * Fix keybindings conflicts check when swapping a binding.
+ * Fix comments insertion in some cases (#3449635, #3534320).
* Add missing Windows mio makefile.
Prefs
* Split "always wrap search and hide find dialog" pref into
"always wrap search" and "hide find dialog" (Dimitar Zhekov).
* Add Project Properties overrides for 'Saving files' prefs.
+ * Add hidden VTE preference "send_cmd_prefix" to prefix commands sent
+ to the VTE. (See the manual for details).
Interface
* Add support for switching to the last used document after closing
@@ -73,8 +90,9 @@ Geany 1.22 (unreleased)
* Parse PHP functions with multiline argument list (#3037797).
* Handle ``/bin/dash`` shebang (#3470986).
* Update JavaScript parser from CTags.
- * Parse D class, struct, interface template bodies and template
- blocks; ignore 'static if' expressions.
+ * Parse D class/struct/interface template bodies and template
+ blocks; ignore 'static if' expressions; parse function
+ @attributes, pure/nothrow and immutable/inout/shared return types.
* Fix broken tag/word autocompletion in HTML/PHP documents.
* Enable &entity; completion for all XML-based filetypes.
@@ -94,9 +112,10 @@ Geany 1.22 (unreleased)
* Add stash_group_free_settings().
* Add support for plugins written in C++.
- Internationalisation:
+ Internationalization:
* Add translations: ar, id, lt, mn, nn, sk
- * Update translations: de, hu, it, kk, pl, sl, sv, zh_TW
+ * Update translations: de, es, fr, hu, it, ja, kk, lt, nl, pl, pt,
+ pt_BR, sk, sl, sv, tr, zh_CN, zh_TW
Geany 0.21 (October 2, 2011)
View
2 README
@@ -102,7 +102,7 @@ file.
--
-2005-2011 by Enrico Tröger, Nick Treleaven, Colomban Wendling, Matthew Brush and Frank Lanitz
+2005-2012 by Enrico Tröger, Nick Treleaven, Colomban Wendling, Matthew Brush and Frank Lanitz
enrico(dot)troeger(at)uvena(dot)de
nick(dot)treleaven(at)btinternet(dot)com
lists(dot)ban(at)herbesfolles(dot)org
View
2 README.Packagers
@@ -82,7 +82,7 @@ list to stay informed about major changes and of course, new releases.
--
-2008-2011 by Enrico Tröger, Nick Treleaven, Colomban Wendling, Matthew Brush and Frank Lanitz
+2008-2012 by Enrico Tröger, Nick Treleaven, Colomban Wendling, Matthew Brush and Frank Lanitz
enrico(dot)troeger(at)uvena(dot)de
nick(dot)treleaven(at)btinternet(dot)com
lists(dot)ban(at)herbesfolles(dot)org
View
16 THANKS
@@ -94,8 +94,8 @@ Translators:
------------
These people have translated Geany to foreign languages:
-Fayssal Chamekh <chamfay(at)gmail(dot)com - ar
-Marcos Costales <marcoscostales(at)gmail(dot)com - ast
+Fayssal Chamekh <chamfay(at)gmail(dot)com> - ar
+Marcos Costales <marcoscostales(at)gmail(dot)com> - ast
Yura Siamashka <yurand2(at)gmail(dot)com> - be_BY
Dilyan Rusev <dilyanrusev(at)gmail(dot)com> - bg
Toni Garcia-Navarro <topi(at)elpiset(dot)net> - ca_ES
@@ -105,7 +105,7 @@ Karel Kolman <kolmis(at)gmail(dot)com> - cs_CZ
Frank Lanitz <frank(at)frank(dot)uvena(dot)de> - de_DE
Dominic Hopf <dmaphy(at)googlemail(dot)com> - de_DE
Stavros Temertzidis <bullgr(at)gmail(dot)com> - el
-Jeff Bailes <thepizzaking(at)gmail(dot)com - en_GB
+Jeff Bailes <thepizzaking(at)gmail(dot)com> - en_GB
Damián Viano <debian(at)damianv(dot)com(dot)ar> - es
Antonio Jiménez González <tonificante(at)hotmail(dot)com> - es
Nacho Cabanes <ncabanes(at)gmail(dot)com> - es
@@ -116,7 +116,7 @@ Jari Rahkonen <jari(dot)rahkonen(at)pp1(dot)inet(dot)fi> - fi
Jean-Philippe Moal <skateinmars(at)skateinmars(dot)net> - fr
Roland Baudin <roland(dot)baudin(at)thalesaleniaspace(dot)com> - fr
Lionel Fuentes <funto66(at)gmail(dot)com> - fr
-Benjamin Ballet <benjamin(dot)ballet(at)gmail(dot)com -fr
+Benjamin Ballet <benjamin(dot)ballet(at)gmail(dot)com> -fr
José Manuel Castroagudín Silva <chavescesures(at)mail(dot)com> - gl
Gabor Kmetyko aka kilo <kg_kilo(at)freemail(dot)hu> - hu
M.Baldinelli <m(dot)baldinelli(at)agora(dot)it> - it
@@ -127,18 +127,18 @@ Chikahiro Masami <cmasa(dot)z321(at)gmail(dot)com> - ja
Park Jang-heon <dotkabi(at)gmail(dot)com> - ko
Baurzhan Muftakhidinov <baurthefirst(at)gmail(dot)com> - kk
Laurent Hoeltgen <hoeltgman(at)gmail(dot)com> - lb
-Algimantas Margevičius <margevicius(dot)algimantas(at)gmail(dot)com - lt
+Algimantas Margevičius <margevicius(dot)algimantas(at)gmail(dot)com> - lt
tsetsee <tsetsee(dot)yugi(at)gmail(dot)com> - mn
Kurt De Bree <kdebree(at)telenet(dot)be> - nl
-Peter Scholtens <<peter(dot)scholtens(at)xs4all(dot)nl> - nl
+Peter Scholtens <peter(dot)scholtens(at)xs4all(dot)nl> - nl
Ayke van Laethem <aykevanlaethem(at)gmail(dot)com> - nl
Jacek Wolszczak <shutdownrunner(at)o2(dot)pl> - pl_PL
Jarosław Foksa <jfoksa(at)gmail(dot)com> - pl_PL
Krzysztof Troska <elleander86(at)gmail(dot)com> - pl_PL
Wojciech Świderski <woj.swiderski@gmail.com> - pl_PL
Alexandre Moreira <alexandream(at)gmail(dot)com> - pt_BR
Adrovane Marques Kade <adrovane(at)gmail(dot)com> - pt_BR
-Rafael Peregrino da Silva <rperegrino(at)linuxnewmedia(dot)com(dot)br - pt_BR
+Rafael Peregrino da Silva <rperegrino(at)linuxnewmedia(dot)com(dot)br> - pt_BR
Alex Eftimie <alex(at)rosedu(dot)org> - ro
brahmann_ <brahmann(at)pisem(dot)net> - ru_RU
Nikita E. Shalaev <nshalaev(at)eu(dot)spb(dot)ru> - ru_RU
@@ -148,7 +148,7 @@ John Wehin <john(dot)wehin(at)gmail(dot)com> - ru_RU
Tomáš Vadina <kyberdev(at)gmail(dot)com> - sk
Jože Klepec <joze(dot)klepec(at)siol(dot)net> - sl
Tony Mattsson <superxorn(at)gmail(dot)com> - sv
-Gürkan Gür <seqizz(at)gmail(dot)com - tr
+Gürkan Gür <seqizz(at)gmail(dot)com> - tr
Boris Dibrov <dibrov(dot)bor(at)gmail(dot)com> - uk
Clytie Siddall <clytie(at)riverland(dot)net(dot)au> - vi_VN
Dormouse Young <mouselinux(at)163(dot)com> - zh_CN
View
2 configure.ac
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.60])
-AC_INIT([Geany], [1.22],
+AC_INIT([Geany], [1.23],
[https://sourceforge.net/tracker/?group_id=153444&atid=787791])
AC_CONFIG_SRCDIR([src/geany.h])
AC_CONFIG_AUX_DIR([build-aux])
View
1 data/colorschemes/alt.conf
@@ -69,7 +69,6 @@ character=string_1
backticks=string_2
here_doc=string_2
-scalar=string_2
label=default,bold
preprocessor=0x808000
regex=number_1
View
4 data/filetypes.Genie.conf
@@ -5,8 +5,8 @@
# all items must be in one line
primary=abstract and array as assert async bool break byte case cast char class const construct continue date datetime decimal dedent def default delegate delete dict div do double downto dynamic else ensures enum errordomain event except exception extern false final finally float for foreach get hash identifier if implements implements in init inline int int16 int32 int64 int8 interface internal is isa list lock long max min namespace namespace new not null object of or otherwise out override owned params pass print private prop protected public raise raises readonly ref requires return sbyte self set short single sizeof size_t ssize_t static string struct super to true try typeof uint uint32 uint64 uint8 ulong unichar unit16 unless unowned uses uses ushort var virtual void volatile weak when while writeonly 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 the Doxygen and Valadoc keywords
+docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup inheritDoc interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsubsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem
[lexer_properties]
lexer.cpp.triplequoted.strings=1
View
2 data/filetypes.ada
@@ -6,7 +6,7 @@ word=keyword_1
identifier=identifier_1
number=number
delimiter=operator
-character=string_1
+character=character
charactereol=string_eol
string=string_1
stringeol=string_eol
View
2 data/filetypes.asm
@@ -14,7 +14,7 @@ mathinstruction=keyword_2
register=type
directive=preprocessor
directiveoperand=keyword_3
-character=string_1
+character=character
stringeol=string_eol
extinstruction=keyword_4
View
7 data/filetypes.c
@@ -9,7 +9,7 @@ number=number_1
word=keyword_1
word2=keyword_2
string=string_1
-character=string_1
+character=character
uuid=other
preprocessor=preprocessor
operator=operator
@@ -23,13 +23,14 @@ commentdockeyworderror=comment_doc_keyword_error
globalclass=class
# """verbatim"""
tripleverbatim=string_2
+hashquotedstring=string_2
[keywords]
# all items must be in one line
primary=asm auto break case char const continue default do double else enum extern float for goto if inline int long register restrict return short signed sizeof static struct switch typedef union unsigned void volatile while FALSE NULL TRUE
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 the Doxygen keywords
+docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsubsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem
[lexer_properties]
styling.within.preprocessor=1
View
1 data/filetypes.common
@@ -154,7 +154,6 @@ character=string_1
backticks=string_2
here_doc=string_2
-scalar=string_2
label=default,bold
preprocessor=0x007f7f
regex=number_1
View
4 data/filetypes.cpp
@@ -5,8 +5,8 @@
# all items must be in one line
primary=alignas alignof and and_eq asm auto bitand bitor bool break case catch char char16_t char32_t class compl const const_cast constexpr continue decltype default delete do double dynamic_cast else enum explicit export extern false final float for friend goto if inline int int8_t int16_t int32_t int64_t long mutable namespace new noexcept not not_eq nullptr operator or or_eq override private protected ptrdiff_t public register reinterpret_cast return short signed sizeof size_t static static_assert static_cast struct switch template this thread_local throw true try typedef typeid typename union unsigned using virtual void volatile wchar_t while xor xor_eq
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 tparam typedef var version warning union
+# these are the Doxygen keywords
+docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsubsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem
[lexer_properties]
styling.within.preprocessor=1
View
1 data/filetypes.css
@@ -16,6 +16,7 @@ attribute=attribute
value=value
id=number
identifier2=keyword_2
+variable=identifier_1
important=extra
directive=preprocessor
identifier3=keyword_3
View
3 data/filetypes.d
@@ -28,6 +28,9 @@ secondary=
docComment=Authors Bugs Copyright Date Deprecated Examples History License Macros Params Returns See_Also Standards Throws Version
types=
+[lexer_properties]
+fold.d.comment.explicit=0
+
[settings]
# default extension used when saving files
extension=d
View
10 data/filetypes.perl
@@ -10,13 +10,13 @@
character=character
preprocessor=preprocessor
operator=operator
-identifier=identifier_1
-scalar=scalar
+identifier=identifier
+scalar=identifier_1
pod=comment_doc
regex=regex
-array=regex
-hash=regex
-symboltable=number_2
+array=identifier_2
+hash=identifier_3
+symboltable=identifier_4
backticks=backticks
pod_verbatim=comment_doc_keyword
reg_subst=regex
View
4 data/filetypes.sh
@@ -8,10 +8,10 @@ word=keyword_1
string=string_1
character=character
operator=operator
-identifier=identifier_1
+identifier=identifier
backticks=backticks
param=parameter
-scalar=scalar
+scalar=identifier_1
error=error
here_delim=here_doc
here_q=here_doc
View
4 data/filetypes.vala
@@ -5,8 +5,8 @@
# all items must be in one line
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 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
+# these are the Doxygen and Valadoc keywords
+docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup inheritDoc interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsubsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem
[lexer_properties]
styling.within.preprocessor=1
View
2 doc/geany.1.in
@@ -1,4 +1,4 @@
-.TH "GEANY" "1" "October 02, 2011" "geany @VERSION@" ""
+.TH "GEANY" "1" "June 18, 2012" "geany @VERSION@" ""
.SH "NAME"
Geany \(em a small and lightweight IDE
.SH "SYNOPSIS"
View
42 doc/geany.html
@@ -5,8 +5,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="Docutils 0.8.1: http://docutils.sourceforge.net/" />
<title>Geany</title>
-<meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz Colomban Wendling" />
-<meta name="date" content="2011-10-02" />
+<meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz Colomban Wendling Matthew Brush" />
+<meta name="date" content="2012-06-18" />
<style type="text/css">
/*
@@ -138,14 +138,15 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2>
<td>Enrico Tröger
<br />Nick Treleaven
<br />Frank Lanitz
-<br />Colomban Wendling</td></tr>
+<br />Colomban Wendling
+<br />Matthew Brush</td></tr>
<tr><th class="docinfo-name">Date:</th>
-<td>2011-10-02</td></tr>
+<td>2012-06-18</td></tr>
<tr><th class="docinfo-name">Version:</th>
-<td>1.22</td></tr>
+<td>1.23</td></tr>
</tbody>
</table>
-<p>Copyright © 2005-2011</p>
+<p>Copyright © 2005-2012</p>
<p>This document is distributed under the terms of the GNU General Public
License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version. A copy of this
@@ -2352,6 +2353,8 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2>
<dl class="docutils">
<dt>Line wrapping</dt>
<dd>Show long lines wrapped around to new display lines.</dd>
+</dl>
+<dl class="docutils" id="smart-home-key">
<dt>&quot;Smart&quot; home key</dt>
<dd>Whether to move the cursor to the first non-whitespace character
on the line when you hit the home key on your keyboard. Pressing it
@@ -4195,29 +4198,34 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2>
</tr>
<tr><td>Go to Start of Line</td>
<td>Home</td>
-<td>Move the caret to the end of the line indentation
-unless it is already there, in which case it moves
-it to the start of the line.</td>
+<td>Move the caret to the start of the line.
+Behaves differently if <a class="reference internal" href="#smart-home-key">smart_home_key</a> is set.</td>
</tr>
<tr><td>Go to End of Line</td>
<td>End</td>
<td>Move the caret to the end of the line.</td>
</tr>
+<tr><td>Go to Start of Display Line</td>
+<td>Alt-Home</td>
+<td>Move the caret to the start of the display line.
+This is useful when you use line wrapping and
+want to jump to the start of the wrapped, virtual
+line, not the real start of the whole line.
+If the line is not wrapped, it behaves like
+<cite>Go to Start of Line</cite>.</td>
+</tr>
<tr><td>Go to End of Display Line</td>
<td>Alt-End</td>
<td>Move the caret to the end of the display line.
-This is useful when you use line wrapping and
-want to jump to the end of the wrapped, virtual
-line, not the real end of the whole line.
If the line is not wrapped, it behaves like
-<cite>Go to End of Line</cite>, see above.</td>
+<cite>Go to End of Line</cite>.</td>
</tr>
<tr><td>Go to Previous Word Part</td>
<td>Ctrl-/</td>
<td>Goto the previous part of the current word.</td>
</tr>
<tr><td>Go to Next Word Part</td>
-<td>Ctrl-</td>
+<td>Ctrl-\</td>
<td>Goto the next part of the current word.</td>
</tr>
</tbody>
@@ -5654,7 +5662,7 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2>
</tr>
<tr><td>geanyversion</td>
<td>The actual Geany version, e.g.
-&quot;Geany 1.22&quot;.</td>
+&quot;Geany 1.23&quot;.</td>
<td>file templates, file header,
function description, ChangeLog entry,
bsd, gpl, snippets.</td>
@@ -5986,7 +5994,7 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2>
look, run &quot;<tt class="docutils literal">make doc</tt>&quot; in the subdirectory <tt class="docutils literal">doc</tt> of Geany's source
directory. This regenerates the <tt class="docutils literal">geany.html</tt> file. To generate a PDF
file, use the command &quot;<tt class="docutils literal">make pdf</tt>&quot; which should generate a file called
-geany-1.22.pdf.</p>
+geany-1.23.pdf.</p>
<p>After you are happy with your changes, create a patch e.g. by using:</p>
<pre class="literal-block">
% git diff geany.txt &gt; foo.patch
@@ -6787,7 +6795,7 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2>
<div class="footer">
<hr class="footer" />
<a class="reference external" href="geany.txt">View document source</a>.
-Generated on: 2012-06-04 21:07 UTC.
+Generated on: 2012-06-25 13:30 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>
View
30 doc/geany.txt
@@ -1,4 +1,4 @@
-.. |(version)| replace:: 1.22
+.. |(version)| replace:: 1.23
=======
Geany
@@ -11,11 +11,12 @@
:Authors: Enrico Tröger,
Nick Treleaven,
Frank Lanitz,
- Colomban Wendling
-:Date: 2011-10-02
+ Colomban Wendling,
+ Matthew Brush
+:Date: 2012-06-18
:Version: |(version)|
-Copyright © 2005-2011
+Copyright © 2005-2012
This document is distributed under the terms of the GNU General Public
License as published by the Free Software Foundation; either version 2
@@ -1976,6 +1977,8 @@ Features
Line wrapping
Show long lines wrapped around to new display lines.
+.. _smart_home_key:
+
"Smart" home key
Whether to move the cursor to the first non-whitespace character
on the line when you hit the home key on your keyboard. Pressing it
@@ -3485,22 +3488,25 @@ Go to tag definition Ctrl-T Jump to the definition
Go to tag declaration Ctrl-Shift-T Jump to the declaration of the current word or
selection. See `Go to tag declaration`_.
-Go to Start of Line Home Move the caret to the end of the line indentation
- unless it is already there, in which case it moves
- it to the start of the line.
+Go to Start of Line Home Move the caret to the start of the line.
+ Behaves differently if smart_home_key_ is set.
Go to End of Line End Move the caret to the end of the line.
-Go to End of Display Line Alt-End Move the caret to the end of the display line.
+Go to Start of Display Line Alt-Home Move the caret to the start of the display line.
This is useful when you use line wrapping and
- want to jump to the end of the wrapped, virtual
- line, not the real end of the whole line.
+ want to jump to the start of the wrapped, virtual
+ line, not the real start of the whole line.
+ If the line is not wrapped, it behaves like
+ `Go to Start of Line`.
+
+Go to End of Display Line Alt-End Move the caret to the end of the display line.
If the line is not wrapped, it behaves like
- `Go to End of Line`, see above.
+ `Go to End of Line`.
Go to Previous Word Part Ctrl-/ Goto the previous part of the current word.
-Go to Next Word Part Ctrl-\ Goto the next part of the current word.
+Go to Next Word Part Ctrl-\\ Goto the next part of the current word.
=============================== ========================= ==================================================
View keybindings
View
33 doc/making-a-release
@@ -4,44 +4,45 @@ For major releases:
* Try to synchronize release date with geany-plugins.
Update NEWS file - ideally each committer should review their changes
-and summarise the interesting ones. Use scripts/changelist.pl to
-format & filter commits by a particular developer name.
+and summarize the interesting ones. Use `git log --author='name'`
+to filter commits by a particular developer name.
Ensure version numbers are all updated in:
configure.ac geany.nsi geany_private.rc win32-config.h wscript
doc/geany.txt
Ensure release date is updated in:
- doc/geany.txt doc/geany.1.in
+ NEWS doc/geany.txt doc/geany.1.in
Regenerate doc/geany.html.
Check GEANY_CODENAME is set in src/geany.h.
-Update NEWS release date.
-Add changelog entry for new release.
Export the code into a new directory (i.e. not usual working copy).
Run 'make distcheck'.
Delete the created archive and run 'make dist' and 'make dist-bzip2'.
+Sign the archives with 'make sign'.
-Put the resulting tarballs on uvena.de - upload to home directory
-and after the upload is finished move them into
-/home/www/files.uvena.de/geany/.
+Put the resulting tarballs and signature files on geany.org - upload
+to home directory and after the upload is finished move them into
+/srv/www/download.geany.org/.
Rename LATEST-IS-... to the new version number in
-/home/www/files.uvena.de/geany/ and /home/www/www.geany.org/files.
-Add the GPG signatures - use 'make sign' and check the public key
+/srv/www/download.geany.org/ and /srv/www/www.geany.org/files.
+Make sure the public part of the GPG key used to sign the archives
can be found on the download page.
+
Windows builds (enrico?).
-Tag release in SVN, remove the branch if used.
+Create a signed tag for the release in Git with 'git tag -s <version>'.
Website: update Releases, Documentation links and add a News item.
Update the manual data and links in the filesystem in
-/home/www/www.geany.org/manual. Remember to update current/hacking.html
+/srv/www/www.geany.org/manual. Remember to update current/hacking.html
too.
Announce on geany, devel, i18n mailing lists (check you're subscribed).
-Put a news item on Sourceforge, add a new release on Freshmeat.net
-and update the information on gnomefiles.org.
+Put a news item on SourceForge (https://sourceforge.net/news/?group_id=153444)
+and a new release on freecode.com (https://freecode.com/projects/geany).
-For non-trunk releases, merge NEWS into trunk and any branch-only
+For non-master releases, merge NEWS into master and any branch-only
commits that need to merged.
-For trunk releases, bump version strings and merge unstable branch.
+For merge releases, bump version strings and codename and merge unstable
+branch if any.
View
2 doc/plugins.dox
@@ -3,7 +3,7 @@
*
* Copyright 2008-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* Copyright 2008-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
- * Copyright 2009-2011 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
+ * Copyright 2009-2012 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
4 doc/pluginsignals.c
@@ -1,8 +1,8 @@
/*
* pluginsignals.c - this file is part of Geany, a fast and lightweight IDE
*
- * Copyright 2008-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
- * Copyright 2008-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+ * Copyright 2008-2012 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+ * Copyright 2008-2012 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
4 doc/pluginsymbols.c
@@ -1,8 +1,8 @@
/*
* pluginsymbols.c - this file is part of Geany, a fast and lightweight IDE
*
- * Copyright 2008-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
- * Copyright 2008-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+ * Copyright 2008-2012 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+ * Copyright 2008-2012 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
14 geany.nsi
@@ -1,8 +1,8 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; geany.nsi - this file is part of Geany, a fast and lightweight IDE
;
-; Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
-; Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+; Copyright 2007-2012 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+; Copyright 2007-2012 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
;
; This program is free software; you can redistribute it and/or modify
; it under the terms of the GNU General Public License as published by
@@ -32,8 +32,8 @@ RequestExecutionLevel highest ; set execution level for Windows Vista
; helper defines ;
;;;;;;;;;;;;;;;;;;;
!define PRODUCT_NAME "Geany"
-!define PRODUCT_VERSION "1.22"
-!define PRODUCT_VERSION_ID "1.22.0.0"
+!define PRODUCT_VERSION "1.23"
+!define PRODUCT_VERSION_ID "1.23.0.0"
!define PRODUCT_PUBLISHER "The Geany developer team"
!define PRODUCT_WEB_SITE "http://www.geany.org/"
!define PRODUCT_DIR_REGKEY "Software\Geany"
@@ -50,7 +50,7 @@ VIProductVersion "${PRODUCT_VERSION_ID}"
VIAddVersionKey "ProductName" "${PRODUCT_NAME}"
VIAddVersionKey "FileVersion" "${PRODUCT_VERSION}"
VIAddVersionKey "ProductVersion" "${PRODUCT_VERSION}"
-VIAddVersionKey "LegalCopyright" "Copyright 2005-2011 by the Geany developer team"
+VIAddVersionKey "LegalCopyright" "Copyright 2005-2012 by the Geany developer team"
VIAddVersionKey "FileDescription" "${PRODUCT_NAME} Installer"
BrandingText "$(^NAME) installer (NSIS 2.46)"
@@ -128,12 +128,16 @@ Section "!Program Files" SEC01
SetOutPath "$INSTDIR\data"
File "${RESOURCEDIR}\data\GPL-2"
File "${RESOURCEDIR}\data\file*"
+ File "${RESOURCEDIR}\data\geany.glade"
File "${RESOURCEDIR}\data\snippets.conf"
File "${RESOURCEDIR}\data\ui_toolbar.xml"
SetOutPath "$INSTDIR\data\templates"
File /r "${RESOURCEDIR}\data\templates\*"
+ SetOutPath "$INSTDIR\data\colorschemes"
+ File /r "${RESOURCEDIR}\data\colorschemes\*"
+
SetOutPath "$INSTDIR\share\icons"
File /r "${RESOURCEDIR}\share\icons\*"
View
6 geany_private.rc
@@ -1,8 +1,8 @@
#include <windows.h> // include for version info constants
-#define VER_FILEVERSION 1,22,0,0
-#define VER_FILEVERSION_STR "1.22"
+#define VER_FILEVERSION 1,23,0,0
+#define VER_FILEVERSION_STR "1.23"
A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../icons/geany.ico"
@@ -21,7 +21,7 @@ FILETYPE VFT_APP
VALUE "FileVersion", VER_FILEVERSION_STR
VALUE "FileDescription", "Geany"
VALUE "InternalName", "Geany"
- VALUE "LegalCopyright", "Copyright 2005-2011 by the Geany developers"
+ VALUE "LegalCopyright", "Copyright 2005-2012 by the Geany developers"
VALUE "LegalTrademarks", ""
VALUE "OriginalFilename", "Geany.exe"
VALUE "ProductName", "Geany"
View
5 m4/geany-i18n.m4
@@ -13,10 +13,7 @@ AC_DEFUN([GEANY_I18N],
if test -n "${LINGUAS}"; then
ALL_LINGUAS="${LINGUAS}"
else
- if test -z "$conf_dir"; then
- conf_dir="."
- fi
- ALL_LINGUAS=`cd "$conf_dir/po" 2>/dev/null && ls *.po 2>/dev/null | $AWK 'BEGIN { FS="."; ORS=" " } { print $[]1 }'`
+ ALL_LINGUAS=`cd "$srcdir/po" 2>/dev/null && ls *.po 2>/dev/null | $AWK 'BEGIN { FS="."; ORS=" " } { print $[]1 }'`
fi
AM_GLIB_GNU_GETTEXT
View
57 makefile.win32
@@ -1,33 +1,37 @@
+# See http://www.geany.org/Support/BuildingOnWin32
# Running make creates config.h then calls the sub makefiles.
#
# Other targets are:
# deps: delete the dependencies so they are regenerated on next make
# clean: clean all generated files
+# install: install to DESTDIR
#
# localwin32.mk is an optional file to override make variables.
# Use localwin32.mk instead of editing variables as it is included in sub
# makefiles.
-# localwin32.mk to set PREFIX instead of the default C:\libs
-# For MSYS use localwin32.mk to set CP and RM.
-# By default this will work in a Windows command prompt.
+# E.g. use localwin32.mk to set PREFIX=C:/libs instead of the default C:\libs
+# For MSYS use localwin32.mk to set CP, CP_R, RM, DIRSEP.
+# By default this should work in a Windows command prompt (cmd.exe).
WINDRES = windres.exe
CC = gcc
CXX = g++
-CP = copy
+CP = copy /Y
+CP_R = xcopy /S /Y
RM = del
-MAKE = make
+MKDIR = mkdir
+# strip is used to prevent line wrap
+DIRSEP := $(strip \)
+DESTDIR = C:/Program Files/Geany
-include localwin32.mk
-# Note: && is needed after cd because each line is executed in a different
-# shell. (cd .. is just for clarity).
all: config.h
- cd tagmanager/ctags && $(MAKE) -f makefile.win32 && cd ../..
- cd tagmanager/mio && $(MAKE) -f makefile.win32 && cd ../..
- cd tagmanager/src && $(MAKE) -f makefile.win32 && cd ../..
- cd scintilla && $(MAKE) -f makefile.win32 && cd ..
- cd plugins && $(MAKE) -f makefile.win32 && cd ..
- cd src && $(MAKE) -f makefile.win32 && cd ..
+ $(MAKE) -C tagmanager/ctags -f makefile.win32
+ $(MAKE) -C tagmanager/mio -f makefile.win32
+ $(MAKE) -C tagmanager/src -f makefile.win32
+ $(MAKE) -C scintilla -f makefile.win32
+ $(MAKE) -C plugins -f makefile.win32
+ $(MAKE) -C src -f makefile.win32
config.h: win32-config.h
$(CP) $< $@
@@ -40,18 +44,23 @@ clean-local:
-$(RM) geany_private.res geany.exe
clean: deps
- cd tagmanager/ctags && $(MAKE) -f makefile.win32 clean && cd ../..
- cd tagmanager/mio && $(MAKE) -f makefile.win32 clean && cd ../..
- cd tagmanager/src && $(MAKE) -f makefile.win32 clean && cd ../..
- cd scintilla && $(MAKE) -f makefile.win32 clean && cd ..
- cd plugins && $(MAKE) -f makefile.win32 clean && cd ..
- cd src && $(MAKE) -f makefile.win32 clean && cd ..
+ $(MAKE) -C tagmanager/ctags -f makefile.win32 clean
+ $(MAKE) -C tagmanager/mio -f makefile.win32 clean
+ $(MAKE) -C tagmanager/src -f makefile.win32 clean
+ $(MAKE) -C scintilla -f makefile.win32 clean
+ $(MAKE) -C plugins -f makefile.win32 clean
+ $(MAKE) -C src -f makefile.win32 clean
.PHONY: install
-DESTDIR='C:/Program Files/Geany'
-# requires admin privileges and MSYS
+# likely requires admin privileges
+# mkdir output is ignored in case dir exists
+# 'copy' seems to only accept / in the destination
install:
- cp -r data $(DESTDIR)
- cp plugins/*.dll $(DESTDIR)/lib
- cp geany.exe $(DESTDIR)/bin
+ -$(MKDIR) "$(DESTDIR)"
+ -$(MKDIR) "$(DESTDIR)/bin"
+ $(CP) geany.exe "$(DESTDIR)/bin"
+ -$(MKDIR) "$(DESTDIR)/lib"
+ $(CP) plugins$(DIRSEP)*.dll "$(DESTDIR)/lib"
+ -$(MKDIR) "$(DESTDIR)/data"
+ $(CP_R) data "$(DESTDIR)/data"
View
2 plugins/Makefile.am
@@ -94,7 +94,7 @@ splitwindow_la_CFLAGS = -DG_LOG_DOMAIN=\""SplitWindow"\"
demoplugin_la_LIBADD = $(GTK_LIBS)
classbuilder_la_LIBADD = $(GTK_LIBS)
htmlchars_la_LIBADD = $(GTK_LIBS)
-export_la_LIBADD = $(GTK_LIBS)
+export_la_LIBADD = $(GTK_LIBS) -lm
saveactions_la_LIBADD = $(GTK_LIBS)
filebrowser_la_LIBADD = $(GTK_LIBS)
splitwindow_la_LIBADD = $(GTK_LIBS)
View
4 plugins/classbuilder.c
@@ -2,8 +2,8 @@
* classbuilder.c - this file is part of Geany, a fast and lightweight IDE
*
* Copyright 2007 Alexander Rodin <rodin(dot)alexander(at)gmail(dot)com>
- * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
- * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+ * Copyright 2007-2012 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+ * Copyright 2007-2012 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
4 plugins/demoplugin.c
@@ -1,8 +1,8 @@
/*
* demoplugin.c - this file is part of Geany, a fast and lightweight IDE
*
- * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
- * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+ * Copyright 2007-2012 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+ * Copyright 2007-2012 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
4 plugins/export.c
@@ -1,8 +1,8 @@
/*
* export.c - this file is part of Geany, a fast and lightweight IDE
*
- * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
- * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+ * Copyright 2007-2012 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+ * Copyright 2007-2012 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
4 plugins/filebrowser.c
@@ -1,8 +1,8 @@
/*
* filebrowser.c - this file is part of Geany, a fast and lightweight IDE
*
- * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
- * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+ * Copyright 2007-2012 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+ * Copyright 2007-2012 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
4 plugins/geanyplugin.h
@@ -1,8 +1,8 @@
/*
* geanyplugin.h - this file is part of Geany, a fast and lightweight IDE
*
- * Copyright 2009-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
- * Copyright 2009-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+ * Copyright 2009-2012 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+ * Copyright 2009-2012 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
6 plugins/htmlchars.c
@@ -1,9 +1,9 @@
/*
* htmlchars.c - this file is part of Geany, a fast and lightweight IDE
*
- * Copyright 2009-2011 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
- * Copyright 2006-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
- * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+ * Copyright 2009-2012 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
+ * Copyright 2006-2012 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+ * Copyright 2007-2012 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
4 plugins/saveactions.c
@@ -1,8 +1,8 @@
/*
* saveactions.c - this file is part of Geany, a fast and lightweight IDE
*
- * Copyright 2007-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
- * Copyright 2007-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+ * Copyright 2007-2012 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+ * Copyright 2007-2012 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
4 plugins/splitwindow.c
@@ -1,8 +1,8 @@
/*
* splitwindow.c - this file is part of Geany, a fast and lightweight IDE
*
- * Copyright 2008-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
- * Copyright 2008-2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+ * Copyright 2008-2012 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+ * Copyright 2008-2012 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
1,865 po/de.po
840 additions, 1,025 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
21 po/es.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Geany 1.22\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-04 17:26+0200\n"
-"PO-Revision-Date: 2012-06-04 09:21+0100\n"
+"POT-Creation-Date: 2012-06-13 18:44+0200\n"
+"PO-Revision-Date: 2012-06-12 12:24+0100\n"
"Last-Translator: Lucas Vieites <lucas.vieites@gmail.com>\n"
"Language-Team: Español <geany-i18n@uvena.de>\n"
"Language: es\n"
@@ -187,11 +187,10 @@ msgstr "Ruta de inicio:"
#: ../data/geany.glade.h:38
msgid ""
-"Path to start in when opening or saving files. Must be an absolute path. "
-"Leave blank to use the current working directory."
+"Path to start in when opening or saving files. Must be an absolute path."
msgstr ""
"Ruta en la que iniciar cuando se abren o guardan archivos. Debe ser una ruta "
-"absoluta. Dejar en blanco para usar el directorio de trabajo actual."
+"absoluta."
#: ../data/geany.glade.h:39
msgid "Project files:"
@@ -3249,7 +3248,7 @@ msgid "Document"
msgstr "Documento"
#: ../src/keybindings.c:238 ../src/keybindings.c:585 ../src/project.c:444
-#: ../src/ui_utils.c:1980
+#: ../src/ui_utils.c:1981
msgid "Build"
msgstr "Construir"
@@ -5138,23 +5137,23 @@ msgstr "C++ STL"
msgid "_Set Custom Date Format"
msgstr "_Establecer formato de fecha personalizado"
-#: ../src/ui_utils.c:1819
+#: ../src/ui_utils.c:1820
msgid "Select Folder"
msgstr "Seleccionar carpeta"
-#: ../src/ui_utils.c:1819
+#: ../src/ui_utils.c:1820
msgid "Select File"
msgstr "Seleccionar archivo"
-#: ../src/ui_utils.c:1978
+#: ../src/ui_utils.c:1979
msgid "Save All"
msgstr "Guardar _todo"
-#: ../src/ui_utils.c:1979
+#: ../src/ui_utils.c:1980
msgid "Close All"
msgstr "C_errar todo"
-#: ../src/ui_utils.c:2225
+#: ../src/ui_utils.c:2226
msgid "Geany cannot start!"
msgstr "Geany no puede iniciarse."
View
1,760 po/fr.po
759 additions, 1,001 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
1,707 po/hu.po
724 additions, 983 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
9 po/it.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Geany 1.22\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-06 21:50+0200\n"
-"PO-Revision-Date: 2012-06-04 23:18+0100\n"
+"POT-Creation-Date: 2012-06-09 08:57+0200\n"
+"PO-Revision-Date: 2012-06-07 18:58+0100\n"
"Last-Translator: Giuseppe Penone <giuspen@gmail.com>\n"
"Language-Team: <geany-i18n@uvena.de>\n"
"Language: it\n"
@@ -188,12 +188,11 @@ msgid "Startup path:"
msgstr "Percorso di avvio:"
#: ../data/geany.glade.h:38
-#, fuzzy
msgid ""
"Path to start in when opening or saving files. Must be an absolute path."
msgstr ""
-"Percorso iniziale per l'apertura o il salvataggio dei file. Dev'essere un "
-"percorso assoluto. Lasciare vuoto per usare la cartella di lavoro corrente."
+"Percorso iniziale per l'apertura o il salvataggio dei file. Deve essere un "
+"percorso assoluto."
#: ../data/geany.glade.h:39
msgid "Project files:"
View
446 po/kk.po 100755 → 100644
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Geany 1.22\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-03 17:50+0200\n"
-"PO-Revision-Date: 2012-02-21 10:43+0600\n"
+"POT-Creation-Date: 2012-06-11 19:05+0200\n"
+"PO-Revision-Date: 2012-06-10 19:41+0600\n"
"Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
"Language-Team: Kazakh <kk_KZ@googlegroups.com>\n"
"Language: kk\n"
@@ -29,7 +29,7 @@ msgstr "Интеграцияланған өндіру ортасы"
#: ../geany.desktop.in.h:3
msgid "A fast and lightweight IDE using GTK2"
-msgstr "GTK2 негізінде жылдам әрі жеңіл өндіру ортасы"
+msgstr "GTK2 негізіндегі жылдам әрі жеңіл өндіру ортасы"
#: ../data/geany.glade.h:1
msgid "_Edit"
@@ -83,7 +83,7 @@ msgstr "жасырын"
msgid "_Insert \"include <...>\""
msgstr "\"include <...>\" кірі_стіру"
-#: ../data/geany.glade.h:14 ../src/keybindings.c:408
+#: ../data/geany.glade.h:14 ../src/keybindings.c:411
msgid "_Insert Alternative White Space"
msgstr "_Альтернативті бос аралықты енгізу"
@@ -127,7 +127,7 @@ msgstr "Ағымдағы таңбалар"
msgid "Match braces"
msgstr ""
-#: ../data/geany.glade.h:25 ../src/keybindings.c:418
+#: ../data/geany.glade.h:25 ../src/keybindings.c:421
msgid "Preferences"
msgstr "Баптаулар"
@@ -157,7 +157,7 @@ msgstr "Плагиндерді қолдауды іске қосу"
#: ../data/geany.glade.h:31
msgid "<b>Startup</b>"
-msgstr "<b>Қосылу</b>"
+msgstr "<b>Іске қосылу</b>"
#: ../data/geany.glade.h:32
msgid "Save window position and geometry"
@@ -181,12 +181,12 @@ msgstr "<b>Сөндіру</b>"
#: ../data/geany.glade.h:37
msgid "Startup path:"
-msgstr "Қосылу жолы:"
+msgstr "Іске қосылу жолы:"
#: ../data/geany.glade.h:38
+#, fuzzy
msgid ""
-"Path to start in when opening or saving files. Must be an absolute path. "
-"Leave blank to use the current working directory."
+"Path to start in when opening or saving files. Must be an absolute path."
msgstr ""
"Файлдарды ашу не сақтау үшін бастау жолы. Абсолютті жол болуы тиіс. Ағымдағы "
"жұмыс бумасын қолдану үшін осыны бос қалдырыңыз."
@@ -219,7 +219,7 @@ msgstr "<b>Жолдар</b>"
#: ../data/geany.glade.h:44
msgid "Startup"
-msgstr "Қосылу"
+msgstr "Іске қосылу"
#: ../data/geany.glade.h:45
msgid "Beep on errors or when compilation has finished"
@@ -280,11 +280,11 @@ msgstr "<b>Таңдамалы</b>"
#: ../data/geany.glade.h:56
msgid "Always wrap search"
-msgstr ""
+msgstr "Құжат соңына жеткенде, іздеуді құжат басынан қайта бастау"
#: ../data/geany.glade.h:57
msgid "Always wrap search around the document"
-msgstr ""
+msgstr "Іздеуді құжат аумағында әрқашан айналдыру"
#: ../data/geany.glade.h:58
msgid "Hide the Find dialog"
@@ -628,7 +628,7 @@ msgstr "Жолды үзу бағаны:"
#: ../data/geany.glade.h:135
msgid "Comment toggle marker:"
-msgstr ""
+msgstr "Комментарийді ауыстыру маркері:"
#: ../data/geany.glade.h:136
msgid ""
@@ -825,39 +825,39 @@ msgstr "Жақшалар ( )"
#: ../data/geany.glade.h:178
msgid "Auto-close parenthesis when typing an opening one"
-msgstr ""
+msgstr "Ашылу жақшасын терген кезде, жабылу жақшасын енгізу"
#: ../data/geany.glade.h:179
msgid "Single quotes ' '"
msgstr "Бірлік тырнақша ' '"
#: ../data/geany.glade.h:180
msgid "Auto-close single quote when typing an opening one"
-msgstr ""
+msgstr "Ашылу бірлік тырнақшасын терген кезде, жабылу тырнақшасын енгізу"
#: ../data/geany.glade.h:181
msgid "Curly brackets { }"
-msgstr ""
+msgstr "Пішінді жақша { }"
#: ../data/geany.glade.h:182
msgid "Auto-close curly bracket when typing an opening one"
-msgstr ""
+msgstr "Ашылу пішінді жақшасын терген кезде, жабылу жақшасын енгізу"
#: ../data/geany.glade.h:183
msgid "Square brackets [ ]"
msgstr "Тік жақша [ ]"
#: ../data/geany.glade.h:184
msgid "Auto-close square-bracket when typing an opening one"
-msgstr ""
+msgstr "Ашылу тік жақшасын терген кезде, жабылу жақшасын енгізу"
#: ../data/geany.glade.h:185
msgid "Double quotes \" \""
msgstr "Тырнақша \" \""
#: ../data/geany.glade.h:186
msgid "Auto-close double quote when typing an opening one"
-msgstr ""
+msgstr "Ашылу қос тырнақшасын терген кезде, жабылу тырнақшасын енгізу"
#: ../data/geany.glade.h:187
msgid "<b>Auto-close quotes and brackets</b>"
@@ -977,7 +977,7 @@ msgstr ""
#: ../data/geany.glade.h:213
msgid "Enabled"
-msgstr "Қосулы"
+msgstr "Іске қосулы"
#: ../data/geany.glade.h:214
msgid "<b>Long line marker</b>"
@@ -989,7 +989,7 @@ msgstr "Сөндірулі"
#: ../data/geany.glade.h:216
msgid "Do not show virtual spaces"
-msgstr ""
+msgstr "Виртуалды бос аралықтарды көрсетпеу"
#: ../data/geany.glade.h:217
msgid "Only for rectangular selections"
@@ -1007,17 +1007,17 @@ msgstr "Әрқашан"
#: ../data/geany.glade.h:220
msgid "Always show virtual spaces beyond the end of lines"
-msgstr ""
+msgstr "Жол соңынан кейінгі виртуалды бос аралықтарды әрқашан көрсету"
#: ../data/geany.glade.h:221
msgid "<b>Virtual spaces</b>"
-msgstr ""
+msgstr "<b>Виртуалды бос аралықтар</b>"
#: ../data/geany.glade.h:222
msgid "Display"
msgstr "Көрсету"
-#: ../data/geany.glade.h:223 ../src/keybindings.c:224 ../src/prefs.c:1581
+#: ../data/geany.glade.h:223 ../src/keybindings.c:227 ../src/prefs.c:1581
msgid "Editor"
msgstr "Түзетуші"
@@ -1094,7 +1094,7 @@ msgstr ""
msgid "Removes trailing spaces and tabs and the end of lines"
msgstr ""
-#: ../data/geany.glade.h:241 ../src/keybindings.c:559
+#: ../data/geany.glade.h:241 ../src/keybindings.c:562
msgid "Replace tabs by space"
msgstr "Бос аралықтарды табуляциямен алмастыру"
@@ -1175,7 +1175,7 @@ msgstr ""
msgid "<b>Commands</b>"
msgstr "<b>Командалар</b>"
-#: ../data/geany.glade.h:259 ../src/keybindings.c:236 ../src/prefs.c:1585
+#: ../data/geany.glade.h:259 ../src/keybindings.c:239 ../src/prefs.c:1585
msgid "Tools"
msgstr "Саймандар"
@@ -1251,7 +1251,7 @@ msgstr ""
#: ../data/geany.glade.h:276
msgid "<b>Template data</b>"
-msgstr ""
+msgstr "<b>Үлгілер мәліметі</b>"
#: ../data/geany.glade.h:277 ../src/prefs.c:1587
msgid "Templates"
@@ -1419,12 +1419,11 @@ msgid "Override Geany keybindings"
msgstr "Geany пернетақта жарлықтарын алмастыру"
#: ../data/geany.glade.h:316
-#, fuzzy
msgid ""
"Allows the VTE to receive keyboard shortcuts (apart from focus commands)"
msgstr ""
-"VTE үшін пернетақта жарлықтарын қабылдауға рұқсат ету (фокустағы "
-"командалардан басқа)"
+"VTE үшін пернетақта жарлықтарын қабылдауға рұқсат ету (фокус командаларынан "
+"басқа)"
#: ../data/geany.glade.h:317
msgid "Disable menu shortcut key (F10 by default)"
@@ -1524,14 +1523,13 @@ msgid ""
"project filename."
msgstr ""
-#: ../data/geany.glade.h:338 ../src/keybindings.c:234
+#: ../data/geany.glade.h:338 ../src/keybindings.c:237
msgid "Project"
msgstr "Жоба"
#: ../data/geany.glade.h:339
-#, fuzzy
msgid "Display:"
-msgstr "Көрсетілуі"
+msgstr "Көрсетілуі:"
#: ../data/geany.glade.h:340
msgid "Custom"
@@ -1598,45 +1596,45 @@ msgstr "Бар_лығын жабу"
msgid "_Commands"
msgstr "Кома_ндалар"
-#: ../data/geany.glade.h:357 ../src/keybindings.c:343
+#: ../data/geany.glade.h:357 ../src/keybindings.c:346
msgid "_Cut Current Line(s)"
msgstr "Ағы_мдағы жол(дар)ды қиып алу"
-#: ../data/geany.glade.h:358 ../src/keybindings.c:340
+#: ../data/geany.glade.h:358 ../src/keybindings.c:343
msgid "_Copy Current Line(s)"
msgstr "Ағ_ымдағы жол(дар)ды көшіру"
-#: ../data/geany.glade.h:359 ../src/keybindings.c:295
+#: ../data/geany.glade.h:359 ../src/keybindings.c:298
msgid "_Delete Current Line(s)"
msgstr "Ағымдағы жол(дар)ды ө_шіру"
-#: ../data/geany.glade.h:360 ../src/keybindings.c:292
+#: ../data/geany.glade.h:360 ../src/keybindings.c:295
msgid "_Duplicate Line or Selection"
msgstr "Жол не таңдауды қа_йталау"
-#: ../data/geany.glade.h:361 ../src/keybindings.c:353
+#: ../data/geany.glade.h:361 ../src/keybindings.c:356
msgid "_Select Current Line(s)"
msgstr "Ағымдағы ж_ол(дар)ды таңдау"
-#: ../data/geany.glade.h:362 ../src/keybindings.c:356
+#: ../data/geany.glade.h:362 ../src/keybindings.c:359
msgid "_Select Current Paragraph"
msgstr "Ағымдағы а_бзацты таңдау"
-#: ../data/geany.glade.h:363 ../src/keybindings.c:395
+#: ../data/geany.glade.h:363 ../src/keybindings.c:398
msgid "_Send Selection to Terminal"
msgstr "Таңдалғанды _терминалға жіберу"
-#: ../data/geany.glade.h:364 ../src/keybindings.c:397
+#: ../data/geany.glade.h:364 ../src/keybindings.c:400
msgid "_Reflow Lines/Block"
-msgstr ""
+msgstr "Жолдар/блокты қайта _пішімдеу"
-#: ../data/geany.glade.h:365 ../src/keybindings.c:367
+#: ../data/geany.glade.h:365 ../src/keybindings.c:370
msgid "T_oggle Case of Selection"
-msgstr "Таңдауд_ын регистрін ауыстыру"
+msgstr "Таңдауд_ың регистрін ауыстыру"
-#: ../data/geany.glade.h:366 ../src/keybindings.c:302
+#: ../data/geany.glade.h:366 ../src/keybindings.c:305
msgid "_Transpose Current Line"
-msgstr ""
+msgstr "Жолд_ы алмастыру"
#: ../data/geany.glade.h:367
msgid "_Comment Line(s)"
@@ -1658,9 +1656,9 @@ msgstr "Шегінуді үл_кейту"
msgid "_Decrease Indent"
msgstr "Шегінуді кі_шірейту"
-#: ../data/geany.glade.h:372 ../src/keybindings.c:386
+#: ../data/geany.glade.h:372 ../src/keybindings.c:389
msgid "_Smart Line Indent"
-msgstr ""
+msgstr "\"Ақылды\" ш_егінуді қолдану"
#: ../data/geany.glade.h:373
msgid "_Send Selection to"
@@ -1674,7 +1672,7 @@ msgstr "К_омментарий енгізу"
msgid "Preference_s"
msgstr "Ба_птаулар"
-#: ../data/geany.glade.h:376 ../src/keybindings.c:421
+#: ../data/geany.glade.h:376 ../src/keybindings.c:424
msgid "P_lugin Preferences"
msgstr "Плаг_ин баптаулары"
@@ -1702,27 +1700,27 @@ msgstr "Келе_сі хабарлама"
msgid "Pr_evious Message"
msgstr "Алдыңғ_ы хабарлама"
-#: ../data/geany.glade.h:383 ../src/keybindings.c:470
+#: ../data/geany.glade.h:383 ../src/keybindings.c:473
msgid "_Go to Next Marker"
msgstr "Келесі маркерге ө_ту"
-#: ../data/geany.glade.h:384 ../src/keybindings.c:473
+#: ../data/geany.glade.h:384 ../src/keybindings.c:476
msgid "_Go to Previous Marker"
msgstr "Алдыңғы маркерге ө_ту"
#: ../data/geany.glade.h:385
msgid "_Go to Line"
msgstr "Ж_олға өту"
-#: ../data/geany.glade.h:386 ../src/keybindings.c:433
+#: ../data/geany.glade.h:386 ../src/keybindings.c:436
msgid "Find Next _Selection"
msgstr "Кел_есі таңдауды табу"
-#: ../data/geany.glade.h:387 ../src/keybindings.c:435
+#: ../data/geany.glade.h:387 ../src/keybindings.c:438
msgid "Find Pre_vious Selection"
msgstr "А_лдыңғы таңдауды табу"
-#: ../data/geany.glade.h:388 ../src/keybindings.c:452
+#: ../data/geany.glade.h:388 ../src/keybindings.c:455
msgid "_Mark All"
msgstr "Барлығын _ерекшелеу"
@@ -1880,7 +1878,7 @@ msgstr "Түрл_ендіру және CR (Mac) етіп орнату"
#: ../data/geany.glade.h:427
msgid "_Strip Trailing Spaces"
-msgstr ""
+msgstr "Ар_тық бос аралықтарды өшіру"
#: ../data/geany.glade.h:428
msgid "_Replace Tabs by Spaces"
@@ -1972,26 +1970,24 @@ msgid "_Keyboard Shortcuts"
msgstr "П_ернетақта жарлықтары"
#: ../data/geany.glade.h:450
-#, fuzzy
msgid "Debug _Messages"
-msgstr "Жөндеу хабарламалары"
+msgstr "Жөндеу ха_барламалары"
#: ../data/geany.glade.h:451
msgid "_Website"
msgstr "Веб са_йт"
#: ../data/geany.glade.h:452
msgid "Wi_ki"
-msgstr ""
+msgstr "Ви_ки"
#: ../data/geany.glade.h:453
msgid "Report a _Bug"
-msgstr ""
+msgstr "Ақ_аулық жөнінде хабарлау"
#: ../data/geany.glade.h:454
-#, fuzzy
msgid "_Donate"
-msgstr "Сақ_тамау"
+msgstr "Ақ_шалай көмектесу"
#: ../data/geany.glade.h:455 ../src/sidebar.c:124
msgid "Symbols"
@@ -2048,7 +2044,7 @@ msgstr "Ақпарат"
#: ../src/about.c:275
msgid "Developers"
-msgstr "Өндірушілер"
+msgstr "Жасағандар"
#: ../src/about.c:282
msgid "maintainer"
@@ -2123,9 +2119,9 @@ msgid "Failed to change the working directory to \"%s\""
msgstr "Жұмыс бумасын \"%s\" етіп орнату сәтсіз"
#: ../src/build.c:929
-#, fuzzy, c-format
+#, c-format
msgid "Failed to execute \"%s\" (start-script could not be created: %s)"
-msgstr " \"%s\" орындау сәтсіз (бастау скриптін жасау мүмкін емес)"
+msgstr " \"%s\" орындау сәтсіз (іске қосылу скриптін жасау мүмкін емес: %s)"
#: ../src/build.c:984
msgid ""
@@ -2302,7 +2298,7 @@ msgstr "Барлық сақталмаған өзгерістер жоғалад
msgid "Are you sure you want to reload '%s'?"
msgstr "'%s' қайтадан жүктеуді шынымен қалайсыз ба?"
-#: ../src/callbacks.c:1062 ../src/keybindings.c:461
+#: ../src/callbacks.c:1062 ../src/keybindings.c:464
msgid "Go to Line"
msgstr "Жолға өту"
@@ -2417,7 +2413,7 @@ msgid ""
"Note if you choose multiple files, they will all be opened with the chosen "
"encoding."
msgstr ""
-"Файл үшін кодталауын қолмен орнату, егер ол дұрыс анықталмаса. Бұл әрекет "
+"Файл үшін кодталуын қолмен орнату, егер ол дұрыс анықталмаса. Бұл әрекет "
"файлдың кодталуын білсеңіз, бірақ Geany оны дұрыс анықтай алмаған кезде "
"пайдалы.\n"
"Бірнеше файл таңдалса, олардың барлығы осы кодталуда ашылатынын есте "
@@ -2668,12 +2664,12 @@ msgstr "Табуляция мен бос аралықтар"
#: ../src/document.c:1044
#, c-format
msgid "Setting %s indentation mode for %s."
-msgstr ""
+msgstr "%s шегіну режимін орнату, %s үшін."
#: ../src/document.c:1055
#, c-format
msgid "Setting indentation width to %d for %s."
-msgstr ""
+msgstr "Шегіну өлшемін %d етіп орнату, %s үшін."
#: ../src/document.c:1207
#, c-format
@@ -2811,7 +2807,7 @@ msgstr "Табуляция таңбасымен алмастырылатын б
#: ../src/editor.c:4469
#, c-format
msgid "Warning: non-standard hard tab width: %d != 8!"
-msgstr ""
+msgstr "Назарыңызға: стандартты емес табуляция ені: %d != 8!"
#: ../src/encodings.c:67
msgid "Celtic"
@@ -3011,539 +3007,536 @@ msgstr ""
msgid "untitled"
msgstr "атаусыз"
-#: ../src/highlighting.c:1225 ../src/main.c:828 ../src/socket.c:166
+#: ../src/highlighting.c:1232 ../src/main.c:828 ../src/socket.c:166
#: ../src/templates.c:224
#, c-format
msgid "Could not find file '%s'."
msgstr "'%s' файлын табу мүмкін емес."
-#: ../src/highlighting.c:1297
-#, fuzzy
+#: ../src/highlighting.c:1304
msgid "Default"
-msgstr "Ба_стапқы"
+msgstr "Бастапқы"
-#: ../src/highlighting.c:1336
+#: ../src/highlighting.c:1343
#, fuzzy
msgid "The current filetype overrides the default style."
msgstr "Ағымдағы файлды Make және үнсіз келісім бойынша мақсатпен құрастыру"
-#: ../src/highlighting.c:1337
+#: ../src/highlighting.c:1344
msgid "This may cause color schemes to display incorrectly."
msgstr ""