Commits July 2012

commits@lists.geany.org

1 participants
381 discussions

[geany/geany] 9f99b4: Merge remote-tracking branch 'origin/master' into tm/tree-refactoring
by Nick Treleaven 04 Jul '12

04 Jul '12

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Thu, 07 Jun 2012 15:32:32 Commit: 9f99b4f55ad4a1adae4d2db7858b91e95e81c8ad https://github.com/geany/geany/commit/9f99b4f55ad4a1adae4d2db7858b91e95e81c… Log Message: ----------- Merge remote-tracking branch 'origin/master' into tm/tree-refactoring Modified Paths: -------------- NEWS data/colorschemes/alt.conf data/filetypes.common data/geany.glade doc/geany.html doc/geany.txt doc/plugins.dox po/ar.po po/ast.po po/be.po po/bg.po po/ca.po po/cs.po po/de.po po/el.po po/en_GB.po po/es.po po/fa.po po/fi.po po/fr.po po/gl.po po/hu.po po/id.po po/it.po po/ja.po po/kk.po po/ko.po po/lb.po po/lt.po po/mn.po po/nl.po po/nn.po po/pl.po po/pt.po po/pt_BR.po po/ro.po po/ru.po po/sk.po po/sl.po po/sv.po po/tr.po po/uk.po po/vi.po po/zh_CN.po po/zh_TW.po scintilla/makefile.win32 scripts/svn-add.sh scripts/svn-changes.sh src/about.c src/dialogs.c src/highlighting.c src/keybindings.c src/log.c src/main.c src/ui_utils.c tagmanager/ctags/makefile.win32 tagmanager/mio/makefile.win32 Modified: NEWS 2 files changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -21,6 +21,7 @@ Geany 1.22 (unreleased) * 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. * Add missing Windows mio makefile. Prefs @@ -31,6 +32,7 @@ Geany 1.22 (unreleased) Interface * Add support for switching to the last used document after closing a tab (Jiří Techet). + * Improve the tab switching dialog for better usability (Jiří Techet). * Add support for user-defined labels for 'Send Selection to' custom commands. * Fix sidebar width when on the right (#3514436). Modified: data/colorschemes/alt.conf 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -13,7 +13,7 @@ error=0xffffff;0xff0000 # Editor styles #------------------------------------------------------------------------------- -selection=0x000000;0xc0c0c0;false;false +selection=0x000000;0xc0c0c0;false;true current_line=0x000000;0xf0f0f0;true brace_good=0x0000ff;0xFFFFFF;true;false brace_bad=0xff0000;0xFFFFFF;true;false Modified: data/filetypes.common 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -103,7 +103,7 @@ whitespace_chars=\s\t!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~ default=0x000000;0xffffff;false;false error=0xff0000;0xBFBFBF;false;italic -selection=0x000000;0xc0c0c0;false;false +selection=0x000000;0xc0c0c0;false;true current_line=0x000000;0xf0f0f0;true; brace_good=0x0000ff;0xFFFFFF;true;false brace_bad=0xff0000;0xFFFFFF;true;false Modified: data/geany.glade 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -997,7 +997,7 @@ <object class="GtkEntry" id="startup_path_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Path to start in when opening or saving files. Must be an absolute path. Leave blank to use the current working directory.</property> + <property name="tooltip_text" translatable="yes">Path to start in when opening or saving files. Must be an absolute path.</property> <property name="invisible_char">•</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> Modified: doc/geany.html 23 files changed, 17 insertions(+), 6 deletions(-) =================================================================== @@ -2159,8 +2159,7 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2> <dl class="docutils"> <dt>Startup path</dt> <dd>Path to start in when opening or saving files. -It must be an absolute path. -Leave it blank to use the current working directory.</dd> +It must be an absolute path.</dd> <dt>Project files</dt> <dd>Path to start in when opening project files.</dd> <dt>Extra plugin path</dt> @@ -5982,17 +5981,29 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2> This document (<tt class="docutils literal">geany.txt</tt>) is written in <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> (or "reST"). The source file for it is located in Geany's <tt class="docutils literal">doc</tt> subdirectory. If you intend on making changes, you should grab the -source right from SVN to make sure you've got the newest version. After +source right from Git to make sure you've got the newest version. After editing the file, to build the HTML document to see how your changes look, run "<tt class="docutils literal">make doc</tt>" 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 "<tt class="docutils literal">make pdf</tt>" which should generate a file called geany-1.22.pdf. -After you are happy with your changes, create a patch: +After you are happy with your changes, create a patch e.g. by using: <pre class="literal-block"> -% svn diff geany.txt > foo.patch +% git diff geany.txt > foo.patch +</pre> +or even better, by creating a Git-formatted patch which will keep authoring +and description data, by first committing your changes (doing so in a fresh +new branch is recommended for <cite>matser</cite> not to diverge from upstream) and then +using git format-patch: +<pre class="literal-block"> +% git checkout -b my-documentation-changes # create a fresh branch +% git commit geany.txt +Write a good commit message... +% git format-patch HEAD^ +% git checkout master # go back to master </pre> and then submit that file to the mailing list for review. +Also you can clone the Geany repository at GitHub and send a pull request. Note, you will need the Python docutils software package installed to build the docs. The package is named <tt class="docutils literal">python-docutils</tt> on Debian and Fedora systems. @@ -6776,7 +6787,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-04-25 14:39 UTC. +Generated on: 2012-06-04 21:07 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: doc/geany.txt 20 files changed, 16 insertions(+), 4 deletions(-) =================================================================== @@ -1763,7 +1763,6 @@ Paths Startup path Path to start in when opening or saving files. It must be an absolute path. - Leave it blank to use the current working directory. Project files Path to start in when opening project files. @@ -4985,7 +4984,7 @@ Contributing to this document This document (``geany.txt``) is written in `reStructuredText`__ (or "reST"). The source file for it is located in Geany's ``doc`` subdirectory. If you intend on making changes, you should grab the -source right from SVN to make sure you've got the newest version. After +source right from Git to make sure you've got the newest version. After editing the file, to build the HTML document to see how your changes look, run "``make doc``" in the subdirectory ``doc`` of Geany's source directory. This regenerates the ``geany.html`` file. To generate a PDF @@ -4994,12 +4993,25 @@ geany-|(version)|.pdf. __ http://docutils.sourceforge.net/rst.html -After you are happy with your changes, create a patch:: +After you are happy with your changes, create a patch e.g. by using:: - % svn diff geany.txt > foo.patch + % git diff geany.txt > foo.patch + +or even better, by creating a Git-formatted patch which will keep authoring +and description data, by first committing your changes (doing so in a fresh +new branch is recommended for `matser` not to diverge from upstream) and then +using git format-patch:: + + % git checkout -b my-documentation-changes # create a fresh branch + % git commit geany.txt + Write a good commit message... + % git format-patch HEAD^ + % git checkout master # go back to master and then submit that file to the mailing list for review. +Also you can clone the Geany repository at GitHub and send a pull request. + Note, you will need the Python docutils software package installed to build the docs. The package is named ``python-docutils`` on Debian and Fedora systems. Modified: doc/plugins.dox 50 files changed, 25 insertions(+), 25 deletions(-) =================================================================== @@ -84,41 +84,41 @@ * * @subsection code Managing the source code * - * For authors of plugins for Geany, we created a dedicated @a geany-plugins project at - * Sourceforge to ease development of plugins and help new authors. - * Project website: http://sourceforge.net/projects/geany-plugins - * - * Each plugin author is welcome to use these services. To do so, you need an account at - * Sourceforge. You can easily register at (http://sourceforge.net/account/registration/). - * After you successfully created an account, - * tell your account name Enrico or Nick and you will write access to the SVN repository - * (http://geany-plugins.svn.sourceforge.net/viewvc/geany-plugins/). - * Then you can use the repository for your own plugin. - * - * Authors using this service should subscribe to the - * geany-plugins-commits at uvena.de and geany-plugins-tracker at uvena.de - * mailing lists(see my previous post) to stay up to date with changes. - * General plugin discussion can happen on the normal geany at uvena.de or - * geany-devel at uvena.de lists. + * For authors of plugins for Geany, we created a dedicated @a geany-plugins project + * on Sourceforge and GitHub to ease development of plugins and help new authors. + * All information about this project you can find at http://plugins.geany.org/ + * + * To add a new plugin to this project, get in touch with the people on the + * geany-devel-mailing list and create a fork of the geany-plugins project + * at https://github.com/geany/geany-plugins. + * Beside of adding a new plugin, geany-devel-mailing list is also the place where + * to discuss development related questions. + * However, once you have done your fork of geany-plugins you can develop + * your plugin until you think its the right time to publish it. At this point, + * create a pull request for adding your patch set into the master branch of the main + * geany-plugins repository. + * + * Of course, you don't need to use GitHub - any Git is fine. But GitHub + * is making it way easier for review, merging and get in touch with you for + * comments. + * + * If you don't want your plugin to be part of the geany-plugins project it is also fine. + * Just skip the part about forking geany-plugins and sending a pull request. + * In this case it is of course also a good idea to post some kind of announcement + * to geany-devel and maybe to the main geany mailing list -- it's up to you. + * You can also ask for your plugin to be listed on the http://plugins.geany.org/ + * website as a third party plugin, helping Geany user to know about your plugin. * * At time of writing, there are some plugins already available in the - * repository. Feel free to use any of these plugins as a start for your own, + * repositories. Feel free to use any of these plugins as a start for your own, * maybe by copying the directory structure and the autotools files * (Makefile.am, configure.in, ...). Most of the available plugins are also ready for * i18n support, just for reference. * - * New plugins should be imported into a new directory inside the trunk/ - * directory. There are also the common branches and tags directories, use - * them as needed, use always a subdirectory for your own plugin. - * * We encourage authors using this service to only commit changes to their * own plugin and not to others' plugins. Instead just send patches to * geany-devel at uvena.de or the plugin author directly. * - * (the full announcement of this service can be found at - * http://lists.uvena.de/geany/2008-April/003225.html) - * - * * @section paths Installation paths * * - The plugin binary (@c pluginname.so) should be installed in Geany's libdir. This is Modified: po/ar.po 1021 files changed, 543 insertions(+), 478 deletions(-) =================================================================== @@ -6,9 +6,9 @@ # Fayssal Chamekh <chamfay(a)gmail.com>, 2012 msgid "" msgstr "" -"Project-Id-Version: 1.22\n" +"Project-Id-Version: Geany 1.22\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-09 16:51+0100\n" +"POT-Creation-Date: 2012-06-03 17:50+0200\n" "PO-Revision-Date: 2012-02-08 11:28-0000\n" "Last-Translator: فيصل شامخ <chamfay(a)gmail.com>\n" "Language-Team: فيصل شامخ <chamfay(a)gmail.com>\n" @@ -86,7 +86,7 @@ msgstr "غير مرئي" msgid "_Insert \"include <...>\"" msgstr "أدرج \"include <...>\"" -#: ../data/geany.glade.h:14 ../src/keybindings.c:406 +#: ../data/geany.glade.h:14 ../src/keybindings.c:408 msgid "_Insert Alternative White Space" msgstr "إضافة مسافات بيضاء أخرى." @@ -114,7 +114,7 @@ msgstr "إذهب إلى تعريف الوسم" msgid "Conte_xt Action" msgstr "" -#: ../data/geany.glade.h:21 ../src/filetypes.c:102 ../src/filetypes.c:1778 +#: ../data/geany.glade.h:21 ../src/filetypes.c:102 ../src/filetypes.c:1775 msgid "None" msgstr "لا شيء" @@ -130,7 +130,7 @@ msgstr "اﻷحرف الحالية" msgid "Match braces" msgstr "" -#: ../data/geany.glade.h:25 ../src/keybindings.c:416 +#: ../data/geany.glade.h:25 ../src/keybindings.c:418 msgid "Preferences" msgstr "تفضيلات" @@ -340,7 +340,7 @@ msgstr "متفرقات" #. * corresponding chapter in the documentation, comparing translatable #. * strings is easy to break. Maybe attach an identifying string to the #. * tab label object. -#: ../data/geany.glade.h:70 ../src/prefs.c:1549 +#: ../data/geany.glade.h:70 ../src/prefs.c:1575 msgid "General" msgstr "عام" @@ -416,7 +416,7 @@ msgstr "إظهار شريط الحالة" msgid "Whether to show the status bar at the bottom of the main window" msgstr "" -#: ../data/geany.glade.h:89 ../src/prefs.c:1551 +#: ../data/geany.glade.h:89 ../src/prefs.c:1577 msgid "Interface" msgstr "الواجهة" @@ -544,7 +544,7 @@ msgstr "حجم الأيقونة" msgid "Toolbar" msgstr "شريط اﻷدوات" -#: ../data/geany.glade.h:120 ../src/prefs.c:1553 +#: ../data/geany.glade.h:120 ../src/prefs.c:1579 msgid "Toolbar" msgstr "شريط اﻷدوات" @@ -931,7 +931,7 @@ msgstr "اللون:" msgid "Sets the color of the long line marker" msgstr "تعيين لون سطر العلامات الطويل" -#: ../data/geany.glade.h:207 ../src/toolbar.c:70 ../src/tools.c:929 +#: ../data/geany.glade.h:207 ../src/toolbar.c:70 ../src/tools.c:972 msgid "Color Chooser" msgstr "الملوّن" @@ -1005,7 +1005,7 @@ msgstr "المساحات الافتراضية" msgid "Display" msgstr "عرض" -#: ../data/geany.glade.h:223 ../src/keybindings.c:222 ../src/prefs.c:1555 +#: ../data/geany.glade.h:223 ../src/keybindings.c:224 ../src/prefs.c:1581 msgid "Editor" msgstr "المحرر" @@ -1082,7 +1082,7 @@ msgstr "" msgid "Removes trailing spaces and tabs and the end of lines" msgstr "" -#: ../data/geany.glade.h:241 ../src/keybindings.c:557 +#: ../data/geany.glade.h:241 ../src/keybindings.c:559 msgid "Replace tabs by space" msgstr "استبدل الإزاحات بالمسافات" @@ -1112,7 +1112,7 @@ msgid "" "disables checking." msgstr "" -#: ../data/geany.glade.h:248 ../src/prefs.c:1557 ../src/symbols.c:683 +#: ../data/geany.glade.h:248 ../src/prefs.c:1583 ../src/symbols.c:687 #: ../plugins/filebrowser.c:1120 msgid "Files" msgstr "الملفات" @@ -1159,7 +1159,7 @@ msgstr "" msgid "Commands" msgstr "اﻷوامر" -#: ../data/geany.glade.h:259 ../src/keybindings.c:234 ../src/prefs.c:1559 +#: ../data/geany.glade.h:259 ../src/keybindings.c:236 ../src/prefs.c:1585 msgid "Tools" msgstr "الأدوات" @@ -1237,7 +1237,7 @@ msgstr "" msgid "Template data" msgstr "" -#: ../data/geany.glade.h:277 ../src/prefs.c:1561 +#: ../data/geany.glade.h:277 ../src/prefs.c:1587 msgid "Templates" msgstr "القوالب" @@ -1249,7 +1249,7 @@ msgstr "تغيير" msgid "Keyboard shortcuts" msgstr "اختصارات لوحة المفاتيح" -#: ../data/geany.glade.h:280 ../src/prefs.c:1563 +#: ../data/geany.glade.h:280 ../src/prefs.c:1589 msgid "Keybindings" msgstr "الاختصارات" @@ -1320,7 +1320,7 @@ msgstr "" msgid "Printing" msgstr "الطباعة" -#: ../data/geany.glade.h:297 ../src/prefs.c:1565 +#: ../data/geany.glade.h:297 ../src/prefs.c:1591 msgid "Printing" msgstr "الطباعة" @@ -1449,7 +1449,7 @@ msgstr "" msgid "Terminal" msgstr "الطرفية" -#: ../data/geany.glade.h:326 ../src/prefs.c:1569 ../src/vte.c:281 +#: ../data/geany.glade.h:326 ../src/prefs.c:1595 ../src/vte.c:281 msgid "Terminal" msgstr "الطرفية" @@ -1461,7 +1461,7 @@ msgstr "تحذير: اقرأ المساعة قبل تغيير هذه اﻹع msgid "Various preferences" msgstr "تفضيلات متعدّدة" -#: ../data/geany.glade.h:329 ../src/prefs.c:1567 +#: ../data/geany.glade.h:329 ../src/prefs.c:1593 msgid "Various" msgstr "متعدد" @@ -1469,7 +1469,7 @@ msgstr "متعدد" msgid "Project Properties" msgstr "خصائص المشروع" -#: ../data/geany.glade.h:331 ../src/plugins.c:1456 ../src/project.c:150 +#: ../data/geany.glade.h:331 ../src/plugins.c:1457 ../src/project.c:150 msgid "Filename:" msgstr "اسم الملف:" @@ -1503,7 +1503,7 @@ msgid "" "project filename." msgstr "" -#: ../data/geany.glade.h:338 ../src/keybindings.c:232 +#: ../data/geany.glade.h:338 ../src/keybindings.c:234 msgid "Project" msgstr "مشروع" @@ -1551,7 +1551,7 @@ msgstr "الملفات السابقة" msgid "Save A_ll" msgstr "اِحفظ الكل" -#: ../data/geany.glade.h:351 ../src/callbacks.c:429 ../src/document.c:2836 +#: ../data/geany.glade.h:351 ../src/callbacks.c:430 ../src/document.c:2838 #: ../src/sidebar.c:696 msgid "_Reload" msgstr "أعِد التحميل" @@ -1564,11 +1564,11 @@ msgstr "أعِد التحميل بترميز" msgid "Page Set_up" msgstr "إعدادات الصفحة" -#: ../data/geany.glade.h:354 ../src/notebook.c:479 +#: ../data/geany.glade.h:354 ../src/notebook.c:489 msgid "Close Ot_her Documents" msgstr "أغلِق الملفات اﻷخرى" -#: ../data/geany.glade.h:355 ../src/notebook.c:485 +#: ../data/geany.glade.h:355 ../src/notebook.c:495 msgid "C_lose All" msgstr "أغلِق الكل" @@ -1576,43 +1576,43 @@ msgstr "أغلِق الكل" msgid "_Commands" msgstr "الأوامر" -#: ../data/geany.glade.h:357 ../src/keybindings.c:341 +#: ../data/geany.glade.h:357 ../src/keybindings.c:343 msgid "_Cut Current Line(s)" msgstr "قص السطر الحالي" -#: ../data/geany.glade.h:358 ../src/keybindings.c:338 +#: ../data/geany.glade.h:358 ../src/keybindings.c:340 msgid "_Copy Current Line(s)" msgstr "نسخ السطر الحالي" -#: ../data/geany.glade.h:359 ../src/keybindings.c:293 +#: ../data/geany.glade.h:359 ../src/keybindings.c:295 msgid "_Delete Current Line(s)" msgstr "حذف السطر (اﻷسطر) التالي" -#: ../data/geany.glade.h:360 ../src/keybindings.c:290 +#: ../data/geany.glade.h:360 ../src/keybindings.c:292 msgid "_Duplicate Line or Selection" msgstr "ضاعف السطر أو التحديد" -#: ../data/geany.glade.h:361 ../src/keybindings.c:351 +#: ../data/geany.glade.h:361 ../src/keybindings.c:353 msgid "_Select Current Line(s)" msgstr "حدد العنصر الحالي" -#: ../data/geany.glade.h:362 ../src/keybindings.c:354 +#: ../data/geany.glade.h:362 ../src/keybindings.c:356 msgid "_Select Current Paragraph" msgstr "تحديد الفقرة الحالية" -#: ../data/geany.glade.h:363 ../src/keybindings.c:393 +#: ../data/geany.glade.h:363 ../src/keybindings.c:395 msgid "_Send Selection to Terminal" msgstr "إرسال التحديد إلى الطرفية" -#: ../data/geany.glade.h:364 ../src/keybindings.c:395 +#: ../data/geany.glade.h:364 ../src/keybindings.c:397 msgid "_Reflow Lines/Block" msgstr "" -#: ../data/geany.glade.h:365 ../src/keybindings.c:365 +#: ../data/geany.glade.h:365 ../src/keybindings.c:367 msgid "T_oggle Case of Selection" msgstr "" -#: ../data/geany.glade.h:366 ../src/keybindings.c:300 +#: ../data/geany.glade.h:366 ../src/keybindings.c:302 msgid "_Transpose Current Line" msgstr "نقل السطر الحالي" @@ -1636,7 +1636,7 @@ msgstr "زيادة الإزاحة" msgid "_Decrease Indent" msgstr "" -#: ../data/geany.glade.h:372 ../src/keybindings.c:384 +#: ../data/geany.glade.h:372 ../src/keybindings.c:386 msgid "_Smart Line Indent" msgstr "" @@ -1652,7 +1652,7 @@ msgstr "أدرجْ تعليقات" msgid "Preference_s" msgstr "تفضيلات" -#: ../data/geany.glade.h:376 ../src/keybindings.c:419 +#: ../data/geany.glade.h:376 ../src/keybindings.c:421 msgid "P_lugin Preferences" msgstr "تفضيلات اﻹضافات" @@ -1680,11 +1680,11 @@ msgstr "الرسالة التالية" msgid "Pr_evious Message" msgstr "الرسالة السابقة" -#: ../data/geany.glade.h:383 ../src/keybindings.c:468 +#: ../data/geany.glade.h:383 ../src/keybindings.c:470 msgid "_Go to Next Marker" msgstr "اذهب إلى العلامة التالية" -#: ../data/geany.glade.h:384 ../src/keybindings.c:471 +#: ../data/geany.glade.h:384 ../src/keybindings.c:473 msgid "_Go to Previous Marker" msgstr "اذهب إلى العلامة السابقة" @@ -1692,15 +1692,15 @@ msgstr "اذهب إلى العلامة السابقة" msgid "_Go to Line" msgstr "اذهب إلى السطر" -#: ../data/geany.glade.h:386 ../src/keybindings.c:431 +#: ../data/geany.glade.h:386 ../src/keybindings.c:433 msgid "Find Next _Selection" msgstr "إيجاد التحديد التالي" -#: ../data/geany.glade.h:387 ../src/keybindings.c:433 +#: ../data/geany.glade.h:387 ../src/keybindings.c:435 msgid "Find Pre_vious Selection" msgstr "إيجاد التحديد السابق" -#: ../data/geany.glade.h:388 ../src/keybindings.c:450 +#: ../data/geany.glade.h:388 ../src/keybindings.c:452 msgid "_Mark All" msgstr "علّم الكل" @@ -1737,307 +1737,336 @@ msgid "Show Side_bar" msgstr "إظهار الشريط الجانبي" #: ../data/geany.glade.h:397 +msgid "_Color Schemes" +msgstr "مخطط اﻷلوان" + +#: ../data/geany.glade.h:398 msgid "Show _Markers Margin" msgstr "إظهار هامش العلامات" -#: ../data/geany.glade.h:398 +#: ../data/geany.glade.h:399 msgid "Show _Line Numbers" msgstr "إظهار عدد اﻷسطر" -#: ../data/geany.glade.h:399 +#: ../data/geany.glade.h:400 msgid "Show _White Space" msgstr "إظهار المسافة البيضاء" -#: ../data/geany.glade.h:400 +#: ../data/geany.glade.h:401 msgid "Show Line _Endings" msgstr "إظهار نهايات السطر" -#: ../data/geany.glade.h:401 +#: ../data/geany.glade.h:402 msgid "Show _Indentation Guides" msgstr "" -#: ../data/geany.glade.h:402 +#: ../data/geany.glade.h:403 msgid "_Document" msgstr "مستند" -#: ../data/geany.glade.h:403 +#: ../data/geany.glade.h:404 msgid "_Line Wrapping" msgstr "التفاف النص" -#: ../data/geany.glade.h:404 +#: ../data/geany.glade.h:405 msgid "Line _Breaking" msgstr "قطع السّطور" -#: ../data/geany.glade.h:405 +#: ../data/geany.glade.h:406 msgid "_Auto-indentation" msgstr "" -#: ../data/geany.glade.h:406 +#: ../data/geany.glade.h:407 msgid "In_dent Type" msgstr "" -#: ../data/geany.glade.h:407 +#: ../data/geany.glade.h:408 msgid "_Detect from Content" msgstr "" -#: ../data/geany.glade.h:408 +#: ../data/geany.glade.h:409 msgid "T_abs and Spaces" msgstr "إزاحات و مسافات" -#: ../data/geany.glade.h:409 +#: ../data/geany.glade.h:410 msgid "Indent Widt_h" msgstr "" -#: ../data/geany.glade.h:410 +#: ../data/geany.glade.h:411 msgid "_1" msgstr "_1" -#: ../data/geany.glade.h:411 +#: ../data/geany.glade.h:412 msgid "_2" msgstr "_2" -#: ../data/geany.glade.h:412 +#: ../data/geany.glade.h:413 msgid "_3" msgstr "_3" -#: ../data/geany.glade.h:413 +#: ../data/geany.glade.h:414 msgid "_4" msgstr "_4" -#: ../data/geany.glade.h:414 +#: ../data/geany.glade.h:415 msgid "_5" msgstr "_5" -#: ../data/geany.glade.h:415 +#: ../data/geany.glade.h:416 msgid "_6" msgstr "_6" -#: ../data/geany.glade.h:416 +#: ../data/geany.glade.h:417 msgid "_7" msgstr "_7" -#: ../data/geany.glade.h:417 +#: ../data/geany.glade.h:418 msgid "_8" msgstr "_8" -#: ../data/geany.glade.h:418 +#: ../data/geany.glade.h:419 msgid "Read _Only" msgstr "قراءة فقط" -#: ../data/geany.glade.h:419 +#: ../data/geany.glade.h:420 msgid "_Write Unicode BOM" msgstr "أكتب Unicode BOM" -#: ../data/geany.glade.h:420 +#: ../data/geany.glade.h:421 msgid "Set File_type" msgstr "عيّن نوع الملف" -#: ../data/geany.glade.h:421 +#: ../data/geany.glade.h:422 msgid "Set _Encoding" msgstr "عيّن الترميز" -#: ../data/geany.glade.h:422 +#: ../data/geany.glade.h:423 msgid "Set Line E_ndings" msgstr "عيّن ترميز السطر" -#: ../data/geany.glade.h:423 +#: ../data/geany.glade.h:424 msgid "Convert and Set to _CR/LF (Win)" msgstr "Convert and Set to _CR/LF (Win)" -#: ../data/geany.glade.h:424 +#: ../data/geany.glade.h:425 msgid "Convert and Set to _LF (Unix)" msgstr "" -#: ../data/geany.glade.h:425 +#: ../data/geany.glade.h:426 msgid "Convert and Set to CR (_Mac)" msgstr "Convert and Set to CR (_Mac)" -#: ../data/geany.glade.h:426 +#: ../data/geany.glade.h:427 msgid "_Strip Trailing Spaces" msgstr "" -#: ../data/geany.glade.h:427 +#: ../data/geany.glade.h:428 msgid "_Replace Tabs by Spaces" msgstr "استبدل الإزاحات بالمسافات" -#: ../data/geany.glade.h:428 +#: ../data/geany.glade.h:429 msgid "Replace Spaces b_y Tabs" msgstr "استبدل المسافات بالإزاحات" -#: ../data/geany.glade.h:429 +#: ../data/geany.glade.h:430 msgid "_Fold All" msgstr "" -#: ../data/geany.glade.h:430 +#: ../data/geany.glade.h:431 msgid "_Unfold All" msgstr "" -#: ../data/geany.glade.h:431 +#: ../data/geany.glade.h:432 msgid "Remove _Markers" msgstr "ا_حذف العلامة" -#: ../data/geany.glade.h:432 +#: ../data/geany.glade.h:433 msgid "Remove Error _Indicators" msgstr "احذف إشارات الخطأ" -#: ../data/geany.glade.h:433 +#: ../data/geany.glade.h:434 msgid "_Project" msgstr "مشروع" -#: ../data/geany.glade.h:434 +#: ../data/geany.glade.h:435 msgid "_New" msgstr "جديد" -#: ../data/geany.glade.h:435 +#: ../data/geany.glade.h:436 msgid "_Open" msgstr "اِفتح" -#: ../data/geany.glade.h:436 +#: ../data/geany.glade.h:437 msgid "_Recent Projects" msgstr "المشاريع السابقة" -#: ../data/geany.glade.h:437 +#: ../data/geany.glade.h:438 msgid "_Close" msgstr "إغلِق" -#: ../data/geany.glade.h:438 +#: ../data/geany.glade.h:439 msgid "Apply the default indentation settings to all documents" msgstr "" -#: ../data/geany.glade.h:439 +#: ../data/geany.glade.h:440 msgid "_Apply Default Indentation" msgstr "" #. build the code -#: ../data/geany.glade.h:440 ../src/build.c:2568 ../src/build.c:2845 +#: ../data/geany.glade.h:441 ../src/build.c:2568 ../src/build.c:2845 msgid "_Build" msgstr "بناء" -#: ../data/geany.glade.h:441 +#: ../data/geany.glade.h:442 msgid "_Tools" msgstr "أدوات" -#: ../data/geany.glade.h:442 +#: ../data/geany.glade.h:443 msgid "_Reload Configuration" msgstr "أعِد تحميل اﻹعداد" -#: ../data/geany.glade.h:443 +#: ../data/geany.glade.h:444 msgid "C_onfiguration Files" msgstr "ملفات الإعداد" -#: ../data/geany.glade.h:444 +#: ../data/geany.glade.h:445 msgid "_Color Chooser" msgstr "اِختر لونا" -#: ../data/geany.glade.h:445 +#: ../data/geany.glade.h:446 msgid "_Word Count" msgstr "احصائيات المستند" -#: ../data/geany.glade.h:446 +#: ../data/geany.glade.h:447 msgid "Load Ta_gs" msgstr "حمّل الوسوم" -#: ../data/geany.glade.h:447 +#: ../data/geany.glade.h:448 msgid "_Help" msgstr "مساعدة" -#: ../data/geany.glade.h:448 -msgid "_Website" -msgstr "الموقع على اﻷنترنت" - #: ../data/geany.glade.h:449 msgid "_Keyboard Shortcuts" msgstr "اختصارات لوحة المفاتيح" #: ../data/geany.glade.h:450 -msgid "_Debug Messages" +#, fuzzy +msgid "Debug _Messages" msgstr "رسائل المعالجة" -#: ../data/geany.glade.h:451 ../src/sidebar.c:124 +#: ../data/geany.glade.h:451 +msgid "_Website" +msgstr "الموقع على اﻷنترنت" + +#: ../data/geany.glade.h:452 +msgid "Wi_ki" +msgstr "" + +#: ../data/geany.glade.h:453 +msgid "Report a _Bug" +msgstr "" + +#: ../data/geany.glade.h:454 +#, fuzzy +msgid "_Donate" +msgstr "لا تحفظ." + +#: ../data/geany.glade.h:455 ../src/sidebar.c:124 msgid "Symbols" msgstr "الدلائل" -#: ../data/geany.glade.h:452 +#: ../data/geany.glade.h:456 msgid "Documents" msgstr "المستندات" -#: ../data/geany.glade.h:453 +#: ../data/geany.glade.h:457 msgid "Status" msgstr "الحالة" -#: ../data/geany.glade.h:454 +#: ../data/geany.glade.h:458 msgid "Compiler" msgstr "المصنّف" -#: ../data/geany.glade.h:455 +#: ../data/geany.glade.h:459 msgid "Messages" msgstr "الرسائل" -#: ../data/geany.glade.h:456 +#: ../data/geany.glade.h:460 msgid "Scribble" msgstr "" -#: ../src/about.c:154 +#: ../src/about.c:41 +msgid "" +"Copyright (c) 2005-2012\n" +"Colomban Wendling\n" +"Nick Treleaven\n" +"Matthew Brush\n" +"Enrico Tröger\n" +"Frank Lanitz\n" +"All rights reserved." +msgstr "" + +#: ../src/about.c:157 msgid "About Geany" msgstr "عن Geany" -#: ../src/about.c:204 +#: ../src/about.c:207 msgid "A fast and lightweight IDE" msgstr "بيئة تطوير خفيفة وسريعة" -#: ../src/about.c:225 +#: ../src/about.c:228 #, c-format msgid "(built on or after %s)" msgstr "" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:256 +#: ../src/about.c:259 msgid "Info" msgstr "معلومة" -#: ../src/about.c:272 +#: ../src/about.c:275 msgid "Developers" msgstr "المطورون" -#: ../src/about.c:279 +#: ../src/about.c:282 msgid "maintainer" msgstr "المشرف" -#: ../src/about.c:287 ../src/about.c:295 ../src/about.c:303 +#: ../src/about.c:290 ../src/about.c:298 ../src/about.c:306 msgid "developer" msgstr "المطور" -#: ../src/about.c:311 +#: ../src/about.c:314 msgid "translation maintainer" msgstr "مشرف الترجمة" -#: ../src/about.c:320 +#: ../src/about.c:323 msgid "Translators" msgstr "المترجمون" -#: ../src/about.c:340 +#: ../src/about.c:343 msgid "Previous Translators" msgstr "المترجمون السابقون" -#: ../src/about.c:361 +#: ../src/about.c:364 msgid "Contributors" msgstr "المساهمون" -#: ../src/about.c:371 +#: ../src/about.c:374 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "" -#: ../src/about.c:397 +#: ../src/about.c:400 msgid "Credits" msgstr "شكْر" -#: ../src/about.c:411 +#: ../src/about.c:417 msgid "License" msgstr "الرخصة" -#: ../src/about.c:420 +#: ../src/about.c:426 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -2058,7 +2087,7 @@ msgstr "" msgid "%s (in directory: %s)" msgstr "%s (في الدليل: %s)" -#: ../src/build.c:831 ../src/build.c:1055 ../src/search.c:1627 +#: ../src/build.c:831 ../src/build.c:1055 ../src/search.c:1632 #, c-format msgid "Process failed (%s)" msgstr "فشل المهمة (%s)" @@ -2143,11 +2172,12 @@ msgstr "" msgid "Set menu item label" msgstr "" -#: ../src/build.c:1967 ../src/symbols.c:738 +#: ../src/build.c:1967 ../src/symbols.c:742 ../src/tools.c:554 msgid "Label" msgstr "عنوان" -#: ../src/build.c:1968 ../src/symbols.c:733 ../src/tools.c:524 +#. command column, holding status and command display +#: ../src/build.c:1968 ../src/symbols.c:737 ../src/tools.c:539 msgid "Command" msgstr "أمر" @@ -2226,11 +2256,11 @@ msgstr "" msgid "_Make All" msgstr "" -#: ../src/callbacks.c:147 +#: ../src/callbacks.c:148 msgid "Do you really want to quit?" msgstr "هل تود فعلا الخروج؟" -#: ../src/callbacks.c:205 +#: ../src/callbacks.c:206 #, c-format msgid "%d file saved." msgid_plural "%d files saved." @@ -2241,75 +2271,75 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: ../src/callbacks.c:430 +#: ../src/callbacks.c:431 msgid "Any unsaved changes will be lost." msgstr "سيتم فقدان أي تغييرات غير محفوظة." -#: ../src/callbacks.c:431 +#: ../src/callbacks.c:432 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "أأنت متأكد أنك تريد إعادة تحميل '%s'؟" -#: ../src/callbacks.c:1055 ../src/keybindings.c:459 +#: ../src/callbacks.c:1062 ../src/keybindings.c:461 msgid "Go to Line" msgstr "إذهب إلى السطر" -#: ../src/callbacks.c:1056 +#: ../src/callbacks.c:1063 msgid "Enter the line you want to go to:" msgstr "أكتب النص المراد الوصول إليه:" -#: ../src/callbacks.c:1139 ../src/callbacks.c:1164 +#: ../src/callbacks.c:1164 ../src/callbacks.c:1189 msgid "" "Please set the filetype for the current file before using this function." msgstr "رجاءً حدد نوع الملف للملف الحالي قبل استعمال هذا الإجراء." -#: ../src/callbacks.c:1269 ../src/ui_utils.c:628 +#: ../src/callbacks.c:1294 ../src/ui_utils.c:639 msgid "dd.mm.yyyy" msgstr "dd.mm.yyyy" -#: ../src/callbacks.c:1271 ../src/ui_utils.c:629 +#: ../src/callbacks.c:1296 ../src/ui_utils.c:640 msgid "mm.dd.yyyy" msgstr "mm.dd.yyyy" -#: ../src/callbacks.c:1273 ../src/ui_utils.c:630 +#: ../src/callbacks.c:1298 ../src/ui_utils.c:641 msgid "yyyy/mm/dd" msgstr "yyyy/mm/dd" -#: ../src/callbacks.c:1275 ../src/ui_utils.c:639 +#: ../src/callbacks.c:1300 ../src/ui_utils.c:650 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.yyyy hh:mm:ss" -#: ../src/callbacks.c:1277 ../src/ui_utils.c:640 +#: ../src/callbacks.c:1302 ../src/ui_utils.c:651 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.yyyy hh:mm:ss" -#: ../src/callbacks.c:1279 ../src/ui_utils.c:641 +#: ../src/callbacks.c:1304 ../src/ui_utils.c:652 msgid "yyyy/mm/dd hh:mm:ss" msgstr "yyyy/mm/dd hh:mm:ss" -#: ../src/callbacks.c:1281 ../src/ui_utils.c:650 +#: ../src/callbacks.c:1306 ../src/ui_utils.c:661 msgid "_Use Custom Date Format" msgstr "استخدام صيغة تاريخ مخصصة" -#: ../src/callbacks.c:1285 +#: ../src/callbacks.c:1310 msgid "Custom Date Format" msgstr "صيغة تاريخ مخصصة" -#: ../src/callbacks.c:1286 +#: ../src/callbacks.c:1311 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 "" -#: ../src/callbacks.c:1309 +#: ../src/callbacks.c:1334 msgid "Date format string could not be converted (possibly too long)." msgstr "" -#: ../src/callbacks.c:1502 ../src/callbacks.c:1510 +#: ../src/callbacks.c:1527 ../src/callbacks.c:1535 msgid "No more message items." msgstr "" -#: ../src/callbacks.c:1648 +#: ../src/callbacks.c:1673 #, c-format msgid "Could not open file %s (File not found)" msgstr "لا يمكن فتح الملف %s (الملف غير موجود)" @@ -2465,12 +2495,12 @@ msgstr "" #: ../src/dialogs.c:1223 ../src/dialogs.c:1224 ../src/dialogs.c:1225 #: ../src/dialogs.c:1231 ../src/dialogs.c:1232 ../src/dialogs.c:1233 -#: ../src/symbols.c:1996 ../src/symbols.c:2017 ../src/symbols.c:2069 -#: ../src/ui_utils.c:253 +#: ../src/symbols.c:2094 ../src/symbols.c:2115 ../src/symbols.c:2167 +#: ../src/ui_utils.c:264 msgid "unknown" msgstr "غير معروف" -#: ../src/dialogs.c:1238 ../src/symbols.c:888 +#: ../src/dialogs.c:1238 ../src/symbols.c:892 msgid "Properties" msgstr "خصائص" @@ -2498,7 +2528,7 @@ msgstr "(داخل Geany فقط)" msgid "Encoding:" msgstr "الترميز:" -#: ../src/dialogs.c:1339 ../src/ui_utils.c:257 +#: ../src/dialogs.c:1339 ../src/ui_utils.c:268 msgid "(with BOM)" msgstr "(مع BOM)" @@ -2697,7 +2727,7 @@ msgid "Wrap search and find again?" msgstr "" #: ../src/document.c:2034 ../src/search.c:1279 ../src/search.c:1323 -#: ../src/search.c:2082 ../src/search.c:2083 +#: ../src/search.c:2087 ../src/search.c:2088 #, c-format msgid "No matches found for \"%s\"." msgstr "" @@ -2709,39 +2739,39 @@ msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "" msgstr[1] "" -#: ../src/document.c:2837 +#: ../src/document.c:2839 msgid "Do you want to reload it?" msgstr "هل تريد إعادة تحميله؟" -#: ../src/document.c:2838 +#: ../src/document.c:2840 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" "the current buffer." msgstr "" -#: ../src/document.c:2856 +#: ../src/document.c:2858 msgid "Close _without saving" msgstr "أغلق بدون حفظ" -#: ../src/document.c:2859 +#: ../src/document.c:2861 msgid "Try to resave the file?" msgstr "حاول إعادة حفظ الملف؟" -#: ../src/document.c:2860 +#: ../src/document.c:2862 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "الملف \"%s\" غير موجود على القرص!" -#: ../src/editor.c:4300 +#: ../src/editor.c:4310 msgid "Enter Tab Width" msgstr "أدخل عرض اﻹزاحة" -#: ../src/editor.c:4301 +#: ../src/editor.c:4311 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "" -#: ../src/editor.c:4459 +#: ../src/editor.c:4469 #, c-format msgid "Warning: non-standard hard tab width: %d != 8!" msgstr "" @@ -2925,562 +2955,572 @@ msgstr "" msgid "M_iscellaneous" msgstr "متفرقات" -#: ../src/filetypes.c:1462 ../src/win32.c:104 +#: ../src/filetypes.c:1459 ../src/win32.c:104 msgid "All Source" msgstr "كل المصدر" #. create meta file filter "All files" -#: ../src/filetypes.c:1487 ../src/project.c:295 ../src/win32.c:94 +#: ../src/filetypes.c:1484 ../src/project.c:295 ../src/win32.c:94 #: ../src/win32.c:139 ../src/win32.c:160 ../src/win32.c:165 msgid "All files" msgstr "جميع الملفات" -#: ../src/filetypes.c:1535 +#: ../src/filetypes.c:1532 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "" -#: ../src/geany.h:50 +#: ../src/geany.h:55 msgid "untitled" msgstr "بدون اسم" -#: ../src/highlighting.c:1202 ../src/main.c:821 ../src/socket.c:166 +#: ../src/highlighting.c:1225 ../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:1225 -msgid "_Default" +#: ../src/highlighting.c:1297 +#, fuzzy +msgid "Default" msgstr "افتراضي" -#: ../src/highlighting.c:1294 -msgid "_Color Schemes" +#: ../src/highlighting.c:1336 +msgid "The current filetype overrides the default style." +msgstr "" + +#: ../src/highlighting.c:1337 +msgid "This may cause color schemes to display incorrectly." +msgstr "" + +#: ../src/highlighting.c:1358 +#, fuzzy +msgid "Color Schemes" msgstr "مخطط اﻷلوان" #. visual group order -#: ../src/keybindings.c:221 ../src/symbols.c:710 +#: ../src/keybindings.c:223 ../src/symbols.c:714 msgid "File" msgstr "ملف" -#: ../src/keybindings.c:223 +#: ../src/keybindings.c:225 msgid "Clipboard" msgstr "الحافظة" -#: ../src/keybindings.c:224 +#: ../src/keybindings.c:226 msgid "Select" msgstr "تحديد" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:227 msgid "Format" msgstr "الهيئة" -#: ../src/keybindings.c:226 +#: ../src/keybindings.c:228 msgid "Insert" msgstr "إدراج" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:229 msgid "Settings" msgstr "خيارات" -#: ../src/keybindings.c:228 +#: ../src/keybindings.c:230 msgid "Search" msgstr "بحث" -#: ../src/keybindings.c:229 +#: ../src/keybindings.c:231 msgid "Go to" msgstr "إذهب إلى" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:232 msgid "View" msgstr "عرض" -#: ../src/keybindings.c:231 +#: ../src/keybindings.c:233 msgid "Document" msgstr "مستند" -#: ../src/keybindings.c:233 ../src/keybindings.c:580 ../src/project.c:444 -#: ../src/ui_utils.c:1969 +#: ../src/keybindings.c:235 ../src/keybindings.c:582 ../src/project.c:444 +#: ../src/ui_utils.c:1980 msgid "Build" msgstr "بناء" -#: ../src/keybindings.c:235 ../src/keybindings.c:605 +#: ../src/keybindings.c:237 ../src/keybindings.c:607 msgid "Help" msgstr "مساعدة" -#: ../src/keybindings.c:236 +#: ../src/keybindings.c:238 msgid "Focus" msgstr "تركيز" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:239 msgid "Notebook tab" msgstr "لسان المصنّف" -#: ../src/keybindings.c:246 ../src/keybindings.c:274 +#: ../src/keybindings.c:248 ../src/keybindings.c:276 msgid "New" msgstr "جديد" -#: ../src/keybindings.c:248 ../src/keybindings.c:276 +#: ../src/keybindings.c:250 ../src/keybindings.c:278 msgid "Open" msgstr "اِفتح" -#: ../src/keybindings.c:251 +#: ../src/keybindings.c:253 msgid "Open selected file" msgstr "اِفتح الملف المحدد" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:255 msgid "Save" msgstr "اِحفظ" -#: ../src/keybindings.c:255 ../src/toolbar.c:55 +#: ../src/keybindings.c:257 ../src/toolbar.c:55 msgid "Save as" msgstr "اِحفظ باسم" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:259 msgid "Save all" msgstr "حفظ الكل" -#: ../src/keybindings.c:260 +#: ../src/keybindings.c:262 msgid "Print" msgstr "طباعة" -#: ../src/keybindings.c:262 ../src/keybindings.c:281 +#: ../src/keybindings.c:264 ../src/keybindings.c:283 msgid "Close" msgstr "أغلِق" -#: ../src/keybindings.c:264 +#: ../src/keybindings.c:266 msgid "Close all" msgstr "اغلق الكل" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:269 msgid "Reload file" msgstr "أعِد تحميل الملف" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:271 msgid "Re-open last closed tab" msgstr "أعد فتح آخر لسان" -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:288 msgid "Undo" msgstr "تراجع" -#: ../src/keybindings.c:288 +#: ../src/keybindings.c:290 msgid "Redo" msgstr "تراجع" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:299 msgid "Delete to line end" msgstr "احذف إلى نهاية السطر" -#: ../src/keybindings.c:303 +#: ../src/keybindings.c:305 msgid "Scroll to current line" msgstr "" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:307 msgid "Scroll up the view by one line" msgstr "" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:309 msgid "Scroll down the view by one line" msgstr "" -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:311 msgid "Complete snippet" msgstr "" -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:313 msgid "Move cursor in snippet" msgstr "" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:315 msgid "Suppress snippet completion" msgstr "" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:317 msgid "Context Action" msgstr "" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:319 msgid "Complete word" msgstr "تكملة الكلمة" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:321 msgid "Show calltip" msgstr "" -#: ../src/keybindings.c:321 +#: ../src/keybindings.c:323 msgid "Show macro list" msgstr "أظهر قائمة أوامر الماكرو" -#: ../src/keybindings.c:323 +#: ../src/keybindings.c:325 msgid "Word part completion" msgstr "تكملة جزء الكلمة" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:327 msgid "Move line(s) up" msgstr "نقل السطر إلى أعلى" -#: ../src/keybindings.c:327 +#: ../src/keybindings.c:329 msgid "Move line(s) down" msgstr "نقل السطر إلى أسفل" -#: ../src/keybindings.c:332 +#: ../src/keybindings.c:334 msgid "Cut" msgstr "قص" -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:336 msgid "Copy" msgstr "نسخ" -#: ../src/keybindings.c:336 +#: ../src/keybindings.c:338 msgid "Paste" msgstr "لصق" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:349 msgid "Select All" msgstr "تحديد الكل" -#: ../src/keybindings.c:349 +#: ../src/keybindings.c:351 msgid "Select current word" msgstr "حدد الكلمة الحالية" -#: ../src/keybindings.c:357 +#: ../src/keybindings.c:359 msgid "Select to previous word part" msgstr "حدد إلى الجزء السابق من الكلمة" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:361 msgid "Select to next word part" msgstr "حدد إلى الجزء التالي من الكلمة" -#: ../src/keybindings.c:367 +#: ../src/keybindings.c:369 msgid "Toggle line commentation" msgstr "" -#: ../src/keybindings.c:370 +#: ../src/keybindings.c:372 msgid "Comment line(s)" msgstr "" -#: ../src/keybindings.c:372 +#: ../src/keybindings.c:374 msgid "Uncomment line(s)" msgstr "" -#: ../src/keybindings.c:374 +#: ../src/keybindings.c:376 msgid "Increase indent" msgstr "زد التثليم" -#: ../src/keybindings.c:377 +#: ../src/keybindings.c:379 msgid "Decrease indent" msgstr "أنقص التثليم" -#: ../src/keybindings.c:380 +#: ../src/keybindings.c:382 msgid "Increase indent by one space" msgstr "زد التثليم بمسافة واحدة" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:384 msgid "Decrease indent by one space" msgstr "أنقِص التثليم بمسافة واحدة" -#: ../src/keybindings.c:386 +#: ../src/keybindings.c:388 msgid "Send to Custom Command 1" msgstr "ابعث إلى الأمر المخصص 1" -#: ../src/keybindings.c:388 +#: ../src/keybindings.c:390 msgid "Send to Custom Command 2" msgstr "ابعث إلى الأمر المخصص 2" -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:392 msgid "Send to Custom Command 3" msgstr "ابعث إلى الأمر المخصص 3" -#: ../src/keybindings.c:398 +#: ../src/keybindings.c:400 msgid "Join lines" msgstr "" -#: ../src/keybindings.c:403 +#: ../src/keybindings.c:405 msgid "Insert date" msgstr "إدراج تاريخ" -#: ../src/keybindings.c:409 +#: ../src/keybindings.c:411 msgid "Insert New Line Before Current" msgstr "أدرج سطر جديد قبل الحالي" -#: ../src/keybindings.c:411 +#: ../src/keybindings.c:413 msgid "Insert New Line After Current" msgstr "أدرج سطر جديد بعد الحالي" -#: ../src/keybindings.c:424 ../src/search.c:463 +#: ../src/keybindings.c:426 ../src/search.c:463 msgid "Find" msgstr "إيجاد" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:428 msgid "Find Next" msgstr "إيجاد التالي" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:430 msgid "Find Previous" msgstr "إيجاد السابق" -#: ../src/keybindings.c:435 ../src/search.c:619 +#: ../src/keybindings.c:437 ../src/search.c:619 msgid "Replace" msgstr "استبدِل" -#: ../src/keybindings.c:437 ../src/search.c:871 +#: ../src/keybindings.c:439 ../src/search.c:871 msgid "Find in Files" msgstr "بحث في الملفات" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:442 msgid "Next Message" msgstr "الرسالة التالية" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:444 msgid "Previous Message" msgstr "الرسالة السابقة" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:447 msgid "Find Usage" msgstr "" -#: ../src/keybindings.c:448 +#: ../src/keybindings.c:450 msgid "Find Document Usage" msgstr "" -#: ../src/keybindings.c:455 ../src/toolbar.c:66 +#: ../src/keybindings.c:457 ../src/toolbar.c:66 msgid "Navigate back a location" msgstr "" -#: ../src/keybindings.c:457 ../src/toolbar.c:67 +#: ../src/keybindings.c:459 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "" -#: ../src/keybindings.c:462 +#: ../src/keybindings.c:464 msgid "Go to matching brace" msgstr "" -#: ../src/keybindings.c:465 +#: ../src/keybindings.c:467 msgid "Toggle marker" msgstr "" -#: ../src/keybindings.c:474 +#: ../src/keybindings.c:476 msgid "Go to Tag Definition" msgstr "إذهب إلى تعريف الوسم" -#: ../src/keybindings.c:477 +#: ../src/keybindings.c:479 msgid "Go to Tag Declaration" msgstr "إذهب إلى تصريح الوسم" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:481 msgid "Go to Start of Line" msgstr "إذهب إلى بداية السطر" -#: ../src/keybindings.c:481 +#: ../src/keybindings.c:483 msgid "Go to End of Line" msgstr "إذهب إلى نهاية السطر" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:485 msgid "Go to End of Display Line" msgstr "إذهب إلى نهاية السطر الظاهر" -#: ../src/keybindings.c:485 +#: ../src/keybindings.c:487 msgid "Go to Previous Word Part" msgstr "اذهب إلى الجزء السابق من الكلمة" -#: ../src/keybindings.c:487 +#: ../src/keybindings.c:489 msgid "Go to Next Word Part" msgstr "اذهب إلى الجزء التالي من الكلمة" -#: ../src/keybindings.c:492 +#: ../src/keybindings.c:494 msgid "Toggle All Additional Widgets" msgstr "" -#: ../src/keybindings.c:495 +#: ../src/keybindings.c:497 msgid "Fullscreen" msgstr "ملأ الشاشة" -#: ../src/keybindings.c:497 +#: ../src/keybindings.c:499 msgid "Toggle Messages Window" msgstr "ثبّت نافذة الرسائل" -#: ../src/keybindings.c:500 +#: ../src/keybindings.c:502 msgid "Toggle Sidebar" msgstr "ثبت الشريط الجانبي" -#: ../src/keybindings.c:502 +#: ../src/keybindings.c:504 msgid "Zoom In" msgstr "تكبير" -#: ../src/keybindings.c:504 +#: ../src/keybindings.c:506 msgid "Zoom Out" msgstr "تصغير" -#: ../src/keybindings.c:506 +#: ../src/keybindings.c:508 msgid "Zoom Reset" msgstr "اﻷصلي" -#: ../src/keybindings.c:511 +#: ../src/keybindings.c:513 msgid "Switch to Editor" msgstr "انتقل إلى المحرر" -#: ../src/keybindings.c:513 +#: ../src/keybindings.c:515 msgid "Switch to Search Bar" msgstr "بدّل إلى لسان البحث" -#: ../src/keybindings.c:515 +#: ../src/keybindings.c:517 msgid "Switch to Message Window" msgstr "انتقل إلى نافذة الرسائل" -#: ../src/keybindings.c:517 +#: ../src/keybindings.c:519 msgid "Switch to Compiler" msgstr "انتقل إلى المفسر" -#: ../src/keybindings.c:519 +#: ../src/keybindings.c:521 msgid "Switch to Messages" msgstr "انتقل إلى الرسائل" -#: ../src/keybindings.c:521 +#: ../src/keybindings.c:523 msgid "Switch to Scribble" msgstr "" -#: ../src/keybindings.c:523 +#: ../src/keybindings.c:525 msgid "Switch to VTE" msgstr "انتقل إلى VTE (الطرفية الافتراضية)" -#: ../src/keybindings.c:525 +#: ../src/keybindings.c:527 msgid "Switch to Sidebar" msgstr "انتقل إلى الشريط الجانبي" -#: ../src/keybindings.c:527 +#: ../src/keybindings.c:529 msgid "Switch to Sidebar Symbol List" msgstr "" -#: ../src/keybindings.c:529 +#: ../src/keybindings.c:531 msgid "Switch to Sidebar Document List" msgstr "" -#: ../src/keybindings.c:534 +#: ../src/keybindings.c:536 msgid "Switch to left document" msgstr "انقل المستند إلى اليسار" -#: ../src/keybindings.c:536 +#: ../src/keybindings.c:538 msgid "Switch to right document" msgstr "انقل المستند إلى اليمين" -#: ../src/keybindings.c:538 +#: ../src/keybindings.c:540 msgid "Switch to last used document" msgstr "انتقل إلى آخر مستند مستعمل" -#: ../src/keybindings.c:541 +#: ../src/keybindings.c:543 msgid "Move document left" msgstr "انقل المستند يسارا" -#: ../src/keybindings.c:544 +#: ../src/keybindings.c:546 msgid "Move document right" msgstr "انقل المستند يمينا" -#: ../src/keybindings.c:546 +#: ../src/keybindings.c:548 msgid "Move document first" msgstr "انقل المستند إلى البداية" -#: ../src/keybindings.c:548 +#: ../src/keybindings.c:550 msgid "Move document last" msgstr "انقل المستند إلى النهاية" -#: ../src/keybindings.c:553 +#: ../src/keybindings.c:555 msgid "Toggle Line wrapping" msgstr "" -#: ../src/keybindings.c:555 +#: ../src/keybindings.c:557 msgid "Toggle Line breaking" msgstr "" -#: ../src/keybindings.c:559 +#: ../src/keybindings.c:561 msgid "Replace spaces by tabs" msgstr "استبدل المسافات بالإزاحات" -#: ../src/keybindings.c:561 +#: ../src/keybindings.c:563 msgid "Toggle current fold" msgstr "" -#: ../src/keybindings.c:563 +#: ../src/keybindings.c:565 msgid "Fold all" msgstr "" -#: ../src/keybindings.c:565 +#: ../src/keybindings.c:567 msgid "Unfold all" msgstr "" -#: ../src/keybindings.c:567 +#: ../src/keybindings.c:569 msgid "Reload symbol list" msgstr "" -#: ../src/keybindings.c:569 +#: ../src/keybindings.c:571 msgid "Remove Markers" msgstr "" -#: ../src/keybindings.c:571 +#: ../src/keybindings.c:573 msgid "Remove Error Indicators" msgstr "" -#: ../src/keybindings.c:573 +#: ../src/keybindings.c:575 msgid "Remove Markers and Error Indicators" msgstr "" -#: ../src/keybindings.c:578 ../src/toolbar.c:68 +#: ../src/keybindings.c:580 ../src/toolbar.c:68 msgid "Compile" msgstr "بناء" -#: ../src/keybindings.c:582 +#: ../src/keybindings.c:584 msgid "Make all" msgstr "" -#: ../src/keybindings.c:585 +#: ../src/keybindings.c:587 msgid "Make custom target" msgstr "" -#: ../src/keybindings.c:587 +#: ../src/keybindings.c:589 msgid "Make object" msgstr "" -#: ../src/keybindings.c:589 +#: ../src/keybindings.c:591 msgid "Next error" msgstr "الخطأ التالي" -#: ../src/keybindings.c:591 +#: ../src/keybindings.c:593 msgid "Previous error" msgstr "الخطأ السابق" -#: ../src/keybindings.c:593 +#: ../src/keybindings.c:595 msgid "Run" msgstr "شغّل" -#: ../src/keybindings.c:595 +#: ../src/keybindings.c:597 msgid "Build options" msgstr "خيارات البناء" -#: ../src/keybindings.c:600 +#: ../src/keybindings.c:602 msgid "Show Color Chooser" msgstr "أضظر الملون" -#: ../src/keybindings.c:837 +#: ../src/keybindings.c:849 msgid "Keyboard Shortcuts" msgstr "اختصارات لوحة المفاتيح" -#: ../src/keybindings.c:849 +#: ../src/keybindings.c:861 msgid "The following keyboard shortcuts are configurable:" msgstr "" -#: ../src/keyfile.c:920 +#: ../src/keyfile.c:950 msgid "Type here what you want, use it as a notice/scratch board" msgstr "" -#: ../src/keyfile.c:1119 +#: ../src/keyfile.c:1150 msgid "Failed to load one or more session files." msgstr "فشل في تحميل ملف أو عدة ملفات الجلسة." -#: ../src/log.c:180 +#: ../src/log.c:181 msgid "Debug Messages" msgstr "رسائل المعالجة" -#: ../src/log.c:182 +#: ../src/log.c:183 msgid "Cl_ear" msgstr "مسح" @@ -3568,20 +3608,20 @@ msgid "[FILES...]" msgstr "" #. note for translators: library versions are printed after this -#: ../src/main.c:540 +#: ../src/main.c:547 #, c-format msgid "built on %s with " msgstr "" -#: ../src/main.c:628 +#: ../src/main.c:635 msgid "Move it now?" msgstr "هل تود نقله الآن؟" -#: ../src/main.c:630 +#: ../src/main.c:637 msgid "Geany needs to move your old configuration directory before starting." msgstr "" -#: ../src/main.c:639 +#: ../src/main.c:646 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3590,14 +3630,14 @@ msgstr "" #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:649 +#: ../src/main.c:656 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " "Please move manually the directory to the new location." msgstr "" -#: ../src/main.c:730 +#: ../src/main.c:737 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3605,17 +3645,17 @@ msgid "" "Start Geany anyway?" msgstr "" -#: ../src/main.c:1070 +#: ../src/main.c:1074 #, c-format msgid "This is Geany %s." msgstr "هذا Geany %s" -#: ../src/main.c:1072 +#: ../src/main.c:1076 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "لم يتم إنشاء مجلد الإعداد (%s)." -#: ../src/main.c:1288 +#: ../src/main.c:1293 msgid "Configuration files reloaded." msgstr "تم إعادة تحميل ملفات الإعداد" @@ -3640,60 +3680,60 @@ msgstr "أخفِ نافذة الرسائل" msgid "Could not find file '%s' - trying the current document path." msgstr "" -#: ../src/notebook.c:191 +#: ../src/notebook.c:195 msgid "Switch to Document" msgstr "بدّل إلى المستند" -#: ../src/plugins.c:496 +#: ../src/plugins.c:497 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " "please recompile it." msgstr "" -#: ../src/plugins.c:1040 +#: ../src/plugins.c:1041 msgid "_Plugin Manager" msgstr "مدير اﻹضافات" #. Translators: <plugin name> <plugin version> -#: ../src/plugins.c:1211 +#: ../src/plugins.c:1212 #, c-format msgid "%s %s" msgstr "%s %s" -#: ../src/plugins.c:1287 +#: ../src/plugins.c:1288 msgid "Active" msgstr "نشط" -#: ../src/plugins.c:1293 +#: ../src/plugins.c:1294 msgid "Plugin" msgstr "إضافة" -#: ../src/plugins.c:1299 +#: ../src/plugins.c:1300 msgid "Description" msgstr "وصف" -#: ../src/plugins.c:1317 +#: ../src/plugins.c:1318 msgid "No plugins available." msgstr "لا توجد إضافات." -#: ../src/plugins.c:1413 +#: ../src/plugins.c:1414 msgid "Plugins" msgstr "إضافات" -#: ../src/plugins.c:1433 +#: ../src/plugins.c:1434 msgid "Choose which plugins should be loaded at startup:" msgstr "اختر أي إضافة تريد تحميلها مع بداية التشغيل" -#: ../src/plugins.c:1445 +#: ../src/plugins.c:1446 msgid "Plugin details:" msgstr "تفاصيل اﻹضافة" -#: ../src/plugins.c:1454 +#: ../src/plugins.c:1455 msgid "Plugin:" msgstr "اﻹظافة:" -#: ../src/plugins.c:1455 +#: ../src/plugins.c:1456 msgid "Author(s):" msgstr "المؤلفون" @@ -3701,63 +3741,63 @@ msgstr "المؤلفون" msgid "Configure Plugins" msgstr "إعداد اﻹضافات" -#: ../src/prefs.c:176 +#: ../src/prefs.c:179 msgid "Grab Key" msgstr "" -#: ../src/prefs.c:182 +#: ../src/prefs.c:185 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "" -#: ../src/prefs.c:223 ../src/symbols.c:2138 ../src/sidebar.c:730 +#: ../src/prefs.c:226 ../src/symbols.c:2236 ../src/sidebar.c:730 msgid "_Expand All" msgstr "" -#: ../src/prefs.c:228 ../src/symbols.c:2143 ../src/sidebar.c:736 +#: ../src/prefs.c:231 ../src/symbols.c:2241 ../src/sidebar.c:736 msgid "_Collapse All" msgstr "" -#: ../src/prefs.c:287 +#: ../src/prefs.c:291 msgid "Action" msgstr "الإجراء" -#: ../src/prefs.c:291 +#: ../src/prefs.c:296 msgid "Shortcut" msgstr "اختصار" -#: ../src/prefs.c:1430 +#: ../src/prefs.c:1456 msgid "_Allow" msgstr "اسمح" -#: ../src/prefs.c:1432 +#: ../src/prefs.c:1458 msgid "_Override" msgstr "" -#: ../src/prefs.c:1433 +#: ../src/prefs.c:1459 msgid "Override that keybinding?" msgstr "" -#: ../src/prefs.c:1434 +#: ../src/prefs.c:1460 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "" #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1635 +#: ../src/prefs.c:1661 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" #. page Templates -#: ../src/prefs.c:1640 +#: ../src/prefs.c:1666 msgid "" "Set the information to be used in templates. See the documentation for " "details." msgstr "" #. page Keybindings -#: ../src/prefs.c:1645 +#: ../src/prefs.c:1671 msgid "" "Here you can change keyboard shortcuts for various actions. Select one and " "press the Change button to enter a new shortcut, or double click on an " @@ -3765,7 +3805,7 @@ msgid "" msgstr "" #. page Editor->Indentation -#: ../src/prefs.c:1650 +#: ../src/prefs.c:1676 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3861,7 +3901,7 @@ msgstr "لا يمكن كتابة ملف المشروع" msgid "Project \"%s\" created." msgstr "تم إنشاء المشروع \"%s\" بنجاح." -#: ../src/project.c:241 ../src/project.c:273 ../src/project.c:949 +#: ../src/project.c:241 ../src/project.c:273 ../src/project.c:950 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "لم يتم تحميل ملف المشروع \"%s\" فشلت العملية." @@ -3884,53 +3924,53 @@ msgstr "تم إغلاق المشروع \"%s\" بنجاح." msgid "Project \"%s\" saved." msgstr "تم حفظ المشروع \"%s\" بنجاح." -#: ../src/project.c:595 +#: ../src/project.c:596 msgid "Do you want to close it before proceeding?" msgstr "" -#: ../src/project.c:596 -#, c-format -msgid "The '%s' project is already open." +#: ../src/project.c:597 +#, fuzzy, c-format +msgid "The '%s' project is open." msgstr "المشروع %s مفتوح مسبقا." -#: ../src/project.c:645 +#: ../src/project.c:646 msgid "The specified project name is too short." msgstr "اسم المشروع قصير جداً" -#: ../src/project.c:651 +#: ../src/project.c:652 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "اسم المشروع طويل جداً (على اﻷكثر %d حرفا)." -#: ../src/project.c:663 +#: ../src/project.c:664 msgid "You have specified an invalid project filename." msgstr "لقد حدد اسم مشروع خاطئ." -#: ../src/project.c:686 +#: ../src/project.c:687 msgid "Create the project's base path directory?" msgstr "" -#: ../src/project.c:687 +#: ../src/project.c:688 #, c-format msgid "The path \"%s\" does not exist." msgstr "المسار \"%s\" غير موجود." -#: ../src/project.c:696 +#: ../src/project.c:697 #, c-format msgid "Project base directory could not be created (%s)." msgstr "" -#: ../src/project.c:709 +#: ../src/project.c:710 #, c-format msgid "Project file could not be written (%s)." msgstr "لم تتم كتابة ملف المشروع (%s)." #. initialise the dialog -#: ../src/project.c:853 ../src/project.c:864 +#: ../src/project.c:854 ../src/project.c:865 msgid "Choose Project Filename" msgstr "اختيار اسم المشروع" -#: ../src/project.c:939 +#: ../src/project.c:940 #, c-format msgid "Project \"%s\" opened." msgstr "تم فتح المشروع \"%s\" بنجاح." @@ -4093,7 +4133,7 @@ msgstr "خيارات أخرى:" msgid "Other options to pass to Grep" msgstr "" -#: ../src/search.c:1282 ../src/search.c:2088 ../src/search.c:2091 +#: ../src/search.c:1282 ../src/search.c:2093 ../src/search.c:2096 #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." @@ -4118,36 +4158,41 @@ msgstr "لا يوجد نص للبحث عنه" msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "لا يمكن تنفيذ اﻷداة grep '%s'; افحص المسار في نافذة التفضيلات." -#: ../src/search.c:1635 +#: ../src/search.c:1574 +#, c-format +msgid "Cannot parse extra options: %s" +msgstr "" + +#: ../src/search.c:1640 msgid "Searching..." msgstr "بحث..." -#: ../src/search.c:1646 +#: ../src/search.c:1651 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (في المجلد: %s)" -#: ../src/search.c:1687 +#: ../src/search.c:1692 #, c-format msgid "Could not open directory (%s)" msgstr "" -#: ../src/search.c:1789 +#: ../src/search.c:1794 msgid "Search failed." msgstr "فشل البحث." -#: ../src/search.c:1809 +#: ../src/search.c:1814 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." msgstr[0] "" msgstr[1] "" -#: ../src/search.c:1817 +#: ../src/search.c:1822 msgid "No matches found." msgstr "لا تطابقات." -#: ../src/search.c:1847 +#: ../src/search.c:1852 #, c-format msgid "Bad regex: %s" msgstr "عبارة سيئة: %s" @@ -4160,274 +4205,274 @@ msgid "" "This is a fatal error and Geany will now quit." msgstr "" -#: ../src/stash.c:1075 +#: ../src/stash.c:1099 msgid "Name" msgstr "الاسم" -#: ../src/stash.c:1082 +#: ../src/stash.c:1106 msgid "Value" msgstr "القيمة" -#: ../src/symbols.c:689 ../src/symbols.c:739 ../src/symbols.c:806 +#: ../src/symbols.c:693 ../src/symbols.c:743 ../src/symbols.c:810 msgid "Chapter" msgstr "الفصل" -#: ../src/symbols.c:690 ../src/symbols.c:735 ../src/symbols.c:807 +#: ../src/symbols.c:694 ../src/symbols.c:739 ../src/symbols.c:811 msgid "Section" msgstr "القسم" -#: ../src/symbols.c:691 +#: ../src/symbols.c:695 msgid "Sect1" msgstr "قسم 1" -#: ../src/symbols.c:692 +#: ../src/symbols.c:696 msgid "Sect2" msgstr "قسم 2" -#: ../src/symbols.c:693 +#: ../src/symbols.c:697 msgid "Sect3" msgstr "قسم 3" -#: ../src/symbols.c:694 +#: ../src/symbols.c:698 msgid "Appendix" msgstr "التذييل" -#: ../src/symbols.c:695 ../src/symbols.c:740 ../src/symbols.c:756 -#: ../src/symbols.c:767 ../src/symbols.c:854 ../src/symbols.c:865 -#: ../src/symbols.c:877 ../src/symbols.c:891 ../src/symbols.c:903 -#: ../src/symbols.c:915 ../src/symbols.c:930 ../src/symbols.c:959 -#: ../src/symbols.c:989 +#: ../src/symbols.c:699 ../src/symbols.c:744 ../src/symbols.c:760 +#: ../src/symbols.c:771 ../src/symbols.c:858 ../src/symbols.c:869 +#: ../src/symbols.c:881 ../src/symbols.c:895 ../src/symbols.c:907 +#: ../src/symbols.c:919 ../src/symbols.c:934 ../src/symbols.c:963 +#: ../src/symbols.c:993 msgid "Other" msgstr "آخر" -#: ../src/symbols.c:701 ../src/symbols.c:923 ../src/symbols.c:968 +#: ../src/symbols.c:705 ../src/symbols.c:927 ../src/symbols.c:972 msgid "Module" msgstr "الوِحدة" -#: ../src/symbols.c:702 ../src/symbols.c:850 ../src/symbols.c:901 -#: ../src/symbols.c:913 ../src/symbols.c:928 ../src/symbols.c:940 +#: ../src/symbols.c:706 ../src/symbols.c:854 ../src/symbols.c:905 +#: ../src/symbols.c:917 ../src/symbols.c:932 ../src/symbols.c:944 msgid "Types" msgstr "أنواع" -#: ../src/symbols.c:703 +#: ../src/symbols.c:707 msgid "Type constructors" msgstr "نوع الهادم" -#: ../src/symbols.c:704 ../src/symbols.c:726 ../src/symbols.c:747 -#: ../src/symbols.c:755 ../src/symbols.c:764 ../src/symbols.c:776 -#: ../src/symbols.c:785 ../src/symbols.c:838 ../src/symbols.c:887 -#: ../src/symbols.c:910 ../src/symbols.c:925 ../src/symbols.c:953 -#: ../src/symbols.c:976 +#: ../src/symbols.c:708 ../src/symbols.c:730 ../src/symbols.c:751 +#: ../src/symbols.c:759 ../src/symbols.c:768 ../src/symbols.c:780 +#: ../src/symbols.c:789 ../src/symbols.c:842 ../src/symbols.c:891 +#: ../src/symbols.c:914 ../src/symbols.c:929 ../src/symbols.c:957 +#: ../src/symbols.c:980 msgid "Functions" msgstr "الدوال" -#: ../src/symbols.c:709 +#: ../src/symbols.c:713 msgid "Program" msgstr "برناج" -#: ../src/symbols.c:711 ../src/symbols.c:719 ../src/symbols.c:725 +#: ../src/symbols.c:715 ../src/symbols.c:723 ../src/symbols.c:729 msgid "Sections" msgstr "اﻷقسام" -#: ../src/symbols.c:712 +#: ../src/symbols.c:716 msgid "Paragraph" msgstr "فقرة" -#: ../src/symbols.c:713 +#: ../src/symbols.c:717 msgid "Group" msgstr "مجمةعة" -#: ../src/symbols.c:714 +#: ../src/symbols.c:718 msgid "Data" msgstr "معطيات" -#: ../src/symbols.c:720 +#: ../src/symbols.c:724 msgid "Keys" msgstr "مفاتيح" -#: ../src/symbols.c:727 ../src/symbols.c:778 ../src/symbols.c:839 -#: ../src/symbols.c:864 ../src/symbols.c:889 ../src/symbols.c:902 -#: ../src/symbols.c:911 ../src/symbols.c:927 ../src/symbols.c:988 +#: ../src/symbols.c:731 ../src/symbols.c:782 ../src/symbols.c:843 +#: ../src/symbols.c:868 ../src/symbols.c:893 ../src/symbols.c:906 +#: ../src/symbols.c:915 ../src/symbols.c:931 ../src/symbols.c:992 msgid "Variables" msgstr "متغيرات" -#: ../src/symbols.c:734 +#: ../src/symbols.c:738 msgid "Environment" msgstr "بيئة" -#: ../src/symbols.c:736 ../src/symbols.c:808 +#: ../src/symbols.c:740 ../src/symbols.c:812 msgid "Subsection" msgstr "" -#: ../src/symbols.c:737 ../src/symbols.c:809 +#: ../src/symbols.c:741 ../src/symbols.c:813 msgid "Subsubsection" msgstr "" -#: ../src/symbols.c:748 +#: ../src/symbols.c:752 msgid "Structures" msgstr "" -#: ../src/symbols.c:763 ../src/symbols.c:847 ../src/symbols.c:872 -#: ../src/symbols.c:884 +#: ../src/symbols.c:767 ../src/symbols.c:851 ../src/symbols.c:876 +#: ../src/symbols.c:888 msgid "Package" msgstr "حزمة" -#: ../src/symbols.c:765 ../src/symbols.c:914 ../src/symbols.c:937 +#: ../src/symbols.c:769 ../src/symbols.c:918 ../src/symbols.c:941 msgid "Labels" msgstr "" -#: ../src/symbols.c:766 ../src/symbols.c:777 ../src/symbols.c:890 -#: ../src/symbols.c:912 +#: ../src/symbols.c:770 ../src/symbols.c:781 ../src/symbols.c:894 +#: ../src/symbols.c:916 msgid "Constants" msgstr "ثوابت" -#: ../src/symbols.c:774 ../src/symbols.c:873 ../src/symbols.c:885 -#: ../src/symbols.c:898 ../src/symbols.c:924 ../src/symbols.c:975 +#: ../src/symbols.c:778 ../src/symbols.c:877 ../src/symbols.c:889 +#: ../src/symbols.c:902 ../src/symbols.c:928 ../src/symbols.c:979 msgid "Interfaces" msgstr "واجهات" -#: ../src/symbols.c:775 ../src/symbols.c:796 ../src/symbols.c:817 -#: ../src/symbols.c:827 ../src/symbols.c:836 ../src/symbols.c:874 -#: ../src/symbols.c:886 ../src/symbols.c:899 ../src/symbols.c:974 +#: ../src/symbols.c:779 ../src/symbols.c:800 ../src/symbols.c:821 +#: ../src/symbols.c:831 ../src/symbols.c:840 ../src/symbols.c:878 +#: ../src/symbols.c:890 ../src/symbols.c:903 ../src/symbols.c:978 msgid "Classes" msgstr "أصناف" -#: ../src/symbols.c:786 +#: ../src/symbols.c:790 msgid "Anchors" msgstr "" -#: ../src/symbols.c:787 +#: ../src/symbols.c:791 msgid "H1 Headings" msgstr "" -#: ../src/symbols.c:788 +#: ../src/symbols.c:792 msgid "H2 Headings" msgstr "" -#: ../src/symbols.c:789 +#: ../src/symbols.c:793 msgid "H3 Headings" msgstr "" -#: ../src/symbols.c:797 +#: ../src/symbols.c:801 msgid "ID Selectors" msgstr "" -#: ../src/symbols.c:798 +#: ../src/symbols.c:802 msgid "Type Selectors" msgstr "" -#: ../src/symbols.c:816 ../src/symbols.c:862 +#: ../src/symbols.c:820 ../src/symbols.c:866 msgid "Modules" msgstr "" -#: ../src/symbols.c:818 +#: ../src/symbols.c:822 msgid "Singletons" msgstr "" -#: ../src/symbols.c:819 ../src/symbols.c:828 ../src/symbols.c:837 -#: ../src/symbols.c:875 ../src/symbols.c:900 +#: ../src/symbols.c:823 ../src/symbols.c:832 ../src/symbols.c:841 +#: ../src/symbols.c:879 ../src/symbols.c:904 msgid "Methods" msgstr "" -#: ../src/symbols.c:826 ../src/symbols.c:971 +#: ../src/symbols.c:830 ../src/symbols.c:975 msgid "Namespaces" msgstr "" -#: ../src/symbols.c:829 ../src/symbols.c:954 +#: ../src/symbols.c:833 ../src/symbols.c:958 msgid "Procedures" msgstr "" -#: ../src/symbols.c:840 +#: ../src/symbols.c:844 msgid "Imports" msgstr "" -#: ../src/symbols.c:848 +#: ../src/symbols.c:852 msgid "Entities" msgstr "" -#: ../src/symbols.c:849 +#: ../src/symbols.c:853 msgid "Architectures" msgstr "" -#: ../src/symbols.c:851 +#: ../src/symbols.c:855 msgid "Functions / Procedures" msgstr "" -#: ../src/symbols.c:852 +#: ../src/symbols.c:856 msgid "Variables / Signals" msgstr "" -#: ../src/symbols.c:853 +#: ../src/symbols.c:857 msgid "Processes / Components" msgstr "" -#: ../src/symbols.c:861 +#: ../src/symbols.c:865 msgid "Events" msgstr "" -#: ../src/symbols.c:863 +#: ../src/symbols.c:867 msgid "Functions / Tasks" msgstr "" -#: ../src/symbols.c:876 ../src/symbols.c:977 +#: ../src/symbols.c:880 ../src/symbols.c:981 msgid "Members" msgstr "" -#: ../src/symbols.c:926 +#: ../src/symbols.c:930 msgid "Subroutines" msgstr "" -#: ../src/symbols.c:929 +#: ../src/symbols.c:933 msgid "Blocks" msgstr "" -#: ../src/symbols.c:938 ../src/symbols.c:947 ../src/symbols.c:985 +#: ../src/symbols.c:942 ../src/symbols.c:951 ../src/symbols.c:989 msgid "Macros" msgstr "" -#: ../src/symbols.c:939 +#: ../src/symbols.c:943 msgid "Defines" msgstr "" -#: ../src/symbols.c:946 +#: ../src/symbols.c:950 msgid "Targets" msgstr "" -#: ../src/symbols.c:955 +#: ../src/symbols.c:959 msgid "Indexes" msgstr "" -#: ../src/symbols.c:956 +#: ../src/symbols.c:960 msgid "Tables" msgstr "" -#: ../src/symbols.c:957 +#: ../src/symbols.c:961 msgid "Triggers" msgstr "" -#: ../src/symbols.c:958 +#: ../src/symbols.c:962 msgid "Views" msgstr "" -#: ../src/symbols.c:978 +#: ../src/symbols.c:982 msgid "Structs" msgstr "" -#: ../src/symbols.c:979 +#: ../src/symbols.c:983 msgid "Typedefs / Enums" msgstr "" -#: ../src/symbols.c:1615 +#: ../src/symbols.c:1728 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "لاحقة الملف غير معروفة \"%s\".\n" -#: ../src/symbols.c:1638 +#: ../src/symbols.c:1751 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "" -#: ../src/symbols.c:1645 +#: ../src/symbols.c:1758 #, c-format msgid "" "Usage: %s -g <Tag File> <File list>\n" @@ -4436,7 +4481,7 @@ msgstr "" "Usage: %s -g <Tag File> <File list>\n" "\n" -#: ../src/symbols.c:1646 +#: ../src/symbols.c:1759 #, c-format msgid "" "Example:\n" @@ -4447,40 +4492,41 @@ msgstr "" "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1660 +#: ../src/symbols.c:1773 msgid "Load Tags" msgstr "حمّل وسوما" -#: ../src/symbols.c:1667 -msgid "Geany tag files (*.tags)" +#: ../src/symbols.c:1780 +#, fuzzy +msgid "Geany tag files (*.*.tags)" msgstr "Geany tag files (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1687 +#: ../src/symbols.c:1800 #, c-format msgid "Loaded %s tags file '%s'." msgstr "" -#: ../src/symbols.c:1690 +#: ../src/symbols.c:1803 #, c-format msgid "Could not load tags file '%s'." msgstr "لم يتم تحميل ملف الوسوم '%s'." -#: ../src/symbols.c:1845 +#: ../src/symbols.c:1943 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "" -#: ../src/symbols.c:1847 +#: ../src/symbols.c:1945 #, c-format msgid "Definition of \"%s\" not found." msgstr "تعريف \"%s\" غير موجود." -#: ../src/symbols.c:2153 +#: ../src/symbols.c:2251 msgid "Sort by _Name" msgstr "ترتيب بالاسم" -#: ../src/symbols.c:2160 +#: ../src/symbols.c:2258 msgid "Sort by _Appearance" msgstr "ترتيب حسب الظهور" @@ -4637,79 +4683,79 @@ msgstr "المواد المتوفرة" msgid "Displayed Items" msgstr "المواد المعروضة" -#: ../src/tools.c:108 ../src/tools.c:113 +#: ../src/tools.c:109 ../src/tools.c:114 #, c-format msgid "Invalid command: %s" msgstr "أمر خاطيء: %s" -#: ../src/tools.c:108 +#: ../src/tools.c:109 msgid "Command not found" msgstr "اﻷمر غير موجود" -#: ../src/tools.c:254 +#: ../src/tools.c:260 #, c-format msgid "" "The executed custom command returned an error. Your selection was not " "changed. Error message: %s" msgstr "" -#: ../src/tools.c:320 +#: ../src/tools.c:326 msgid "The executed custom command exited with an unsuccessful exit code." msgstr "" -#: ../src/tools.c:348 ../src/tools.c:396 +#: ../src/tools.c:354 ../src/tools.c:402 #, c-format msgid "Custom command failed: %s" msgstr "" -#: ../src/tools.c:352 +#: ../src/tools.c:358 #, c-format msgid "Passing data and executing custom command: %s" msgstr "" -#: ../src/tools.c:498 ../src/tools.c:731 +#: ../src/tools.c:514 ../src/tools.c:774 msgid "Set Custom Commands" msgstr "تعيين أوامر مخصصة" -#: ../src/tools.c:506 +#: ../src/tools.c:522 msgid "" "You can send the current selection to any of these commands and the output " "of the command replaces the current selection." msgstr "" -#: ../src/tools.c:520 +#: ../src/tools.c:536 msgid "ID" msgstr "ID" -#: ../src/tools.c:706 +#: ../src/tools.c:745 msgid "No custom commands defined." msgstr "لا توجد أوامر مخصصة." -#: ../src/tools.c:800 +#: ../src/tools.c:843 msgid "Word Count" msgstr "احصائيات المستند" -#: ../src/tools.c:810 +#: ../src/tools.c:853 msgid "selection" msgstr "التحديد" -#: ../src/tools.c:816 +#: ../src/tools.c:859 msgid "whole document" msgstr "المستند كاملا" -#: ../src/tools.c:825 +#: ../src/tools.c:868 msgid "Range:" msgstr "المجال:" -#: ../src/tools.c:837 +#: ../src/tools.c:880 msgid "Lines:" msgstr "اﻷسطر:" -#: ../src/tools.c:851 +#: ../src/tools.c:894 msgid "Words:" msgstr "الكلمات" -#: ../src/tools.c:865 +#: ../src/tools.c:908 msgid "Characters:" msgstr "اﻷحرف:" @@ -4738,94 +4784,110 @@ msgid "Show _Paths" msgstr "إظهار المسارات" #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:184 +#: ../src/ui_utils.c:185 msgid "" "line: %l / %L\t col: %c\t sel: %s\t %w %t %mmode: %M " "encoding: %e filetype: %f scope: %S" msgstr "" +#. L = lines +#: ../src/ui_utils.c:219 +#, c-format +msgid "%dL" +msgstr "" + #. RO = read-only -#: ../src/ui_utils.c:214 ../src/ui_utils.c:221 +#: ../src/ui_utils.c:225 ../src/ui_utils.c:232 msgid "RO " msgstr "RO " #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:216 +#: ../src/ui_utils.c:227 msgid "OVR" msgstr "OVR" -#: ../src/ui_utils.c:216 +#: ../src/ui_utils.c:227 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:230 +#: ../src/ui_utils.c:241 msgid "TAB" msgstr "TAB" #. SP = space -#: ../src/ui_utils.c:233 +#: ../src/ui_utils.c:244 msgid "SP" msgstr "SP" #. T/S = tabs and spaces -#: ../src/ui_utils.c:236 +#: ../src/ui_utils.c:247 msgid "T/S" msgstr "T/S" -#: ../src/ui_utils.c:244 +#: ../src/ui_utils.c:255 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:371 +#: ../src/ui_utils.c:328 +#, c-format +msgid "pos: %d" +msgstr "" + +#: ../src/ui_utils.c:330 +#, c-format +msgid "style: %d" +msgstr "" + +#: ../src/ui_utils.c:382 msgid " (new instance)" msgstr "(كائن جديد)" -#: ../src/ui_utils.c:401 +#: ../src/ui_utils.c:412 #, c-format msgid "Font updated (%s)." msgstr "تمّ تحديث الخط (%s)" -#: ../src/ui_utils.c:597 +#: ../src/ui_utils.c:608 msgid "C Standard Library" msgstr "مكتبة سي القياسية" -#: ../src/ui_utils.c:598 +#: ../src/ui_utils.c:609 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:599 +#: ../src/ui_utils.c:610 msgid "C++ (C Standard Library)" msgstr "C++ (مكتبة سي القياسية)" -#: ../src/ui_utils.c:600 +#: ../src/ui_utils.c:611 msgid "C++ Standard Library" msgstr "مكتبة سي بلس بلس القياسية" -#: ../src/ui_utils.c:601 +#: ../src/ui_utils.c:612 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:663 +#: ../src/ui_utils.c:674 msgid "_Set Custom Date Format" msgstr "تعيين صيغة تاريخ مخصصة" -#: ../src/ui_utils.c:1808 +#: ../src/ui_utils.c:1819 msgid "Select Folder" msgstr "اختيار مجلد" -#: ../src/ui_utils.c:1808 +#: ../src/ui_utils.c:1819 msgid "Select File" msgstr "اختيار ملف" -#: ../src/ui_utils.c:1967 +#: ../src/ui_utils.c:1978 msgid "Save All" msgstr "حفظ الكل" -#: ../src/ui_utils.c:1968 +#: ../src/ui_utils.c:1979 msgid "Close All" msgstr "أغلق الكل" -#: ../src/ui_utils.c:2216 +#: ../src/ui_utils.c:2225 msgid "Geany cannot start!" msgstr "برنامج Geany لا يمكنه العمل!" @@ -5368,3 +5430,6 @@ msgstr "شطر أفقي" #: ../plugins/splitwindow.c:431 msgid "Split Vertically" msgstr "شطر عمودي" + +#~ msgid "_Debug Messages" +#~ msgstr "رسائل المعالجة" Modified: po/ast.po 6107 files changed, 3114 insertions(+), 2993 deletions(-) =================================================================== No diff available, check online Modified: po/be.po 6061 files changed, 3094 insertions(+), 2967 deletions(-) =================================================================== No diff available, check online Modified: po/bg.po 6311 files changed, 3214 insertions(+), 3097 deletions(-) =================================================================== No diff available, check online Modified: po/ca.po 6079 files changed, 3100 insertions(+), 2979 deletions(-) =================================================================== No diff available, check online Modified: po/cs.po 6089 files changed, 3105 insertions(+), 2984 deletions(-) =================================================================== No diff available, check online Modified: po/de.po 87 files changed, 57 insertions(+), 30 deletions(-) =================================================================== @@ -9,15 +9,15 @@ # msgid "" msgstr "" -"Project-Id-Version: geany 1.22\n" +"Project-Id-Version: Geany 1.22\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-28 13:53+0200\n" +"POT-Creation-Date: 2012-06-03 17:50+0200\n" "PO-Revision-Date: 2012-03-05 19:20+0100\n" "Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <geany-i18n(a)uvena.de>\n" "Language: de\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-Country: GERMANY\n" @@ -2160,6 +2160,17 @@ msgstr "Meldungen" msgid "Scribble" msgstr "Notizen" +#: ../src/about.c:41 +msgid "" +"Copyright (c) 2005-2012\n" +"Colomban Wendling\n" +"Nick Treleaven\n" +"Matthew Brush\n" +"Enrico Tröger\n" +"Frank Lanitz\n" +"All rights reserved." +msgstr "" + #: ../src/about.c:157 msgid "About Geany" msgstr "Über Geany" @@ -2218,11 +2229,11 @@ msgstr "" msgid "Credits" msgstr "Credits" -#: ../src/about.c:414 +#: ../src/about.c:417 msgid "License" msgstr "Lizenz" -#: ../src/about.c:423 +#: ../src/about.c:426 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -2677,7 +2688,7 @@ msgstr "" #: ../src/dialogs.c:1223 ../src/dialogs.c:1224 ../src/dialogs.c:1225 #: ../src/dialogs.c:1231 ../src/dialogs.c:1232 ../src/dialogs.c:1233 -#: ../src/symbols.c:2096 ../src/symbols.c:2117 ../src/symbols.c:2169 +#: ../src/symbols.c:2094 ../src/symbols.c:2115 ../src/symbols.c:2167 #: ../src/ui_utils.c:264 msgid "unknown" msgstr "unbekannt" @@ -3176,17 +3187,26 @@ msgstr "Schlechter RegEx für Dateityp %s: %s" msgid "untitled" msgstr "unbenannt" -#: ../src/highlighting.c:1215 ../src/main.c:821 ../src/socket.c:166 +#: ../src/highlighting.c:1225 ../src/main.c:828 ../src/socket.c:166 #: ../src/templates.c:224 #, c-format msgid "Could not find file '%s'." msgstr "Konnte die Datei »%s« nicht finden." -#: ../src/highlighting.c:1287 +#: ../src/highlighting.c:1297 msgid "Default" msgstr "Standard" -#: ../src/highlighting.c:1341 +#: ../src/highlighting.c:1336 +#, fuzzy +msgid "The current filetype overrides the default style." +msgstr "Kompiliert die aktuelle Datei mit »make« und dem Standard-Target" + +#: ../src/highlighting.c:1337 +msgid "This may cause color schemes to display incorrectly." +msgstr "" + +#: ../src/highlighting.c:1358 msgid "Color Schemes" msgstr "Farbschemata" @@ -3711,11 +3731,11 @@ msgstr "" "Eine oder mehre Datei(en) aus der letzten Sitzung konnte(n) nicht geladen " "werden." -#: ../src/log.c:180 +#: ../src/log.c:181 msgid "Debug Messages" msgstr "Debug-Meldungen" -#: ../src/log.c:182 +#: ../src/log.c:183 msgid "Cl_ear" msgstr "_Leeren" @@ -3813,22 +3833,22 @@ msgid "[FILES...]" msgstr "[Dateien...]" #. note for translators: library versions are printed after this -#: ../src/main.c:540 +#: ../src/main.c:547 #, c-format msgid "built on %s with " msgstr "kompiliert am %s mit " -#: ../src/main.c:628 +#: ../src/main.c:635 msgid "Move it now?" msgstr "Soll es jetzt verschoben werden?" -#: ../src/main.c:630 +#: ../src/main.c:637 msgid "Geany needs to move your old configuration directory before starting." msgstr "" "Geany muss Ihr aktuelles Konfigurationsverzeichnis an einen neuen Ort " "verschieben, bevor es gestartet wird." -#: ../src/main.c:639 +#: ../src/main.c:646 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3839,7 +3859,7 @@ msgstr "" #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:649 +#: ../src/main.c:656 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " @@ -3848,7 +3868,7 @@ msgstr "" "Ihr altes Konfigurationsverzeichnis »%s« konnte nicht nach »%s« verschoben " "werden. Fehlermeldung: %s. Bitte führen Sie die Aktion manuell aus." -#: ../src/main.c:730 +#: ../src/main.c:737 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3859,17 +3879,17 @@ msgstr "" "Es könnte zu Problemen bei der Verwendung von Geany kommen.\n" "Geany trotzdem starten?" -#: ../src/main.c:1067 +#: ../src/main.c:1074 #, c-format msgid "This is Geany %s." msgstr "Willkommen zu Geany %s." -#: ../src/main.c:1069 +#: ../src/main.c:1076 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Konfigurationsverzeichnis konnte nicht erstellt werden (%s)." -#: ../src/main.c:1286 +#: ../src/main.c:1293 msgid "Configuration files reloaded." msgstr "Einstellungen erneut geladen." @@ -3967,11 +3987,11 @@ msgstr "Tasten festlegen" msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "Welche Tastenkombination soll für »%s« genutzt werden?" -#: ../src/prefs.c:226 ../src/symbols.c:2238 ../src/sidebar.c:730 +#: ../src/prefs.c:226 ../src/symbols.c:2236 ../src/sidebar.c:730 msgid "_Expand All" msgstr "Alle a_usklappen" -#: ../src/prefs.c:231 ../src/symbols.c:2243 ../src/sidebar.c:736 +#: ../src/prefs.c:231 ../src/symbols.c:2241 ../src/sidebar.c:736 msgid "_Collapse All" msgstr "Alle _einklappen" @@ -4763,21 +4783,21 @@ msgstr "%s Tag-Datei »%s« geladen." msgid "Could not load tags file '%s'." msgstr "Konnte Tag-Datei »%s« nicht laden." -#: ../src/symbols.c:1945 +#: ../src/symbols.c:1943 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "(Vorwärts-)Deklaration von »%s« nicht gefunden." -#: ../src/symbols.c:1947 +#: ../src/symbols.c:1945 #, c-format msgid "Definition of \"%s\" not found." msgstr "Definition von »%s« nicht gefunden." -#: ../src/symbols.c:2253 +#: ../src/symbols.c:2251 msgid "Sort by _Name" msgstr "Nach _Namen sortieren" -#: ../src/symbols.c:2260 +#: ../src/symbols.c:2258 msgid "Sort by _Appearance" msgstr "Nach _Auftreten sortieren" @@ -5088,6 +5108,16 @@ msgstr "T/L" msgid "MOD" msgstr "MOD" +#: ../src/ui_utils.c:328 +#, c-format +msgid "pos: %d" +msgstr "" + +#: ../src/ui_utils.c:330 +#, fuzzy, c-format +msgid "style: %d" +msgstr "Symbolstil:" + #: ../src/ui_utils.c:382 msgid " (new instance)" msgstr " (neue Instanz)" @@ -5137,7 +5167,7 @@ msgstr "Alle speichern" msgid "Close All" msgstr "Alle schließen" -#: ../src/ui_utils.c:2230 +#: ../src/ui_utils.c:2225 msgid "Geany cannot start!" msgstr "Geany kann nicht starten!" @@ -5864,9 +5894,6 @@ msgstr "Vertikal teilen" #~ msgid "_Customize Toolbar" #~ msgstr "_Werkzeugleiste anpassen" -#~ msgid "Icon style:" -#~ msgstr "Symbolstil:" - #~ msgid "Icon size:" #~ msgstr "Symbolgröße:" Modified: po/el.po 6291 files changed, 3206 insertions(+), 3085 deletions(-) =================================================================== No diff available, check online Modified: po/en_GB.po 6081 files changed, 3101 insertions(+), 2980 deletions(-) =================================================================== No diff available, check online Modified: po/es.po 6180 files changed, 3147 insertions(+), 3033 deletions(-) =================================================================== No diff available, check online Modified: po/fa.po 6067 files changed, 3094 insertions(+), 2973 deletions(-) =================================================================== No diff available, check online Modified: po/fi.po 6336 files changed, 3235 insertions(+), 3101 deletions(-) =================================================================== No diff available, check online Modified: po/fr.po 6144 files changed, 3129 insertions(+), 3015 deletions(-) =================================================================== No diff available, check online Modified: po/gl.po 6121 files changed, 3121 insertions(+), 3000 deletions(-) =================================================================== No diff available, check online Modified: po/hu.po 6643 files changed, 3473 insertions(+), 3170 deletions(-) =================================================================== No diff available, check online Modified: po/id.po 3600 files changed, 1835 insertions(+), 1765 deletions(-) =================================================================== No diff available, check online Modified: po/it.po 3016 files changed, 1527 insertions(+), 1489 deletions(-) =================================================================== No diff available, check online Modified: po/ja.po 5937 files changed, 3023 insertions(+), 2914 deletions(-) =================================================================== No diff available, check online Modified: po/kk.po 3125 files changed, 1598 insertions(+), 1527 deletions(-) =================================================================== No diff available, check online Modified: po/ko.po 6105 files changed, 3111 insertions(+), 2994 deletions(-) =================================================================== No diff available, check online Modified: po/lb.po 6148 files changed, 3134 insertions(+), 3014 deletions(-) =================================================================== No diff available, check online Modified: po/lt.po 585 files changed, 309 insertions(+), 276 deletions(-) =================================================================== No diff available, check online Modified: po/mn.po 7246 files changed, 5621 insertions(+), 1625 deletions(-) =================================================================== No diff available, check online Modified: po/nl.po 6093 files changed, 3110 insertions(+), 2983 deletions(-) =================================================================== No diff available, check online Modified: po/nn.po 2658 files changed, 1362 insertions(+), 1296 deletions(-) =================================================================== No diff available, check online Modified: po/pl.po 6063 files changed, 3111 insertions(+), 2952 deletions(-) =================================================================== No diff available, check online Modified: po/pt.po 6031 files changed, 3068 insertions(+), 2963 deletions(-) =================================================================== No diff available, check online Modified: po/pt_BR.po 6113 files changed, 3117 insertions(+), 2996 deletions(-) =================================================================== No diff available, check online Modified: po/ro.po 6185 files changed, 3150 insertions(+), 3035 deletions(-) =================================================================== No diff available, check online Modified: po/ru.po 6087 files changed, 3104 insertions(+), 2983 deletions(-) =================================================================== No diff available, check online Modified: po/sk.po 1923 files changed, 976 insertions(+), 947 deletions(-) =================================================================== No diff available, check online Modified: po/sl.po 6592 files changed, 3383 insertions(+), 3209 deletions(-) =================================================================== No diff available, check online Modified: po/sv.po 2653 files changed, 1340 insertions(+), 1313 deletions(-) =================================================================== No diff available, check online Modified: po/tr.po 5905 files changed, 3013 insertions(+), 2892 deletions(-) =================================================================== No diff available, check online Modified: po/uk.po 6162 files changed, 3141 insertions(+), 3021 deletions(-) =================================================================== No diff available, check online Modified: po/vi.po 6109 files changed, 3115 insertions(+), 2994 deletions(-) =================================================================== No diff available, check online Modified: po/zh_CN.po 5757 files changed, 2939 insertions(+), 2818 deletions(-) =================================================================== No diff available, check online Modified: po/zh_TW.po 6063 files changed, 3056 insertions(+), 3007 deletions(-) =================================================================== No diff available, check online Modified: scintilla/makefile.win32 10 files changed, 5 insertions(+), 5 deletions(-) =================================================================== No diff available, check online Modified: scripts/svn-add.sh 8 files changed, 0 insertions(+), 8 deletions(-) =================================================================== No diff available, check online Modified: scripts/svn-changes.sh 60 files changed, 0 insertions(+), 60 deletions(-) =================================================================== No diff available, check online Modified: src/about.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== No diff available, check online Modified: src/dialogs.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== No diff available, check online Modified: src/highlighting.c 15 files changed, 11 insertions(+), 4 deletions(-) =================================================================== No diff available, check online Modified: src/keybindings.c 3 files changed, 3 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: src/log.c 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== No diff available, check online Modified: src/main.c 7 files changed, 7 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: src/ui_utils.c 12 files changed, 4 insertions(+), 8 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/makefile.win32 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/mio/makefile.win32 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== No diff available, check online @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 05e5f7: Merge branch 'master' into tm/tree-refactoring
by Colomban Wendling 04 Jul '12

