Commits November 2016

commits@lists.geany.org

1 participants
37 discussions

[geany/geany] 5753b3: Update of Dutch transation. (#1289)
by Peter C. S. Scholtens 07 Nov '16

07 Nov '16

Branch: refs/heads/master Author: Peter C. S. Scholtens <peter.scholtens(a)xs4all.nl> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 07 Nov 2016 16:17:10 UTC Commit: 5753b3c15da8ecd2031b4cfdeabfeaa3339854fb https://github.com/geany/geany/commit/5753b3c15da8ecd2031b4cfdeabfeaa333985… Log Message: ----------- Update of Dutch transation. (#1289) * Update of Dutch transation. * Update nl.po Modified Paths: -------------- po/nl.po Modified: po/nl.po 38 lines changed, 19 insertions(+), 19 deletions(-) =================================================================== @@ -11,15 +11,15 @@ msgstr "" "Project-Id-Version: Geany 1.28\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-10-29 20:21+0200\n" -"PO-Revision-Date: 2016-03-07 15:29+0100\n" -"Last-Translator: Benno Schulenberg <benno(a)vertaalt.nl>\n" +"PO-Revision-Date: 2016-11-04 19:18+0100\n" +"Last-Translator: Peter Scholtens <peter.scholtens(a)xs4all.nl>\n" "Language-Team: Dutch <geany-i18n(a)uvena.de>\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Poedit 1.8.7.1\n" #: ../geany.desktop.in.h:1 ../data/geany.glade.h:343 msgid "Geany" @@ -34,9 +34,8 @@ msgid "A fast and lightweight IDE using GTK+" msgstr "Een snelle en lichtgewicht IDE, gebaseerd op GTK+" #: ../geany.desktop.in.h:4 -#, fuzzy msgid "Text;Editor;" -msgstr "Editor" +msgstr "Tekst;Editor;" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" @@ -1049,7 +1048,7 @@ msgstr "" #: ../data/geany.glade.h:212 msgid "Lines visible _around the cursor:" -msgstr "" +msgstr "Regels zichtbaar _rondom de cursor:" #: ../data/geany.glade.h:213 msgid "Display" @@ -2268,7 +2267,6 @@ msgid "Other:" msgstr "Anderen:" #: ../src/about.c:48 -#, fuzzy msgid "" "Copyright (c) 2005-2016\n" "Colomban Wendling\n" @@ -2278,7 +2276,7 @@ msgid "" "Frank Lanitz\n" "All rights reserved." msgstr "" -"Auteursrecht (c) 2005-2015\n" +"Auteursrecht (c) 2005-2016\n" "Colomban Wendling\n" "Nick Treleaven\n" "Matthew Brush\n" @@ -2396,13 +2394,13 @@ msgstr "" "of Enter om op te schonen." #: ../src/build.c:907 -#, fuzzy, c-format +#, c-format msgid "" "Cannot execute build command \"%s\": %s. Check the Terminal setting in " "Preferences" msgstr "" -"Kan afdrukprogramma '%s' niet uitvoeren: %s; controleer de padinstelling in " -"Voorkeuren." +"Kan bouwcommando '%s' niet uitvoeren: %s. Controleer de terminalinstelling " +"in Voorkeuren." #: ../src/build.c:1016 msgid "Compilation failed." @@ -3378,9 +3376,8 @@ msgid "Delete to line end" msgstr "Rest van de regel verwijderen" #: ../src/keybindings.c:391 -#, fuzzy msgid "Delete to beginning of line" -msgstr "Rest van de regel verwijderen" +msgstr "Tot begin van de regel verwijderen" #: ../src/keybindings.c:394 msgid "_Transpose Current Line" @@ -4064,6 +4061,8 @@ msgid "" "Proxy plugin '%s' extension '%s' starts with a dot. Please fix your proxy " "plugin." msgstr "" +"Proxy plugin '%s' uitbreiding '%s' begint met een punt. Gelieve dit te " +"repareren." #: ../src/pluginutils.c:411 msgid "Configure Plugins" @@ -4348,12 +4347,11 @@ msgid "_Use regular expressions" msgstr "_Reguliere expressies gebruiken" #: ../src/search.c:311 -#, fuzzy msgid "" "Use Perl-like regular expressions. For detailed information about using " "regular expressions, please refer to the manual." msgstr "" -"Gebruik POSIX-achtige reguliere expressies. Voor gedetailleerde informatie " +"Gebruik Perl-achtige reguliere expressies. Voor gedetailleerde informatie " "over het gebruik van reguliere expressies, gelieve de documentatie te lezen." #: ../src/search.c:316 @@ -4988,15 +4986,15 @@ msgstr "Kon labelbestand '%s' niet laden." #. For translators: it's the filename and line number of a symbol in the goto-symbol popup menu #: ../src/symbols.c:1942 -#, fuzzy, c-format +#, c-format msgid "%s: %lu" -msgstr "Weergave" +msgstr "%s: %lu" #. For translators: it's the filename and line number of a symbol in the goto-symbol popup menu #: ../src/symbols.c:1945 #, c-format msgid "%s: %lu" -msgstr "" +msgstr "%s: %lu" #: ../src/symbols.c:2154 #, c-format @@ -5027,6 +5025,8 @@ msgid "" "Cannot execute template command \"%s\". Hint: incorrect paths in the command " "are a common cause of errors. Error: %s." msgstr "" +"Kan sjablooncommando '%s' niet uitvoeren. Hint: verkeerde paden in het " +"commando zijn een veelvoorkomende foutoorzaak. Fout: %s." #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" #: ../src/toolbar.c:58 @@ -5509,7 +5509,7 @@ msgstr "Uitvoerbaren" #: ../src/win32.c:802 #, c-format msgid "Failed to open URI \"%s\": %s" -msgstr "" +msgstr "Kon URI '%s' niet openen: %s" #: ../plugins/classbuilder.c:36 msgid "Class Builder" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 42a909: Update zh_CN translation (#1292)
by 柳东原 LIU Dongyuan 07 Nov '16

07 Nov '16

Branch: refs/heads/master Author: 柳东原 LIU Dongyuan <liu.dongyuan(a)gmail.com> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 07 Nov 2016 16:15:06 UTC Commit: 42a9098959c2b05f33bb8caef9d40e3ed58c4b3a https://github.com/geany/geany/commit/42a9098959c2b05f33bb8caef9d40e3ed58c4… Log Message: ----------- Update zh_CN translation (#1292) Modified Paths: -------------- po/zh_CN.po Modified: po/zh_CN.po 17 lines changed, 9 insertions(+), 8 deletions(-) =================================================================== @@ -11,14 +11,14 @@ msgstr "" "Project-Id-Version: Geany 1.28\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-10-29 20:21+0200\n" -"PO-Revision-Date: 2016-07-01 00:52-0700\n" +"PO-Revision-Date: 2016-11-07 23:57+0800\n" "Last-Translator: Xhacker Liu <liu.dongyuan(a)gmail.com>\n" "Language-Team: Chinese (simplified) <i18n-zh(a)googlegroups.com>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.11\n" "Plural-Forms: nplurals=1; plural=0;\n" #: ../geany.desktop.in.h:1 ../data/geany.glade.h:343 @@ -979,7 +979,7 @@ msgstr "当移动到文档的最后一行时停止滚动" #: ../data/geany.glade.h:212 msgid "Lines visible _around the cursor:" -msgstr "" +msgstr "光标上下显示的行数 (_A)：" #: ../data/geany.glade.h:213 msgid "Display" @@ -3220,9 +3220,8 @@ msgid "Delete to line end" msgstr "删除到行尾" #: ../src/keybindings.c:391 -#, fuzzy msgid "Delete to beginning of line" -msgstr "删除到行尾" +msgstr "删除到行首" #: ../src/keybindings.c:394 msgid "_Transpose Current Line" @@ -3896,7 +3895,7 @@ msgstr "选择哪些插件应该在启动时装载：" msgid "" "Proxy plugin '%s' extension '%s' starts with a dot. Please fix your proxy " "plugin." -msgstr "" +msgstr "代理插件“%s”的扩展名“%s”由点号开始。请修复您的的代理插件。" #: ../src/pluginutils.c:411 msgid "Configure Plugins" @@ -4168,11 +4167,11 @@ msgid "_Use regular expressions" msgstr "使用正则表达式(_U)" #: ../src/search.c:311 -#, fuzzy msgid "" "Use Perl-like regular expressions. For detailed information about using " "regular expressions, please refer to the manual." -msgstr "使用POSIX-like正则表达式，详见帮助文档。" +msgstr "" +"使用 Perl-like 正则表达式。要了解关于使用正则表达式的详细信息，请参阅文档。" #: ../src/search.c:316 msgid "Use _escape sequences" @@ -4831,6 +4830,8 @@ msgid "" "Cannot execute template command \"%s\". Hint: incorrect paths in the command " "are a common cause of errors. Error: %s." msgstr "" +"无法执行模板命令“%s”。提示：一个常见的错误原因是命令中的路径不正确。错误：" +"%s。" #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" #: ../src/toolbar.c:58 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 513659: Update of Slovak translation (#1291)
by Andrej Herceg 05 Nov '16

05 Nov '16

Branch: refs/heads/master Author: Andrej Herceg <chrono.i18n(a)gmail.com> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sat, 05 Nov 2016 22:50:50 UTC Commit: 513659372463af2cd24319f39dec4836572746c3 https://github.com/geany/geany/commit/513659372463af2cd24319f39dec483657274… Log Message: ----------- Update of Slovak translation (#1291) Modified Paths: -------------- po/sk.po Modified: po/sk.po 27 lines changed, 7 insertions(+), 20 deletions(-) =================================================================== @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Geany 1.28\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-10-29 20:21+0200\n" -"PO-Revision-Date: 2016-07-02 16:01+0200\n" +"PO-Revision-Date: 2016-11-05 21:43+0100\n" "Last-Translator: Andrej Herceg <chrono.i18n(a)gmail.com>\n" "Language-Team: Slovak\n" "Language: sk\n" @@ -1027,7 +1027,7 @@ msgstr "" #: ../data/geany.glade.h:212 msgid "Lines visible _around the cursor:" -msgstr "" +msgstr "Počet _riadkov viditeľných okolo kurzora:" #: ../data/geany.glade.h:213 msgid "Display" @@ -3335,9 +3335,8 @@ msgid "Delete to line end" msgstr "Vymazať do konca riadku" #: ../src/keybindings.c:391 -#, fuzzy msgid "Delete to beginning of line" -msgstr "Vymazať do konca riadku" +msgstr "Vymazať po začiatok riadku" #: ../src/keybindings.c:394 msgid "_Transpose Current Line" @@ -4299,13 +4298,12 @@ msgid "_Use regular expressions" msgstr "Používať re_gulárne výrazy" #: ../src/search.c:311 -#, fuzzy msgid "" "Use Perl-like regular expressions. For detailed information about using " "regular expressions, please refer to the manual." msgstr "" -"Používať POSIX regulárne výrazy. Pre viac detailov o používaní regulárnych " -"výrazov, si prečítajte dokumentáciu." +"Používať regulárne výrazy jayzka Perl. Pre viac detailov o používaní " +"regulárnych výrazov, si prečítajte dokumentáciu." #: ../src/search.c:316 msgid "Use _escape sequences" @@ -4976,6 +4974,8 @@ msgid "" "Cannot execute template command \"%s\". Hint: incorrect paths in the command " "are a common cause of errors. Error: %s." msgstr "" +"Nie je možné spustíť príkaz šablóny „%s“. Tip: nesprávne cesty v príkaze sú " +"častou príčinou chýb. Chyba: %s." #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" #: ../src/toolbar.c:58 @@ -5958,16 +5958,3 @@ msgstr "Vedľa seba" #: ../plugins/splitwindow.c:468 msgid "Top and Bottom" msgstr "Nad sebou" - -#~ msgid "" -#~ "Cannot execute command \"%s\" from the template: %s. Check the path in " -#~ "the template." -#~ msgstr "" -#~ "Nemôžem spustiť príkaz „%s“ zo šablóny: %s. Skontrolujte cestu v šablóne." - -#~ msgid "" -#~ "Cannot execute terminal command \"%s\": %s. Check the path setting in " -#~ "Preferences." -#~ msgstr "" -#~ "Nie je možné spustiť príkaz „%s“: %s. Skontrolujte cestu uvedenú v " -#~ "Nastaveniach." -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] e1450f: Updated spanish translation es.po (#1288)
by Abel Serrano Juste 03 Nov '16

03 Nov '16

Branch: refs/heads/master Author: Abel Serrano Juste <akronix5(a)gmail.com> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Thu, 03 Nov 2016 07:15:46 UTC Commit: e1450f5dea6b7f19d7a523cb08d500ae1b965f1b https://github.com/geany/geany/commit/e1450f5dea6b7f19d7a523cb08d500ae1b965… Log Message: ----------- Updated spanish translation es.po (#1288) Modified Paths: -------------- po/es.po Modified: po/es.po 24 lines changed, 13 insertions(+), 11 deletions(-) =================================================================== @@ -6,18 +6,18 @@ # Lucas Vieites <lucas.vieites(a)gmail.com>, 2010 - 2015. msgid "" msgstr "" -"Project-Id-Version: Geany 1.28\n" +"Project-Id-Version: Geany 1.29\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-10-29 20:21+0200\n" -"PO-Revision-Date: 2016-06-27 20:16+0100\n" -"Last-Translator: Lucas Vieites <lucas(a)codexion.com>\n" +"PO-Revision-Date: 2016-11-03 01:11+0100\n" +"Last-Translator: Abel 'Akronix' Serrano Juste <akronix5(a)gmail.com>\n" "Language-Team: Español <geany-i18n(a)uvena.de>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.6.10\n" +"X-Generator: Poedit 1.8.9\n" #: ../geany.desktop.in.h:1 ../data/geany.glade.h:343 msgid "Geany" @@ -113,7 +113,7 @@ msgstr "Encontrar _uso" #: ../data/geany.glade.h:20 ../src/symbols.c:2555 msgid "Find _Document Usage" -msgstr "Encontrar _uso del documento" +msgstr "Encontrar _uso en el documento" #: ../data/geany.glade.h:21 msgid "Go to Symbol Defini_tion" @@ -142,7 +142,7 @@ msgstr "Básico" #: ../data/geany.glade.h:25 msgid "Current chars" -msgstr "Carácter actual" +msgstr "Caracteres actuales" #: ../data/geany.glade.h:26 msgid "Match braces" @@ -1053,7 +1053,7 @@ msgstr "" #: ../data/geany.glade.h:212 msgid "Lines visible _around the cursor:" -msgstr "" +msgstr "Líneas visibles _alrededor del cursor:" #: ../data/geany.glade.h:213 msgid "Display" @@ -3382,9 +3382,8 @@ msgid "Delete to line end" msgstr "Borrar hasta el final de línea" #: ../src/keybindings.c:391 -#, fuzzy msgid "Delete to beginning of line" -msgstr "Borrar hasta el final de línea" +msgstr "Borrar hasta el comienzo de línea" #: ../src/keybindings.c:394 msgid "_Transpose Current Line" @@ -4077,6 +4076,8 @@ msgid "" "Proxy plugin '%s' extension '%s' starts with a dot. Please fix your proxy " "plugin." msgstr "" +"El plugin proxy '%s' con extension '%s' empieza con un punto. Por favor, " +"arregla tu plugin proxy." #: ../src/pluginutils.c:411 msgid "Configure Plugins" @@ -4362,12 +4363,11 @@ msgid "_Use regular expressions" msgstr "_Usar expresiones regulares" #: ../src/search.c:311 -#, fuzzy msgid "" "Use Perl-like regular expressions. For detailed information about using " "regular expressions, please refer to the manual." msgstr "" -"Usar expresiones regulares estilo-POSIX. Lea la documentación para obtener " +"Usar expresiones regulares al estilo Perl. Lea la documentación para obtener " "información detallada sobre el uso de expresiones regulares." #: ../src/search.c:316 @@ -5043,6 +5043,8 @@ msgid "" "Cannot execute template command \"%s\". Hint: incorrect paths in the command " "are a common cause of errors. Error: %s." msgstr "" +"No se puede ejecutar el comando plantilla \"%s\". Pista: Las rutas " +"incorrectas en el comando suelen ser una causa común de errores. Error: %s." #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" #: ../src/toolbar.c:58 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] b9c8ab: Small NEWS updates
by Colomban Wendling 01 Nov '16

01 Nov '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 01 Nov 2016 10:23:11 UTC Commit: b9c8abb4b80a6cc7a5067f4b9bbb11878b6abbc1 https://github.com/geany/geany/commit/b9c8abb4b80a6cc7a5067f4b9bbb11878b6ab… Log Message: ----------- Small NEWS updates Modified Paths: -------------- NEWS Modified: NEWS 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -4,6 +4,7 @@ Geany 1.29 (unreleased) * Fix search entries color with the default GNOME 3.20 GTK2 theme (PR#1137, Issue#1101, Issue#1135, Issue#1267). * Improve support for GTK 3.22. + * Add support for VTE 0.38 and newer (Issue#336, PR#1181). Bug fixes * Fix build when the CXX variable contains flags (PR#1155, Issue#829). @@ -25,7 +26,7 @@ Geany 1.29 (unreleased) * Add `.exp` extension to TCL (Simon Marchi, PR#979). Internationalization - * Updated translations: ca, de, es, fr, id, pt, pt_BR, sv + * Updated translations: ca, de, es, fr, id, it, kk, pt, pt_BR, sv API * Update `GeanyProxyProbeResults` API (PR#1213). -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 743e30: Merge pull request #1181 from b4n/vte-2.91
by Colomban Wendling 01 Nov '16

01 Nov '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 01 Nov 2016 10:10:25 UTC Commit: 743e30ddea398915449f86ff547a684d7f7d56fc https://github.com/geany/geany/commit/743e30ddea398915449f86ff547a684d7f7d5… Log Message: ----------- Merge pull request #1181 from b4n/vte-2.91 Support for VTE 2.91 Modified Paths: -------------- data/geany.glade doc/geany.txt src/keyfile.c src/prefs.c src/vte.c src/vte.h Modified: data/geany.glade 76 lines changed, 10 insertions(+), 66 deletions(-) =================================================================== @@ -5858,29 +5858,15 @@ </packing> </child> <child> - <object class="GtkLabel" id="bg_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Background image:</property> - </object> - <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> <object class="GtkLabel" id="terminal_scrollback_lines_label"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Scrollback lines:</property> </object> <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property> </packing> @@ -5893,8 +5879,8 @@ <property name="label" translatable="yes">Shell:</property> </object> <packing> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property> </packing> @@ -5934,48 +5920,6 @@ </packing> </child> <child> - <object class="GtkEntry" id="entry_image"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Sets the path to the background image in the terminal widget</property> - <property name="invisible_char">•</property> - <property name="primary_icon_activatable">False</property> - <property name="secondary_icon_activatable">False</property> - <property name="primary_icon_sensitive">True</property> - <property name="secondary_icon_sensitive">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkButton" id="button_term_image"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <child> - <object class="GtkImage" id="image1337"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-open</property> - <property name="icon-size">1</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> <object class="GtkSpinButton" id="spin_scrollback"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -5992,8 +5936,8 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">3</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="y_options">GTK_FILL</property> </packing> </child> @@ -6011,8 +5955,8 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="y_options">GTK_FILL</property> </packing> </child> @@ -6033,8 +5977,8 @@ <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property> </packing> Modified: doc/geany.txt 3 lines changed, 0 insertions(+), 3 deletions(-) =================================================================== @@ -2554,9 +2554,6 @@ msgwin_messages_visible Whether to show the Messages tab in the t msgwin_scribble_visible Whether to show the Scribble tab in the true immediately Messages Window **VTE related** -emulation Terminal emulation mode. Only change this xterm immediately - if you have VTE termcap files other than - ``vte/termcap/xterm``. send_selection_unsafe By default, Geany strips any trailing false immediately newline characters from the current selection before sending it to the terminal Modified: src/keyfile.c 5 lines changed, 0 insertions(+), 5 deletions(-) =================================================================== @@ -524,8 +524,6 @@ static void save_dialog_prefs(GKeyFile *config) { gchar *tmp_string; - if (!g_key_file_has_key(config, "VTE", "emulation", NULL)) /* hidden */ - g_key_file_set_string(config, "VTE", "emulation", vc->emulation); g_key_file_set_string(config, "VTE", "font", vc->font); g_key_file_set_boolean(config, "VTE", "scroll_on_key", vc->scroll_on_key); g_key_file_set_boolean(config, "VTE", "scroll_on_out", vc->scroll_on_out); @@ -537,7 +535,6 @@ static void save_dialog_prefs(GKeyFile *config) g_key_file_set_boolean(config, "VTE", "cursor_blinks", vc->cursor_blinks); g_key_file_set_integer(config, "VTE", "scrollback_lines", vc->scrollback_lines); g_key_file_set_string(config, "VTE", "font", vc->font); - g_key_file_set_string(config, "VTE", "image", vc->image); g_key_file_set_string(config, "VTE", "shell", vc->shell); tmp_string = utils_get_hex_from_color(&vc->colour_fore); g_key_file_set_string(config, "VTE", "colour_fore", tmp_string); @@ -881,8 +878,6 @@ static void load_dialog_prefs(GKeyFile *config) /* fallback to root */ vte_info.dir = g_strdup("/"); - vc->emulation = utils_get_setting_string(config, "VTE", "emulation", "xterm"); - vc->image = utils_get_setting_string(config, "VTE", "image", ""); vc->shell = utils_get_setting_string(config, "VTE", "shell", shell); vc->font = utils_get_setting_string(config, "VTE", "font", GEANY_DEFAULT_FONT_EDITOR); vc->scroll_on_key = utils_get_setting_boolean(config, "VTE", "scroll_on_key", TRUE); Modified: src/prefs.c 7 lines changed, 0 insertions(+), 7 deletions(-) =================================================================== @@ -770,9 +770,6 @@ static void prefs_init_dialog(void) widget = ui_lookup_widget(ui_widgets.prefs_dialog, "color_back"); gtk_color_button_set_color(GTK_COLOR_BUTTON(widget), &vc->colour_back); - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "entry_image"); - gtk_entry_set_text(GTK_ENTRY(widget), vc->image); - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "spin_scrollback"); gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), vc->scrollback_lines); @@ -1241,10 +1238,6 @@ on_prefs_dialog_response(GtkDialog *dialog, gint response, gpointer user_data) gtk_spin_button_update(GTK_SPIN_BUTTON(widget)); vc->scrollback_lines = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "entry_image"); - g_free(vc->image); - vc->image = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))); - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "entry_shell"); g_free(vc->shell); vc->shell = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))); Modified: src/vte.c 214 lines changed, 171 insertions(+), 43 deletions(-) =================================================================== @@ -59,7 +59,7 @@ VteInfo vte_info = { FALSE, FALSE, FALSE, NULL, NULL }; VteConfig *vc; -static pid_t pid = 0; +static GPid pid = 0; static gboolean clean = TRUE; static GModule *module = NULL; static struct VteFunctions *vf; @@ -69,6 +69,7 @@ static guint terminal_label_update_source = 0; /* use vte wordchars to select paths */ static const gchar VTE_WORDCHARS[] = "-A-Za-z0-9,./?%&#:_"; +static const gchar VTE_ADDITIONAL_WORDCHARS[] = "-,./?%&#:_"; /* Incomplete VteTerminal struct from vte/vte.h. */ @@ -88,27 +89,39 @@ typedef enum { VTE_CURSOR_BLINK_OFF } VteTerminalCursorBlinkMode; +typedef enum { + /* we don't care for the other possible values */ + VTE_PTY_DEFAULT = 0 +} VtePtyFlags; + /* Holds function pointers we need to access the VTE API. */ struct VteFunctions { + guint (*vte_get_major_version) (void); + guint (*vte_get_minor_version) (void); GtkWidget* (*vte_terminal_new) (void); pid_t (*vte_terminal_fork_command) (VteTerminal *terminal, const char *command, char **argv, char **envv, const char *directory, gboolean lastlog, gboolean utmp, gboolean wtmp); + gboolean (*vte_terminal_spawn_sync) (VteTerminal *terminal, VtePtyFlags pty_flags, + const char *working_directory, char **argv, char **envv, + GSpawnFlags spawn_flags, GSpawnChildSetupFunc child_setup, + gpointer child_setup_data, GPid *child_pid, + GCancellable *cancellable, GError **error); void (*vte_terminal_set_size) (VteTerminal *terminal, glong columns, glong rows); void (*vte_terminal_set_word_chars) (VteTerminal *terminal, const char *spec); + void (*vte_terminal_set_word_char_exceptions) (VteTerminal *terminal, const char *exceptions); void (*vte_terminal_set_mouse_autohide) (VteTerminal *terminal, gboolean setting); void (*vte_terminal_reset) (VteTerminal *terminal, gboolean full, gboolean clear_history); GType (*vte_terminal_get_type) (void); void (*vte_terminal_set_scroll_on_output) (VteTerminal *terminal, gboolean scroll); void (*vte_terminal_set_scroll_on_keystroke) (VteTerminal *terminal, gboolean scroll); - void (*vte_terminal_set_font_from_string) (VteTerminal *terminal, const char *name); + void (*vte_terminal_set_font) (VteTerminal *terminal, const PangoFontDescription *font_desc); void (*vte_terminal_set_scrollback_lines) (VteTerminal *terminal, glong lines); gboolean (*vte_terminal_get_has_selection) (VteTerminal *terminal); void (*vte_terminal_copy_clipboard) (VteTerminal *terminal); void (*vte_terminal_paste_clipboard) (VteTerminal *terminal); - void (*vte_terminal_set_emulation) (VteTerminal *terminal, const gchar *emulation); void (*vte_terminal_set_color_foreground) (VteTerminal *terminal, const GdkColor *foreground); void (*vte_terminal_set_color_bold) (VteTerminal *terminal, const GdkColor *foreground); void (*vte_terminal_set_color_background) (VteTerminal *terminal, const GdkColor *background); @@ -119,7 +132,13 @@ struct VteFunctions void (*vte_terminal_set_cursor_blinks) (VteTerminal *terminal, gboolean blink); void (*vte_terminal_select_all) (VteTerminal *terminal); void (*vte_terminal_set_audible_bell) (VteTerminal *terminal, gboolean is_audible); - void (*vte_terminal_set_background_image_file) (VteTerminal *terminal, const char *path); + GtkAdjustment* (*vte_terminal_get_adjustment) (VteTerminal *terminal); +#if GTK_CHECK_VERSION(3, 0, 0) + /* hack for the VTE 2.91 API using GdkRGBA: we wrap the API to keep using GdkColor on our side */ + void (*vte_terminal_set_color_foreground_rgba) (VteTerminal *terminal, const GdkRGBA *foreground); + void (*vte_terminal_set_color_bold_rgba) (VteTerminal *terminal, const GdkRGBA *foreground); + void (*vte_terminal_set_color_background_rgba) (VteTerminal *terminal, const GdkRGBA *background); +#endif }; @@ -162,6 +181,45 @@ static const GtkTargetEntry dnd_targets[] = }; +/* replacement for vte_terminal_get_adjustment() when it's not available */ +static GtkAdjustment *default_vte_terminal_get_adjustment(VteTerminal *vte) +{ +#if GTK_CHECK_VERSION(3, 0, 0) + if (GTK_IS_SCROLLABLE(vte)) + return gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(vte)); +#endif + /* this is only valid in < 0.38, 0.38 broke ABI */ + return vte->adjustment; +} + + +#if GTK_CHECK_VERSION(3, 0, 0) +/* Wrap VTE 2.91 API using GdkRGBA with GdkColor so we use a single API on our side */ + +static void rgba_from_color(GdkRGBA *rgba, const GdkColor *color) +{ + rgba->red = color->red / 65535.0; + rgba->green = color->green / 65535.0; + rgba->blue = color->blue / 65535.0; + rgba->alpha = 1.0; +} + +# define WRAP_RGBA_SETTER(name) \ + static void wrap_##name(VteTerminal *terminal, const GdkColor *color) \ + { \ + GdkRGBA rgba; \ + rgba_from_color(&rgba, color); \ + vf->name##_rgba(terminal, &rgba); \ + } + +WRAP_RGBA_SETTER(vte_terminal_set_color_background) +WRAP_RGBA_SETTER(vte_terminal_set_color_bold) +WRAP_RGBA_SETTER(vte_terminal_set_color_foreground) + +# undef WRAP_RGBA_SETTER +#endif + + static gchar **vte_get_child_environment(void) { const gchar *exclude_vars[] = {"COLUMNS", "LINES", "TERM", "TERM_PROGRAM", NULL}; @@ -218,6 +276,7 @@ void vte_init(void) gint i; const gchar *sonames[] = { #if GTK_CHECK_VERSION(3, 0, 0) + "libvte-2.91.so", "libvte-2.91.so.0", "libvte-2.91.dylib", "libvte2_90.so", "libvte2_90.so.9", "libvte2_90.dylib", #else "libvte.so", "libvte.so.4", "libvte.so.8", "libvte.so.9", "libvte.dylib", @@ -239,6 +298,7 @@ void vte_init(void) } else { + geany_debug("Loaded libvte from %s", g_module_name(module)); vf = g_new0(struct VteFunctions, 1); if (vte_register_symbols(module)) vte_info.have_vte = TRUE; @@ -267,7 +327,8 @@ static void on_vte_realize(void) /* the vte widget has to be realised before color changes take effect */ vte_apply_user_settings(); - vf->vte_terminal_im_append_menuitems(VTE_TERMINAL(vc->vte), GTK_MENU_SHELL(vc->im_submenu)); + if (vf->vte_terminal_im_append_menuitems && vc->im_submenu) + vf->vte_terminal_im_append_menuitems(VTE_TERMINAL(vc->vte), GTK_MENU_SHELL(vc->im_submenu)); } @@ -283,7 +344,7 @@ static void create_vte(void) GtkWidget *vte, *scrollbar, *hbox; vc->vte = vte = vf->vte_terminal_new(); - scrollbar = gtk_vscrollbar_new(GTK_ADJUSTMENT(VTE_TERMINAL(vte)->adjustment)); + scrollbar = gtk_vscrollbar_new(vf->vte_terminal_get_adjustment(VTE_TERMINAL(vte))); gtk_widget_set_can_focus(scrollbar, FALSE); /* create menu now so copy/paste shortcuts work */ @@ -300,7 +361,10 @@ static void create_vte(void) vf->vte_terminal_set_size(VTE_TERMINAL(vte), 30, 1); vf->vte_terminal_set_mouse_autohide(VTE_TERMINAL(vte), TRUE); - vf->vte_terminal_set_word_chars(VTE_TERMINAL(vte), VTE_WORDCHARS); + if (vf->vte_terminal_set_word_chars) + vf->vte_terminal_set_word_chars(VTE_TERMINAL(vte), VTE_WORDCHARS); + else if (vf->vte_terminal_set_word_char_exceptions) + vf->vte_terminal_set_word_char_exceptions(VTE_TERMINAL(vte), VTE_ADDITIONAL_WORDCHARS); gtk_drag_dest_set(vte, GTK_DEST_DEFAULT_ALL, dnd_targets, G_N_ELEMENTS(dnd_targets), GDK_ACTION_COPY); @@ -332,9 +396,7 @@ void vte_close(void) gtk_widget_destroy(vc->vte); gtk_widget_destroy(vc->menu); g_object_unref(vc->menu); - g_free(vc->emulation); g_free(vc->shell); - g_free(vc->image); g_free(vc->font); g_free(vc->send_cmd_prefix); g_free(vc); @@ -424,8 +486,20 @@ static void vte_start(GtkWidget *widget) { gchar **env = vte_get_child_environment(); - pid = vf->vte_terminal_fork_command(VTE_TERMINAL(widget), argv[0], argv, env, - vte_info.dir, TRUE, TRUE, TRUE); + if (vf->vte_terminal_spawn_sync) + { + if (! vf->vte_terminal_spawn_sync(VTE_TERMINAL(widget), VTE_PTY_DEFAULT, + vte_info.dir, argv, env, 0, NULL, NULL, + &pid, NULL, NULL)) + { + pid = -1; + } + } + else + { + pid = vf->vte_terminal_fork_command(VTE_TERMINAL(widget), argv[0], argv, env, + vte_info.dir, TRUE, TRUE, TRUE); + } g_strfreev(env); g_strfreev(argv); } @@ -476,69 +550,116 @@ static void vte_set_cursor_blink_mode(void) } +#if GTK_CHECK_VERSION(3, 0, 0) +static gboolean vte_is_2_91(void) +{ + guint major = vf->vte_get_major_version ? vf->vte_get_major_version() : 0; + guint minor = vf->vte_get_minor_version ? vf->vte_get_minor_version() : 0; + + /* 2.91 API started at 0.38 */ + return ((major > 0 || (major == 0 && minor >= 38)) || + /* 0.38 doesn't have runtime version checks, so check a symbol that didn't exist before */ + vf->vte_terminal_spawn_sync != NULL); +} +#endif + + static gboolean vte_register_symbols(GModule *mod) { + #define BIND_SYMBOL_FULL(name, dest) \ + g_module_symbol(mod, name, (void*)(dest)) #define BIND_SYMBOL(field) \ - g_module_symbol(mod, #field, (void*)&vf->field) - #define BIND_REQUIRED_SYMBOL(field) \ + BIND_SYMBOL_FULL(#field, &vf->field) + #define BIND_REQUIRED_SYMBOL_FULL(name, dest) \ G_STMT_START { \ - if (! BIND_SYMBOL(field)) \ + if (! BIND_SYMBOL_FULL(name, dest)) \ { \ g_critical(_("invalid VTE library \"%s\": missing symbol \"%s\""), \ - g_module_name(mod), #field); \ + g_module_name(mod), name); \ return FALSE; \ } \ } G_STMT_END + #define BIND_REQUIRED_SYMBOL(field) \ + BIND_REQUIRED_SYMBOL_FULL(#field, &vf->field) + #define BIND_REQUIRED_SYMBOL_RGBA_WRAPPED(field) \ + G_STMT_START { \ + BIND_REQUIRED_SYMBOL_FULL(#field, &vf->field##_rgba); \ + vf->field = wrap_##field; \ + } G_STMT_END + BIND_SYMBOL(vte_get_major_version); + BIND_SYMBOL(vte_get_minor_version); BIND_REQUIRED_SYMBOL(vte_terminal_new); BIND_REQUIRED_SYMBOL(vte_terminal_set_size); - BIND_REQUIRED_SYMBOL(vte_terminal_fork_command); - BIND_REQUIRED_SYMBOL(vte_terminal_set_word_chars); + if (! BIND_SYMBOL(vte_terminal_spawn_sync)) + /* vte_terminal_spawn_sync() is available only in 0.38 */ + BIND_REQUIRED_SYMBOL(vte_terminal_fork_command); + /* 0.38 removed vte_terminal_set_word_chars() */ + BIND_SYMBOL(vte_terminal_set_word_chars); + /* 0.40 introduced it under a different API */ + BIND_SYMBOL(vte_terminal_set_word_char_exceptions); BIND_REQUIRED_SYMBOL(vte_terminal_set_mouse_autohide); BIND_REQUIRED_SYMBOL(vte_terminal_reset); BIND_REQUIRED_SYMBOL(vte_terminal_get_type); BIND_REQUIRED_SYMBOL(vte_terminal_set_scroll_on_output); BIND_REQUIRED_SYMBOL(vte_terminal_set_scroll_on_keystroke); - BIND_REQUIRED_SYMBOL(vte_terminal_set_font_from_string); + BIND_REQUIRED_SYMBOL(vte_terminal_set_font); BIND_REQUIRED_SYMBOL(vte_terminal_set_scrollback_lines); BIND_REQUIRED_SYMBOL(vte_terminal_get_has_selection); BIND_REQUIRED_SYMBOL(vte_terminal_copy_clipboard); BIND_REQUIRED_SYMBOL(vte_terminal_paste_clipboard); - BIND_REQUIRED_SYMBOL(vte_terminal_set_emulation); - BIND_REQUIRED_SYMBOL(vte_terminal_set_color_foreground); - BIND_REQUIRED_SYMBOL(vte_terminal_set_color_bold); - BIND_REQUIRED_SYMBOL(vte_terminal_set_color_background); - BIND_REQUIRED_SYMBOL(vte_terminal_set_background_image_file); +#if GTK_CHECK_VERSION(3, 0, 0) + if (vte_is_2_91()) + { + BIND_REQUIRED_SYMBOL_RGBA_WRAPPED(vte_terminal_set_color_foreground); + BIND_REQUIRED_SYMBOL_RGBA_WRAPPED(vte_terminal_set_color_bold); + BIND_REQUIRED_SYMBOL_RGBA_WRAPPED(vte_terminal_set_color_background); + } + else +#endif + { + BIND_REQUIRED_SYMBOL(vte_terminal_set_color_foreground); + BIND_REQUIRED_SYMBOL(vte_terminal_set_color_bold); + BIND_REQUIRED_SYMBOL(vte_terminal_set_color_background); + } BIND_REQUIRED_SYMBOL(vte_terminal_feed_child); - BIND_REQUIRED_SYMBOL(vte_terminal_im_append_menuitems); + BIND_SYMBOL(vte_terminal_im_append_menuitems); if (! BIND_SYMBOL(vte_terminal_set_cursor_blink_mode)) /* vte_terminal_set_cursor_blink_mode() is only available since 0.17.1, so if we don't find * this symbol, we are probably on an older version and use the old API instead */ BIND_REQUIRED_SYMBOL(vte_terminal_set_cursor_blinks); BIND_REQUIRED_SYMBOL(vte_terminal_select_all); BIND_REQUIRED_SYMBOL(vte_terminal_set_audible_bell); + if (! BIND_SYMBOL(vte_terminal_get_adjustment)) + /* vte_terminal_get_adjustment() is available since 0.9 and removed in 0.38 */ + vf->vte_terminal_get_adjustment = default_vte_terminal_get_adjustment; + #undef BIND_REQUIRED_SYMBOL_RGBA_WRAPPED #undef BIND_REQUIRED_SYMBOL + #undef BIND_REQUIRED_SYMBOL_FULL #undef BIND_SYMBOL + #undef BIND_SYMBOL_FULL return TRUE; } void vte_apply_user_settings(void) { + PangoFontDescription *font_desc; + if (! ui_prefs.msgwindow_visible) return; vf->vte_terminal_set_scrollback_lines(VTE_TERMINAL(vc->vte), vc->scrollback_lines); vf->vte_terminal_set_scroll_on_keystroke(VTE_TERMINAL(vc->vte), vc->scroll_on_key); vf->vte_terminal_set_scroll_on_output(VTE_TERMINAL(vc->vte), vc->scroll_on_out); - vf->vte_terminal_set_emulation(VTE_TERMINAL(vc->vte), vc->emulation); - vf->vte_terminal_set_font_from_string(VTE_TERMINAL(vc->vte), vc->font); + font_desc = pango_font_description_from_string(vc->font); + vf->vte_terminal_set_font(VTE_TERMINAL(vc->vte), font_desc); + pango_font_description_free(font_desc); vf->vte_terminal_set_color_foreground(VTE_TERMINAL(vc->vte), &vc->colour_fore); vf->vte_terminal_set_color_bold(VTE_TERMINAL(vc->vte), &vc->colour_fore); vf->vte_terminal_set_color_background(VTE_TERMINAL(vc->vte), &vc->colour_back); - vf->vte_terminal_set_background_image_file(VTE_TERMINAL(vc->vte), vc->image); vf->vte_terminal_set_audible_bell(VTE_TERMINAL(vc->vte), prefs.beep_on_errors); vte_set_cursor_blink_mode(); @@ -600,6 +721,7 @@ static GtkWidget *vte_create_popup_menu(void) { GtkWidget *menu, *item; GtkAccelGroup *accel_group; + gboolean show_im_menu = TRUE; menu = gtk_menu_new(); @@ -654,19 +776,31 @@ static GtkWidget *vte_create_popup_menu(void) msgwin_menu_add_common_items(GTK_MENU(menu)); - item = gtk_separator_menu_item_new(); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); + /* VTE 2.91 doesn't have IM context items, and GTK >= 3.10 doesn't show them anyway */ + if (! vf->vte_terminal_im_append_menuitems || gtk_check_version(3, 10, 0) == NULL) + show_im_menu = FALSE; + else /* otherwise, query the setting */ + g_object_get(gtk_settings_get_default(), "gtk-show-input-method-menu", &show_im_menu, NULL); + + if (! show_im_menu) + vc->im_submenu = NULL; + else + { + item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); - /* the IM submenu should always be the last item to be consistent with other GTK popup menus */ - vc->im_submenu = gtk_menu_new(); + /* the IM submenu should always be the last item to be consistent with other GTK popup menus */ + vc->im_submenu = gtk_menu_new(); - item = gtk_image_menu_item_new_with_mnemonic(_("_Input Methods")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); + item = gtk_image_menu_item_new_with_mnemonic(_("_Input Methods")); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + + gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), vc->im_submenu); + /* submenu populated after vte realized */ + } - gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), vc->im_submenu); - /* submenu populated after vte realized */ return menu; } @@ -822,18 +956,12 @@ void vte_append_preferences_tab(void) GtkWidget *frame_term, *button_shell, *entry_shell; GtkWidget *check_run_in_vte, *check_skip_script; GtkWidget *font_button, *fg_color_button, *bg_color_button; - GtkWidget *entry_image, *button_image; button_shell = GTK_WIDGET(ui_lookup_widget(ui_widgets.prefs_dialog, "button_term_shell")); entry_shell = GTK_WIDGET(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_shell")); ui_setup_open_button_callback(button_shell, NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_ENTRY(entry_shell)); - button_image = GTK_WIDGET(ui_lookup_widget(ui_widgets.prefs_dialog, "button_term_image")); - entry_image = GTK_WIDGET(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_image")); - ui_setup_open_button_callback(button_image, NULL, - GTK_FILE_CHOOSER_ACTION_OPEN, GTK_ENTRY(entry_image)); - check_skip_script = GTK_WIDGET(ui_lookup_widget(ui_widgets.prefs_dialog, "check_skip_script")); gtk_widget_set_sensitive(check_skip_script, vc->run_in_vte); Modified: src/vte.h 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -56,9 +56,7 @@ typedef struct gboolean cursor_blinks; gboolean send_selection_unsafe; gint scrollback_lines; - gchar *emulation; gchar *shell; - gchar *image; gchar *font; gchar *send_cmd_prefix; GdkColor colour_fore; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 96b110: updated it.po (#1285)
by Giuseppe 01 Nov '16

01 Nov '16

Branch: refs/heads/master Author: Giuseppe <giuspen(a)gmail.com> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Tue, 01 Nov 2016 07:45:51 UTC Commit: 96b11092f74588b0f0fac50cb774e701784d13b9 https://github.com/geany/geany/commit/96b11092f74588b0f0fac50cb774e701784d1… Log Message: ----------- updated it.po (#1285) Modified Paths: -------------- po/it.po Modified: po/it.po 16 lines changed, 9 insertions(+), 7 deletions(-) =================================================================== @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Geany 1.28\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-10-29 20:21+0200\n" -"PO-Revision-Date: 2016-06-30 19:05+0100\n" +"PO-Revision-Date: 2016-10-31 20:39+0000\n" "Last-Translator: Giuseppe Penone <giuspen(a)gmail.com>\n" "Language-Team: geany-i18n(a)uvena.de\n" "Language: it\n" @@ -20,7 +20,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-SourceCharset: iso-8859-15\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.7.1\n" #: ../geany.desktop.in.h:1 ../data/geany.glade.h:343 msgid "Geany" @@ -1061,7 +1061,7 @@ msgstr "" #: ../data/geany.glade.h:212 msgid "Lines visible _around the cursor:" -msgstr "" +msgstr "Righe visibili _attorno al cursore:" #: ../data/geany.glade.h:213 msgid "Display" @@ -3413,9 +3413,8 @@ msgid "Delete to line end" msgstr "Cancella fino a fine riga" #: ../src/keybindings.c:391 -#, fuzzy msgid "Delete to beginning of line" -msgstr "Cancella fino a fine riga" +msgstr "Cancella fino a inizio riga" #: ../src/keybindings.c:394 msgid "_Transpose Current Line" @@ -4110,6 +4109,8 @@ msgid "" "Proxy plugin '%s' extension '%s' starts with a dot. Please fix your proxy " "plugin." msgstr "" +"Il plugin proxy '%s' estensione '%s' inizia con un punto. Correggere il " +"plugin proxy." #: ../src/pluginutils.c:411 msgid "Configure Plugins" @@ -4403,12 +4404,11 @@ msgid "_Use regular expressions" msgstr "_Usa espressioni regolari" #: ../src/search.c:311 -#, fuzzy msgid "" "Use Perl-like regular expressions. For detailed information about using " "regular expressions, please refer to the manual." msgstr "" -"Imposta l'uso di espressioni regolari simil-POSIX. Per informazioni " +"Imposta l'uso di espressioni regolari simil-Perl. Per informazioni " "dettagliate sull'uso delle espressioni regolari, consultare la " "documentazione." @@ -5089,6 +5089,8 @@ msgid "" "Cannot execute template command \"%s\". Hint: incorrect paths in the command " "are a common cause of errors. Error: %s." msgstr "" +"Impossibile eseguire il modello di comando \"%s\". Suggerimento: percorsi " +"scorretti nei comandi sono causa comune di errori. Errore: %s." #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" #: ../src/toolbar.c:58 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2016