04 Jul '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 31 May 2012 20:19:32 Commit: 05e5f756c11cd2ab66cf064301c115ae82fd5a7a https://github.com/geany/geany/commit/05e5f756c11cd2ab66cf064301c115ae82fd5… Log Message: ----------- Merge branch 'master' into tm/tree-refactoring Modified Paths: -------------- NEWS THANKS data/filetypes.common data/geany.glade po/de.po po/it.po po/lt.po po/sk.po po/sv.po src/about.c src/callbacks.c src/callbacks.h src/filetypesprivate.h src/geanywraplabel.c src/highlighting.c src/highlighting.h src/keyfile.c src/main.c src/sciwrappers.c src/symbols.c src/tools.c src/ui_utils.h src/utils.c tagmanager/src/tm_tag.c Modified: NEWS 89 files changed, 89 insertions(+), 0 deletions(-) =================================================================== @@ -1,11 +1,100 @@ Geany 1.22 (unreleased) + 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 + authoring. + * Make 'Replace Spaces by Tabs' only match leading spaces to + preserve alignment. + + 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 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). + * 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. + + Interface + * Add support for switching to the last used document after closing + a tab (Jiří Techet). + * Add support for user-defined labels for 'Send Selection to' + custom commands. + * Fix sidebar width when on the right (#3514436). + * Use case-insensitive document list path comparison on Windows. + * Replace Color Schemes menu with custom dialog. + * Show selected line count on status bar when whole lines are + selected. + Editor * Update Scintilla to version 2.29. + * Add a "join lines" command (Eugene Arshinov). + * Hide autocompletion when the only entry has been typed (#3516212). Search + * Add full PCRE regular expressions support. * Extra options passed to grep through Find in Files now follows a real shell-style syntax (#3516263). + * Search pattern length is no longer limited to 248 characters. + * Fix showing Find/Replace regex compile errors on the status bar. + + Keybindings + * Add Project New/Open/Properties/Close keybindings. + * Show overridden keybindings in bold for prefs dialog tree. + + Tags + * Speed up loading of multiple global tags files. + * Show global tags file preprocessing errors on stderr & add + current directory to include path. + * Add C/C++ ignore.tags wildcard format 'PREFIX*'. + + Filetypes + * Add support for regex-based filetype detection. + * C snippets no longer apply to all filetypes. + * Improve support for HTML embedded filetypes (#2863829, #3127598). + * Add filetype Objective-C (Elias Pschernig, P#3325139). + * Fix highlighting of ``...R"`` inside C and C++ (#3425107). + * Fix TCL keyword highlighting in some situations (#3432877). + * 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. + * Fix broken tag/word autocompletion in HTML/PHP documents. + * Enable &entity; completion for all XML-based filetypes. + + Plugins + * Split Window: show marker margin. + * Split Window: enable basic context menu. + + API: + * document_save_file() now shows the Save As dialog when necessary. + * Rename signal "project-dialog-create" to "project-dialog-open" and + add new "project-dialog-close" signal. + * setptr is deprecated in favour of SETPTR. + * Add ui_hookup_object() and ui_lookup_object(). + * Add ui_lookup_stock_label(). + * Add build_{activate,get_current,remove,set}_menu_item(), + build_get_group_count(). + * Add stash_group_free_settings(). + * Add support for plugins written in C++. + + Internationalisation: + * Add translations: ar, id, lt, mn, nn, sk + * Update translations: de, hu, it, kk, pl, sl, sv, zh_TW Geany 0.21 (October 2, 2011) Modified: THANKS 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -145,6 +145,7 @@ Nikita E. Shalaev <nshalaev(at)eu(dot)spb(dot)ru> - ru_RU stat.c <Static-Const(at)yandex(dot)ru> - ru_RU Andrew Drynov <adryno(at)gmail(dot)com> - ru_RU 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 Modified: data/filetypes.common 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -146,7 +146,7 @@ identifier_2=identifier_1 identifier_3=identifier_1 identifier_4=identifier_1 -string=0xff901e +string=0xff8000 string_1=string string_2=string_1 string_eol=0x000000;0xe0c0e0;false;false Modified: data/geany.glade 25 files changed, 25 insertions(+), 0 deletions(-) =================================================================== @@ -452,6 +452,12 @@ <column type="gchararray"/> </columns> </object> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-select-color</property> + <property name="icon-size">1</property> + </object> <object class="GtkImage" id="image4060"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -8306,6 +8312,25 @@ <object class="GtkMenu" id="menu_view_editor1_menu"> <property name="can_focus">False</property> <child> + <object class="GtkImageMenuItem" id="menu_color_schemes"> + <property name="label" translatable="yes">_Color Schemes</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="use_underline">True</property> + <property name="image">image2</property> + <property name="use_stock">False</property> + <signal name="activate" handler="on_menu_color_schemes_activate" swapped="no"/> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separatormenuitem1"> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> <object class="GtkCheckMenuItem" id="menu_markers_margin1"> <property name="use_action_appearance">False</property> <property name="visible">True</property> Modified: po/de.po 922 files changed, 467 insertions(+), 455 deletions(-) =================================================================== @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: geany 1.22\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-31 09:39+0200\n" +"POT-Creation-Date: 2012-05-28 13:53+0200\n" "PO-Revision-Date: 2012-03-05 19:20+0100\n" "Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <geany-i18n(a)uvena.de>\n" @@ -88,7 +88,7 @@ msgstr "unsichtbar" msgid "_Insert \"include <...>\"" msgstr "\"include <...>\" ei_nfügen" -#: ../data/geany.glade.h:14 ../src/keybindings.c:406 +#: ../data/geany.glade.h:14 ../src/keybindings.c:408 msgid "_Insert Alternative White Space" msgstr "Alternatives _Leerzeichen einfügen" @@ -116,7 +116,7 @@ msgstr "Gehe zur _Tagdefinition" msgid "Conte_xt Action" msgstr "_Kontextaktion" -#: ../data/geany.glade.h:21 ../src/filetypes.c:102 ../src/filetypes.c:1778 +#: ../data/geany.glade.h:21 ../src/filetypes.c:102 ../src/filetypes.c:1775 msgid "None" msgstr "Keiner" @@ -132,7 +132,7 @@ msgstr "Aktuelle Zeichenkette" msgid "Match braces" msgstr "Übereinstimmende Klammerung" -#: ../data/geany.glade.h:25 ../src/keybindings.c:416 +#: ../data/geany.glade.h:25 ../src/keybindings.c:418 msgid "Preferences" msgstr "Einstellungen" @@ -374,7 +374,7 @@ msgstr "Sonstiges" #. * corresponding chapter in the documentation, comparing translatable #. * strings is easy to break. Maybe attach an identifying string to the #. * tab label object. -#: ../data/geany.glade.h:70 ../src/prefs.c:1549 +#: ../data/geany.glade.h:70 ../src/prefs.c:1575 msgid "General" msgstr "Allgemein" @@ -452,7 +452,7 @@ msgstr "" "Legt fest, ob die Statuszeile an der unteren Seite des Fensters angezeigt " "werden soll oder nicht" -#: ../data/geany.glade.h:89 ../src/prefs.c:1551 +#: ../data/geany.glade.h:89 ../src/prefs.c:1577 msgid "Interface" msgstr "Schnittstelle" @@ -588,7 +588,7 @@ msgstr "Symbolgröße" msgid "Toolbar" msgstr "Werkzeugleiste" -#: ../data/geany.glade.h:120 ../src/prefs.c:1553 +#: ../data/geany.glade.h:120 ../src/prefs.c:1579 msgid "Toolbar" msgstr "Werkzeugleiste" @@ -1030,7 +1030,7 @@ msgstr "Farbe:" msgid "Sets the color of the long line marker" msgstr "Stellt die Farbe der »Umbruchhilfe für lange Zeilen« ein" -#: ../data/geany.glade.h:207 ../src/toolbar.c:70 ../src/tools.c:929 +#: ../data/geany.glade.h:207 ../src/toolbar.c:70 ../src/tools.c:972 msgid "Color Chooser" msgstr "Farbwähler" @@ -1115,7 +1115,7 @@ msgstr "Virtuelle Leerzeichen" msgid "Display" msgstr "Ansicht" -#: ../data/geany.glade.h:223 ../src/keybindings.c:222 ../src/prefs.c:1555 +#: ../data/geany.glade.h:223 ../src/keybindings.c:224 ../src/prefs.c:1581 msgid "Editor" msgstr "Editor" @@ -1203,7 +1203,7 @@ msgstr "Leerzeichen und Tabulatoren am Zeilenende entfernen" msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Entfernt Leerzeichen und Tabulatoren am Ende einer Zeile" -#: ../data/geany.glade.h:241 ../src/keybindings.c:557 +#: ../data/geany.glade.h:241 ../src/keybindings.c:559 msgid "Replace tabs by space" msgstr "Tabulatoren durch Leerzeichen ersetzen" @@ -1235,7 +1235,7 @@ msgstr "" "Wie oft soll auf Veränderungen geprüft werden? Angabe in Sekunden. 0 " "deaktiviert die Funktion." -#: ../data/geany.glade.h:248 ../src/prefs.c:1557 ../src/symbols.c:683 +#: ../data/geany.glade.h:248 ../src/prefs.c:1583 ../src/symbols.c:687 #: ../plugins/filebrowser.c:1120 msgid "Files" msgstr "Dateien" @@ -1286,7 +1286,7 @@ msgstr "" msgid "Commands" msgstr "Befehle" -#: ../data/geany.glade.h:259 ../src/keybindings.c:234 ../src/prefs.c:1559 +#: ../data/geany.glade.h:259 ../src/keybindings.c:236 ../src/prefs.c:1585 msgid "Tools" msgstr "Werkzeuge" @@ -1373,7 +1373,7 @@ msgstr "" msgid "Template data" msgstr "Daten für Vorlagen:" -#: ../data/geany.glade.h:277 ../src/prefs.c:1561 +#: ../data/geany.glade.h:277 ../src/prefs.c:1587 msgid "Templates" msgstr "Vorlagen" @@ -1385,7 +1385,7 @@ msgstr "Ä_ndern" msgid "Keyboard shortcuts" msgstr "Tastaturkürzel" -#: ../data/geany.glade.h:280 ../src/prefs.c:1563 +#: ../data/geany.glade.h:280 ../src/prefs.c:1589 msgid "Keybindings" msgstr "Tastenkürzel" @@ -1465,7 +1465,7 @@ msgstr "GTK-Druckunterstützung benutzen" msgid "Printing" msgstr "Drucken" -#: ../data/geany.glade.h:297 ../src/prefs.c:1565 +#: ../data/geany.glade.h:297 ../src/prefs.c:1591 msgid "Printing" msgstr "Drucken" @@ -1608,7 +1608,7 @@ msgstr "" msgid "Terminal" msgstr "Terminal" -#: ../data/geany.glade.h:326 ../src/prefs.c:1569 ../src/vte.c:281 +#: ../data/geany.glade.h:326 ../src/prefs.c:1595 ../src/vte.c:281 msgid "Terminal" msgstr "Terminal" @@ -1622,7 +1622,7 @@ msgstr "" msgid "Various preferences" msgstr "Verschiedene Einstellungen" -#: ../data/geany.glade.h:329 ../src/prefs.c:1567 +#: ../data/geany.glade.h:329 ../src/prefs.c:1593 msgid "Various" msgstr "Verschiedenes" @@ -1630,7 +1630,7 @@ msgstr "Verschiedenes" msgid "Project Properties" msgstr "Projekteigenschaften" -#: ../data/geany.glade.h:331 ../src/plugins.c:1456 ../src/project.c:150 +#: ../data/geany.glade.h:331 ../src/plugins.c:1457 ../src/project.c:150 msgid "Filename:" msgstr "Dateiname:" @@ -1670,7 +1670,7 @@ msgstr "" "Verzeichnis angeben. Weiterhin kann es sowohl in relativer als auch " "absoluter Form eingegeben werden." -#: ../data/geany.glade.h:338 ../src/keybindings.c:232 +#: ../data/geany.glade.h:338 ../src/keybindings.c:234 msgid "Project" msgstr "Projekt" @@ -1718,7 +1718,7 @@ msgstr "_Zuletzt geöffnet" msgid "Save A_ll" msgstr "A_lle speichern" -#: ../data/geany.glade.h:351 ../src/callbacks.c:429 ../src/document.c:2836 +#: ../data/geany.glade.h:351 ../src/callbacks.c:430 ../src/document.c:2838 #: ../src/sidebar.c:696 msgid "_Reload" msgstr "_Neu laden" @@ -1743,43 +1743,43 @@ msgstr "_Alle schließen" msgid "_Commands" msgstr "_Kommandos" -#: ../data/geany.glade.h:357 ../src/keybindings.c:341 +#: ../data/geany.glade.h:357 ../src/keybindings.c:343 msgid "_Cut Current Line(s)" msgstr "Aktuelle Zeile(n) _ausschneiden" -#: ../data/geany.glade.h:358 ../src/keybindings.c:338 +#: ../data/geany.glade.h:358 ../src/keybindings.c:340 msgid "_Copy Current Line(s)" msgstr "Aktuelle Zeile(n) _kopieren" -#: ../data/geany.glade.h:359 ../src/keybindings.c:293 +#: ../data/geany.glade.h:359 ../src/keybindings.c:295 msgid "_Delete Current Line(s)" msgstr "Aktuelle Zeile(n) _löschen" -#: ../data/geany.glade.h:360 ../src/keybindings.c:290 +#: ../data/geany.glade.h:360 ../src/keybindings.c:292 msgid "_Duplicate Line or Selection" msgstr "_Zeile oder Auswahl duplizieren" -#: ../data/geany.glade.h:361 ../src/keybindings.c:351 +#: ../data/geany.glade.h:361 ../src/keybindings.c:353 msgid "_Select Current Line(s)" msgstr "Aktuelle Zeile(n) a_uswählen" -#: ../data/geany.glade.h:362 ../src/keybindings.c:354 +#: ../data/geany.glade.h:362 ../src/keybindings.c:356 msgid "_Select Current Paragraph" msgstr "Aktuellen Absatz au_swählen" -#: ../data/geany.glade.h:363 ../src/keybindings.c:393 +#: ../data/geany.glade.h:363 ../src/keybindings.c:395 msgid "_Send Selection to Terminal" msgstr "_Auswahl an Terminal senden" -#: ../data/geany.glade.h:364 ../src/keybindings.c:395 +#: ../data/geany.glade.h:364 ../src/keybindings.c:397 msgid "_Reflow Lines/Block" msgstr "_Neuformatieren der Zeile/des Abschnitts" -#: ../data/geany.glade.h:365 ../src/keybindings.c:365 +#: ../data/geany.glade.h:365 ../src/keybindings.c:367 msgid "T_oggle Case of Selection" msgstr "_Groß- und Kleinschreibung für die Auswahl tauschen" -#: ../data/geany.glade.h:366 ../src/keybindings.c:300 +#: ../data/geany.glade.h:366 ../src/keybindings.c:302 msgid "_Transpose Current Line" msgstr "Aktuelle Zeile _tauschen" @@ -1803,7 +1803,7 @@ msgstr "Einzug _erhöhen" msgid "_Decrease Indent" msgstr "Einzug _verringern" -#: ../data/geany.glade.h:372 ../src/keybindings.c:384 +#: ../data/geany.glade.h:372 ../src/keybindings.c:386 msgid "_Smart Line Indent" msgstr "Intelligentes _Einrücken" @@ -1819,7 +1819,7 @@ msgstr "K_ommentare einfügen" msgid "Preference_s" msgstr "E_instellungen" -#: ../data/geany.glade.h:376 ../src/keybindings.c:419 +#: ../data/geany.glade.h:376 ../src/keybindings.c:421 msgid "P_lugin Preferences" msgstr "Plugin-_Einstellungen" @@ -1847,11 +1847,11 @@ msgstr "Nä_chste Nachricht" msgid "Pr_evious Message" msgstr "V_orherige Nachricht" -#: ../data/geany.glade.h:383 ../src/keybindings.c:468 +#: ../data/geany.glade.h:383 ../src/keybindings.c:470 msgid "_Go to Next Marker" msgstr "Zur _nächsten Markierung springen" -#: ../data/geany.glade.h:384 ../src/keybindings.c:471 +#: ../data/geany.glade.h:384 ../src/keybindings.c:473 msgid "_Go to Previous Marker" msgstr "Zur _vorherigen Markierung springen" @@ -1859,15 +1859,15 @@ msgstr "Zur _vorherigen Markierung springen" msgid "_Go to Line" msgstr "_Gehe zu Zeile" -#: ../data/geany.glade.h:386 ../src/keybindings.c:431 +#: ../data/geany.glade.h:386 ../src/keybindings.c:433 msgid "Find Next _Selection" msgstr "Auswahl _vorwärts im Dokument finden " -#: ../data/geany.glade.h:387 ../src/keybindings.c:433 +#: ../data/geany.glade.h:387 ../src/keybindings.c:435 msgid "Find Pre_vious Selection" msgstr "Auswahl _rückwärts im Dokument finden" -#: ../data/geany.glade.h:388 ../src/keybindings.c:450 +#: ../data/geany.glade.h:388 ../src/keybindings.c:452 msgid "_Mark All" msgstr "_Alles markieren" @@ -1904,305 +1904,309 @@ msgid "Show Side_bar" msgstr "Seiten_leiste anzeigen" #: ../data/geany.glade.h:397 +msgid "_Color Schemes" +msgstr "_Farbschemata" + +#: ../data/geany.glade.h:398 msgid "Show _Markers Margin" msgstr "M_arkierungsrand anzeigen" -#: ../data/geany.glade.h:398 +#: ../data/geany.glade.h:399 msgid "Show _Line Numbers" msgstr "_Zeilennummern anzeigen" -#: ../data/geany.glade.h:399 +#: ../data/geany.glade.h:400 msgid "Show _White Space" msgstr "_Leerzeichen anzeigen" -#: ../data/geany.glade.h:400 +#: ../data/geany.glade.h:401 msgid "Show Line _Endings" msgstr "Zeile_nenden anzeigen" -#: ../data/geany.glade.h:401 +#: ../data/geany.glade.h:402 msgid "Show _Indentation Guides" msgstr "Zeige _Einrückungshinweise" -#: ../data/geany.glade.h:402 +#: ../data/geany.glade.h:403 msgid "_Document" msgstr "D_okument" -#: ../data/geany.glade.h:403 +#: ../data/geany.glade.h:404 msgid "_Line Wrapping" msgstr "_Visueller Zeilenumbruch" -#: ../data/geany.glade.h:404 +#: ../data/geany.glade.h:405 msgid "Line _Breaking" msgstr "Automatischer Zeilen_umbruch" -#: ../data/geany.glade.h:405 +#: ../data/geany.glade.h:406 msgid "_Auto-indentation" msgstr "_Automatische Einrückung benutzen" -#: ../data/geany.glade.h:406 +#: ../data/geany.glade.h:407 msgid "In_dent Type" msgstr "Art der _Einrückung" -#: ../data/geany.glade.h:407 +#: ../data/geany.glade.h:408 msgid "_Detect from Content" msgstr "Aus Inhalt lesen" -#: ../data/geany.glade.h:408 +#: ../data/geany.glade.h:409 msgid "T_abs and Spaces" msgstr "Tabulatoren _und Leerzeichen" -#: ../data/geany.glade.h:409 +#: ../data/geany.glade.h:410 msgid "Indent Widt_h" msgstr "Einzugsbreite" -#: ../data/geany.glade.h:410 +#: ../data/geany.glade.h:411 msgid "_1" msgstr "_1" -#: ../data/geany.glade.h:411 +#: ../data/geany.glade.h:412 msgid "_2" msgstr "_2" -#: ../data/geany.glade.h:412 +#: ../data/geany.glade.h:413 msgid "_3" msgstr "_3" -#: ../data/geany.glade.h:413 +#: ../data/geany.glade.h:414 msgid "_4" msgstr "_4" -#: ../data/geany.glade.h:414 +#: ../data/geany.glade.h:415 msgid "_5" msgstr "_5" -#: ../data/geany.glade.h:415 +#: ../data/geany.glade.h:416 msgid "_6" msgstr "_6" -#: ../data/geany.glade.h:416 +#: ../data/geany.glade.h:417 msgid "_7" msgstr "_7" -#: ../data/geany.glade.h:417 +#: ../data/geany.glade.h:418 msgid "_8" msgstr "_8" -#: ../data/geany.glade.h:418 +#: ../data/geany.glade.h:419 msgid "Read _Only" msgstr "_Nur Lesen" -#: ../data/geany.glade.h:419 +#: ../data/geany.glade.h:420 msgid "_Write Unicode BOM" msgstr "_Unicode BOM schreiben" -#: ../data/geany.glade.h:420 +#: ../data/geany.glade.h:421 msgid "Set File_type" msgstr "Datei_typ festlegen" -#: ../data/geany.glade.h:421 +#: ../data/geany.glade.h:422 msgid "Set _Encoding" msgstr "Ze_ichenkodierung festlegen" -#: ../data/geany.glade.h:422 +#: ../data/geany.glade.h:423 msgid "Set Line E_ndings" msgstr "Zeilenen_den festlegen" -#: ../data/geany.glade.h:423 +#: ../data/geany.glade.h:424 msgid "Convert and Set to _CR/LF (Win)" msgstr "Auf _CR/LF setzen und umwandeln (Win)" -#: ../data/geany.glade.h:424 +#: ../data/geany.glade.h:425 msgid "Convert and Set to _LF (Unix)" msgstr "Auf _LF setzen und umwandeln (Unix)" -#: ../data/geany.glade.h:425 +#: ../data/geany.glade.h:426 msgid "Convert and Set to CR (_Mac)" msgstr "Auf CR setzen und umwandeln (_Mac)" -#: ../data/geany.glade.h:426 +#: ../data/geany.glade.h:427 msgid "_Strip Trailing Spaces" msgstr "Lee_rzeichen am Zeilenende entfernen" -#: ../data/geany.glade.h:427 +#: ../data/geany.glade.h:428 msgid "_Replace Tabs by Spaces" msgstr "Tabulat_oren durch Leerzeichen ersetzen" -#: ../data/geany.glade.h:428 +#: ../data/geany.glade.h:429 msgid "Replace Spaces b_y Tabs" msgstr "_Leerzeichen durch Tabulatoren ersetzen" -#: ../data/geany.glade.h:429 +#: ../data/geany.glade.h:430 msgid "_Fold All" msgstr "A_lle einklappen" -#: ../data/geany.glade.h:430 +#: ../data/geany.glade.h:431 msgid "_Unfold All" msgstr "_Alle ausklappen" -#: ../data/geany.glade.h:431 +#: ../data/geany.glade.h:432 msgid "Remove _Markers" msgstr "Alle _Markierungen entfernen" -#: ../data/geany.glade.h:432 +#: ../data/geany.glade.h:433 msgid "Remove Error _Indicators" msgstr "Alle _Fehlermarkierungen entfernen" -#: ../data/geany.glade.h:433 +#: ../data/geany.glade.h:434 msgid "_Project" msgstr "_Projekt" -#: ../data/geany.glade.h:434 +#: ../data/geany.glade.h:435 msgid "_New" msgstr "_Neu" -#: ../data/geany.glade.h:435 +#: ../data/geany.glade.h:436 msgid "_Open" msgstr "Ö_ffnen" -#: ../data/geany.glade.h:436 +#: ../data/geany.glade.h:437 msgid "_Recent Projects" msgstr "_Zuletzt geöffnete Projekte" -#: ../data/geany.glade.h:437 +#: ../data/geany.glade.h:438 msgid "_Close" msgstr "S_chließen" -#: ../data/geany.glade.h:438 +#: ../data/geany.glade.h:439 msgid "Apply the default indentation settings to all documents" msgstr "Wende die Standardeinreckü" -#: ../data/geany.glade.h:439 +#: ../data/geany.glade.h:440 msgid "_Apply Default Indentation" msgstr "_Standardeinrückung anwenden" #. build the code -#: ../data/geany.glade.h:440 ../src/build.c:2568 ../src/build.c:2845 +#: ../data/geany.glade.h:441 ../src/build.c:2568 ../src/build.c:2845 msgid "_Build" msgstr "_Erstellen" -#: ../data/geany.glade.h:441 +#: ../data/geany.glade.h:442 msgid "_Tools" msgstr "_Werkzeuge" -#: ../data/geany.glade.h:442 +#: ../data/geany.glade.h:443 msgid "_Reload Configuration" msgstr "_Einstellungen erneut laden" -#: ../data/geany.glade.h:443 +#: ../data/geany.glade.h:444 msgid "C_onfiguration Files" msgstr "_Konfigurationsdateien" -#: ../data/geany.glade.h:444 +#: ../data/geany.glade.h:445 msgid "_Color Chooser" msgstr "_Farb-Wähler" -#: ../data/geany.glade.h:445 +#: ../data/geany.glade.h:446 msgid "_Word Count" msgstr "_Wörter zählen" -#: ../data/geany.glade.h:446 +#: ../data/geany.glade.h:447 msgid "Load Ta_gs" msgstr "_Tags laden" -#: ../data/geany.glade.h:447 +#: ../data/geany.glade.h:448 msgid "_Help" msgstr "_Hilfe" -#: ../data/geany.glade.h:448 +#: ../data/geany.glade.h:449 msgid "_Keyboard Shortcuts" msgstr "_Tastenkürzel" -#: ../data/geany.glade.h:449 +#: ../data/geany.glade.h:450 msgid "Debug _Messages" msgstr "Debug-_Meldungen" -#: ../data/geany.glade.h:450 +#: ../data/geany.glade.h:451 msgid "_Website" msgstr "_Webseite" -#: ../data/geany.glade.h:451 +#: ../data/geany.glade.h:452 msgid "Wi_ki" msgstr "Wi_ki" -#: ../data/geany.glade.h:452 +#: ../data/geany.glade.h:453 msgid "Report a _Bug" msgstr "Einen Fehler _berichten" -#: ../data/geany.glade.h:453 +#: ../data/geany.glade.h:454 msgid "_Donate" msgstr "_Spenden" -#: ../data/geany.glade.h:454 ../src/sidebar.c:124 +#: ../data/geany.glade.h:455 ../src/sidebar.c:124 msgid "Symbols" msgstr "Symbole" -#: ../data/geany.glade.h:455 +#: ../data/geany.glade.h:456 msgid "Documents" msgstr "Dokumente" -#: ../data/geany.glade.h:456 +#: ../data/geany.glade.h:457 msgid "Status" msgstr "Status" -#: ../data/geany.glade.h:457 +#: ../data/geany.glade.h:458 msgid "Compiler" msgstr "Compiler" -#: ../data/geany.glade.h:458 +#: ../data/geany.glade.h:459 msgid "Messages" msgstr "Meldungen" -#: ../data/geany.glade.h:459 +#: ../data/geany.glade.h:460 msgid "Scribble" msgstr "Notizen" -#: ../src/about.c:156 +#: ../src/about.c:157 msgid "About Geany" msgstr "Über Geany" -#: ../src/about.c:206 +#: ../src/about.c:207 msgid "A fast and lightweight IDE" msgstr "Eine kleine und schnelle Entwicklungsumgebung" -#: ../src/about.c:227 +#: ../src/about.c:228 #, c-format msgid "(built on or after %s)" msgstr "(kompiliert am %s oder später)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:258 +#: ../src/about.c:259 msgid "Info" msgstr "Info" -#: ../src/about.c:274 +#: ../src/about.c:275 msgid "Developers" msgstr "Entwickler" -#: ../src/about.c:281 +#: ../src/about.c:282 msgid "maintainer" msgstr "Hauptentwickler" -#: ../src/about.c:289 ../src/about.c:297 ../src/about.c:305 +#: ../src/about.c:290 ../src/about.c:298 ../src/about.c:306 msgid "developer" msgstr "Entwickler" -#: ../src/about.c:313 +#: ../src/about.c:314 msgid "translation maintainer" msgstr "Übersetzungskoordinator" -#: ../src/about.c:322 +#: ../src/about.c:323 msgid "Translators" msgstr "Übersetzer" -#: ../src/about.c:342 +#: ../src/about.c:343 msgid "Previous Translators" msgstr "Ehemalige Übersetzer" -#: ../src/about.c:363 +#: ../src/about.c:364 msgid "Contributors" msgstr "Mitwirkende" -#: ../src/about.c:373 +#: ../src/about.c:374 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" @@ -2210,15 +2214,15 @@ msgstr "" "Einige der vielen Leute, die an Geany mitgearbeitet haben (eine " "detailliertere Liste findet sich in der Datei %s):" -#: ../src/about.c:399 +#: ../src/about.c:400 msgid "Credits" msgstr "Credits" -#: ../src/about.c:413 +#: ../src/about.c:414 msgid "License" msgstr "Lizenz" -#: ../src/about.c:422 +#: ../src/about.c:423 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -2241,7 +2245,7 @@ msgstr "Ausführung fehlgeschlagen. Kein Arbeitsverzeichnis gefunden." msgid "%s (in directory: %s)" msgstr "%s (im Verzeichnis: %s)" -#: ../src/build.c:831 ../src/build.c:1055 ../src/search.c:1627 +#: ../src/build.c:831 ../src/build.c:1055 ../src/search.c:1632 #, c-format msgid "Process failed (%s)" msgstr "Prozess fehlgeschlagen (%s)" @@ -2333,11 +2337,12 @@ msgstr "Keine weiteren Fehlermeldungen." msgid "Set menu item label" msgstr "Bezeichnung für den Menüeintrag definieren" -#: ../src/build.c:1967 ../src/symbols.c:738 +#: ../src/build.c:1967 ../src/symbols.c:742 ../src/tools.c:554 msgid "Label" msgstr "Label" -#: ../src/build.c:1968 ../src/symbols.c:733 ../src/tools.c:524 +#. command column, holding status and command display +#: ../src/build.c:1968 ../src/symbols.c:737 ../src/tools.c:539 msgid "Command" msgstr "Kommando" @@ -2420,72 +2425,72 @@ msgstr "_Make" msgid "_Make All" msgstr "_Make all" -#: ../src/callbacks.c:147 +#: ../src/callbacks.c:148 msgid "Do you really want to quit?" msgstr "Soll Geany wirklich beendet werden?" -#: ../src/callbacks.c:205 +#: ../src/callbacks.c:206 #, c-format msgid "%d file saved." msgid_plural "%d files saved." msgstr[0] "%d Datei gespeichert." msgstr[1] "%d Dateien gespeichert." -#: ../src/callbacks.c:430 +#: ../src/callbacks.c:431 msgid "Any unsaved changes will be lost." msgstr "Alle ungesicherten Änderungen werden verloren gehen." -#: ../src/callbacks.c:431 +#: ../src/callbacks.c:432 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Möchten Sie »%s« wirklich neu laden?" -#: ../src/callbacks.c:1055 ../src/keybindings.c:459 +#: ../src/callbacks.c:1062 ../src/keybindings.c:461 msgid "Go to Line" msgstr "Gehe zu Zeile" -#: ../src/callbacks.c:1056 +#: ../src/callbacks.c:1063 msgid "Enter the line you want to go to:" msgstr "Geben Sie die Zeile an, zu der Sie springen möchten:" -#: ../src/callbacks.c:1157 ../src/callbacks.c:1182 +#: ../src/callbacks.c:1164 ../src/callbacks.c:1189 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:1287 ../src/ui_utils.c:628 +#: ../src/callbacks.c:1294 ../src/ui_utils.c:639 msgid "dd.mm.yyyy" msgstr "TT.MM.JJJJ" -#: ../src/callbacks.c:1289 ../src/ui_utils.c:629 +#: ../src/callbacks.c:1296 ../src/ui_utils.c:640 msgid "mm.dd.yyyy" msgstr "MM.TT.JJJJ" -#: ../src/callbacks.c:1291 ../src/ui_utils.c:630 +#: ../src/callbacks.c:1298 ../src/ui_utils.c:641 msgid "yyyy/mm/dd" msgstr "JJJJ/MM/TT" -#: ../src/callbacks.c:1293 ../src/ui_utils.c:639 +#: ../src/callbacks.c:1300 ../src/ui_utils.c:650 msgid "dd.mm.yyyy hh:mm:ss" msgstr "TT.MM.JJJJ HH:MM:SS" -#: ../src/callbacks.c:1295 ../src/ui_utils.c:640 +#: ../src/callbacks.c:1302 ../src/ui_utils.c:651 msgid "mm.dd.yyyy hh:mm:ss" msgstr "MM.TT.JJJJ HH:MM:SS" -#: ../src/callbacks.c:1297 ../src/ui_utils.c:641 +#: ../src/callbacks.c:1304 ../src/ui_utils.c:652 msgid "yyyy/mm/dd hh:mm:ss" msgstr "JJJJ/MM/TT HH:MM:SS" -#: ../src/callbacks.c:1299 ../src/ui_utils.c:650 +#: ../src/callbacks.c:1306 ../src/ui_utils.c:661 msgid "_Use Custom Date Format" msgstr "Benutze selbst erstelltes _Datumsformat" -#: ../src/callbacks.c:1303 +#: ../src/callbacks.c:1310 msgid "Custom Date Format" msgstr "Benutzerdefiniertes Datumsformat" -#: ../src/callbacks.c:1304 +#: ../src/callbacks.c:1311 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." @@ -2493,16 +2498,16 @@ msgstr "" "Hier kann ein benutzerdefiniertes Datumsformat eingegeben werden. Dabei " "funktionieren alle Platzhalter der ANSI C Funktion »strftime«." -#: ../src/callbacks.c:1327 +#: ../src/callbacks.c:1334 msgid "Date format string could not be converted (possibly too long)." msgstr "" "Das Datenformat konnte nicht umgewandelt werden. Eventuell ist es zu lang." -#: ../src/callbacks.c:1520 ../src/callbacks.c:1528 +#: ../src/callbacks.c:1527 ../src/callbacks.c:1535 msgid "No more message items." msgstr "Keine weiteren Nachrichten." -#: ../src/callbacks.c:1666 +#: ../src/callbacks.c:1673 #, c-format msgid "Could not open file %s (File not found)" msgstr "Konnte Datei »%s« nicht öffnen (Datei nicht gefunden)." @@ -2672,12 +2677,12 @@ msgstr "" #: ../src/dialogs.c:1223 ../src/dialogs.c:1224 ../src/dialogs.c:1225 #: ../src/dialogs.c:1231 ../src/dialogs.c:1232 ../src/dialogs.c:1233 -#: ../src/symbols.c:2105 ../src/symbols.c:2126 ../src/symbols.c:2178 -#: ../src/ui_utils.c:253 +#: ../src/symbols.c:2096 ../src/symbols.c:2117 ../src/symbols.c:2169 +#: ../src/ui_utils.c:264 msgid "unknown" msgstr "unbekannt" -#: ../src/dialogs.c:1238 ../src/symbols.c:888 +#: ../src/dialogs.c:1238 ../src/symbols.c:892 msgid "Properties" msgstr "Eigenschaften" @@ -2705,7 +2710,7 @@ msgstr "(nur innerhalb von Geany)" msgid "Encoding:" msgstr "Kodierung:" -#: ../src/dialogs.c:1339 ../src/ui_utils.c:257 +#: ../src/dialogs.c:1339 ../src/ui_utils.c:268 msgid "(with BOM)" msgstr "(mit BOM)" @@ -2920,7 +2925,7 @@ msgid "Wrap search and find again?" msgstr "Suche vom Dokumentanfang bzw. -ende neu beginnen?" #: ../src/document.c:2034 ../src/search.c:1279 ../src/search.c:1323 -#: ../src/search.c:2082 ../src/search.c:2083 +#: ../src/search.c:2087 ../src/search.c:2088 #, c-format msgid "No matches found for \"%s\"." msgstr "Keine Treffer für »%s« gefunden." @@ -2932,11 +2937,11 @@ 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:2837 +#: ../src/document.c:2839 msgid "Do you want to reload it?" msgstr "Möchten Sie die Datei neu laden?" -#: ../src/document.c:2838 +#: ../src/document.c:2840 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -2945,30 +2950,30 @@ msgstr "" "Die Datei »%s« auf dem Datenträger ist aktueller als die momentan geöffnete " "Version." -#: ../src/document.c:2856 +#: ../src/document.c:2858 msgid "Close _without saving" msgstr "Schließen _ohne Speichern" -#: ../src/document.c:2859 +#: ../src/document.c:2861 msgid "Try to resave the file?" msgstr "Versuchen die Datei erneut zu speichern?" -#: ../src/document.c:2860 +#: ../src/document.c:2862 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "»%s« wurde nicht auf dem Datenträger gefunden." -#: ../src/editor.c:4300 +#: ../src/editor.c:4310 msgid "Enter Tab Width" msgstr "Tabulatorbreite:" -#: ../src/editor.c:4301 +#: ../src/editor.c:4311 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." -#: ../src/editor.c:4459 +#: ../src/editor.c:4469 #, c-format msgid "Warning: non-standard hard tab width: %d != 8!" msgstr "Achtung: Keine gewöhnliche harte Tabulatorbreite:: %d != 8!" @@ -3152,17 +3157,17 @@ msgstr "_Markup-Sprachen" msgid "M_iscellaneous" msgstr "_Sonstiges" -#: ../src/filetypes.c:1462 ../src/win32.c:104 +#: ../src/filetypes.c:1459 ../src/win32.c:104 msgid "All Source" msgstr "Alle Quellen" #. create meta file filter "All files" -#: ../src/filetypes.c:1487 ../src/project.c:295 ../src/win32.c:94 +#: ../src/filetypes.c:1484 ../src/project.c:295 ../src/win32.c:94 #: ../src/win32.c:139 ../src/win32.c:160 ../src/win32.c:165 msgid "All files" msgstr "Alle Dateien" -#: ../src/filetypes.c:1535 +#: ../src/filetypes.c:1532 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Schlechter RegEx für Dateityp %s: %s" @@ -3171,13 +3176,13 @@ msgstr "Schlechter RegEx für Dateityp %s: %s" msgid "untitled" msgstr "unbenannt" -#: ../src/highlighting.c:1218 ../src/main.c:821 ../src/socket.c:166 +#: ../src/highlighting.c:1215 ../src/main.c:821 ../src/socket.c:166 #: ../src/templates.c:224 #, c-format msgid "Could not find file '%s'." msgstr "Konnte die Datei »%s« nicht finden." -#: ../src/highlighting.c:1290 +#: ../src/highlighting.c:1287 msgid "Default" msgstr "Standard" @@ -3185,526 +3190,522 @@ msgstr "Standard" msgid "Color Schemes" msgstr "Farbschemata" -#: ../src/highlighting.c:1366 -msgid "_Color Schemes" -msgstr "_Farbschemata" - #. visual group order -#: ../src/keybindings.c:221 ../src/symbols.c:710 +#: ../src/keybindings.c:223 ../src/symbols.c:714 msgid "File" msgstr "Datei" -#: ../src/keybindings.c:223 +#: ../src/keybindings.c:225 msgid "Clipboard" msgstr "Zwischenablage" -#: ../src/keybindings.c:224 +#: ../src/keybindings.c:226 msgid "Select" msgstr "Auswahl" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:227 msgid "Format" msgstr "Formatierung" -#: ../src/keybindings.c:226 +#: ../src/keybindings.c:228 msgid "Insert" msgstr "Einfügen" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:229 msgid "Settings" msgstr "Einstellungen" -#: ../src/keybindings.c:228 +#: ../src/keybindings.c:230 msgid "Search" msgstr "Suchen" -#: ../src/keybindings.c:229 +#: ../src/keybindings.c:231 msgid "Go to" msgstr "Gehe zu" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:232 msgid "View" msgstr "Ansicht" -#: ../src/keybindings.c:231 +#: ../src/keybindings.c:233 msgid "Document" msgstr "Dokument" -#: ../src/keybindings.c:233 ../src/keybindings.c:580 ../src/project.c:444 -#: ../src/ui_utils.c:1969 +#: ../src/keybindings.c:235 ../src/keybindings.c:582 ../src/project.c:444 +#: ../src/ui_utils.c:1980 msgid "Build" msgstr "Erstellen" -#: ../src/keybindings.c:235 ../src/keybindings.c:605 +#: ../src/keybindings.c:237 ../src/keybindings.c:607 msgid "Help" msgstr "Hilfe" -#: ../src/keybindings.c:236 +#: ../src/keybindings.c:238 msgid "Focus" msgstr "Fokus" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:239 msgid "Notebook tab" msgstr "Dateireiter" -#: ../src/keybindings.c:246 ../src/keybindings.c:274 +#: ../src/keybindings.c:248 ../src/keybindings.c:276 msgid "New" msgstr "Neu" -#: ../src/keybindings.c:248 ../src/keybindings.c:276 +#: ../src/keybindings.c:250 ../src/keybindings.c:278 msgid "Open" msgstr "Öffnen" -#: ../src/keybindings.c:251 +#: ../src/keybindings.c:253 msgid "Open selected file" msgstr "Markierte Datei öffnen" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:255 msgid "Save" msgstr "Speichern" -#: ../src/keybindings.c:255 ../src/toolbar.c:55 +#: ../src/keybindings.c:257 ../src/toolbar.c:55 msgid "Save as" msgstr "Speichern unter" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:259 msgid "Save all" msgstr "Alle speichern" -#: ../src/keybindings.c:260 +#: ../src/keybindings.c:262 msgid "Print" msgstr "Drucken" -#: ../src/keybindings.c:262 ../src/keybindings.c:281 +#: ../src/keybindings.c:264 ../src/keybindings.c:283 msgid "Close" msgstr "Schließen" -#: ../src/keybindings.c:264 +#: ../src/keybindings.c:266 msgid "Close all" msgstr "Alle Schließen" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:269 msgid "Reload file" msgstr "Neu laden" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:271 msgid "Re-open last closed tab" msgstr "Zuletzt geschlossenes Dokument wieder öffnen" -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:288 msgid "Undo" msgstr "Zurück" -#: ../src/keybindings.c:288 +#: ../src/keybindings.c:290 msgid "Redo" msgstr "Wiederholen" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:299 msgid "Delete to line end" msgstr "Bis zum Ende der Zeile löschen" -#: ../src/keybindings.c:303 +#: ../src/keybindings.c:305 msgid "Scroll to current line" msgstr "Zu der aktuellen Zeile rollen" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:307 msgid "Scroll up the view by one line" msgstr "Rollt um eine Zeile nach oben" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:309 msgid "Scroll down the view by one line" msgstr "Rollt um eine Zeile nach unten" -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:311 msgid "Complete snippet" msgstr "Vervollständige (Code-)Schnipsel" -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:313 msgid "Move cursor in snippet" msgstr "Bewege den Cursor im Schnipsel" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:315 msgid "Suppress snippet completion" msgstr "Vervollständigung von (Code-)Schnipseln unterdrücken" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:317 msgid "Context Action" msgstr "Kontextaktion" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:319 msgid "Complete word" msgstr "Vervollständige Wort" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:321 msgid "Show calltip" msgstr "Calltip anzeigen" -#: ../src/keybindings.c:321 +#: ../src/keybindings.c:323 msgid "Show macro list" msgstr "Zeige Makroliste" -#: ../src/keybindings.c:323 +#: ../src/keybindings.c:325 msgid "Word part completion" msgstr "Automatische Wortergänzung" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:327 msgid "Move line(s) up" msgstr "Zeile(n) nach oben bewegen" -#: ../src/keybindings.c:327 +#: ../src/keybindings.c:329 msgid "Move line(s) down" msgstr "Zeile(n) nach unten bewegen" -#: ../src/keybindings.c:332 +#: ../src/keybindings.c:334 msgid "Cut" msgstr "Ausschneiden" -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:336 msgid "Copy" msgstr "Kopieren" -#: ../src/keybindings.c:336 +#: ../src/keybindings.c:338 msgid "Paste" msgstr "Einfügen" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:349 msgid "Select All" msgstr "Alles ersetzen" -#: ../src/keybindings.c:349 +#: ../src/keybindings.c:351 msgid "Select current word" msgstr "Aktuelles Wort auswählen" -#: ../src/keybindings.c:357 +#: ../src/keybindings.c:359 msgid "Select to previous word part" msgstr "Zum vorherigen Teilwort springen" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:361 msgid "Select to next word part" msgstr "Zum nächsten Teilwort springen" -#: ../src/keybindings.c:367 +#: ../src/keybindings.c:369 msgid "Toggle line commentation" msgstr "Kommentierung umschalten" -#: ../src/keybindings.c:370 +#: ../src/keybindings.c:372 msgid "Comment line(s)" msgstr "Zeile(n) kommentieren" -#: ../src/keybindings.c:372 +#: ../src/keybindings.c:374 msgid "Uncomment line(s)" msgstr "Kommentarzeichen entfernen" -#: ../src/keybindings.c:374 +#: ../src/keybindings.c:376 msgid "Increase indent" msgstr "Einzug erhöhen" -#: ../src/keybindings.c:377 +#: ../src/keybindings.c:379 msgid "Decrease indent" msgstr "Einzug verringern" -#: ../src/keybindings.c:380 +#: ../src/keybindings.c:382 msgid "Increase indent by one space" msgstr "Einzug um ein Leerzeichen erhöhen" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:384 msgid "Decrease indent by one space" msgstr "Einzug um ein Leerzeichen verringern" -#: ../src/keybindings.c:386 +#: ../src/keybindings.c:388 msgid "Send to Custom Command 1" msgstr "Zum 1. benutzerdefinierten Kommando senden" -#: ../src/keybindings.c:388 +#: ../src/keybindings.c:390 msgid "Send to Custom Command 2" msgstr "Zum 2. benutzerdefinierten Kommando senden" -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:392 msgid "Send to Custom Command 3" msgstr "Zum 3. benutzerdefinierten Kommando senden" -#: ../src/keybindings.c:398 +#: ../src/keybindings.c:400 msgid "Join lines" msgstr "Zeilen zusammenführen" -#: ../src/keybindings.c:403 +#: ../src/keybindings.c:405 msgid "Insert date" msgstr "Datum einfügen" -#: ../src/keybindings.c:409 +#: ../src/keybindings.c:411 msgid "Insert New Line Before Current" msgstr "Neue Zeile vor der aktuellen einfügen" -#: ../src/keybindings.c:411 +#: ../src/keybindings.c:413 msgid "Insert New Line After Current" msgstr "Neue Zeile hinter der aktuellen Einfügen" -#: ../src/keybindings.c:424 ../src/search.c:463 +#: ../src/keybindings.c:426 ../src/search.c:463 msgid "Find" msgstr "Suchen" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:428 msgid "Find Next" msgstr "Weitersuchen" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:430 msgid "Find Previous" msgstr "Vorheriges" -#: ../src/keybindings.c:435 ../src/search.c:619 +#: ../src/keybindings.c:437 ../src/search.c:619 msgid "Replace" msgstr "Ersetzen" -#: ../src/keybindings.c:437 ../src/search.c:871 +#: ../src/keybindings.c:439 ../src/search.c:871 msgid "Find in Files" msgstr "In Dateien suchen" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:442 msgid "Next Message" msgstr "Nächste Nachricht" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:444 msgid "Previous Message" msgstr "Vorherige Nachricht" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:447 msgid "Find Usage" msgstr "Auftreten finden" -#: ../src/keybindings.c:448 +#: ../src/keybindings.c:450 msgid "Find Document Usage" msgstr "Auftreten im Dokument finden" -#: ../src/keybindings.c:455 ../src/toolbar.c:66 +#: ../src/keybindings.c:457 ../src/toolbar.c:66 msgid "Navigate back a location" msgstr "Navigiert eine Position nach hinten" -#: ../src/keybindings.c:457 ../src/toolbar.c:67 +#: ../src/keybindings.c:459 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "Navigiert eine Position nach vorne" -#: ../src/keybindings.c:462 +#: ../src/keybindings.c:464 msgid "Go to matching brace" msgstr "Springe zur passenden Klammer" -#: ../src/keybindings.c:465 +#: ../src/keybindings.c:467 msgid "Toggle marker" msgstr "Markierung setzen" -#: ../src/keybindings.c:474 +#: ../src/keybindings.c:476 msgid "Go to Tag Definition" msgstr "Gehe zur Tagdefinition" -#: ../src/keybindings.c:477 +#: ../src/keybindings.c:479 msgid "Go to Tag Declaration" msgstr "Gehe zur Tagdeklaration" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:481 msgid "Go to Start of Line" msgstr "Gehe zum Zeilenanfang" -#: ../src/keybindings.c:481 +#: ../src/keybindings.c:483 msgid "Go to End of Line" msgstr "Gehe zum Zeilenende" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:485 msgid "Go to End of Display Line" msgstr "Gehe zum Zeilenende" -#: ../src/keybindings.c:485 +#: ../src/keybindings.c:487 msgid "Go to Previous Word Part" msgstr "Zum vorherigen Teilwort springen" -#: ../src/keybindings.c:487 +#: ../src/keybindings.c:489 msgid "Go to Next Word Part" msgstr "Zum nächsten Teilwort springen" -#: ../src/keybindings.c:492 +#: ../src/keybindings.c:494 msgid "Toggle All Additional Widgets" msgstr "Zusätzliche Infofenster ein-/ausblenden" -#: ../src/keybindings.c:495 +#: ../src/keybindings.c:497 msgid "Fullscreen" msgstr "Vollbild" -#: ../src/keybindings.c:497 +#: ../src/keybindings.c:499 msgid "Toggle Messages Window" msgstr "Meldungsfenster verstecken" -#: ../src/keybindings.c:500 +#: ../src/keybindings.c:502 msgid "Toggle Sidebar" msgstr "Seitenleiste ausblenden" -#: ../src/keybindings.c:502 +#: ../src/keybindings.c:504 msgid "Zoom In" msgstr "Hineinzoomen" -#: ../src/keybindings.c:504 +#: ../src/keybindings.c:506 msgid "Zoom Out" msgstr "Herauszoomen" -#: ../src/keybindings.c:506 +#: ../src/keybindings.c:508 msgid "Zoom Reset" msgstr "Vergrößerung zurücksetzen" -#: ../src/keybindings.c:511 +#: ../src/keybindings.c:513 msgid "Switch to Editor" msgstr "Zum Editor wechseln" -#: ../src/keybindings.c:513 +#: ../src/keybindings.c:515 msgid "Switch to Search Bar" msgstr "Zu dem Suchfenster wechseln" -#: ../src/keybindings.c:515 +#: ../src/keybindings.c:517 msgid "Switch to Message Window" msgstr "Meldungsfenster anzeigen" -#: ../src/keybindings.c:517 +#: ../src/keybindings.c:519 msgid "Switch to Compiler" msgstr "Wechsle zum Compiler" -#: ../src/keybindings.c:519 +#: ../src/keybindings.c:521 msgid "Switch to Messages" msgstr "Zu den Meldungen wechseln" -#: ../src/keybindings.c:521 +#: ../src/keybindings.c:523 msgid "Switch to Scribble" msgstr "Zu den Notizen wechseln" -#: ../src/keybindings.c:523 +#: ../src/keybindings.c:525 msgid "Switch to VTE" msgstr "Zur VTE wechseln" -#: ../src/keybindings.c:525 +#: ../src/keybindings.c:527 msgid "Switch to Sidebar" msgstr "Zur Seitenleiste wechseln" -#: ../src/keybindings.c:527 +#: ../src/keybindings.c:529 msgid "Switch to Sidebar Symbol List" msgstr "Zur Symbolliste der Seitenleiste springen" -#: ../src/keybindings.c:529 +#: ../src/keybindings.c:531 msgid "Switch to Sidebar Document List" msgstr "Zur Dokumentenliste der Seitenleiste springen" -#: ../src/keybindings.c:534 +#: ../src/keybindings.c:536 msgid "Switch to left document" msgstr "Zum linken Dokument wechseln" -#: ../src/keybindings.c:536 +#: ../src/keybindings.c:538 msgid "Switch to right document" msgstr "Zum rechten Dokument wechseln" -#: ../src/keybindings.c:538 +#: ../src/keybindings.c:540 msgid "Switch to last used document" msgstr "Zum letzten Dokument wechseln" -#: ../src/keybindings.c:541 +#: ../src/keybindings.c:543 msgid "Move document left" msgstr "Dateireiter nach links verschieben" -#: ../src/keybindings.c:544 +#: ../src/keybindings.c:546 msgid "Move document right" msgstr "Dateireiter nach rechts verschieben" -#: ../src/keybindings.c:546 +#: ../src/keybindings.c:548 msgid "Move document first" msgstr "Dateireiter an den Anfang verschieben" -#: ../src/keybindings.c:548 +#: ../src/keybindings.c:550 msgid "Move document last" msgstr "Dateireiter ans Ende verschieben" -#: ../src/keybindings.c:553 +#: ../src/keybindings.c:555 msgid "Toggle Line wrapping" msgstr "Visuellen Zeilenumbruch umschalten" -#: ../src/keybindings.c:555 +#: ../src/keybindings.c:557 msgid "Toggle Line breaking" msgstr "Automatischen Zeilenumbruch umschalten" -#: ../src/keybindings.c:559 +#: ../src/keybindings.c:561 msgid "Replace spaces by tabs" msgstr "Leerzeichen durch Tabulatoren ersetzen" -#: ../src/keybindings.c:561 +#: ../src/keybindings.c:563 msgid "Toggle current fold" msgstr "Aktuelle Faltung umschalten" -#: ../src/keybindings.c:563 +#: ../src/keybindings.c:565 msgid "Fold all" msgstr "Alle einblenden" -#: ../src/keybindings.c:565 +#: ../src/keybindings.c:567 msgid "Unfold all" msgstr "Alle ausblenden" -#: ../src/keybindings.c:567 +#: ../src/keybindings.c:569 msgid "Reload symbol list" msgstr "Symbolliste neuladen" -#: ../src/keybindings.c:569 +#: ../src/keybindings.c:571 msgid "Remove Markers" msgstr "Markierungen entfernen" -#: ../src/keybindings.c:571 +#: ../src/keybindings.c:573 msgid "Remove Error Indicators" msgstr "Fehlermarkierungen entfernen" -#: ../src/keybindings.c:573 +#: ../src/keybindings.c:575 msgid "Remove Markers and Error Indicators" msgstr "Fehlermarkierungen und andere Markierungen entfernen" -#: ../src/keybindings.c:578 ../src/toolbar.c:68 +#: ../src/keybindings.c:580 ../src/toolbar.c:68 msgid "Compile" msgstr "Kompilieren" -#: ../src/keybindings.c:582 +#: ../src/keybindings.c:584 msgid "Make all" msgstr "Make all" -#: ../src/keybindings.c:585 +#: ../src/keybindings.c:587 msgid "Make custom target" msgstr "Make mit eigenem Target" -#: ../src/keybindings.c:587 +#: ../src/keybindings.c:589 msgid "Make object" msgstr "Make Objekt-Datei" -#: ../src/keybindings.c:589 +#: ../src/keybindings.c:591 msgid "Next error" msgstr "Nächster Fehler" -#: ../src/keybindings.c:591 +#: ../src/keybindings.c:593 msgid "Previous error" msgstr "Vorheriger Fehler" -#: ../src/keybindings.c:593 +#: ../src/keybindings.c:595 msgid "Run" msgstr "Ausführen" -#: ../src/keybindings.c:595 +#: ../src/keybindings.c:597 msgid "Build options" msgstr "Optionen bei der Erzeugung" -#: ../src/keybindings.c:600 +#: ../src/keybindings.c:602 msgid "Show Color Chooser" msgstr "Farbwähler öffnen" -#: ../src/keybindings.c:847 +#: ../src/keybindings.c:849 msgid "Keyboard Shortcuts" msgstr "Tastenkürzel" -#: ../src/keybindings.c:859 +#: ../src/keybindings.c:861 msgid "The following keyboard shortcuts are configurable:" msgstr "Die folgenden Tastenkürzel sind frei definierbar:" -#: ../src/keyfile.c:920 +#: ../src/keyfile.c:950 msgid "Type here what you want, use it as a notice/scratch board" msgstr "" "Schreiben Sie hier rein, was sie möchten. Sie können es als Notizbuch nutzen." -#: ../src/keyfile.c:1120 +#: ../src/keyfile.c:1150 msgid "Failed to load one or more session files." msgstr "" "Eine oder mehre Datei(en) aus der letzten Sitzung konnte(n) nicht geladen " @@ -3815,7 +3816,7 @@ msgstr "[Dateien...]" #: ../src/main.c:540 #, c-format msgid "built on %s with " -msgstr "kompiliert am %s mit" +msgstr "kompiliert am %s mit " #: ../src/main.c:628 msgid "Move it now?" @@ -3858,17 +3859,17 @@ msgstr "" "Es könnte zu Problemen bei der Verwendung von Geany kommen.\n" "Geany trotzdem starten?" -#: ../src/main.c:1070 +#: ../src/main.c:1067 #, c-format msgid "This is Geany %s." msgstr "Willkommen zu Geany %s." -#: ../src/main.c:1072 +#: ../src/main.c:1069 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Konfigurationsverzeichnis konnte nicht erstellt werden (%s)." -#: ../src/main.c:1288 +#: ../src/main.c:1286 msgid "Configuration files reloaded." msgstr "Einstellungen erneut geladen." @@ -3898,7 +3899,7 @@ msgstr "" msgid "Switch to Document" msgstr "Zum Dokument wechseln" -#: ../src/plugins.c:496 +#: ../src/plugins.c:497 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3907,49 +3908,49 @@ msgstr "" "Das Plugin »%s« ist nicht kompatibel mit dieser Version von Geany. Bitte neu " "kompilieren." -#: ../src/plugins.c:1040 +#: ../src/plugins.c:1041 msgid "_Plugin Manager" msgstr "_Plugin-Verwaltung" #. Translators: <plugin name> <plugin version> -#: ../src/plugins.c:1211 +#: ../src/plugins.c:1212 #, c-format msgid "%s %s" msgstr "%s %s" -#: ../src/plugins.c:1287 +#: ../src/plugins.c:1288 msgid "Active" msgstr "Aktiv" -#: ../src/plugins.c:1293 +#: ../src/plugins.c:1294 msgid "Plugin" msgstr "Plugin" -#: ../src/plugins.c:1299 +#: ../src/plugins.c:1300 msgid "Description" msgstr "Beschreibung" -#: ../src/plugins.c:1317 +#: ../src/plugins.c:1318 msgid "No plugins available." msgstr "Keine Plugins gefunden." -#: ../src/plugins.c:1413 +#: ../src/plugins.c:1414 msgid "Plugins" msgstr "Plugins" -#: ../src/plugins.c:1433 +#: ../src/plugins.c:1434 msgid "Choose which plugins should be loaded at startup:" msgstr "Plugins, die beim Starten geladen werden sollen:" -#: ../src/plugins.c:1445 +#: ../src/plugins.c:1446 msgid "Plugin details:" msgstr "Plugindetails" -#: ../src/plugins.c:1454 +#: ../src/plugins.c:1455 msgid "Plugin:" msgstr "Plugin:" -#: ../src/plugins.c:1455 +#: ../src/plugins.c:1456 msgid "Author(s):" msgstr "Autor(en):" @@ -3957,58 +3958,58 @@ msgstr "Autor(en):" msgid "Configure Plugins" msgstr "Plugins konfigurieren" -#: ../src/prefs.c:176 +#: ../src/prefs.c:179 msgid "Grab Key" msgstr "Tasten festlegen" -#: ../src/prefs.c:182 +#: ../src/prefs.c:185 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "Welche Tastenkombination soll für »%s« genutzt werden?" -#: ../src/prefs.c:223 ../src/symbols.c:2247 ../src/sidebar.c:730 +#: ../src/prefs.c:226 ../src/symbols.c:2238 ../src/sidebar.c:730 msgid "_Expand All" msgstr "Alle a_usklappen" -#: ../src/prefs.c:228 ../src/symbols.c:2252 ../src/sidebar.c:736 +#: ../src/prefs.c:231 ../src/symbols.c:2243 ../src/sidebar.c:736 msgid "_Collapse All" msgstr "Alle _einklappen" -#: ../src/prefs.c:287 +#: ../src/prefs.c:291 msgid "Action" msgstr "Aktion" -#: ../src/prefs.c:291 +#: ../src/prefs.c:296 msgid "Shortcut" msgstr "Tastenkürzel" -#: ../src/prefs.c:1430 +#: ../src/prefs.c:1456 msgid "_Allow" msgstr "_Zulassen" -#: ../src/prefs.c:1432 +#: ../src/prefs.c:1458 msgid "_Override" msgstr "_Ersetzen" -#: ../src/prefs.c:1433 +#: ../src/prefs.c:1459 msgid "Override that keybinding?" msgstr "Diese Tastenkombination ersetzen?" -#: ../src/prefs.c:1434 +#: ../src/prefs.c:1460 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "Die Tastenkombination '%s' wird bereits für »%s« verwendet." #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1635 +#: ../src/prefs.c:1661 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" "Geben Sie hier die Pfade zu den einzelnen Werkzeugen an. Programme die nicht " "benötigt werden, können freigelassen werden." #. page Templates -#: ../src/prefs.c:1640 +#: ../src/prefs.c:1666 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -4019,7 +4020,7 @@ msgstr "" "Vorlagen zu erfahren." #. page Keybindings -#: ../src/prefs.c:1645 +#: ../src/prefs.c:1671 msgid "" "Here you can change keyboard shortcuts for various actions. Select one and " "press the Change button to enter a new shortcut, or double click on an " @@ -4031,7 +4032,7 @@ msgstr "" "Sie die Tastenkombinationen auch direkt eingeben." #. page Editor->Indentation -#: ../src/prefs.c:1650 +#: ../src/prefs.c:1676 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -4376,7 +4377,7 @@ msgstr "_Zus. Optionen:" msgid "Other options to pass to Grep" msgstr "Andere Argumente, die an grep übergeben werden sollen" -#: ../src/search.c:1282 ../src/search.c:2088 ../src/search.c:2091 +#: ../src/search.c:1282 ../src/search.c:2093 ../src/search.c:2096 #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." @@ -4403,36 +4404,41 @@ msgstr "" "Konnte das grep Kommando »%s« nicht finden (Pfad zum Grep Kommando in den " "Einstellungen überprüfen)." -#: ../src/search.c:1635 +#: ../src/search.c:1574 +#, c-format +msgid "Cannot parse extra options: %s" +msgstr "Konnte die zusätzlichen Optionen nicht analysieren: %s" + +#: ../src/search.c:1640 msgid "Searching..." msgstr "Suchen..." -#: ../src/search.c:1646 +#: ../src/search.c:1651 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (im Verzeichnis: %s)" -#: ../src/search.c:1687 +#: ../src/search.c:1692 #, c-format msgid "Could not open directory (%s)" msgstr "Konnte Verzeichnis nicht öffnen (%s)." -#: ../src/search.c:1789 +#: ../src/search.c:1794 msgid "Search failed." msgstr "Suche fehlgeschlagen." -#: ../src/search.c:1809 +#: ../src/search.c:1814 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." msgstr[0] "Such mit %d Treffer abgeschlossen." msgstr[1] "Such mit %d Treffern abgeschlossen." -#: ../src/search.c:1817 +#: ../src/search.c:1822 msgid "No matches found." msgstr "Keine Treffer gefunden." -#: ../src/search.c:1847 +#: ../src/search.c:1852 #, c-format msgid "Bad regex: %s" msgstr "Fehler in Ausdruck: %s" @@ -4449,276 +4455,276 @@ msgstr "" " Dies ist ein schwerwiegendes Problem, so dass Geany nun beendet werden " "muss. " -#: ../src/stash.c:1075 +#: ../src/stash.c:1099 msgid "Name" msgstr "Name" -#: ../src/stash.c:1082 +#: ../src/stash.c:1106 msgid "Value" msgstr "Wert" -#: ../src/symbols.c:689 ../src/symbols.c:739 ../src/symbols.c:806 +#: ../src/symbols.c:693 ../src/symbols.c:743 ../src/symbols.c:810 msgid "Chapter" msgstr "Kapitel" -#: ../src/symbols.c:690 ../src/symbols.c:735 ../src/symbols.c:807 +#: ../src/symbols.c:694 ../src/symbols.c:739 ../src/symbols.c:811 msgid "Section" msgstr "Abschnitt" -#: ../src/symbols.c:691 +#: ../src/symbols.c:695 msgid "Sect1" msgstr "Sect1" -#: ../src/symbols.c:692 +#: ../src/symbols.c:696 msgid "Sect2" msgstr "Sect2" -#: ../src/symbols.c:693 +#: ../src/symbols.c:697 msgid "Sect3" msgstr "Sect3" -#: ../src/symbols.c:694 +#: ../src/symbols.c:698 msgid "Appendix" msgstr "Anhang" -#: ../src/symbols.c:695 ../src/symbols.c:740 ../src/symbols.c:756 -#: ../src/symbols.c:767 ../src/symbols.c:854 ../src/symbols.c:865 -#: ../src/symbols.c:877 ../src/symbols.c:891 ../src/symbols.c:903 -#: ../src/symbols.c:915 ../src/symbols.c:930 ../src/symbols.c:959 -#: ../src/symbols.c:989 +#: ../src/symbols.c:699 ../src/symbols.c:744 ../src/symbols.c:760 +#: ../src/symbols.c:771 ../src/symbols.c:858 ../src/symbols.c:869 +#: ../src/symbols.c:881 ../src/symbols.c:895 ../src/symbols.c:907 +#: ../src/symbols.c:919 ../src/symbols.c:934 ../src/symbols.c:963 +#: ../src/symbols.c:993 msgid "Other" msgstr "Sonstiges" -#: ../src/symbols.c:701 ../src/symbols.c:923 ../src/symbols.c:968 +#: ../src/symbols.c:705 ../src/symbols.c:927 ../src/symbols.c:972 msgid "Module" msgstr "Modul" -#: ../src/symbols.c:702 ../src/symbols.c:850 ../src/symbols.c:901 -#: ../src/symbols.c:913 ../src/symbols.c:928 ../src/symbols.c:940 +#: ../src/symbols.c:706 ../src/symbols.c:854 ../src/symbols.c:905 +#: ../src/symbols.c:917 ../src/symbols.c:932 ../src/symbols.c:944 msgid "Types" msgstr "Typen" -#: ../src/symbols.c:703 +#: ../src/symbols.c:707 msgid "Type constructors" msgstr "Typkonstruktoren" -#: ../src/symbols.c:704 ../src/symbols.c:726 ../src/symbols.c:747 -#: ../src/symbols.c:755 ../src/symbols.c:764 ../src/symbols.c:776 -#: ../src/symbols.c:785 ../src/symbols.c:838 ../src/symbols.c:887 -#: ../src/symbols.c:910 ../src/symbols.c:925 ../src/symbols.c:953 -#: ../src/symbols.c:976 +#: ../src/symbols.c:708 ../src/symbols.c:730 ../src/symbols.c:751 +#: ../src/symbols.c:759 ../src/symbols.c:768 ../src/symbols.c:780 +#: ../src/symbols.c:789 ../src/symbols.c:842 ../src/symbols.c:891 +#: ../src/symbols.c:914 ../src/symbols.c:929 ../src/symbols.c:957 +#: ../src/symbols.c:980 msgid "Functions" msgstr "Funktionen" -#: ../src/symbols.c:709 +#: ../src/symbols.c:713 msgid "Program" msgstr "Programm" -#: ../src/symbols.c:711 ../src/symbols.c:719 ../src/symbols.c:725 +#: ../src/symbols.c:715 ../src/symbols.c:723 ../src/symbols.c:729 msgid "Sections" msgstr "Abschnitte" -#: ../src/symbols.c:712 +#: ../src/symbols.c:716 msgid "Paragraph" msgstr "Absatz" -#: ../src/symbols.c:713 +#: ../src/symbols.c:717 msgid "Group" msgstr "Gruppe" -#: ../src/symbols.c:714 +#: ../src/symbols.c:718 msgid "Data" msgstr "Daten" -#: ../src/symbols.c:720 +#: ../src/symbols.c:724 msgid "Keys" msgstr "Indizes" -#: ../src/symbols.c:727 ../src/symbols.c:778 ../src/symbols.c:839 -#: ../src/symbols.c:864 ../src/symbols.c:889 ../src/symbols.c:902 -#: ../src/symbols.c:911 ../src/symbols.c:927 ../src/symbols.c:988 +#: ../src/symbols.c:731 ../src/symbols.c:782 ../src/symbols.c:843 +#: ../src/symbols.c:868 ../src/symbols.c:893 ../src/symbols.c:906 +#: ../src/symbols.c:915 ../src/symbols.c:931 ../src/symbols.c:992 msgid "Variables" msgstr "Variablen" -#: ../src/symbols.c:734 +#: ../src/symbols.c:738 msgid "Environment" msgstr "Umgebung" -#: ../src/symbols.c:736 ../src/symbols.c:808 +#: ../src/symbols.c:740 ../src/symbols.c:812 msgid "Subsection" msgstr "Unterabschnitt" -#: ../src/symbols.c:737 ../src/symbols.c:809 +#: ../src/symbols.c:741 ../src/symbols.c:813 msgid "Subsubsection" msgstr "Unterunterabschnitt" -#: ../src/symbols.c:748 +#: ../src/symbols.c:752 msgid "Structures" msgstr "Strukturen" -#: ../src/symbols.c:763 ../src/symbols.c:847 ../src/symbols.c:872 -#: ../src/symbols.c:884 +#: ../src/symbols.c:767 ../src/symbols.c:851 ../src/symbols.c:876 +#: ../src/symbols.c:888 msgid "Package" msgstr "Package" -#: ../src/symbols.c:765 ../src/symbols.c:914 ../src/symbols.c:937 +#: ../src/symbols.c:769 ../src/symbols.c:918 ../src/symbols.c:941 msgid "Labels" msgstr "Label" -#: ../src/symbols.c:766 ../src/symbols.c:777 ../src/symbols.c:890 -#: ../src/symbols.c:912 +#: ../src/symbols.c:770 ../src/symbols.c:781 ../src/symbols.c:894 +#: ../src/symbols.c:916 msgid "Constants" msgstr "Konstanten" -#: ../src/symbols.c:774 ../src/symbols.c:873 ../src/symbols.c:885 -#: ../src/symbols.c:898 ../src/symbols.c:924 ../src/symbols.c:975 +#: ../src/symbols.c:778 ../src/symbols.c:877 ../src/symbols.c:889 +#: ../src/symbols.c:902 ../src/symbols.c:928 ../src/symbols.c:979 msgid "Interfaces" msgstr "Interfaces" -#: ../src/symbols.c:775 ../src/symbols.c:796 ../src/symbols.c:817 -#: ../src/symbols.c:827 ../src/symbols.c:836 ../src/symbols.c:874 -#: ../src/symbols.c:886 ../src/symbols.c:899 ../src/symbols.c:974 +#: ../src/symbols.c:779 ../src/symbols.c:800 ../src/symbols.c:821 +#: ../src/symbols.c:831 ../src/symbols.c:840 ../src/symbols.c:878 +#: ../src/symbols.c:890 ../src/symbols.c:903 ../src/symbols.c:978 msgid "Classes" msgstr "Klassen" -#: ../src/symbols.c:786 +#: ../src/symbols.c:790 msgid "Anchors" msgstr "Anker" -#: ../src/symbols.c:787 +#: ../src/symbols.c:791 msgid "H1 Headings" msgstr "Überschrift (H1)" -#: ../src/symbols.c:788 +#: ../src/symbols.c:792 msgid "H2 Headings" msgstr "Überschrift (H2)" -#: ../src/symbols.c:789 +#: ../src/symbols.c:793 msgid "H3 Headings" msgstr "Überschrift (H3)" -#: ../src/symbols.c:797 +#: ../src/symbols.c:801 msgid "ID Selectors" msgstr "ID" -#: ../src/symbols.c:798 +#: ../src/symbols.c:802 msgid "Type Selectors" msgstr "Typ" -#: ../src/symbols.c:816 ../src/symbols.c:862 +#: ../src/symbols.c:820 ../src/symbols.c:866 msgid "Modules" msgstr "Module" -#: ../src/symbols.c:818 +#: ../src/symbols.c:822 msgid "Singletons" msgstr "Singletons" -#: ../src/symbols.c:819 ../src/symbols.c:828 ../src/symbols.c:837 -#: ../src/symbols.c:875 ../src/symbols.c:900 +#: ../src/symbols.c:823 ../src/symbols.c:832 ../src/symbols.c:841 +#: ../src/symbols.c:879 ../src/symbols.c:904 msgid "Methods" msgstr "Methoden" -#: ../src/symbols.c:826 ../src/symbols.c:971 +#: ../src/symbols.c:830 ../src/symbols.c:975 msgid "Namespaces" msgstr "Namensräume" -#: ../src/symbols.c:829 ../src/symbols.c:954 +#: ../src/symbols.c:833 ../src/symbols.c:958 msgid "Procedures" msgstr "Prozeduren" -#: ../src/symbols.c:840 +#: ../src/symbols.c:844 msgid "Imports" msgstr "Importe" -#: ../src/symbols.c:848 +#: ../src/symbols.c:852 msgid "Entities" msgstr "Entitäten" -#: ../src/symbols.c:849 +#: ../src/symbols.c:853 msgid "Architectures" msgstr "Architekturen" -#: ../src/symbols.c:851 +#: ../src/symbols.c:855 msgid "Functions / Procedures" msgstr "Funktionen/Prozeduren" -#: ../src/symbols.c:852 +#: ../src/symbols.c:856 msgid "Variables / Signals" msgstr "Variablen/Signale" -#: ../src/symbols.c:853 +#: ../src/symbols.c:857 msgid "Processes / Components" msgstr "Prozesse/Komponenten" -#: ../src/symbols.c:861 +#: ../src/symbols.c:865 msgid "Events" msgstr "Ereignisse" -#: ../src/symbols.c:863 +#: ../src/symbols.c:867 msgid "Functions / Tasks" msgstr "Funktionen" -#: ../src/symbols.c:876 ../src/symbols.c:977 +#: ../src/symbols.c:880 ../src/symbols.c:981 msgid "Members" msgstr "Instanzvariablen" -#: ../src/symbols.c:926 +#: ../src/symbols.c:930 msgid "Subroutines" msgstr "Subroutinen" -#: ../src/symbols.c:929 +#: ../src/symbols.c:933 msgid "Blocks" msgstr "Blöcke" -#: ../src/symbols.c:938 ../src/symbols.c:947 ../src/symbols.c:985 +#: ../src/symbols.c:942 ../src/symbols.c:951 ../src/symbols.c:989 msgid "Macros" msgstr "Makros" -#: ../src/symbols.c:939 +#: ../src/symbols.c:943 msgid "Defines" msgstr "Definitionen" -#: ../src/symbols.c:946 +#: ../src/symbols.c:950 msgid "Targets" msgstr "Targets" -#: ../src/symbols.c:955 +#: ../src/symbols.c:959 msgid "Indexes" msgstr "Indizies" -#: ../src/symbols.c:956 +#: ../src/symbols.c:960 msgid "Tables" msgstr "Tabellen" -#: ../src/symbols.c:957 +#: ../src/symbols.c:961 msgid "Triggers" msgstr "Trigger" -#: ../src/symbols.c:958 +#: ../src/symbols.c:962 msgid "Views" msgstr "Ansichten" -#: ../src/symbols.c:978 +#: ../src/symbols.c:982 msgid "Structs" msgstr "Strukturen" -#: ../src/symbols.c:979 +#: ../src/symbols.c:983 msgid "Typedefs / Enums" msgstr "Typendefinition und Enumerates" -#: ../src/symbols.c:1724 +#: ../src/symbols.c:1728 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Unbekannte Dateierweiterung für »%s«.\n" -#: ../src/symbols.c:1747 +#: ../src/symbols.c:1751 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "" "Die Tag-Datei konnte nicht erstellt werden, möglicherweise konnten keine " "Tags gefunden werden.\n" -#: ../src/symbols.c:1754 +#: ../src/symbols.c:1758 #, c-format msgid "" "Usage: %s -g <Tag File> <File list>\n" @@ -4727,7 +4733,7 @@ msgstr "" "Verwendung: %s -g <Tag-Datei> <Datei-Liste>\n" "\n" -#: ../src/symbols.c:1755 +#: ../src/symbols.c:1759 #, c-format msgid "" "Example:\n" @@ -4738,40 +4744,40 @@ msgstr "" "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1769 +#: ../src/symbols.c:1773 msgid "Load Tags" msgstr "Tags laden" -#: ../src/symbols.c:1776 -msgid "Geany tag files (*.tags)" -msgstr "Geany Tag-Datei (*.tags)" +#: ../src/symbols.c:1780 +msgid "Geany tag files (*.*.tags)" +msgstr "Geany Tag-Datei (*.*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1796 +#: ../src/symbols.c:1800 #, c-format msgid "Loaded %s tags file '%s'." msgstr "%s Tag-Datei »%s« geladen." -#: ../src/symbols.c:1799 +#: ../src/symbols.c:1803 #, c-format msgid "Could not load tags file '%s'." msgstr "Konnte Tag-Datei »%s« nicht laden." -#: ../src/symbols.c:1954 +#: ../src/symbols.c:1945 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "(Vorwärts-)Deklaration von »%s« nicht gefunden." -#: ../src/symbols.c:1956 +#: ../src/symbols.c:1947 #, c-format msgid "Definition of \"%s\" not found." msgstr "Definition von »%s« nicht gefunden." -#: ../src/symbols.c:2262 +#: ../src/symbols.c:2253 msgid "Sort by _Name" msgstr "Nach _Namen sortieren" -#: ../src/symbols.c:2269 +#: ../src/symbols.c:2260 msgid "Sort by _Appearance" msgstr "Nach _Auftreten sortieren" @@ -4931,16 +4937,16 @@ msgstr "Vorhandene Einträge" msgid "Displayed Items" msgstr "Angezeigte Einträge" -#: ../src/tools.c:108 ../src/tools.c:113 +#: ../src/tools.c:109 ../src/tools.c:114 #, c-format msgid "Invalid command: %s" msgstr "Ungültiges Kommando: %s" -#: ../src/tools.c:108 +#: ../src/tools.c:109 msgid "Command not found" msgstr "Kommando konnte nicht gefunden werden" -#: ../src/tools.c:254 +#: ../src/tools.c:260 #, c-format msgid "" "The executed custom command returned an error. Your selection was not " @@ -4949,25 +4955,25 @@ msgstr "" "Das ausgeführte Kommando wurde mit einem Fehler beendet. Die Auswahl wurde " "nicht geändert. Fehlermeldung: %s" -#: ../src/tools.c:320 +#: ../src/tools.c:326 msgid "The executed custom command exited with an unsuccessful exit code." msgstr "Das ausgeführte Kommando wurde mit einem Fehler beendet." -#: ../src/tools.c:348 ../src/tools.c:396 +#: ../src/tools.c:354 ../src/tools.c:402 #, c-format msgid "Custom command failed: %s" msgstr "Benutzerdefiniertes Kommando war nicht erfolgreich: %s" -#: ../src/tools.c:352 +#: ../src/tools.c:358 #, c-format msgid "Passing data and executing custom command: %s" msgstr "Führe benutzerdefiniertes Kommando aus: %s" -#: ../src/tools.c:498 ../src/tools.c:731 +#: ../src/tools.c:514 ../src/tools.c:774 msgid "Set Custom Commands" msgstr "Benutzerdefiniertes Kommandos einstellen" -#: ../src/tools.c:506 +#: ../src/tools.c:522 msgid "" "You can send the current selection to any of these commands and the output " "of the command replaces the current selection." @@ -4975,39 +4981,39 @@ msgstr "" "Sie können die aktuelle Auswahl an ein benutzerdefiniertes Kommando senden. " "Die aktuelle Auswahl wird durch die Ausgabe des Kommandos ersetzt." -#: ../src/tools.c:520 +#: ../src/tools.c:536 msgid "ID" msgstr "ID" -#: ../src/tools.c:706 +#: ../src/tools.c:745 msgid "No custom commands defined." msgstr "Keine Kommandos definiert." -#: ../src/tools.c:800 +#: ../src/tools.c:843 msgid "Word Count" msgstr "Wörter zählen" -#: ../src/tools.c:810 +#: ../src/tools.c:853 msgid "selection" msgstr "Auswahl" -#: ../src/tools.c:816 +#: ../src/tools.c:859 msgid "whole document" msgstr "Vollständiges Dokument" -#: ../src/tools.c:825 +#: ../src/tools.c:868 msgid "Range:" msgstr "Bereich:" -#: ../src/tools.c:837 +#: ../src/tools.c:880 msgid "Lines:" msgstr "Zeilen:" -#: ../src/tools.c:851 +#: ../src/tools.c:894 msgid "Words:" msgstr "Wörter:" -#: ../src/tools.c:865 +#: ../src/tools.c:908 msgid "Characters:" msgstr "Buchstaben:" @@ -5036,7 +5042,7 @@ msgid "Show _Paths" msgstr "_Pfade anzeigen" #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:184 +#: ../src/ui_utils.c:185 msgid "" "line: %l / %L\t col: %c\t sel: %s\t %w %t %mmode: %M " "encoding: %e filetype: %f scope: %S" @@ -5044,88 +5050,94 @@ msgstr "" "Zeile: %l / %L\t Spa: %c\t Aus: %s\t %w %t %mmode: %M " "Kodierung: %e Dateityp: %f Kontext: %S" +#. L = lines +#: ../src/ui_utils.c:219 +#, c-format +msgid "%dL" +msgstr "%dZ" + #. RO = read-only -#: ../src/ui_utils.c:214 ../src/ui_utils.c:221 +#: ../src/ui_utils.c:225 ../src/ui_utils.c:232 msgid "RO " msgstr "RO " #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:216 +#: ../src/ui_utils.c:227 msgid "OVR" msgstr "ÜBER" -#: ../src/ui_utils.c:216 +#: ../src/ui_utils.c:227 msgid "INS" msgstr "EINFG" -#: ../src/ui_utils.c:230 +#: ../src/ui_utils.c:241 msgid "TAB" msgstr "Tab" #. SP = space -#: ../src/ui_utils.c:233 +#: ../src/ui_utils.c:244 msgid "SP" msgstr "Leer" #. T/S = tabs and spaces -#: ../src/ui_utils.c:236 +#: ../src/ui_utils.c:247 msgid "T/S" msgstr "T/L" -#: ../src/ui_utils.c:244 +#: ../src/ui_utils.c:255 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:371 +#: ../src/ui_utils.c:382 msgid " (new instance)" msgstr " (neue Instanz)" -#: ../src/ui_utils.c:401 +#: ../src/ui_utils.c:412 #, c-format msgid "Font updated (%s)." msgstr "Schriftart gewechselt (%s)." -#: ../src/ui_utils.c:597 +#: ../src/ui_utils.c:608 msgid "C Standard Library" msgstr "C Standard Bibliothek" -#: ../src/ui_utils.c:598 +#: ../src/ui_utils.c:609 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:599 +#: ../src/ui_utils.c:610 msgid "C++ (C Standard Library)" msgstr "C++ (C Standard Bibliothek)" -#: ../src/ui_utils.c:600 +#: ../src/ui_utils.c:611 msgid "C++ Standard Library" msgstr "C++ Standard Bibliothek" -#: ../src/ui_utils.c:601 +#: ../src/ui_utils.c:612 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:663 +#: ../src/ui_utils.c:674 msgid "_Set Custom Date Format" msgstr "_Benutzerdefiniertes Datumsformat einstellen" -#: ../src/ui_utils.c:1808 +#: ../src/ui_utils.c:1819 msgid "Select Folder" msgstr "Ordner wählen" -#: ../src/ui_utils.c:1808 +#: ../src/ui_utils.c:1819 msgid "Select File" msgstr "Datei wählen" -#: ../src/ui_utils.c:1967 +#: ../src/ui_utils.c:1978 msgid "Save All" msgstr "Alle speichern" -#: ../src/ui_utils.c:1968 +#: ../src/ui_utils.c:1979 msgid "Close All" msgstr "Alle schließen" -#: ../src/ui_utils.c:2216 +#: ../src/ui_utils.c:2230 msgid "Geany cannot start!" msgstr "Geany kann nicht starten!" Modified: po/it.po 2911 files changed, 1449 insertions(+), 1462 deletions(-) =================================================================== No diff available, check online Modified: po/lt.po 777 files changed, 396 insertions(+), 381 deletions(-) =================================================================== @@ -1,15 +1,14 @@ # Lithuanian of Geany # Copyright (C) 2012 # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # Algimantas Margevičius <margevicius.algimantas(a)gmail.com>, 2012. # msgid "" msgstr "" "Project-Id-Version: geany\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-06 19:57+0200\n" -"PO-Revision-Date: 2012-03-14 16:35+0200\n" +"POT-Creation-Date: 2012-05-26 08:36+0200\n" +"PO-Revision-Date: 2012-05-26 08:11+0300\n" "Last-Translator: Algimantas Margevičius <margevicius.algimantas(a)gmail.com>\n" "Language-Team: Lietuvių <>\n" "Language: \n" @@ -83,7 +82,7 @@ msgstr "nematomas" msgid "_Insert \"include <...>\"" msgstr "Į_terpti \"include <...>\"" -#: ../data/geany.glade.h:14 ../src/keybindings.c:406 +#: ../data/geany.glade.h:14 ../src/keybindings.c:408 msgid "_Insert Alternative White Space" msgstr "Įterpti _alternatyvų tarpą" @@ -111,7 +110,7 @@ msgstr "Eiti į _žymės aprašymą" msgid "Conte_xt Action" msgstr "Kontekstinis _veiksmas" -#: ../data/geany.glade.h:21 ../src/filetypes.c:102 ../src/filetypes.c:1778 +#: ../data/geany.glade.h:21 ../src/filetypes.c:102 ../src/filetypes.c:1775 msgid "None" msgstr "Joks" @@ -127,7 +126,7 @@ msgstr "Esami simboliai" msgid "Match braces" msgstr "Atitikti petnešas" -#: ../data/geany.glade.h:25 ../src/keybindings.c:416 +#: ../data/geany.glade.h:25 ../src/keybindings.c:418 msgid "Preferences" msgstr "Nuostatos" @@ -357,7 +356,7 @@ msgstr "Kita" #. * corresponding chapter in the documentation, comparing translatable #. * strings is easy to break. Maybe attach an identifying string to the #. * tab label object. -#: ../data/geany.glade.h:70 ../src/prefs.c:1549 +#: ../data/geany.glade.h:70 ../src/prefs.c:1575 msgid "General" msgstr "Bendra" @@ -433,7 +432,7 @@ msgstr "Rodyti būsenos juostą" msgid "Whether to show the status bar at the bottom of the main window" msgstr "Ar būsenos juosta turėtų būti matoma pagrindinio lango apačioje" -#: ../data/geany.glade.h:89 ../src/prefs.c:1551 +#: ../data/geany.glade.h:89 ../src/prefs.c:1577 msgid "Interface" msgstr "Sąsaja" @@ -565,7 +564,7 @@ msgstr "Piktogramų dydis" msgid "Toolbar" msgstr "Įrankių juosta" -#: ../data/geany.glade.h:120 ../src/prefs.c:1553 +#: ../data/geany.glade.h:120 ../src/prefs.c:1579 msgid "Toolbar" msgstr "Įrankių juosta" @@ -985,7 +984,7 @@ msgstr "Spalva:" msgid "Sets the color of the long line marker" msgstr "Nustato ilgos eilutės žymeklio spalvą" -#: ../data/geany.glade.h:207 ../src/toolbar.c:70 ../src/tools.c:929 +#: ../data/geany.glade.h:207 ../src/toolbar.c:70 ../src/tools.c:972 msgid "Color Chooser" msgstr "Spalvų parinkiklis" @@ -1070,7 +1069,7 @@ msgstr "Virtualūs tarpai" msgid "Display" msgstr "Rodymas" -#: ../data/geany.glade.h:223 ../src/keybindings.c:222 ../src/prefs.c:1555 +#: ../data/geany.glade.h:223 ../src/keybindings.c:224 ../src/prefs.c:1581 msgid "Editor" msgstr "Redaktorius" @@ -1153,7 +1152,7 @@ msgstr "Pašalinti pradžioje esančius tarpus ir tabuliavimo ženklus" msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Eilutės pabaigoje pašalina tarpus ir tabuliavimo ženklus" -#: ../data/geany.glade.h:241 ../src/keybindings.c:557 +#: ../data/geany.glade.h:241 ../src/keybindings.c:559 msgid "Replace tabs by space" msgstr "Pakeisti tabuliavimo ženklus tarpu" @@ -1185,7 +1184,7 @@ msgstr "" "Kaip dažnai tikrinti ar dokumento failai diske nepasikeitė, sekundėmis. " "Nulis išjungia tikrinimą." -#: ../data/geany.glade.h:248 ../src/prefs.c:1557 ../src/symbols.c:683 +#: ../data/geany.glade.h:248 ../src/prefs.c:1583 ../src/symbols.c:687 #: ../plugins/filebrowser.c:1120 msgid "Files" msgstr "Failai" @@ -1237,7 +1236,7 @@ msgstr "" msgid "Commands" msgstr "Komandos" -#: ../data/geany.glade.h:259 ../src/keybindings.c:234 ../src/prefs.c:1559 +#: ../data/geany.glade.h:259 ../src/keybindings.c:236 ../src/prefs.c:1585 msgid "Tools" msgstr "Įrankiai" @@ -1321,7 +1320,7 @@ msgstr "" msgid "Template data" msgstr " Šablono duomenys" -#: ../data/geany.glade.h:277 ../src/prefs.c:1561 +#: ../data/geany.glade.h:277 ../src/prefs.c:1587 msgid "Templates" msgstr "Šablonai" @@ -1333,7 +1332,7 @@ msgstr "_Keisti" msgid "Keyboard shortcuts" msgstr "Klaviatūra ir spartieji klavišai" -#: ../data/geany.glade.h:280 ../src/prefs.c:1563 +#: ../data/geany.glade.h:280 ../src/prefs.c:1589 msgid "Keybindings" msgstr "Klavišų susiejimai" @@ -1411,7 +1410,7 @@ msgstr "Naudoti GTK spausdinimą" msgid "Printing" msgstr "Spausdinimas" -#: ../data/geany.glade.h:297 ../src/prefs.c:1565 +#: ../data/geany.glade.h:297 ../src/prefs.c:1591 msgid "Printing" msgstr "Spausdinimas" @@ -1550,7 +1549,7 @@ msgstr "" msgid "Terminal" msgstr "Terminalas" -#: ../data/geany.glade.h:326 ../src/prefs.c:1569 ../src/vte.c:281 +#: ../data/geany.glade.h:326 ../src/prefs.c:1595 ../src/vte.c:281 msgid "Terminal" msgstr "Terminalas" @@ -1562,7 +1561,7 @@ msgstr "Įspėjimas: prieš keičiant šias parinktis, perskaitykite žinyną msgid "Various preferences" msgstr "Įvairūs nustatymai" -#: ../data/geany.glade.h:329 ../src/prefs.c:1567 +#: ../data/geany.glade.h:329 ../src/prefs.c:1593 msgid "Various" msgstr "Įvairūs" @@ -1570,7 +1569,7 @@ msgstr "Įvairūs" msgid "Project Properties" msgstr "Projekto savybės" -#: ../data/geany.glade.h:331 ../src/plugins.c:1456 ../src/project.c:150 +#: ../data/geany.glade.h:331 ../src/plugins.c:1457 ../src/project.c:150 msgid "Filename:" msgstr "Failo vardas:" @@ -1608,7 +1607,7 @@ msgstr "" "Visų projekto failų bazinis aplankas. Tai gali būti naujas kelias, ar esamas " "aplankų medis. Galite naudoti kelius reliatyvius projekto failo vardui." -#: ../data/geany.glade.h:338 ../src/keybindings.c:232 +#: ../data/geany.glade.h:338 ../src/keybindings.c:234 msgid "Project" msgstr "Projektas" @@ -1656,7 +1655,7 @@ msgstr "Paskutinieji _failai" msgid "Save A_ll" msgstr "_Išsaugoti viską" -#: ../data/geany.glade.h:351 ../src/callbacks.c:429 ../src/document.c:2836 +#: ../data/geany.glade.h:351 ../src/callbacks.c:429 ../src/document.c:2838 #: ../src/sidebar.c:696 msgid "_Reload" msgstr "Į_kelti iš naujo" @@ -1681,43 +1680,43 @@ msgstr "_Užverti visus" msgid "_Commands" msgstr "_Komandos" -#: ../data/geany.glade.h:357 ../src/keybindings.c:341 +#: ../data/geany.glade.h:357 ../src/keybindings.c:343 msgid "_Cut Current Line(s)" msgstr "_Iškirpti esamą eilutę(-es)" -#: ../data/geany.glade.h:358 ../src/keybindings.c:338 +#: ../data/geany.glade.h:358 ../src/keybindings.c:340 msgid "_Copy Current Line(s)" msgstr "_Kopijuoti esamą eilutę(-es)" -#: ../data/geany.glade.h:359 ../src/keybindings.c:293 +#: ../data/geany.glade.h:359 ../src/keybindings.c:295 msgid "_Delete Current Line(s)" msgstr "_Ištrinti esamą eilutę(-es)" -#: ../data/geany.glade.h:360 ../src/keybindings.c:290 +#: ../data/geany.glade.h:360 ../src/keybindings.c:292 msgid "_Duplicate Line or Selection" msgstr "_Dublikuoti eilutę ar pasirinkimą" -#: ../data/geany.glade.h:361 ../src/keybindings.c:351 +#: ../data/geany.glade.h:361 ../src/keybindings.c:353 msgid "_Select Current Line(s)" msgstr "_Pasirinkti esamą eilutę(-es)" -#: ../data/geany.glade.h:362 ../src/keybindings.c:354 +#: ../data/geany.glade.h:362 ../src/keybindings.c:356 msgid "_Select Current Paragraph" msgstr "_Pasirinkti esamą paragrafą" -#: ../data/geany.glade.h:363 ../src/keybindings.c:393 +#: ../data/geany.glade.h:363 ../src/keybindings.c:395 msgid "_Send Selection to Terminal" msgstr "_Siųsti pasirinkimą į terminalą" -#: ../data/geany.glade.h:364 ../src/keybindings.c:395 +#: ../data/geany.glade.h:364 ../src/keybindings.c:397 msgid "_Reflow Lines/Block" msgstr "_Iš naujo perduoti eilutes/atkarpas" -#: ../data/geany.glade.h:365 ../src/keybindings.c:365 +#: ../data/geany.glade.h:365 ../src/keybindings.c:367 msgid "T_oggle Case of Selection" msgstr "_Perjungti pasirinkimo raidžių dydį" -#: ../data/geany.glade.h:366 ../src/keybindings.c:300 +#: ../data/geany.glade.h:366 ../src/keybindings.c:302 msgid "_Transpose Current Line" msgstr "_Perkelti esamą eilutę" @@ -1741,7 +1740,7 @@ msgstr "_Didinti atitraukimą" msgid "_Decrease Indent" msgstr "_Sumažinti atitraukimą" -#: ../data/geany.glade.h:372 ../src/keybindings.c:384 +#: ../data/geany.glade.h:372 ../src/keybindings.c:386 msgid "_Smart Line Indent" msgstr "_Protingas eilučių atitraukimas" @@ -1757,7 +1756,7 @@ msgstr "_Įterpti komentarus" msgid "Preference_s" msgstr "_Nustatymai" -#: ../data/geany.glade.h:376 ../src/keybindings.c:419 +#: ../data/geany.glade.h:376 ../src/keybindings.c:421 msgid "P_lugin Preferences" msgstr "_Įskiepio nustatymai" @@ -1785,11 +1784,11 @@ msgstr "_Kitas pranešimas" msgid "Pr_evious Message" msgstr "Ankst_esnis pranešimas" -#: ../data/geany.glade.h:383 ../src/keybindings.c:468 +#: ../data/geany.glade.h:383 ../src/keybindings.c:470 msgid "_Go to Next Marker" msgstr "Eiti prie _kito žymeklio" -#: ../data/geany.glade.h:384 ../src/keybindings.c:471 +#: ../data/geany.glade.h:384 ../src/keybindings.c:473 msgid "_Go to Previous Marker" msgstr "Eiti prie _ankstesnio žymeklio" @@ -1797,15 +1796,15 @@ msgstr "Eiti prie _ankstesnio žymeklio" msgid "_Go to Line" msgstr "Eiti į _eilutę" -#: ../data/geany.glade.h:386 ../src/keybindings.c:431 +#: ../data/geany.glade.h:386 ../src/keybindings.c:433 msgid "Find Next _Selection" msgstr "Rasti _sekantį pasirinkimą" -#: ../data/geany.glade.h:387 ../src/keybindings.c:433 +#: ../data/geany.glade.h:387 ../src/keybindings.c:435 msgid "Find Pre_vious Selection" msgstr "Rasti _ankstesnį pasirinkimą" -#: ../data/geany.glade.h:388 ../src/keybindings.c:450 +#: ../data/geany.glade.h:388 ../src/keybindings.c:452 msgid "_Mark All" msgstr "_Pažymėti visus" @@ -2094,53 +2093,53 @@ msgstr "Pranešimai" msgid "Scribble" msgstr "Keverzonė" -#: ../src/about.c:154 +#: ../src/about.c:157 msgid "About Geany" msgstr "Apie Geany" -#: ../src/about.c:204 +#: ../src/about.c:207 msgid "A fast and lightweight IDE" msgstr "Greita ir supaprastinta IDE" -#: ../src/about.c:225 +#: ../src/about.c:228 #, c-format msgid "(built on or after %s)" msgstr "(sukurta %s arba vėliau)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:256 +#: ../src/about.c:259 msgid "Info" msgstr "Informacija" -#: ../src/about.c:272 +#: ../src/about.c:275 msgid "Developers" msgstr "Kūrėjai" -#: ../src/about.c:279 +#: ../src/about.c:282 msgid "maintainer" msgstr "prižiūrėtojas" -#: ../src/about.c:287 ../src/about.c:295 ../src/about.c:303 +#: ../src/about.c:290 ../src/about.c:298 ../src/about.c:306 msgid "developer" msgstr "kūrėjas" -#: ../src/about.c:311 +#: ../src/about.c:314 msgid "translation maintainer" msgstr "vertimų prižiūrėtojas" -#: ../src/about.c:320 +#: ../src/about.c:323 msgid "Translators" msgstr "Vertėjai" -#: ../src/about.c:340 +#: ../src/about.c:343 msgid "Previous Translators" msgstr "Ankstesni vertėjai" -#: ../src/about.c:361 +#: ../src/about.c:364 msgid "Contributors" msgstr "Pagalbininkai" -#: ../src/about.c:371 +#: ../src/about.c:374 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" @@ -2148,15 +2147,15 @@ msgstr "" "Kai kurie iš daugelio prisidėjusiųjų (detalesniam sąrašui peržiūrėkite failą " "%s):" -#: ../src/about.c:397 +#: ../src/about.c:400 msgid "Credits" msgstr "Padėkos" -#: ../src/about.c:411 +#: ../src/about.c:414 msgid "License" msgstr "Licencija" -#: ../src/about.c:420 +#: ../src/about.c:423 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -2179,7 +2178,7 @@ msgstr "Procesas nepavyko, nėra darbinio aplanko" msgid "%s (in directory: %s)" msgstr "%s (aplanke: %s)" -#: ../src/build.c:831 ../src/build.c:1055 ../src/search.c:1627 +#: ../src/build.c:831 ../src/build.c:1055 ../src/search.c:1632 #, c-format msgid "Process failed (%s)" msgstr "Procesas nepavyko (%s)" @@ -2268,11 +2267,12 @@ msgstr "Daugiau kūrimo klaidų nėra." msgid "Set menu item label" msgstr "Nustatyti meniu įrašo etiketę" -#: ../src/build.c:1967 ../src/symbols.c:738 +#: ../src/build.c:1967 ../src/symbols.c:742 ../src/tools.c:554 msgid "Label" msgstr "Etiketė" -#: ../src/build.c:1968 ../src/symbols.c:733 ../src/tools.c:524 +#. command column, holding status and command display +#: ../src/build.c:1968 ../src/symbols.c:737 ../src/tools.c:539 msgid "Command" msgstr "Komanda" @@ -2375,7 +2375,7 @@ msgstr "Visi neišsaugoti pakeitimai bus prarasti." msgid "Are you sure you want to reload '%s'?" msgstr "Ar tikrai norite įkrauti iš naujo „%s“?" -#: ../src/callbacks.c:1055 ../src/keybindings.c:459 +#: ../src/callbacks.c:1055 ../src/keybindings.c:461 msgid "Go to Line" msgstr "Eiti į eilutę" @@ -2389,31 +2389,31 @@ msgid "" msgstr "" "Prieš naudojantis šia funkcija, nustatykite dabartinio failo failo tipą." -#: ../src/callbacks.c:1287 ../src/ui_utils.c:628 +#: ../src/callbacks.c:1287 ../src/ui_utils.c:639 msgid "dd.mm.yyyy" msgstr "dd.mm.yyyy" -#: ../src/callbacks.c:1289 ../src/ui_utils.c:629 +#: ../src/callbacks.c:1289 ../src/ui_utils.c:640 msgid "mm.dd.yyyy" msgstr "mm.dd.yyyy" -#: ../src/callbacks.c:1291 ../src/ui_utils.c:630 +#: ../src/callbacks.c:1291 ../src/ui_utils.c:641 msgid "yyyy/mm/dd" msgstr "yyyy/mm/dd" -#: ../src/callbacks.c:1293 ../src/ui_utils.c:639 +#: ../src/callbacks.c:1293 ../src/ui_utils.c:650 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.yyyy hh:mm:ss" -#: ../src/callbacks.c:1295 ../src/ui_utils.c:640 +#: ../src/callbacks.c:1295 ../src/ui_utils.c:651 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.yyyy hh:mm:ss" -#: ../src/callbacks.c:1297 ../src/ui_utils.c:641 +#: ../src/callbacks.c:1297 ../src/ui_utils.c:652 msgid "yyyy/mm/dd hh:mm:ss" msgstr "yyyy/mm/dd hh:mm:ss" -#: ../src/callbacks.c:1299 ../src/ui_utils.c:650 +#: ../src/callbacks.c:1299 ../src/ui_utils.c:661 msgid "_Use Custom Date Format" msgstr "_Naudoti pasirinktinį datos formatą" @@ -2606,12 +2606,12 @@ msgstr "" #: ../src/dialogs.c:1223 ../src/dialogs.c:1224 ../src/dialogs.c:1225 #: ../src/dialogs.c:1231 ../src/dialogs.c:1232 ../src/dialogs.c:1233 -#: ../src/symbols.c:1996 ../src/symbols.c:2017 ../src/symbols.c:2069 -#: ../src/ui_utils.c:253 +#: ../src/symbols.c:2096 ../src/symbols.c:2117 ../src/symbols.c:2169 +#: ../src/ui_utils.c:264 msgid "unknown" msgstr "nežinoma" -#: ../src/dialogs.c:1238 ../src/symbols.c:888 +#: ../src/dialogs.c:1238 ../src/symbols.c:892 msgid "Properties" msgstr "Savybės" @@ -2639,7 +2639,7 @@ msgstr "(tik Geany viduje)" msgid "Encoding:" msgstr "Koduotė:" -#: ../src/dialogs.c:1339 ../src/ui_utils.c:257 +#: ../src/dialogs.c:1339 ../src/ui_utils.c:268 msgid "(with BOM)" msgstr "(su BOM)" @@ -2847,7 +2847,7 @@ msgid "Wrap search and find again?" msgstr "Ieškoti nuo pradžios?" #: ../src/document.c:2034 ../src/search.c:1279 ../src/search.c:1323 -#: ../src/search.c:2082 ../src/search.c:2083 +#: ../src/search.c:2087 ../src/search.c:2088 #, c-format msgid "No matches found for \"%s\"." msgstr "„%s“ atitikmenų nerasta." @@ -2860,11 +2860,11 @@ msgstr[0] "%s: „%d“ pakeistas „%s“ %s kartą" msgstr[1] "%s: „%d“ pakeistas „%s“ %s kartus" msgstr[2] "%s: „%d“ pakeistas „%s“ %s kartų" -#: ../src/document.c:2837 +#: ../src/document.c:2839 msgid "Do you want to reload it?" msgstr "Ar norite įkelti iš naujo?" -#: ../src/document.c:2838 +#: ../src/document.c:2840 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -2873,28 +2873,28 @@ msgstr "" "Failas „%s“ diske yra naujesnis nei\n" "esantis atmintyje." -#: ../src/document.c:2856 +#: ../src/document.c:2858 msgid "Close _without saving" msgstr "Užverti _neišsaugant" -#: ../src/document.c:2859 +#: ../src/document.c:2861 msgid "Try to resave the file?" msgstr "Pabandyti dar kartą išsaugoti failą?" -#: ../src/document.c:2860 +#: ../src/document.c:2862 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "Failas „%s“ diske nerastas!" -#: ../src/editor.c:4300 +#: ../src/editor.c:4310 msgid "Enter Tab Width" msgstr "Įvesti tabuliavimo ženklo plotį" -#: ../src/editor.c:4301 +#: ../src/editor.c:4311 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "Įveskite skaičių, kiek tarpų turėtų būti pakeista tabuliavimo ženklu." -#: ../src/editor.c:4459 +#: ../src/editor.c:4469 #, c-format msgid "Warning: non-standard hard tab width: %d != 8!" msgstr "Įspėjimas: nestandartinis tabuliavimo ženklo plotis %d != 8!" @@ -3078,162 +3078,166 @@ msgstr "_Išvaizdos kalbos" msgid "M_iscellaneous" msgstr "_Kita" -#: ../src/filetypes.c:1462 ../src/win32.c:104 +#: ../src/filetypes.c:1459 ../src/win32.c:104 msgid "All Source" msgstr "Visi pradiniai kodai" #. create meta file filter "All files" -#: ../src/filetypes.c:1487 ../src/project.c:295 ../src/win32.c:94 +#: ../src/filetypes.c:1484 ../src/project.c:295 ../src/win32.c:94 #: ../src/win32.c:139 ../src/win32.c:160 ../src/win32.c:165 msgid "All files" msgstr "Visi failai" -#: ../src/filetypes.c:1535 +#: ../src/filetypes.c:1532 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Bloga reguliarioji išraiška failo tipui %s: %s" -#: ../src/geany.h:53 +#: ../src/geany.h:55 msgid "untitled" msgstr "be vardo" -#: ../src/highlighting.c:1202 ../src/main.c:821 ../src/socket.c:166 +#: ../src/highlighting.c:1218 ../src/main.c:821 ../src/socket.c:166 #: ../src/templates.c:224 #, c-format msgid "Could not find file '%s'." msgstr "Nepavyko rasti failo „%s“." -#: ../src/highlighting.c:1225 -msgid "_Default" -msgstr "_Numatytasis" +#: ../src/highlighting.c:1290 +msgid "Default" +msgstr "Numatytasis" -#: ../src/highlighting.c:1294 +#: ../src/highlighting.c:1341 +msgid "Color Schemes" +msgstr "Spalvų deriniai" + +#: ../src/highlighting.c:1366 msgid "_Color Schemes" msgstr "_Spalvų deriniai" #. visual group order -#: ../src/keybindings.c:221 ../src/symbols.c:710 +#: ../src/keybindings.c:223 ../src/symbols.c:714 msgid "File" msgstr "Failas" -#: ../src/keybindings.c:223 +#: ../src/keybindings.c:225 msgid "Clipboard" msgstr "Iškarpinė" -#: ../src/keybindings.c:224 +#: ../src/keybindings.c:226 msgid "Select" msgstr "Pasirinkti" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:227 msgid "Format" msgstr "Formatas" -#: ../src/keybindings.c:226 +#: ../src/keybindings.c:228 msgid "Insert" msgstr "Įterpti" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:229 msgid "Settings" msgstr "Nustatymai" -#: ../src/keybindings.c:228 +#: ../src/keybindings.c:230 msgid "Search" msgstr "Paieška" -#: ../src/keybindings.c:229 +#: ../src/keybindings.c:231 msgid "Go to" msgstr "Eiti į" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:232 msgid "View" msgstr "Rodymas" -#: ../src/keybindings.c:231 +#: ../src/keybindings.c:233 msgid "Document" msgstr "Dokumentas" -#: ../src/keybindings.c:233 ../src/keybindings.c:580 ../src/project.c:444 -#: ../src/ui_utils.c:1969 +#: ../src/keybindings.c:235 ../src/keybindings.c:582 ../src/project.c:444 +#: ../src/ui_utils.c:1980 msgid "Build" msgstr "Sukurti" -#: ../src/keybindings.c:235 ../src/keybindings.c:605 +#: ../src/keybindings.c:237 ../src/keybindings.c:607 msgid "Help" msgstr "Žinynas" -#: ../src/keybindings.c:236 +#: ../src/keybindings.c:238 msgid "Focus" msgstr "Fokusas" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:239 msgid "Notebook tab" msgstr "Užrašinės kortelė" -#: ../src/keybindings.c:246 ../src/keybindings.c:274 +#: ../src/keybindings.c:248 ../src/keybindings.c:276 msgid "New" msgstr "Naujas" -#: ../src/keybindings.c:248 ../src/keybindings.c:276 +#: ../src/keybindings.c:250 ../src/keybindings.c:278 msgid "Open" msgstr "Atverti" -#: ../src/keybindings.c:251 +#: ../src/keybindings.c:253 msgid "Open selected file" msgstr "Atverti pasirinktą failą" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:255 msgid "Save" msgstr "Išsaugoti" -#: ../src/keybindings.c:255 ../src/toolbar.c:55 +#: ../src/keybindings.c:257 ../src/toolbar.c:55 msgid "Save as" msgstr "Išsaugoti kaip" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:259 msgid "Save all" msgstr "Išsaugoti visus" -#: ../src/keybindings.c:260 +#: ../src/keybindings.c:262 msgid "Print" msgstr "Spausdinti" -#: ../src/keybindings.c:262 ../src/keybindings.c:281 +#: ../src/keybindings.c:264 ../src/keybindings.c:283 msgid "Close" msgstr "Užverti" -#: ../src/keybindings.c:264 +#: ../src/keybindings.c:266 msgid "Close all" msgstr "Užverti visus" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:269 msgid "Reload file" msgstr "Iš naujo įkelti failą" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:271 msgid "Re-open last closed tab" msgstr "Dar kartą atverti paskutinę užvertą kortelę" -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:288 msgid "Undo" msgstr "Atšaukti" -#: ../src/keybindings.c:288 +#: ../src/keybindings.c:290 msgid "Redo" msgstr "Grąžinti" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:299 msgid "Delete to line end" msgstr "Ištrinti iki eilutės pabaigos" -#: ../src/keybindings.c:303 +#: ../src/keybindings.c:305 msgid "Scroll to current line" msgstr "Slinkti iki dabartinės eilutės" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:307 msgid "Scroll up the view by one line" msgstr "Slinkti aukštyn viena eilute" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:309 msgid "Scroll down the view by one line" msgstr "Slinkti žemyn viena eilute" @@ -3242,395 +3246,395 @@ msgstr "Slinkti žemyn viena eilute" # # Keliai: # ../src/keybindings.c:309 -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:311 msgid "Complete snippet" msgstr "Pilnas fragmentas" -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:313 msgid "Move cursor in snippet" msgstr "Perkelti žymeklį fragmente" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:315 msgid "Suppress snippet completion" msgstr "Neleisti užbaigti fragmento" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:317 msgid "Context Action" msgstr "Kontekstinis veiksmas" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:319 msgid "Complete word" msgstr "Užbaigti žodį" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:321 msgid "Show calltip" msgstr "Rodyti iškvietimo patarimą" -#: ../src/keybindings.c:321 +#: ../src/keybindings.c:323 msgid "Show macro list" msgstr "Rodyti makro sąrašą" -#: ../src/keybindings.c:323 +#: ../src/keybindings.c:325 msgid "Word part completion" msgstr "Žodžio dalies užbaigimas" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:327 msgid "Move line(s) up" msgstr "Perkelti eilutę(-es) aukštyn" -#: ../src/keybindings.c:327 +#: ../src/keybindings.c:329 msgid "Move line(s) down" msgstr "Perkelti eilutę(-es) žemyn" -#: ../src/keybindings.c:332 +#: ../src/keybindings.c:334 msgid "Cut" msgstr "Iškirpti" -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:336 msgid "Copy" msgstr "Kopijuoti" -#: ../src/keybindings.c:336 +#: ../src/keybindings.c:338 msgid "Paste" msgstr "Įklijuoti" -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:349 msgid "Select All" msgstr "Pasirinkti viską" -#: ../src/keybindings.c:349 +#: ../src/keybindings.c:351 msgid "Select current word" msgstr "Pasirinkti dabartinį žodį" -#: ../src/keybindings.c:357 +#: ../src/keybindings.c:359 msgid "Select to previous word part" msgstr "Pasirinkti ankstesnę žodžio dalį" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:361 msgid "Select to next word part" msgstr "Pasirinkti sekančią žodžio dalį" -#: ../src/keybindings.c:367 +#: ../src/keybindings.c:369 msgid "Toggle line commentation" msgstr "Perjungti eilučių komentavimą" -#: ../src/keybindings.c:370 +#: ../src/keybindings.c:372 msgid "Comment line(s)" msgstr "Komentuoti eilutę(-es)" -#: ../src/keybindings.c:372 +#: ../src/keybindings.c:374 msgid "Uncomment line(s)" msgstr "Pašalinti eilutės(-čių) komentarą" -#: ../src/keybindings.c:374 +#: ../src/keybindings.c:376 msgid "Increase indent" msgstr "Didinti atitraukimą" -#: ../src/keybindings.c:377 +#: ../src/keybindings.c:379 msgid "Decrease indent" msgstr "Sumažinti atitraukimą" -#: ../src/keybindings.c:380 +#: ../src/keybindings.c:382 msgid "Increase indent by one space" msgstr "Padidinti atitraukimą vienu tarpu" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:384 msgid "Decrease indent by one space" msgstr "Sumažinti atitraukimą vienu tarpu" -#: ../src/keybindings.c:386 +#: ../src/keybindings.c:388 msgid "Send to Custom Command 1" msgstr "Siųsti į pasirinktą komandą 1" -#: ../src/keybindings.c:388 +#: ../src/keybindings.c:390 msgid "Send to Custom Command 2" msgstr "Siųsti į pasirinktą komandą 2" -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:392 msgid "Send to Custom Command 3" msgstr "Siųsti į pasirinktą komandą 3" -#: ../src/keybindings.c:398 +#: ../src/keybindings.c:400 msgid "Join lines" msgstr "Sujungti eilutes" -#: .@@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 928de3: Don't suppress warnings or define G_OS_WIN32 (Windows build)
by Nick Treleaven 04 Jul '12

04 Jul '12

1 0

[geany/geany] 6f0d01: Fix documentation using old directory tagmanager/include
by Nick Treleaven 04 Jul '12

04 Jul '12

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Wed, 06 Jun 2012 14:19:34 Commit: 6f0d015ed2eed5563d02d7824a098256e9874bb9 https://github.com/geany/geany/commit/6f0d015ed2eed5563d02d7824a098256e9874… Log Message: ----------- Fix documentation using old directory tagmanager/include Modified Paths: -------------- doc/Doxyfile.in src/plugindata.h Modified: doc/Doxyfile.in 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -96,9 +96,9 @@ WARN_LOGFILE = #--------------------------------------------------------------------------- INPUT = ../src/ ./ \ ../plugins/geanyplugin.h ../plugins/geanyfunctions.h \ - ../tagmanager/tm_source_file.c ../tagmanager/include/tm_source_file.h \ - ../tagmanager/tm_work_object.c ../tagmanager/include/tm_work_object.h \ - ../tagmanager/tm_workspace.c ../tagmanager/include/tm_workspace.h + ../tagmanager/src/tm_source_file.c ../tagmanager/src/tm_source_file.h \ + ../tagmanager/src/tm_work_object.c ../tagmanager/src/tm_work_object.h \ + ../tagmanager/src/tm_workspace.c ../tagmanager/src/tm_workspace.h INPUT_ENCODING = UTF-8 FILE_PATTERNS = *.c \ *.cc \ Modified: src/plugindata.h 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -265,7 +265,7 @@ struct MsgWinFuncs *p_msgwindow; struct EncodingFuncs *p_encodings; /**< See encodings.h */ struct KeybindingFuncs *p_keybindings; /**< See keybindings.h */ - struct TagManagerFuncs *p_tm; /**< See tagmanager/include */ + struct TagManagerFuncs *p_tm; /**< See tagmanager/src */ struct SearchFuncs *p_search; /**< See search.h */ struct HighlightingFuncs *p_highlighting; /**< See highlighting.h */ struct FiletypeFuncs *p_filetypes; /**< See filetypes.h */ @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 18cec1: Fix Windows build
by Nick Treleaven 04 Jul '12

04 Jul '12

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Wed, 06 Jun 2012 14:21:00 Commit: 18cec1fb81b5a4d186a352e0264a2f1d065bbe3a https://github.com/geany/geany/commit/18cec1fb81b5a4d186a352e0264a2f1d065bb… Log Message: ----------- Fix Windows build Modified Paths: -------------- plugins/makefile.win32 src/makefile.win32 tagmanager/src/makefile.win32 Modified: plugins/makefile.win32 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -23,7 +23,7 @@ GTK_INCLUDES= \ INCLUDEDIRS= -I.. \ -I../src \ -I../scintilla/include \ - -I../tagmanager/include \ + -I../tagmanager/src \ $(GTK_INCLUDES) ALL_GTK_LIBS= \ Modified: src/makefile.win32 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -34,7 +34,7 @@ GTK_INCLUDES= \ INCLUDEDIRS= -I.. \ -I../scintilla/include \ -I../tagmanager/mio \ - -I../tagmanager/include \ + -I../tagmanager/src \ $(GTK_INCLUDES) ALL_GTK_LIBS= \ Modified: tagmanager/src/makefile.win32 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -23,7 +23,7 @@ GTK_INCLUDES= \ -I$(PREFIX)/include \ -I$(PREFIX)/include/gettext -INCLUDEDIRS=-I ../ -I ../mio -I . $(GTK_INCLUDES) +INCLUDEDIRS=-I ../ctags -I ../ -I . $(GTK_INCLUDES) CBASEFLAGS=-Wall -pipe -mms-bitfields -DPACKAGE=\"geany\" -DG_OS_WIN32 -Wno-missing-braces -Wno-char-subscripts $(INCLUDEDIRS) ifdef DEBUG @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] f0a9c4: Update makefile.win32 build system
by Colomban Wendling 04 Jul '12

04 Jul '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 08 May 2012 21:01:23 Commit: f0a9c4298569972abcd6e8d37ddbe7d5c6a7729d https://github.com/geany/geany/commit/f0a9c4298569972abcd6e8d37ddbe7d5c6a77… Log Message: ----------- Update makefile.win32 build system Modified Paths: -------------- makefile.win32 src/makefile.win32 tagmanager/Makefile.am tagmanager/ctags/makefile.win32 tagmanager/mio/makefile.win32 tagmanager/src/makefile.win32 Modified: makefile.win32 8 files changed, 5 insertions(+), 3 deletions(-) =================================================================== @@ -22,8 +22,9 @@ MAKE = make # 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 && $(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 .. @@ -32,15 +33,16 @@ config.h: win32-config.h $(CP) $< $@ deps: - -$(RM) tagmanager/mio/deps.mak tagmanager/deps.mak scintilla/deps.mak plugins/deps.mak src/deps.mak + -$(RM) tagmanager/ctags/deps.mak tagmanager/mio/deps.mak tagmanager/src/deps.mak scintilla/deps.mak plugins/deps.mak src/deps.mak # used by src/makefile.win32 to avoid del ../file which is an error 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 && $(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 .. Modified: src/makefile.win32 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -85,9 +85,9 @@ exec: binclean: $(RM) $(TARGET) -$(TARGET): $(OBJS) $(RES) ../scintilla/scintilla.a ../tagmanager/mio/mio.a ../tagmanager/tagmanager.a +$(TARGET): $(OBJS) $(RES) ../scintilla/scintilla.a ../tagmanager/ctags/ctags.a ../tagmanager/mio/mio.a ../tagmanager/src/tagmanager.a $(CXX) $(OBJS) $(RES) -o $(TARGET) \ - ../scintilla/scintilla.a ../tagmanager/tagmanager.a ../tagmanager/mio/mio.a \ + ../scintilla/scintilla.a ../tagmanager/ctags/ctags.a ../tagmanager/src/tagmanager.a ../tagmanager/mio/mio.a \ $(ALL_GTK_LIBS) $(WIN_LIBS) deps.mak: Modified: tagmanager/Makefile.am 3 files changed, 0 insertions(+), 3 deletions(-) =================================================================== @@ -1,6 +1,3 @@ ## Process this file with automake to produce Makefile.in SUBDIRS = ctags mio src - -EXTRA_DIST = \ - makefile.win32 Modified: tagmanager/ctags/makefile.win32 9 files changed, 4 insertions(+), 5 deletions(-) =================================================================== @@ -5,9 +5,9 @@ AR = ar RANLIB = ranlib PREFIX = C:/libs RM = del --include ../localwin32.mk +-include ../../localwin32.mk -COMPLIB=tagmanager.a +COMPLIB=ctags.a REGEX_DEFINES = -DHAVE_REGCOMP -DSTDC_HEADERS=1 @@ -23,7 +23,7 @@ GTK_INCLUDES= \ -I$(PREFIX)/include \ -I$(PREFIX)/include/gettext -INCLUDEDIRS=-I include -I mio -I . $(GTK_INCLUDES) +INCLUDEDIRS=-I ../ -I . $(GTK_INCLUDES) CBASEFLAGS=-Wall -pipe -mms-bitfields -DPACKAGE=\"geany\" -DG_OS_WIN32 -Wno-missing-braces -Wno-char-subscripts $(INCLUDEDIRS) ifdef DEBUG @@ -45,8 +45,7 @@ actionscript.o nsis.o objc.o \ haskell.o haxe.o html.o python.o lregex.o rest.o sh.o ctags.o entry.o get.o keyword.o nestlevel.o \ options.o \ parse.o basic.o read.o sort.o strlist.o latex.o markdown.o matlab.o docbook.o tcl.o ruby.o asm.o sql.o txt2tags.o css.o \ -vstring.o tm_workspace.o tm_work_object.o tm_source_file.o tm_project.o tm_tag.o \ -tm_symbol.o tm_file_entry.o tm_tagmanager.o r.o +vstring.o r.o $(AR) rc $@ $^ $(RANLIB) $@ Modified: tagmanager/mio/makefile.win32 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -3,7 +3,7 @@ CC = gcc AR = ar RANLIB = ranlib -PREFIX = C:\libs +PREFIX = C:/libs RM = del -include ../../localwin32.mk Modified: tagmanager/src/makefile.win32 52 files changed, 52 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,52 @@ + +.SUFFIXES: .cxx .c .o .h .a +CC = gcc +AR = ar +RANLIB = ranlib +PREFIX = C:/libs +RM = del +-include ../../localwin32.mk + +COMPLIB=tagmanager.a + +REGEX_DEFINES = -DHAVE_REGCOMP -DSTDC_HEADERS=1 + +GTK_INCLUDES= \ + -I$(PREFIX)/include/gtk-2.0 \ + -I$(PREFIX)/lib/gtk-2.0/include \ + -I$(PREFIX)/include/atk-1.0 \ + -I$(PREFIX)/include/cairo \ + -I$(PREFIX)/include/gdk-pixbuf-2.0 \ + -I$(PREFIX)/include/pango-1.0 \ + -I$(PREFIX)/include/glib-2.0 \ + -I$(PREFIX)/lib/glib-2.0/include \ + -I$(PREFIX)/include \ + -I$(PREFIX)/include/gettext + +INCLUDEDIRS=-I ../ -I ../mio -I . $(GTK_INCLUDES) + +CBASEFLAGS=-Wall -pipe -mms-bitfields -DPACKAGE=\"geany\" -DG_OS_WIN32 -Wno-missing-braces -Wno-char-subscripts $(INCLUDEDIRS) +ifdef DEBUG +CFLAGS= -O0 -g $(CBASEFLAGS) +else +CFLAGS=-O2 $(CBASEFLAGS) +endif + +.c.o: + $(CC) $(REGEX_DEFINES) $(CFLAGS) -w -c $< + +all: $(COMPLIB) + +clean: + -$(RM) deps.mak *.o $(COMPLIB) + +$(COMPLIB): tm_workspace.o tm_work_object.o tm_source_file.o tm_project.o tm_tag.o \ +tm_symbol.o tm_file_entry.o tm_tagmanager.o + $(AR) rc $@ $^ + $(RANLIB) $@ + +deps.mak: + $(CC) -MM $(CFLAGS) *.c >deps.mak + +# Generate header dependencies with "make deps.mak" +include deps.mak @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] d69a15: Refactor tagmanager source files architecture
by Colomban Wendling 04 Jul '12

04 Jul '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 08 May 2012 21:01:23 Commit: d69a153bb440bf5e27db6851fa291555be5f9d4b https://github.com/geany/geany/commit/d69a153bb440bf5e27db6851fa291555be5f9… Log Message: ----------- Refactor tagmanager source files architecture Split ctags and tagmanager sources, as follows: tagmanager/ctags: the parsers, more or less upstream CTags; tagmanager/mio: local MIO library copy; tagmanager/src: actual tagmanager sources. Modified Paths: -------------- configure.ac plugins/Makefile.am src/Makefile.am tagmanager/Makefile.am tagmanager/ctags/Makefile.am tagmanager/ctags/abc.c tagmanager/ctags/actionscript.c tagmanager/ctags/args.c tagmanager/ctags/args.h tagmanager/ctags/asm.c tagmanager/ctags/basic.c tagmanager/ctags/c.c tagmanager/ctags/cobol.c tagmanager/ctags/conf.c tagmanager/ctags/css.c tagmanager/ctags/ctags.c tagmanager/ctags/ctags.h tagmanager/ctags/diff.c tagmanager/ctags/docbook.c tagmanager/ctags/entry.c tagmanager/ctags/entry.h tagmanager/ctags/fortran.c tagmanager/ctags/general.h tagmanager/ctags/get.c tagmanager/ctags/get.h tagmanager/ctags/haskell.c tagmanager/ctags/haxe.c tagmanager/ctags/html.c tagmanager/ctags/js.c tagmanager/ctags/keyword.c tagmanager/ctags/keyword.h tagmanager/ctags/latex.c tagmanager/ctags/lregex.c tagmanager/ctags/lua.c tagmanager/ctags/main.h tagmanager/ctags/make.c tagmanager/ctags/markdown.c tagmanager/ctags/matlab.c tagmanager/ctags/nestlevel.c tagmanager/ctags/nestlevel.h tagmanager/ctags/nsis.c tagmanager/ctags/objc.c tagmanager/ctags/options.c tagmanager/ctags/options.h tagmanager/ctags/parse.c tagmanager/ctags/parse.h tagmanager/ctags/parsers.h tagmanager/ctags/pascal.c tagmanager/ctags/perl.c tagmanager/ctags/php.c tagmanager/ctags/python.c tagmanager/ctags/r.c tagmanager/ctags/read.c tagmanager/ctags/read.h tagmanager/ctags/rest.c tagmanager/ctags/ruby.c tagmanager/ctags/sh.c tagmanager/ctags/sort.c tagmanager/ctags/sort.h tagmanager/ctags/sql.c tagmanager/ctags/strlist.c tagmanager/ctags/strlist.h tagmanager/ctags/tcl.c tagmanager/ctags/txt2tags.c tagmanager/ctags/verilog.c tagmanager/ctags/vhdl.c tagmanager/ctags/vstring.c tagmanager/ctags/vstring.h tagmanager/include/Makefile.am tagmanager/mio/Makefile.am tagmanager/src/Makefile.am tagmanager/src/tm_file_entry.c tagmanager/src/tm_file_entry.h tagmanager/src/tm_project.c tagmanager/src/tm_project.h tagmanager/src/tm_source_file.c tagmanager/src/tm_source_file.h tagmanager/src/tm_symbol.c tagmanager/src/tm_symbol.h tagmanager/src/tm_tag.c tagmanager/src/tm_tag.h tagmanager/src/tm_tagmanager.c tagmanager/src/tm_tagmanager.h tagmanager/src/tm_work_object.c tagmanager/src/tm_work_object.h tagmanager/src/tm_workspace.c tagmanager/src/tm_workspace.h Modified: configure.ac 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -105,8 +105,9 @@ AC_CONFIG_FILES([ icons/48x48/Makefile icons/scalable/Makefile tagmanager/Makefile - tagmanager/include/Makefile + tagmanager/ctags/Makefile tagmanager/mio/Makefile + tagmanager/src/Makefile scintilla/Makefile scintilla/include/Makefile src/Makefile Modified: plugins/Makefile.am 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -38,7 +38,7 @@ MINGW_CFLAGS = \ -DGTK \ -I$(top_srcdir) \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/tagmanager/include \ + -I$(top_srcdir)/tagmanager/src \ -I$(top_srcdir)/scintilla/include \ $(GTK_CFLAGS) \ $(PLUGIN_CFLAGS) @@ -106,7 +106,7 @@ AM_CPPFLAGS = \ -DDATADIR=\"$(datadir)\" \ -DGTK \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/tagmanager/include \ + -I$(top_srcdir)/tagmanager/src \ -I$(top_srcdir)/scintilla/include \ $(GTK_CFLAGS) \ $(PLUGIN_CFLAGS) Modified: src/Makefile.am 30 files changed, 23 insertions(+), 7 deletions(-) =================================================================== @@ -74,8 +74,11 @@ geany_include_HEADERS = \ utils.h -INCLUDES = -I$(top_srcdir) -I$(srcdir)/../scintilla/include -I$(srcdir)/../tagmanager/include \ - -I$(topsrcdir)/tagmanager/mio @GTK_CFLAGS@ @GTHREAD_CFLAGS@ +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/scintilla/include \ + -I$(top_srcdir)/tagmanager/src \ + @GTK_CFLAGS@ @GTHREAD_CFLAGS@ # tell automake we have a C++ file so it uses the C++ linker we need for Scintilla nodist_EXTRA_geany_SOURCES = dummy.cxx @@ -86,9 +89,16 @@ if MINGW geany_SOURCES = $(SRCS) win32.c win32.h -geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a ../tagmanager/mio/libmio.a \ - @GTK_LIBS@ @GTHREAD_LIBS@ $(INTLLIBS) -lole32 -luuid -liberty -lwsock32 \ - geany_private.res +geany_LDADD = \ + $(top_builddir)/scintilla/libscintilla.a \ + $(top_builddir)/tagmanager/ctags/libctags.a \ + $(top_builddir)/tagmanager/mio/libmio.a \ + $(top_builddir)/tagmanager/src/libtagmanager.a \ + @GTK_LIBS@ \ + @GTHREAD_LIBS@ \ + $(INTLLIBS) \ + -lole32 -luuid -liberty -lwsock32 \ + geany_private.res AM_CFLAGS = -DGEANY_DATADIR=\"data\" \ -DGEANY_DOCDIR=\"\" \ @@ -114,8 +124,14 @@ else geany_SOURCES = $(SRCS) vte.c vte.h -geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a ../tagmanager/mio/libmio.a \ - @GTK_LIBS@ @GTHREAD_LIBS@ $(INTLLIBS) +geany_LDADD = \ + $(top_builddir)/scintilla/libscintilla.a \ + $(top_builddir)/tagmanager/ctags/libctags.a \ + $(top_builddir)/tagmanager/mio/libmio.a \ + $(top_builddir)/tagmanager/src/libtagmanager.a \ + @GTK_LIBS@ \ + @GTHREAD_LIBS@ \ + $(INTLLIBS) AM_CFLAGS = -DGEANY_DATADIR=\""$(datadir)"\" \ -DGEANY_DOCDIR=\""$(docdir)"\" \ Modified: tagmanager/Makefile.am 83 files changed, 2 insertions(+), 81 deletions(-) =================================================================== @@ -1,85 +1,6 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = mio include -INCLUDES = -I$(srcdir)/include $(GTK_CFLAGS) -I$(srcdir)/mio -I$(srcdir) +SUBDIRS = ctags mio src -AM_CFLAGS = -DG_LOG_DOMAIN=\""Tagmanager"\" - -EXTRA_DIST =\ +EXTRA_DIST = \ makefile.win32 - -noinst_LIBRARIES = libtagmanager.a - -libtagmanager_a_SOURCES =\ - general.h\ - keyword.h\ - parsers.h\ - sort.h\ - vstring.h\ - ctags.h\ - entry.h\ - get.h\ - main.h\ - nestlevel.h\ - read.h\ - parse.h\ - strlist.h\ - args.c\ - args.h\ - abc.c\ - basic.c\ - c.c\ - cobol.c\ - conf.c\ - css.c\ - diff.c\ - docbook.c\ - fortran.c\ - haskell.c\ - haxe.c\ - html.c\ - js.c\ - lua.c\ - make.c\ - asm.c\ - latex.c\ - lregex.c\ - matlab.c\ - markdown.c\ - objc.c\ - pascal.c\ - perl.c\ - rest.c\ - ruby.c\ - sql.c\ - php.c\ - python.c\ - tcl.c\ - sh.c\ - txt2tags.c\ - vhdl.c\ - verilog.c\ - actionscript.c\ - nsis.c\ - r.c \ - ctags.c\ - entry.c\ - get.c\ - keyword.c\ - nestlevel.c\ - options.h\ - options.c\ - parse.c\ - read.c\ - sort.c\ - strlist.c\ - vstring.c\ - tm_workspace.c\ - tm_work_object.c\ - tm_source_file.c\ - tm_project.c\ - tm_tag.c\ - tm_symbol.c\ - tm_file_entry.c\ - tm_tagmanager.c - Modified: tagmanager/ctags/Makefile.am 80 files changed, 80 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,80 @@ +AM_CPPFLAGS = \ + -I$(srcdir) \ + -I$(srcdir)/.. \ + -DG_LOG_DOMAIN=\"CTags\" +AM_CFLAGS = \ + $(GTK_CFLAGS) + +EXTRA_DIST = \ + makefile.win32 + +noinst_LIBRARIES = libctags.a + +parsers = \ + abc.c \ + actionscript.c \ + asm.c \ + basic.c \ + c.c \ + cobol.c \ + conf.c \ + css.c \ + diff.c \ + docbook.c \ + fortran.c \ + haskell.c \ + haxe.c \ + html.c \ + js.c \ + latex.c \ + lregex.c \ + lua.c \ + make.c \ + markdown.c \ + matlab.c \ + nsis.c \ + objc.c \ + pascal.c \ + perl.c \ + php.c \ + python.c \ + r.c \ + rest.c \ + ruby.c \ + sh.c \ + sql.c \ + tcl.c \ + txt2tags.c \ + verilog.c \ + vhdl.c + +libctags_a_SOURCES = \ + args.c \ + args.h \ + ctags.c \ + ctags.h \ + entry.c \ + entry.h \ + general.h \ + get.c \ + get.h \ + keyword.c \ + keyword.h \ + main.h \ + nestlevel.c \ + nestlevel.h \ + options.c \ + options.h \ + parse.c \ + parse.h \ + parsers.h \ + read.c \ + read.h \ + sort.c \ + sort.h \ + strlist.c \ + strlist.h \ + vstring.c \ + vstring.h \ + $(parsers) + Modified: tagmanager/ctags/abc.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/actionscript.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/args.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/args.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/asm.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/basic.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/c.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/cobol.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/conf.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/css.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/ctags.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/ctags.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/diff.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/docbook.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/entry.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/entry.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/fortran.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/general.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/get.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/get.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/haskell.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/haxe.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/html.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/js.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/keyword.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/keyword.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/latex.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/lregex.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/lua.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/main.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/make.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/markdown.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/matlab.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/nestlevel.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/nestlevel.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/nsis.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/objc.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/options.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/options.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/parse.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/parse.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/parsers.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/pascal.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/perl.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/php.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/python.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/r.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/read.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/read.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/rest.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/ruby.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/sh.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/sort.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/sort.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/sql.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/strlist.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/strlist.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/tcl.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/txt2tags.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/verilog.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/vhdl.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/vstring.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/ctags/vstring.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/include/Makefile.am 10 files changed, 0 insertions(+), 10 deletions(-) =================================================================== @@ -1,10 +0,0 @@ -tagmanager_includedir = $(includedir)/geany/tagmanager -tagmanager_include_HEADERS = \ - tm_project.h \ - tm_source_file.h \ - tm_tag.h \ - tm_work_object.h \ - tm_workspace.h \ - tm_symbol.h \ - tm_tagmanager.h \ - tm_file_entry.h Modified: tagmanager/mio/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,5 +1,3 @@ -# $id$ - noinst_LIBRARIES = libmio.a AM_CPPFLAGS = -DG_LOG_DOMAIN=\"MIO\" #-DMIO_DEBUG Modified: tagmanager/src/Makefile.am 34 files changed, 34 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,34 @@ +AM_CPPFLAGS = \ + -I$(srcdir) \ + -I$(srcdir)/.. \ + -I$(srcdir)/../ctags \ + -DG_LOG_DOMAIN=\"Tagmanager\" +AM_CFLAGS = \ + $(GTK_CFLAGS) + +EXTRA_DIST = \ + makefile.win32 + +noinst_LIBRARIES = libtagmanager.a + +tagmanager_includedir = $(includedir)/geany/tagmanager +tagmanager_include_HEADERS = \ + tm_file_entry.h \ + tm_project.h \ + tm_source_file.h \ + tm_symbol.h \ + tm_tag.h \ + tm_tagmanager.h \ + tm_work_object.h \ + tm_workspace.h + + +libtagmanager_a_SOURCES =\ + tm_file_entry.c \ + tm_project.c \ + tm_source_file.c \ + tm_symbol.c \ + tm_tag.c \ + tm_tagmanager.c \ + tm_work_object.c \ + tm_workspace.c Modified: tagmanager/src/tm_file_entry.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/src/tm_file_entry.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/src/tm_project.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/src/tm_project.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/src/tm_source_file.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/src/tm_source_file.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/src/tm_symbol.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/src/tm_symbol.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/src/tm_tag.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/src/tm_tag.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/src/tm_tagmanager.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/src/tm_tagmanager.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/src/tm_work_object.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/src/tm_work_object.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/src/tm_workspace.c 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tagmanager/src/tm_workspace.h 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 13f3ee: Update Waf build system
by Colomban Wendling 04 Jul '12

04 Jul '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 08 May 2012 21:01:23 Commit: 13f3ee5e9982f627a743238defa5c5421518cf7e https://github.com/geany/geany/commit/13f3ee5e9982f627a743238defa5c5421518c… Log Message: ----------- Update Waf build system Modified Paths: -------------- wscript Modified: wscript 103 files changed, 78 insertions(+), 25 deletions(-) =================================================================== @@ -60,23 +60,65 @@ out = '_build_' mio_sources = set(['tagmanager/mio/mio.c']) +ctags_sources = set([ + 'tagmanager/ctags/args.c', + 'tagmanager/ctags/abc.c', + 'tagmanager/ctags/actionscript.c', + 'tagmanager/ctags/asm.c', + 'tagmanager/ctags/basic.c', + 'tagmanager/ctags/c.c', + 'tagmanager/ctags/cobol.c', + 'tagmanager/ctags/conf.c', + 'tagmanager/ctags/css.c', + 'tagmanager/ctags/ctags.c', + 'tagmanager/ctags/diff.c', + 'tagmanager/ctags/docbook.c', + 'tagmanager/ctags/entry.c', + 'tagmanager/ctags/fortran.c', + 'tagmanager/ctags/get.c', + 'tagmanager/ctags/haskell.c', + 'tagmanager/ctags/haxe.c', + 'tagmanager/ctags/html.c', + 'tagmanager/ctags/js.c', + 'tagmanager/ctags/keyword.c', + 'tagmanager/ctags/latex.c', + 'tagmanager/ctags/lregex.c', + 'tagmanager/ctags/lua.c', + 'tagmanager/ctags/make.c', + 'tagmanager/ctags/markdown.c', + 'tagmanager/ctags/matlab.c', + 'tagmanager/ctags/nsis.c', + 'tagmanager/ctags/nestlevel.c', + 'tagmanager/ctags/objc.c', + 'tagmanager/ctags/options.c', + 'tagmanager/ctags/parse.c', + 'tagmanager/ctags/pascal.c', + 'tagmanager/ctags/r.c', + 'tagmanager/ctags/perl.c', + 'tagmanager/ctags/php.c', + 'tagmanager/ctags/python.c', + 'tagmanager/ctags/read.c', + 'tagmanager/ctags/rest.c', + 'tagmanager/ctags/ruby.c', + 'tagmanager/ctags/sh.c', + 'tagmanager/ctags/sort.c', + 'tagmanager/ctags/sql.c', + 'tagmanager/ctags/strlist.c', + 'tagmanager/ctags/txt2tags.c', + 'tagmanager/ctags/tcl.c', + 'tagmanager/ctags/vhdl.c', + 'tagmanager/ctags/verilog.c', + 'tagmanager/ctags/vstring.c']) + tagmanager_sources = set([ - 'tagmanager/args.c', 'tagmanager/abc.c', 'tagmanager/actionscript.c', 'tagmanager/asm.c', - 'tagmanager/basic.c', 'tagmanager/c.c', 'tagmanager/cobol.c', - 'tagmanager/conf.c', 'tagmanager/css.c', 'tagmanager/ctags.c', 'tagmanager/diff.c', - 'tagmanager/docbook.c', 'tagmanager/entry.c', 'tagmanager/fortran.c', 'tagmanager/get.c', - 'tagmanager/haskell.c', 'tagmanager/haxe.c', 'tagmanager/html.c', 'tagmanager/js.c', - 'tagmanager/keyword.c', 'tagmanager/latex.c', 'tagmanager/lregex.c', 'tagmanager/lua.c', - 'tagmanager/make.c', 'tagmanager/markdown.c', 'tagmanager/matlab.c', 'tagmanager/nsis.c', - 'tagmanager/nestlevel.c', 'tagmanager/objc.c', 'tagmanager/options.c', - 'tagmanager/parse.c', 'tagmanager/pascal.c', 'tagmanager/r.c', - 'tagmanager/perl.c', 'tagmanager/php.c', 'tagmanager/python.c', 'tagmanager/read.c', - 'tagmanager/rest.c', 'tagmanager/ruby.c', 'tagmanager/sh.c', 'tagmanager/sort.c', - 'tagmanager/sql.c', 'tagmanager/strlist.c', 'tagmanager/txt2tags.c', 'tagmanager/tcl.c', - 'tagmanager/tm_file_entry.c', - 'tagmanager/tm_project.c', 'tagmanager/tm_source_file.c', 'tagmanager/tm_symbol.c', - 'tagmanager/tm_tag.c', 'tagmanager/tm_tagmanager.c', 'tagmanager/tm_work_object.c', - 'tagmanager/tm_workspace.c', 'tagmanager/vhdl.c', 'tagmanager/verilog.c', 'tagmanager/vstring.c']) + 'tagmanager/src/tm_file_entry.c', + 'tagmanager/src/tm_project.c', + 'tagmanager/src/tm_source_file.c', + 'tagmanager/src/tm_symbol.c', + 'tagmanager/src/tm_tag.c', + 'tagmanager/src/tm_tagmanager.c', + 'tagmanager/src/tm_work_object.c', + 'tagmanager/src/tm_workspace.c']) scintilla_sources = set(['scintilla/gtk/scintilla-marshal.c']) @@ -255,19 +297,30 @@ def build(bld): bld.new_task_gen( features = ['c', 'cshlib'], source = 'plugins/%s.c' % plugin_name, - includes = ['.', 'src/', 'scintilla/include', 'tagmanager/include'], + includes = ['.', 'src/', 'scintilla/include', 'tagmanager/src'], defines = 'G_LOG_DOMAIN="%s"' % plugin_name, target = plugin_name, uselib = ['GTK', 'GLIB', 'GMODULE'], install_path = instpath) + # CTags + bld.new_task_gen( + features = ['c', 'cstlib'], + source = ctags_sources, + name = 'ctags', + target = 'ctags', + includes = ['.', 'tagmanager', 'tagmanager/ctags'], + defines = 'G_LOG_DOMAIN="CTags"', + uselib = ['GLIB'], + install_path = None) # do not install this library + # Tagmanager bld.new_task_gen( features = ['c', 'cstlib'], source = tagmanager_sources, name = 'tagmanager', target = 'tagmanager', - includes = ['.', 'tagmanager', 'tagmanager/include'], + includes = ['.', 'tagmanager', 'tagmanager/ctags'], defines = 'G_LOG_DOMAIN="Tagmanager"', uselib = ['GTK', 'GLIB'], install_path = None) # do not install this library @@ -307,11 +360,11 @@ def build(bld): name = 'geany', target = 'geany', source = geany_sources, - includes = ['.', 'scintilla/include/', 'tagmanager/include/'], + includes = ['.', 'scintilla/include', 'tagmanager/src'], defines = ['G_LOG_DOMAIN="Geany"', 'GEANY_PRIVATE'], linkflags = [] if is_win32 else ['-Wl,--export-dynamic'], uselib = ['GTK', 'GLIB', 'GMODULE', 'GIO', 'GTHREAD', 'WIN32', 'SUNOS_SOCKET'], - use = ['scintilla', 'tagmanager', 'mio']) + use = ['scintilla', 'ctags', 'tagmanager', 'mio']) # geanyfunctions.h bld.new_task_gen( @@ -402,11 +455,11 @@ def build(bld): scintilla/include/SciLexer.h scintilla/include/Scintilla.h scintilla/include/Scintilla.iface scintilla/include/ScintillaWidget.h ''') bld.install_files('${PREFIX}/include/geany/tagmanager', ''' - tagmanager/include/tm_file_entry.h tagmanager/include/tm_project.h - tagmanager/include/tm_source_file.h - tagmanager/include/tm_symbol.h tagmanager/include/tm_tag.h - tagmanager/include/tm_tagmanager.h tagmanager/include/tm_work_object.h - tagmanager/include/tm_workspace.h ''') + tagmanager/src/tm_file_entry.h tagmanager/src/tm_project.h + tagmanager/src/tm_source_file.h + tagmanager/src/tm_symbol.h tagmanager/src/tm_tag.h + tagmanager/src/tm_tagmanager.h tagmanager/src/tm_work_object.h + tagmanager/src/tm_workspace.h ''') # Docs base_dir = '${PREFIX}' if is_win32 else '${DOCDIR}' ext = '.txt' if is_win32 else '' @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] bfa2db: Merge branch 'tm/tree-refactoring'
by Nick Treleaven 04 Jul '12

04 Jul '12

1 0

[geany/geany] c72dce: Merge remote-tracking branch 'origin/master' into tm/tree-refactoring
by Nick Treleaven 04 Jul '12

04 Jul '12

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Wed, 04 Jul 2012 11:15:53 Commit: c72dce06a55594247cad232d78bec9868f585587 https://github.com/geany/geany/commit/c72dce06a55594247cad232d78bec9868f585… Log Message: ----------- Merge remote-tracking branch 'origin/master' into tm/tree-refactoring Conflicts: makefile.win32 src/makefile.win32 Modified Paths: -------------- ChangeLog ChangeLog.pre-1-22 Makefile.am NEWS README README.Packagers THANKS configure.ac data/colorschemes/alt.conf data/filetypes.Genie.conf data/filetypes.ada data/filetypes.asm data/filetypes.c data/filetypes.common data/filetypes.cpp data/filetypes.css data/filetypes.d data/filetypes.perl data/filetypes.sh data/filetypes.vala doc/geany.1.in doc/geany.html doc/geany.txt doc/making-a-release doc/plugins.dox doc/pluginsignals.c doc/pluginsymbols.c geany.nsi geany_private.rc m4/geany-i18n.m4 makefile.win32 plugins/Makefile.am plugins/classbuilder.c plugins/demoplugin.c plugins/export.c plugins/filebrowser.c plugins/geanyplugin.h plugins/htmlchars.c plugins/saveactions.c plugins/splitwindow.c po/de.po po/es.po po/fr.po po/hu.po po/it.po po/kk.po po/pt_BR.po po/sv.po po/tr.po po/zh_CN.po scintilla/gtk/PlatGTK.cxx scintilla/gtk/ScintillaGTK.cxx scintilla/include/ILexer.h scintilla/include/Platform.h scintilla/include/SciLexer.h scintilla/include/Scintilla.h scintilla/include/Scintilla.iface scintilla/lexers/LexAda.cxx scintilla/lexers/LexAsm.cxx scintilla/lexers/LexBash.cxx scintilla/lexers/LexBasic.cxx scintilla/lexers/LexCPP.cxx scintilla/lexers/LexCSS.cxx scintilla/lexers/LexD.cxx scintilla/lexers/LexHTML.cxx scintilla/lexers/LexNsis.cxx scintilla/lexers/LexOthers.cxx scintilla/lexers/LexPascal.cxx scintilla/lexers/LexPerl.cxx scintilla/lexers/LexRuby.cxx scintilla/lexers/LexSQL.cxx scintilla/lexers/LexVHDL.cxx scintilla/lexlib/LexAccessor.h scintilla/lexlib/PropSetSimple.cxx scintilla/scintilla_changes.patch scintilla/src/AutoComplete.cxx scintilla/src/AutoComplete.h scintilla/src/CallTip.cxx scintilla/src/CallTip.h scintilla/src/CellBuffer.cxx scintilla/src/CellBuffer.h scintilla/src/Decoration.cxx scintilla/src/Document.cxx scintilla/src/Document.h scintilla/src/Editor.cxx scintilla/src/Editor.h scintilla/src/FontQuality.h scintilla/src/Indicator.cxx scintilla/src/Indicator.h scintilla/src/LineMarker.cxx scintilla/src/LineMarker.h scintilla/src/PerLine.cxx scintilla/src/PerLine.h scintilla/src/PositionCache.cxx scintilla/src/PositionCache.h scintilla/src/ScintillaBase.cxx scintilla/src/ScintillaBase.h scintilla/src/SplitVector.h scintilla/src/Style.cxx scintilla/src/Style.h scintilla/src/UniConversion.cxx scintilla/src/UniConversion.h scintilla/src/ViewStyle.cxx scintilla/src/ViewStyle.h scintilla/src/XPM.cxx scintilla/src/XPM.h scintilla/version.txt scripts/update-scintilla.sh src/about.c src/about.h src/build.c src/build.h src/callbacks.c src/callbacks.h src/dialogs.c src/dialogs.h src/document.c src/document.h src/documentprivate.h src/editor.c src/editor.h src/encodings.c src/encodings.h src/filetypes.c src/filetypes.h src/filetypesprivate.h src/gb.c src/geany.h src/geanyentryaction.c src/geanyentryaction.h src/geanymenubuttonaction.c src/geanymenubuttonaction.h src/geanyobject.c src/geanyobject.h src/geanywraplabel.c src/geanywraplabel.h src/highlighting.c src/highlighting.h src/highlightingmappings.h src/images.c src/keybindings.c src/keybindings.h src/keyfile.c src/keyfile.h src/log.c src/log.h src/main.c src/main.h src/makefile.win32 src/msgwindow.c src/msgwindow.h src/navqueue.c src/navqueue.h src/notebook.c src/notebook.h src/plugindata.h src/pluginprivate.h src/plugins.c src/plugins.h src/pluginutils.c src/pluginutils.h src/prefs.c src/prefs.h src/printing.c src/printing.h src/project.c src/project.h src/projectprivate.h src/sciwrappers.c src/sciwrappers.h src/search.c src/search.h src/sidebar.c src/sidebar.h src/socket.c src/socket.h src/stash.c src/stash.h src/support.h src/symbols.c src/symbols.h src/templates.c src/templates.h src/toolbar.c src/toolbar.h src/tools.c src/tools.h src/ui_utils.c src/ui_utils.h src/utils.c src/utils.h src/vte.c src/vte.h src/win32.c src/win32.h tagmanager/ctags/c.c win32-config.h wscript Modified: ChangeLog 6877 files changed, 2 insertions(+), 6875 deletions(-) =================================================================== No diff available, check online Modified: ChangeLog.pre-1-22 6875 files changed, 6875 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: Makefile.am 20 files changed, 13 insertions(+), 7 deletions(-) =================================================================== @@ -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,11 +86,19 @@ 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 \ @@ -97,9 +106,6 @@ sign: 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 Modified: NEWS 33 files changed, 26 insertions(+), 7 deletions(-) =================================================================== @@ -1,4 +1,10 @@ -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. @@ -6,28 +12,39 @@ Geany 1.22 (unreleased) * 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) Modified: README 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -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 Modified: README.Packagers 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -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 Modified: THANKS 16 files changed, 8 insertions(+), 8 deletions(-) =================================================================== @@ -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,10 +127,10 @@ 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 @@ -138,7 +138,7 @@ Krzysztof Troska <elleander86(at)gmail(dot)com> - pl_PL Wojciech Świderski <woj.swiderski(a)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 Modified: configure.ac 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -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]) Modified: data/colorschemes/alt.conf 1 files changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -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 Modified: data/filetypes.Genie.conf 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -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 subsu bsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem [lexer_properties] lexer.cpp.triplequoted.strings=1 Modified: data/filetypes.ada 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -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 Modified: data/filetypes.asm 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -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 Modified: data/filetypes.c 7 files changed, 4 insertions(+), 3 deletions(-) =================================================================== @@ -9,7 +9,7 @@ word=keyword_1 word2=keyword_2 string=string_1 -character=string_1 +character=character uuid=other preprocessor=preprocessor operator=operator @@ -23,13 +23,14 @@ 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 ta bleofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem [lexer_properties] styling.within.preprocessor=1 Modified: data/filetypes.common 1 files changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -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 Modified: data/filetypes.cpp 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -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 ta bleofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem [lexer_properties] styling.within.preprocessor=1 Modified: data/filetypes.css 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -16,6 +16,7 @@ attribute=attribute value=value id=number identifier2=keyword_2 +variable=identifier_1 important=extra directive=preprocessor identifier3=keyword_3 Modified: data/filetypes.d 3 files changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -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 Modified: data/filetypes.perl 10 files changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -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 Modified: data/filetypes.sh 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -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 Modified: data/filetypes.vala 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -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 subsu bsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem [lexer_properties] styling.within.preprocessor=1 Modified: doc/geany.1.in 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -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" Modified: doc/geany.html 42 files changed, 25 insertions(+), 17 deletions(-) =================================================================== @@ -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 Nick Treleaven Frank Lanitz - Colomban Wendling</td></tr> + Colomban Wendling + 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> -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 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>"Smart" 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. -"Geany 1.22".</td> +"Geany 1.23".</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 "<tt class="docutils literal">make doc</tt>" 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 "<tt class="docutils literal">make pdf</tt>" which should generate a file called -geany-1.22.pdf. +geany-1.23.pdf. After you are happy with your changes, create a patch e.g. by using: <pre class="literal-block"> % git diff geany.txt > 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> Modified: doc/geany.txt 30 files changed, 18 insertions(+), 12 deletions(-) =================================================================== @@ -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 Modified: doc/making-a-release 33 files changed, 17 insertions(+), 16 deletions(-) =================================================================== @@ -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. Modified: doc/plugins.dox 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -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 Modified: doc/pluginsignals.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -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 Modified: doc/pluginsymbols.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -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 Modified: geany.nsi 14 files changed, 9 insertions(+), 5 deletions(-) =================================================================== @@ -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\*" Modified: geany_private.rc 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -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" Modified: m4/geany-i18n.m4 5 files changed, 1 insertions(+), 4 deletions(-) =================================================================== @@ -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 Modified: makefile.win32 57 files changed, 33 insertions(+), 24 deletions(-) =================================================================== @@ -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" Modified: plugins/Makefile.am 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -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) Modified: plugins/classbuilder.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -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 Modified: plugins/demoplugin.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -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 Modified: plugins/export.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -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 Modified: plugins/filebrowser.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -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 Modified: plugins/geanyplugin.h 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -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 Modified: plugins/htmlchars.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -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 Modified: plugins/saveactions.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -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 Modified: plugins/splitwindow.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -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 Modified: po/de.po 1865 files changed, 840 insertions(+), 1025 deletions(-) =================================================================== No diff available, check online Modified: po/es.po 21 files changed, 10 insertions(+), 11 deletions(-) =================================================================== @@ -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(a)gmail.com>\n" "Language-Team: Español <geany-i18n(a)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." Modified: po/fr.po 1760 files changed, 759 insertions(+), 1001 deletions(-) =================================================================== No diff available, check online Modified: po/hu.po 1707 files changed, 724 insertions(+), 983 deletions(-) =================================================================== No diff available, check online Modified: po/it.po 9 files changed, 4 insertions(+), 5 deletions(-) =================================================================== @@ -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(a)gmail.com>\n" "Language-Team: <geany-i18n(a)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:" Modified: po/kk.po 446 files changed, 222 insertions(+), 224 deletions(-) =================================================================== @@ -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(a)gmail.com>\n" "Language-Team: Kazakh <kk_KZ(a)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 "Startup" -msgstr "Қосылу" +msgstr "Іске қосылу" #: ../data/geany.glade.h:32 msgid "Save window position and geometry" @@ -181,12 +181,12 @@ msgstr "Сөндіру" #: ../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 "Жолдар" #: ../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 "Таңдамалы" #: ../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,7 +825,7 @@ 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 ' '" @@ -833,15 +833,15 @@ 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 [ ]" @@ -849,7 +849,7 @@ 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 \" \"" @@ -857,7 +857,7 @@ msgstr "Тырнақша \" \"" #: ../data/geany.glade.h:186 msgid "Auto-close double quote when typing an opening one" -msgstr "" +msgstr "Ашылу қос тырнақшасын терген кезде, жабылу тырнақшасын енгізу" #: ../data/geany.glade.h:187 msgid "Auto-close quotes and brackets" @@ -977,7 +977,7 @@ msgstr "" #: ../data/geany.glade.h:213 msgid "Enabled" -msgstr "Қосулы" +msgstr "Іске қосулы" #: ../data/geany.glade.h:214 msgid "Long line marker" @@ -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 "Virtual spaces" -msgstr "" +msgstr "Виртуалды бос аралықтар" #: ../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 "Commands" msgstr "Командалар" -#: ../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 "Template data" -msgstr "" +msgstr "Үлгілер мәліметі" #: ../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,11 +1700,11 @@ 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 "Алдыңғы маркерге ө_ту" @@ -1714,15 +1712,15 @@ msgstr "Алдыңғы маркерге ө_ту" 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,9 +1970,8 @@ msgid "_Keyboard Shortcuts" msgstr "П_ернетақта жарлықтары" #: ../data/geany.glade.h:450 -#, fuzzy msgid "Debug _Messages" -msgstr "Жөндеу хабарламалары" +msgstr "Жөндеу ха_барламалары" #: ../data/geany.glade.h:451 msgid "_Website" @@ -1982,16 +1979,15 @@ 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 "" -#: ../src/highlighting.c:1358 -#, fuzzy +#: ../src/highlighting.c:1365 msgid "Color Schemes" -msgstr "Тү_стер схемалары" +msgstr "Түстер схемалары" #. visual group order -#: ../src/keybindings.c:223 ../src/symbols.c:714 +#: ../src/keybindings.c:226 ../src/symbols.c:714 msgid "File" msgstr "Файл" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:228 msgid "Clipboard" msgstr "Алмасу буфері" -#: ../src/keybindings.c:226 +#: ../src/keybindings.c:229 msgid "Select" msgstr "Таңдау" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:230 msgid "Format" msgstr "Пішімі" -#: ../src/keybindings.c:228 +#: ../src/keybindings.c:231 msgid "Insert" msgstr "Енгізу" -#: ../src/keybindings.c:229 +#: ../src/keybindings.c:232 msgid "Settings" msgstr "Баптаулар" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:233 msgid "Search" msgstr "Іздеу" -#: ../src/keybindings.c:231 +#: ../src/keybindings.c:234 msgid "Go to" msgstr "Өту" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:235 msgid "View" msgstr "Қарау" -#: ../src/keybindings.c:233 +#: ../src/keybindings.c:236 msgid "Document" msgstr "Құжат" -#: ../src/keybindings.c:235 ../src/keybindings.c:582 ../src/project.c:444 -#: ../src/ui_utils.c:1980 +#: ../src/keybindings.c:238 ../src/keybindings.c:585 ../src/project.c:444 +#: ../src/ui_utils.c:1981 msgid "Build" msgstr "Құрастыру" -#: ../src/keybindings.c:237 ../src/keybindings.c:607 +#: ../src/keybindings.c:240 ../src/keybindings.c:610 msgid "Help" msgstr "Көмек" -#: ../src/keybindings.c:238 +#: ../src/keybindings.c:241 msgid "Focus" msgstr "Фокус" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:242 msgid "Notebook tab" msgstr "Беттер" -#: ../src/keybindings.c:248 ../src/keybindings.c:276 +#: ../src/keybindings.c:251 ../src/keybindings.c:279 msgid "New" msgstr "Жаңа" -#: ../src/keybindings.c:250 ../src/keybindings.c:278 +#: ../src/keybindings.c:253 ../src/keybindings.c:281 msgid "Open" msgstr "Ашу" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:256 msgid "Open selected file" msgstr "Таңдалған файлды ашу" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:258 msgid "Save" msgstr "Сақтау" -#: ../src/keybindings.c:257 ../src/toolbar.c:55 +#: ../src/keybindings.c:260 ../src/toolbar.c:55 msgid "Save as" msgstr "Қалайша сақтау" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:262 msgid "Save all" msgstr "Барлығын сақтау" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:265 msgid "Print" msgstr "Баспаға шығару" -#: ../src/keybindings.c:264 ../src/keybindings.c:283 +#: ../src/keybindings.c:267 ../src/keybindings.c:286 msgid "Close" msgstr "Жабу" -#: ../src/keybindings.c:266 +#: ../src/keybindings.c:269 msgid "Close all" msgstr "Барлығын жабу" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:272 msgid "Reload file" msgstr "Файлды қайта жүктеу" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:274 msgid "Re-open last closed tab" msgstr "Соңғы жабылған бетті қайта ашу" -#: ../src/keybindings.c:288 +#: ../src/keybindings.c:291 msgid "Undo" msgstr "Болдырмау" -#: ../src/keybindings.c:290 +#: ../src/keybindings.c:293 msgid "Redo" msgstr "Қайталау" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:302 msgid "Delete to line end" msgstr "Жол соңына дейін өшіру" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:308 msgid "Scroll to current line" msgstr "Ағымдағы жолға дейін айналдыру" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:310 msgid "Scroll up the view by one line" msgstr "Көріністі бір жолға үстіне айналдыру" -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:312 msgid "Scroll down the view by one line" msgstr "Көріністі бір жолға төменге айналдыру" -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:314 msgid "Complete snippet" msgstr "" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:316 msgid "Move cursor in snippet" msgstr "" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:318 msgid "Suppress snippet completion" msgstr "" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:320 msgid "Context Action" msgstr "Контекст әрекеті" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:322 msgid "Complete word" msgstr "Сөзді толықтыру" -#: ../src/keybindings.c:321 +#: ../src/keybindings.c:324 msgid "Show calltip" msgstr "" -#: ../src/keybindings.c:323 +#: ../src/keybindings.c:326 msgid "Show macro list" msgstr "Макростар тізімін көрсету" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:328 msgid "Word part completion" msgstr "Сөз бөлігін толықтыру" -#: ../src/keybindings.c:327 +#: ../src/keybindings.c:330 msgid "Move line(s) up" msgstr "Жол(дар)ды жоғары жылжыту" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:332 msgid "Move line(s) down" msgstr "Жол(дар)ды төмен жылжыту" -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:337 msgid "Cut" msgstr "Қиып алу" -#: ../src/keybindings.c:336 +#: ../src/keybindings.c:339 msgid "Copy" msgstr "Көшіру" -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:341 msgid "Paste" msgstr "Кірістіру" -#: ../src/keybindings.c:349 +#: ../src/keybindings.c:352 msgid "Select All" msgstr "Барлығын таңдау" -#: ../src/keybindings.c:351 +#: ../src/keybindings.c:354 msgid "Select current word" msgstr "Ағымдағы сөзді таңдау" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:362 msgid "Select to previous word part" msgstr "" -#: ../src/keybindings.c:361 +#: ../src/keybindings.c:364 msgid "Select to next word part" msgstr "" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:372 msgid "Toggle line commentation" msgstr "" -#: ../src/keybindings.c:372 +#: ../src/keybindings.c:375 msgid "Comment line(s)" msgstr "Жол(дар)ды комментарий қылу" -#: ../src/keybindings.c:374 +#: ../src/keybindings.c:377 msgid "Uncomment line(s)" msgstr "Жол(дар)ды комментарий емес қылу" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:379 msgid "Increase indent" msgstr "Шегінуді үлкейту" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:382 msgid "Decrease indent" msgstr "Шегінуді кішірейту" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:385 msgid "Increase indent by one space" msgstr "Шегінуді бір бос аралыққа үлкейту" -#: ../src/keybindings.c:384 +#: ../src/keybindings.c:387 msgid "Decrease indent by one space" msgstr "Шегінуді бір бос аралыққа кішірейту" -#: ../src/keybindings.c:388 +#: ../src/keybindings.c:391 msgid "Send to Custom Command 1" msgstr "1-ші таңдауыңызша командасына жіберу" -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:393 msgid "Send to Custom Command 2" msgstr "2-ші таңдауыңызша командасына жіберу" -#: ../src/keybindings.c:392 +#: ../src/keybindings.c:395 msgid "Send to Custom Command 3" msgstr "3-ші таңдауыңызша командасына жіберу" -#: ../src/keybindings.c:400 -#, fuzzy +#: ../src/keybindings.c:403 msgid "Join lines" -msgstr "Жол(дар)ды комментарий қылу" +msgstr "Жолдарды біріктіру" -#: ../src/keybindings.c:405 +#: ../src/keybindings.c:408 msgid "Insert date" msgstr "Күн / Уақытты енгізу" -#: ../src/keybindings.c:411 +#: ../src/keybindings.c:414 msgid "Insert New Line Before Current" msgstr "Ағымдағы жолға дейін жаңа жолды енгізу" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:416 msgid "Insert New Line After Current" msgstr "Ағымдағы жолдан кейін жаңа жолды енгізу" -#: ../src/keybindings.c:426 ../src/search.c:463 +#: ../src/keybindings.c:429 ../src/search.c:463 msgid "Find" msgstr "Табу" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:431 msgid "Find Next" msgstr "Келесісін табу" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:433 msgid "Find Previous" msgstr "Алдыңғысын табу" -#: ../src/keybindings.c:437 ../src/search.c:619 +#: ../src/keybindings.c:440 ../src/search.c:619 msgid "Replace" msgstr "Алмастыру" -#: ../src/keybindings.c:439 ../src/search.c:871 +#: ../src/keybindings.c:442 ../src/search.c:871 msgid "Find in Files" msgstr "Файлдардан табу" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:445 msgid "Next Message" msgstr "Келесі хабарлама" -#: ../src/keybindings.c:444 +#: ../src/keybindings.c:447 msgid "Previous Message" msgstr "Алдыңғы хабарлама" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:450 msgid "Find Usage" msgstr "Қолданылуын табу" -#: ../src/keybindings.c:450 +#: ../src/keybindings.c:453 msgid "Find Document Usage" msgstr "Құжатта қолданылуын табу" -#: ../src/keybindings.c:457 ../src/toolbar.c:66 +#: ../src/keybindings.c:460 ../src/toolbar.c:66 msgid "Navigate back a location" msgstr "Алдыңғы қадамға өту" -#: ../src/keybindings.c:459 ../src/toolbar.c:67 +#: ../src/keybindings.c:462 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "Келесі қадамға өту" -#: ../src/keybindings.c:464 +#: ../src/keybindings.c:467 msgid "Go to matching brace" msgstr "Сәйкес жақшаға өту" -#: ../src/keybindings.c:467 +#: ../src/keybindings.c:470 msgid "Toggle marker" msgstr "Маркерді қосу не сөндіру" -#: ../src/keybindings.c:476 +#: ../src/keybindings.c:479 msgid "Go to Tag Definition" msgstr "Тег анықтамасына өту" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:482 msgid "Go to Tag Declaration" msgstr "Тег жариялануына өту" -#: ../src/keybindings.c:481 +#: ../src/keybindings.c:484 msgid "Go to Start of Line" msgstr "Жол басына өту" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:486 msgid "Go to End of Line" msgstr "Жол аяғына өту" -#: ../src/keybindings.c:485 +#: ../src/keybindings.c:488 msgid "Go to End of Display Line" msgstr "Көрсетілетін жолдың соңына өту" -#: ../src/keybindings.c:487 +#: ../src/keybindings.c:490 msgid "Go to Previous Word Part" msgstr "Сөздің алдыңғы бөлігіне өту" -#: ../src/keybindings.c:489 +#: ../src/keybindings.c:492 msgid "Go to Next Word Part" msgstr "Сөздің келесі бөлігіне өту" -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:497 msgid "Toggle All Additional Widgets" msgstr "Барлық қосымша виджеттерді іске қосу/сөндіру" -#: ../src/keybindings.c:497 +#: ../src/keybindings.c:500 msgid "Fullscreen" msgstr "Толық экранға" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:502 msgid "Toggle Messages Window" msgstr "Хабарламалар терезесін іске қосу/сөндіру" -#: ../src/keybindings.c:502 +#: ../src/keybindings.c:505 msgid "Toggle Sidebar" msgstr "Бүйір панелін өшіру не қосу" -#: ../src/keybindings.c:504 +#: ../src/keybindings.c:507 msgid "Zoom In" msgstr "Үлкейту" -#: ../src/keybindings.c:506 +#: ../src/keybindings.c:509 msgid "Zoom Out" msgstr "Кішірейту" -#: ../src/keybindings.c:508 +#: ../src/keybindings.c:511 msgid "Zoom Reset" msgstr "Масштабты тастау" -#: ../src/keybindings.c:513 +#: ../src/keybindings.c:516 msgid "Switch to Editor" msgstr "Түзеткішке ауысу" -#: ../src/keybindings.c:515 +#: ../src/keybindings.c:518 msgid "Switch to Search Bar" msgstr "Іздеу өрісіне ауысу" -#: ../src/keybindings.c:517 +#: ../src/keybindings.c:520 msgid "Switch to Message Window" msgstr "Хабарламалар терезесіне ауысу" -#: ../src/keybindings.c:519 +#: ../src/keybindings.c:522 msgid "Switch to Compiler" msgstr "Компиляторға ауысу" -#: ../src/keybindings.c:521 +#: ../src/keybindings.c:524 msgid "Switch to Messages" msgstr "Хабарламаларға ауысу" -#: ../src/keybindings.c:523 +#: ../src/keybindings.c:526 msgid "Switch to Scribble" msgstr "Жазбаларға ауысу" -#: ../src/keybindings.c:525 +#: ../src/keybindings.c:528 msgid "Switch to VTE" msgstr "VTE-ге ауысу" -#: ../src/keybindings.c:527 +#: ../src/keybindings.c:530 msgid "Switch to Sidebar" msgstr "Бүйір панеліне ауысу" -#: ../src/keybindings.c:529 +#: ../src/keybindings.c:532 msgid "Switch to Sidebar Symbol List" msgstr "Бүйір панелінің таңбалар тізіміне ауысу" -#: ../src/keybindings.c:531 +#: ../src/keybindings.c:534 msgid "Switch to Sidebar Document List" msgstr "Бүйір панелінің құжаттар тізіміне ауысу" -#: ../src/keybindings.c:536 +#: ../src/keybindings.c:539 msgid "Switch to left document" msgstr "Сол жақтағы құжатқа ауысу" -#: ../src/keybindings.c:538 +#: ../src/keybindings.c:541 msgid "Switch to right document" msgstr "Оң жақтағы құжатқа ауысу" -#: ../src/keybindings.c:540 +#: ../src/keybindings.c:543 msgid "Switch to last used document" msgstr "Соңғы қолданылған құжатқа ауысу" -#: ../src/keybindings.c:543 +#: ../src/keybindings.c:546 msgid "Move document left" msgstr "Құжатты солға жылжыту" -#: ../src/keybindings.c:546 +#: ../src/keybindings.c:549 msgid "Move document right" msgstr "Құжатты оңға жылжыту" -#: ../src/keybindings.c:548 +#: ../src/keybindings.c:551 msgid "Move document first" msgstr "Құжатты бірінші етіп жылжыту" -#: ../src/keybindings.c:550 +#: ../src/keybindings.c:553 msgid "Move document last" msgstr "Құжатты соңғы етіп жылжыту" -#: ../src/keybindings.c:555 +#: ../src/keybindings.c:558 msgid "Toggle Line wrapping" msgstr "Жол тасымалдауды іске косу не сөндіру" -#: ../src/keybindings.c:557 +#: ../src/keybindings.c:560 msgid "Toggle Line breaking" msgstr "Жол үзуді іске қосу не сөндіру" -#: ../src/keybindings.c:561 +#: ../src/keybindings.c:564 msgid "Replace spaces by tabs" msgstr "Бос аралықтарды табуляциямен алмастыру" -#: ../src/keybindings.c:563 +#: ../src/keybindings.c:566 msgid "Toggle current fold" msgstr "Жазық / жиналған күйді ауыстыру" -#: ../src/keybindings.c:565 +#: ../src/keybindings.c:568 msgid "Fold all" msgstr "Барлығын жазу" -#: ../src/keybindings.c:567 +#: ../src/keybindings.c:570 msgid "Unfold all" msgstr "Барлығын жинау" -#: ../src/keybindings.c:569 +#: ../src/keybindings.c:572 msgid "Reload symbol list" msgstr "Таңбалар тізімін қайта жүктеу" -#: ../src/keybindings.c:571 +#: ../src/keybindings.c:574 msgid "Remove Markers" msgstr "Маркерлерді өшіру" -#: ../src/keybindings.c:573 +#: ../src/keybindings.c:576 msgid "Remove Error Indicators" msgstr "Қателер индикаторларын өшіру" -#: ../src/keybindings.c:575 +#: ../src/keybindings.c:578 msgid "Remove Markers and Error Indicators" msgstr "Маркерлер мен қателер индикаторларын өшіру" -#: ../src/keybindings.c:580 ../src/toolbar.c:68 +#: ../src/keybindings.c:583 ../src/toolbar.c:68 msgid "Compile" msgstr "Компиляциялау" -#: ../src/keybindings.c:584 +#: ../src/keybindings.c:587 msgid "Make all" msgstr "Барлығын жасау" -#: ../src/keybindings.c:587 +#: ../src/keybindings.c:590 msgid "Make custom target" msgstr "Таңдауыңызша мақсатты жасау" -#: ../src/keybindings.c:589 +#: ../src/keybindings.c:592 msgid "Make object" msgstr "Объектті жасау" -#: ../src/keybindings.c:591 +#: ../src/keybindings.c:594 msgid "Next error" msgstr "Келесі қате" -#: ../src/keybindings.c:593 +#: ../src/keybindings.c:596 msgid "Previous error" msgstr "Алдыңғы қате" -#: ../src/keybindings.c:595 +#: ../src/keybindings.c:598 msgid "Run" msgstr "Орындау" -#: ../src/keybindings.c:597 +#: ../src/keybindings.c:600 msgid "Build options" msgstr "Құрастыру опциялары" -#: ../src/keybindings.c:602 +#: ../src/keybindings.c:605 msgid "Show Color Chooser" msgstr "Түстер таңдаушысын көрсету" -#: ../src/keybindings.c:849 +#: ../src/keybindings.c:852 msgid "Keyboard Shortcuts" msgstr "Пернетақта жарлықтары" -#: ../src/keybindings.c:861 +#: ../src/keybindings.c:864 msgid "The following keyboard shortcuts are configurable:" msgstr "Келесі пернетақта жарлықтары баптауға келеді:" @@ -3979,9 +3972,9 @@ msgid "Do you want to close it before proceeding?" msgstr "Жалғастыру алдында оны жабуды қалайсыз ба?" #: ../src/project.c:597 -#, fuzzy, c-format +#, c-format msgid "The '%s' project is open." -msgstr "'%s' жобасы ашық боп тұр." +msgstr "'%s' жобасы ашық." #: ../src/project.c:646 msgid "The specified project name is too short." @@ -4554,9 +4547,8 @@ msgid "Load Tags" msgstr "Тегтерді жүктеу" #: ../src/symbols.c:1780 -#, fuzzy msgid "Geany tag files (*.*.tags)" -msgstr "Geany тег файлдары (*.tags)" +msgstr "Geany тег файлдары (*.*.tags)" #. For translators: the first wildcard is the filetype, the second the filename #: ../src/symbols.c:1800 @@ -4860,7 +4852,7 @@ msgstr "" #: ../src/ui_utils.c:219 #, c-format msgid "%dL" -msgstr "" +msgstr "%dж" #. RO = read-only #: ../src/ui_utils.c:225 ../src/ui_utils.c:232 @@ -4937,23 +4929,23 @@ msgstr "C++ STL" msgid "_Set Custom Date Format" msgstr "Таңдау_ыңызша күн пішімін орнату" -#: ../src/ui_utils.c:1819 +#: ../src/ui_utils.c:1820 msgid "Select Folder" msgstr "Буманы таңдау" -#: ../src/ui_utils.c:1819 +#: ../src/ui_utils.c:1820 msgid "Select File" msgstr "Файлды таңдау" -#: ../src/ui_utils.c:1978 +#: ../src/ui_utils.c:1979 msgid "Save All" msgstr "Барлығын сақтау" -#: ../src/ui_utils.c:1979 +#: ../src/ui_utils.c:1980 msgid "Close All" msgstr "Барлығын жабу" -#: ../src/ui_utils.c:2225 +#: ../src/ui_utils.c:2226 msgid "Geany cannot start!" msgstr "Geany іске қосылу сәтсіз!" @@ -5347,6 +5339,11 @@ msgid "" "%d will be replaced with the path name of the selected file without the " "filename" msgstr "" +"\"Көмегімен ашу\" кезінде қолданылатын команда. Сіз %f және %d үлгілерін " +"қолдана аласыз.\n" +"%f файл атымен, толық орналасу жолымен қоса, алмастырылады\n" +"%d таңдалған файлдың толық орналасу жолымен, сол файлдың атауына дейін, " +"алмастырылады" #: ../plugins/filebrowser.c:1235 msgid "Show hidden files" @@ -5365,7 +5362,6 @@ msgid "Use the project's base directory" msgstr "Жобаның басты бумасын қолдану" #: ../plugins/filebrowser.c:1272 -#, fuzzy msgid "" "Change the directory to the base directory of the currently opened project" msgstr "Буманы ағымдағы ашық жобасының басты бумасына ауыстыру" @@ -5381,18 +5377,18 @@ msgstr "Бұл плагин файлдарды сақтауға байланыс #: ../plugins/saveactions.c:171 #, c-format msgid "Backup Copy: Directory could not be created (%s)." -msgstr "" +msgstr "Қор көшірме: Буманы жасау мүмкін емес (%s)." #. it's unlikely that this happens #: ../plugins/saveactions.c:203 #, c-format msgid "Backup Copy: File could not be read (%s)." -msgstr "" +msgstr "Қор көшірме: Файлды оқу мүмкін емес (%s)." #: ../plugins/saveactions.c:221 #, c-format msgid "Backup Copy: File could not be saved (%s)." -msgstr "" +msgstr "Қор көшірме: Файлды сақтау мүмкін емес (%s)." #: ../plugins/saveactions.c:313 #, c-format @@ -5407,7 +5403,7 @@ msgstr "Буманы таңдау" #: ../plugins/saveactions.c:467 msgid "Backup directory does not exist or is not writable." -msgstr "" +msgstr "Қор көшірме бумасы жоқ болып тұр не оған жазуға құқық жоқ." #: ../plugins/saveactions.c:548 msgid "Auto Save" @@ -5457,10 +5453,12 @@ msgstr "К_ор көшірмелер файлдарын сақтау бумас #: ../plugins/saveactions.c:684 msgid "Date/_Time format for backup files (\"man strftime\" for details):" msgstr "" +"Қор көшірме файлдары үшін күн/уақы_т пішімі (Көбірек ақпарап үшін \"man " +"strftime\"):" #: ../plugins/saveactions.c:697 msgid "Directory _levels to include in the backup destination:" -msgstr "" +msgstr "Қор көшірмеге кіретін бума_лар тереңдігі:" #: ../plugins/splitwindow.c:34 msgid "Split Window" Modified: po/pt_BR.po 443 files changed, 215 insertions(+), 228 deletions(-) =================================================================== @@ -2,15 +2,15 @@ # Copyright (C) 2006-2011 GEANY'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Alexandre Moreira <alexandream(a)gmail.com>, 2006 -# Adrovane Marques Kade <adrovane(a)gmail.com>, 2007-2011 +# Adrovane Marques Kade <adrovane(a)gmail.com>, 2007-2012 # Rafael Peregrino da Silva <rperegrino(a)linuxmagazine.com.br>, 2011 # 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: 2011-09-17 09:54-0300\n" +"POT-Creation-Date: 2012-06-16 08:16+0200\n" +"PO-Revision-Date: 2012-06-15 20:35-0300\n" "Last-Translator: Adrovane Marques Kade <adrovane(a)gmail.com>\n" "Language-Team: Portuguese <geany-i18n(a)uvena.de>\n" "Language: pt\n" @@ -83,7 +83,7 @@ msgstr "invisível" msgid "_Insert \"include <...>\"" msgstr "_Inserir \"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 "_Inserir Espaço em Branco Alternativo" @@ -127,7 +127,7 @@ msgstr "Caracteres atuais" msgid "Match braces" msgstr "Casar delimitadores" -#: ../data/geany.glade.h:25 ../src/keybindings.c:418 +#: ../data/geany.glade.h:25 ../src/keybindings.c:421 msgid "Preferences" msgstr "Preferências" @@ -184,9 +184,9 @@ msgid "Startup path:" msgstr "Caminho inicial:" #: ../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 "" "Caminho inicial para abrir ou salvar arquivos. Deve ser um caminho absoluto. " "Deixe em branco para usar o diretório de trabalho atual." @@ -289,24 +289,19 @@ msgstr "Miscelânea" #: ../data/geany.glade.h:56 msgid "Always wrap search" -msgstr "" +msgstr "Sempre circular a pesquisa" #: ../data/geany.glade.h:57 -#, fuzzy msgid "Always wrap search around the document" -msgstr "Sempre circular a pesquisa e ocultar o diálogo Localizar" +msgstr "Sempre circular a pesquisa pelo documento" #: ../data/geany.glade.h:58 -#, fuzzy msgid "Hide the Find dialog" -msgstr "Sempre circular a pesquisa e ocultar o diálogo Localizar" +msgstr "Ocultar o diálogo Pesquisar" #: ../data/geany.glade.h:59 -#, fuzzy msgid "Hide the Find dialog after clicking Find Next/Previous" -msgstr "" -"Sempre circula a pesquisa pelo documento e oculta o diálogo Localizar após " -"clicar Próximo/Anterior" +msgstr "Oculta o diálogo Pesquisar após clicar em Encontrar Próximo/Anterior" #: ../data/geany.glade.h:60 msgid "Use the current word under the cursor for Find dialogs" @@ -497,9 +492,8 @@ msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Chama o comando Exibir->Alternar Todos os Painéis Adicionais" #: ../data/geany.glade.h:100 -#, fuzzy msgid "Switch to last used document after closing a tab" -msgstr "Ir para o último documento usado" +msgstr "Ir para o último documento usado após fechar uma aba" #: ../data/geany.glade.h:101 msgid "Editor tabs" @@ -1092,7 +1086,7 @@ msgstr "Espaços virtuais" msgid "Display" msgstr "Exibição" -#: ../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 "Editor" @@ -1176,7 +1170,7 @@ msgstr "Remover espaços e tabs no final" msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Remove espaços e tabulações e finais de linha" -#: ../data/geany.glade.h:241 ../src/keybindings.c:559 +#: ../data/geany.glade.h:241 ../src/keybindings.c:562 msgid "Replace tabs by space" msgstr "Substituir tabs por espaços" @@ -1263,7 +1257,7 @@ msgstr "" msgid "Commands" msgstr "Comandos" -#: ../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 "Ferramentas" @@ -1453,9 +1447,8 @@ msgid "Sets the font for the terminal widget" msgstr "Define a fonte do terminal" #: ../data/geany.glade.h:300 -#, fuzzy msgid "Choose Terminal Font" -msgstr "Fonte do terminal" +msgstr "Escolher Fonte do terminal" #: ../data/geany.glade.h:301 msgid "Foreground color:" @@ -1478,9 +1471,8 @@ msgid "Sets the foreground color of the text in the terminal widget" msgstr "Define a cor do texto do terminal" #: ../data/geany.glade.h:306 -#, fuzzy msgid "Sets the backround color of the text in the terminal widget" -msgstr "Define a cor do fundo do texto do terminal" +msgstr "Define a cor de fundo do texto no terminal" #: ../data/geany.glade.h:307 msgid "" @@ -1546,22 +1538,19 @@ msgstr "" "Commander dentro do VTE." #: ../data/geany.glade.h:319 -#, fuzzy msgid "Follow path of the current file" -msgstr "Seguir o caminho do arquivo padrão" +msgstr "Seguir o caminho do arquivo atual" #: ../data/geany.glade.h:320 -#, fuzzy msgid "" "Whether to execute \\\"cd $path\\\" when you switch between opened files" msgstr "" -"Habilita/desabilita a execução de \"cd $caminho\" quando você alternar entre " -"arquivos abertos" +"Habilita/desabilita a execução de \\\"cd $caminho\\\" quando você alterna " +"entre arquivos abertos" #: ../data/geany.glade.h:321 -#, fuzzy msgid "Execute programs in the VTE" -msgstr "Executar programas em VTE" +msgstr "Executar programas no VTE" #: ../data/geany.glade.h:322 msgid "" @@ -1585,9 +1574,8 @@ msgstr "" "interrompidos" #: ../data/geany.glade.h:325 -#, fuzzy msgid "Terminal" -msgstr "Permissões:" +msgstr "Terminal" #: ../data/geany.glade.h:326 ../src/prefs.c:1595 ../src/vte.c:281 msgid "Terminal" @@ -1648,7 +1636,7 @@ msgstr "" "novo caminho, ou uma árvore de diretório já existente. Você pode usar " "caminhos relativos ao nome de arquivo do projeto." -#: ../data/geany.glade.h:338 ../src/keybindings.c:234 +#: ../data/geany.glade.h:338 ../src/keybindings.c:237 msgid "Project" msgstr "Projeto" @@ -1721,43 +1709,43 @@ msgstr "Fechar T_udo" msgid "_Commands" msgstr "_Comandos" -#: ../data/geany.glade.h:357 ../src/keybindings.c:343 +#: ../data/geany.glade.h:357 ../src/keybindings.c:346 msgid "_Cut Current Line(s)" msgstr "Re_cortar Linha(s) Atual(is)" -#: ../data/geany.glade.h:358 ../src/keybindings.c:340 +#: ../data/geany.glade.h:358 ../src/keybindings.c:343 msgid "_Copy Current Line(s)" msgstr "_Copiar Linha(s) Atual(is)" -#: ../data/geany.glade.h:359 ../src/keybindings.c:295 +#: ../data/geany.glade.h:359 ../src/keybindings.c:298 msgid "_Delete Current Line(s)" msgstr "_Deletar Linha(s) Atual(is)" -#: ../data/geany.glade.h:360 ../src/keybindings.c:292 +#: ../data/geany.glade.h:360 ../src/keybindings.c:295 msgid "_Duplicate Line or Selection" msgstr "_Duplicar Linha ou Seleção" -#: ../data/geany.glade.h:361 ../src/keybindings.c:353 +#: ../data/geany.glade.h:361 ../src/keybindings.c:356 msgid "_Select Current Line(s)" msgstr "_Selecionar Linha(s) Atual(is)" -#: ../data/geany.glade.h:362 ../src/keybindings.c:356 +#: ../data/geany.glade.h:362 ../src/keybindings.c:359 msgid "_Select Current Paragraph" msgstr "_Selecionar Parágrafo Atual" -#: ../data/geany.glade.h:363 ../src/keybindings.c:395 +#: ../data/geany.glade.h:363 ../src/keybindings.c:398 msgid "_Send Selection to Terminal" msgstr "_Enviar Seleção para o Terminal" -#: ../data/geany.glade.h:364 ../src/keybindings.c:397 +#: ../data/geany.glade.h:364 ../src/keybindings.c:400 msgid "_Reflow Lines/Block" msgstr "_Refluir Linhas/Bloco" -#: ../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 "A_lterar maiúsculas/minúsculas da seleção" -#: ../data/geany.glade.h:366 ../src/keybindings.c:302 +#: ../data/geany.glade.h:366 ../src/keybindings.c:305 msgid "_Transpose Current Line" msgstr "_Transpor linha atual" @@ -1781,7 +1769,7 @@ msgstr "Aumen_tar Endentação" msgid "_Decrease Indent" msgstr "Dimi_nuir Endentação" -#: ../data/geany.glade.h:372 ../src/keybindings.c:386 +#: ../data/geany.glade.h:372 ../src/keybindings.c:389 msgid "_Smart Line Indent" msgstr "Endentação Inteligente de Linha_s" @@ -1797,7 +1785,7 @@ msgstr "I_nserir Comentários" msgid "Preference_s" msgstr "Preferência_s" -#: ../data/geany.glade.h:376 ../src/keybindings.c:421 +#: ../data/geany.glade.h:376 ../src/keybindings.c:424 msgid "P_lugin Preferences" msgstr "Preferências de P_lugins" @@ -1825,11 +1813,11 @@ msgstr "Próxima _Mensagem" msgid "Pr_evious Message" msgstr "M_ensagem Prévia" -#: ../data/geany.glade.h:383 ../src/keybindings.c:470 +#: ../data/geany.glade.h:383 ../src/keybindings.c:473 msgid "_Go to Next Marker" msgstr "Ir Para o _Próximo Marcador" -#: ../data/geany.glade.h:384 ../src/keybindings.c:473 +#: ../data/geany.glade.h:384 ../src/keybindings.c:476 msgid "_Go to Previous Marker" msgstr "Ir para o Marcador _Anterior" @@ -1837,15 +1825,15 @@ msgstr "Ir para o Marcador _Anterior" msgid "_Go to Line" msgstr "_Ir para Linha" -#: ../data/geany.glade.h:386 ../src/keybindings.c:433 +#: ../data/geany.glade.h:386 ../src/keybindings.c:436 msgid "Find Next _Selection" msgstr "Localizar Próxima _Seleção" -#: ../data/geany.glade.h:387 ../src/keybindings.c:435 +#: ../data/geany.glade.h:387 ../src/keybindings.c:438 msgid "Find Pre_vious Selection" msgstr "Localizar Seleção Anterior" -#: ../data/geany.glade.h:388 ../src/keybindings.c:452 +#: ../data/geany.glade.h:388 ../src/keybindings.c:455 msgid "_Mark All" msgstr "Marcar Tudo" @@ -2095,9 +2083,8 @@ msgid "_Keyboard Shortcuts" msgstr "Atalhos de _Teclado" #: ../data/geany.glade.h:450 -#, fuzzy msgid "Debug _Messages" -msgstr "Mensagens de Depuração" +msgstr "_Mensagens de Depuração" #: ../data/geany.glade.h:451 msgid "_Website" @@ -2105,16 +2092,15 @@ msgstr "Sítio na _Web" #: ../data/geany.glade.h:452 msgid "Wi_ki" -msgstr "" +msgstr "Wi_ki" #: ../data/geany.glade.h:453 msgid "Report a _Bug" -msgstr "" +msgstr "Relatar um _Bug" #: ../data/geany.glade.h:454 -#, fuzzy msgid "_Donate" -msgstr "_Não salvar" +msgstr "_Doar" #: ../data/geany.glade.h:455 ../src/sidebar.c:124 msgid "Symbols" @@ -2150,6 +2136,13 @@ msgid "" "Frank Lanitz\n" "All rights reserved." msgstr "" +"Copyright (c) 2005-2012\n" +"Colomban Wendling\n" +"Nick Treleaven\n" +"Matthew Brush\n" +"Enrico Tröger\n" +"Frank Lanitz\n" +"Todos os direitos reservados." #: ../src/about.c:157 msgid "About Geany" @@ -2247,9 +2240,10 @@ msgid "Failed to change the working directory to \"%s\"" msgstr "Falha ao alterar o diretório atual para %s" #: ../src/build.c:929 -#, fuzzy, c-format +#, c-format msgid "Failed to execute \"%s\" (start-script could not be created: %s)" -msgstr "Falha ao executar %s (script de inicialização não pôde ser criado)" +msgstr "" +"Falhou ao executar \"%s\" (script de inicialização não pôde ser criado: %s)" #: ../src/build.c:984 msgid "" @@ -2434,7 +2428,7 @@ msgstr "Quaisquer mudanças não salvas serão perdidas." msgid "Are you sure you want to reload '%s'?" msgstr "Tem certeza de que deseja recarregar '%s'?" -#: ../src/callbacks.c:1062 ../src/keybindings.c:461 +#: ../src/callbacks.c:1062 ../src/keybindings.c:464 msgid "Go to Line" msgstr "Ir para Linha" @@ -2500,9 +2494,9 @@ msgid "No more message items." msgstr "Não há mais itens de mensagens." #: ../src/callbacks.c:1673 -#, fuzzy, c-format +#, c-format msgid "Could not open file %s (File not found)" -msgstr "Não foi possível abrir o arquivo %s (%s)" +msgstr "Não foi possível abrir o arquivo %s (Arquivo não encontrado)" #: ../src/dialogs.c:226 msgid "Detect from file" @@ -3166,539 +3160,536 @@ msgstr "Regex ruim para o tipo de arquivo %s: %s" msgid "untitled" msgstr "sem título" -#: ../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 "Não foi possível procurar o arquivo '%s'." -#: ../src/highlighting.c:1297 -#, fuzzy +#: ../src/highlighting.c:1304 msgid "Default" -msgstr "_Default" +msgstr "Default" -#: ../src/highlighting.c:1336 -#, fuzzy +#: ../src/highlighting.c:1343 @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2012