Commits March 2017

commits@lists.geany.org

1 participants
60 discussions

[geany/geany] ec1bde: Update of Slovak translation (#1424)
by Andrej Herceg 17 Mar '17

17 Mar '17

Branch: refs/heads/master Author: Andrej Herceg <chrono.i18n(a)gmail.com> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Fri, 17 Mar 2017 22:00:32 UTC Commit: ec1bde008db0e8174947ac8760358a0804b6af1e https://github.com/geany/geany/commit/ec1bde008db0e8174947ac8760358a0804b6a… Log Message: ----------- Update of Slovak translation (#1424) Modified Paths: -------------- po/sk.po Modified: po/sk.po 9 lines changed, 1 insertions(+), 8 deletions(-) =================================================================== @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Geany 1.30\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-02-19 19:13+0100\n" -"PO-Revision-Date: 2016-11-05 21:43+0100\n" +"PO-Revision-Date: 2017-03-06 19:36+0100\n" "Last-Translator: Andrej Herceg <chrono.i18n(a)gmail.com>\n" "Language-Team: Slovak\n" "Language: sk\n" @@ -1211,7 +1211,6 @@ msgid "Strip trailing spaces and tabs" msgstr "Odstrániť medzery a tabulátory na konci riadkov" #: ../data/geany.glade.h:250 -#, fuzzy msgid "Removes trailing spaces and tabs at the end of lines" msgstr "Odstráni medzery a tabulátory na konci riadkov" @@ -5951,9 +5950,3 @@ msgstr "Vedľa seba" #: ../plugins/splitwindow.c:468 msgid "Top and Bottom" msgstr "Nad sebou" - -#~ msgid "Background image:" -#~ msgstr "Obrázok pozadia:" - -#~ msgid "Sets the path to the background image in the terminal widget" -#~ msgstr "Nastaví cestu k obrázku použitému na pozadí okna terminálu" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 420c10: Update NEWS
by Colomban Wendling 17 Mar '17

17 Mar '17

Branch: refs/heads/1.30 Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 17 Mar 2017 19:44:06 UTC Commit: 420c10960974e193a611cf6c00c71ae280060482 https://github.com/geany/geany/commit/420c10960974e193a611cf6c00c71ae280060… Log Message: ----------- Update NEWS Modified Paths: -------------- NEWS Modified: NEWS 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1,5 +1,9 @@ Geany 1.30.1 (unreleased) + Editor + * Fix auto-completion and calltip popup position on multi-monitor + setups (Issue#1422). + Geany 1.30 (March 05, 2017) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 420c10: Update NEWS
by Colomban Wendling 17 Mar '17

17 Mar '17

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 17 Mar 2017 19:44:06 UTC Commit: 420c10960974e193a611cf6c00c71ae280060482 https://github.com/geany/geany/commit/420c10960974e193a611cf6c00c71ae280060… Log Message: ----------- Update NEWS Modified Paths: -------------- NEWS Modified: NEWS 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1,5 +1,9 @@ Geany 1.30.1 (unreleased) + Editor + * Fix auto-completion and calltip popup position on multi-monitor + setups (Issue#1422). + Geany 1.30 (March 05, 2017) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 03ee2e: GTK: Fix popup positioning on monitors not positioned at 0, 0
by Colomban Wendling 17 Mar '17

17 Mar '17

Branch: refs/heads/1.30 Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 17 Mar 2017 19:20:42 UTC Commit: 03ee2e2b00c707ce6451694c1b59ec77b832957c https://github.com/geany/geany/commit/03ee2e2b00c707ce6451694c1b59ec77b8329… Log Message: ----------- GTK: Fix popup positioning on monitors not positioned at 0,0 Fixes #1422. X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1920/ X-Scintilla-Commit-ID: 8e0cb37c4972cd66b33293b88031acf453685cfd Modified Paths: -------------- scintilla/gtk/PlatGTK.cxx Modified: scintilla/gtk/PlatGTK.cxx 34 lines changed, 14 insertions(+), 20 deletions(-) =================================================================== @@ -1059,25 +1059,21 @@ void Window::SetPositionRelative(PRectangle rc, Window relativeTo) { GdkWindow *wndRelativeTo = WindowFromWidget(PWidget(relativeTo.wid)); gdk_window_get_origin(wndRelativeTo, &ox, &oy); ox += rc.left; - if (ox < 0) - ox = 0; oy += rc.top; - if (oy < 0) - oy = 0; - GdkRectangle rcScreen = MonitorRectangleForWidget(PWidget(relativeTo.wid)); + GdkRectangle rcMonitor = MonitorRectangleForWidget(PWidget(relativeTo.wid)); /* do some corrections to fit into screen */ int sizex = rc.right - rc.left; int sizey = rc.bottom - rc.top; - const int screenWidth = rcScreen.width; - const int screenHeight = rcScreen.height; - if (sizex > screenWidth) - ox = 0; /* the best we can do */ - else if (ox + sizex > screenWidth) - ox = screenWidth - sizex; - if (oy + sizey > screenHeight) - oy = screenHeight - sizey; + if (sizex > rcMonitor.width || ox < rcMonitor.x) + ox = rcMonitor.x; /* the best we can do */ + else if (ox + sizex > rcMonitor.x + rcMonitor.width) + ox = rcMonitor.x + rcMonitor.width - sizex; + if (sizey > rcMonitor.height || oy < rcMonitor.y) + oy = rcMonitor.y; + else if (oy + sizey > rcMonitor.y + rcMonitor.height) + oy = rcMonitor.y + rcMonitor.height - sizey; gtk_window_move(GTK_WINDOW(PWidget(wid)), ox, oy); @@ -1929,20 +1925,18 @@ void Menu::Show(Point pt, Window &wnd) { // Rely on GTK+ to do the right thing with positioning gtk_menu_popup_at_pointer(widget, NULL); #else - GdkRectangle rcScreen = MonitorRectangleForWidget(PWidget(wnd.GetID())); - const int screenWidth = rcScreen.width; - const int screenHeight = rcScreen.height; + GdkRectangle rcMonitor = MonitorRectangleForWidget(PWidget(wnd.GetID())); GtkRequisition requisition; #if GTK_CHECK_VERSION(3,0,0) gtk_widget_get_preferred_size(GTK_WIDGET(widget), NULL, &requisition); #else gtk_widget_size_request(GTK_WIDGET(widget), &requisition); #endif - if ((pt.x + requisition.width) > screenWidth) { - pt.x = screenWidth - requisition.width; + if ((pt.x + requisition.width) > rcMonitor.x + rcMonitor.width) { + pt.x = rcMonitor.x + rcMonitor.width - requisition.width; } - if ((pt.y + requisition.height) > screenHeight) { - pt.y = screenHeight - requisition.height; + if ((pt.y + requisition.height) > rcMonitor.y + rcMonitor.height) { + pt.y = rcMonitor.y + rcMonitor.height - requisition.height; } gtk_menu_popup(widget, NULL, NULL, MenuPositionFunc, GINT_TO_POINTER((static_cast<int>(pt.y) << 16) | static_cast<int>(pt.x)), 0, -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 03ee2e: GTK: Fix popup positioning on monitors not positioned at 0, 0
by Colomban Wendling 17 Mar '17

17 Mar '17

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 17 Mar 2017 19:20:42 UTC Commit: 03ee2e2b00c707ce6451694c1b59ec77b832957c https://github.com/geany/geany/commit/03ee2e2b00c707ce6451694c1b59ec77b8329… Log Message: ----------- GTK: Fix popup positioning on monitors not positioned at 0,0 Fixes #1422. X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1920/ X-Scintilla-Commit-ID: 8e0cb37c4972cd66b33293b88031acf453685cfd Modified Paths: -------------- scintilla/gtk/PlatGTK.cxx Modified: scintilla/gtk/PlatGTK.cxx 34 lines changed, 14 insertions(+), 20 deletions(-) =================================================================== @@ -1059,25 +1059,21 @@ void Window::SetPositionRelative(PRectangle rc, Window relativeTo) { GdkWindow *wndRelativeTo = WindowFromWidget(PWidget(relativeTo.wid)); gdk_window_get_origin(wndRelativeTo, &ox, &oy); ox += rc.left; - if (ox < 0) - ox = 0; oy += rc.top; - if (oy < 0) - oy = 0; - GdkRectangle rcScreen = MonitorRectangleForWidget(PWidget(relativeTo.wid)); + GdkRectangle rcMonitor = MonitorRectangleForWidget(PWidget(relativeTo.wid)); /* do some corrections to fit into screen */ int sizex = rc.right - rc.left; int sizey = rc.bottom - rc.top; - const int screenWidth = rcScreen.width; - const int screenHeight = rcScreen.height; - if (sizex > screenWidth) - ox = 0; /* the best we can do */ - else if (ox + sizex > screenWidth) - ox = screenWidth - sizex; - if (oy + sizey > screenHeight) - oy = screenHeight - sizey; + if (sizex > rcMonitor.width || ox < rcMonitor.x) + ox = rcMonitor.x; /* the best we can do */ + else if (ox + sizex > rcMonitor.x + rcMonitor.width) + ox = rcMonitor.x + rcMonitor.width - sizex; + if (sizey > rcMonitor.height || oy < rcMonitor.y) + oy = rcMonitor.y; + else if (oy + sizey > rcMonitor.y + rcMonitor.height) + oy = rcMonitor.y + rcMonitor.height - sizey; gtk_window_move(GTK_WINDOW(PWidget(wid)), ox, oy); @@ -1929,20 +1925,18 @@ void Menu::Show(Point pt, Window &wnd) { // Rely on GTK+ to do the right thing with positioning gtk_menu_popup_at_pointer(widget, NULL); #else - GdkRectangle rcScreen = MonitorRectangleForWidget(PWidget(wnd.GetID())); - const int screenWidth = rcScreen.width; - const int screenHeight = rcScreen.height; + GdkRectangle rcMonitor = MonitorRectangleForWidget(PWidget(wnd.GetID())); GtkRequisition requisition; #if GTK_CHECK_VERSION(3,0,0) gtk_widget_get_preferred_size(GTK_WIDGET(widget), NULL, &requisition); #else gtk_widget_size_request(GTK_WIDGET(widget), &requisition); #endif - if ((pt.x + requisition.width) > screenWidth) { - pt.x = screenWidth - requisition.width; + if ((pt.x + requisition.width) > rcMonitor.x + rcMonitor.width) { + pt.x = rcMonitor.x + rcMonitor.width - requisition.width; } - if ((pt.y + requisition.height) > screenHeight) { - pt.y = screenHeight - requisition.height; + if ((pt.y + requisition.height) > rcMonitor.y + rcMonitor.height) { + pt.y = rcMonitor.y + rcMonitor.height - requisition.height; } gtk_menu_popup(widget, NULL, NULL, MenuPositionFunc, GINT_TO_POINTER((static_cast<int>(pt.y) << 16) | static_cast<int>(pt.x)), 0, -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 241402: Bump version in preparation for 1.30.1
by Colomban Wendling 17 Mar '17

17 Mar '17

Branch: refs/heads/1.30 Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 17 Mar 2017 19:19:56 UTC Commit: 241402972769b617dfaf1a2fbbc60f0b9f903ed7 https://github.com/geany/geany/commit/241402972769b617dfaf1a2fbbc60f0b9f903… Log Message: ----------- Bump version in preparation for 1.30.1 Modified Paths: -------------- NEWS configure.ac doc/geany.txt geany.exe.manifest geany_private.rc Modified: NEWS 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,6 @@ +Geany 1.30.1 (unreleased) + + Geany 1.30 (March 05, 2017) General Modified: configure.ac 2 lines 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.30], +AC_INIT([Geany], [1.30.1], [https://sourceforge.net/tracker/?group_id=153444&atid=787791]) AC_CONFIG_SRCDIR([src/geany.h]) AC_CONFIG_AUX_DIR([build-aux]) Modified: doc/geany.txt 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,4 @@ -.. |(version)| replace:: 1.30 +.. |(version)| replace:: 1.30.1 .. -*- reStructuredText -*- ======= Modified: geany.exe.manifest 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity - version="1.30.0.0" + version="1.30.1.0" processorArchitecture="X86" name="Geany" type="win32" /> Modified: geany_private.rc 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,8 @@ #include <windows.h> // include for version info constants -#define VER_FILEVERSION 1,30,0,0 -#define VER_FILEVERSION_STR "1.30" +#define VER_FILEVERSION 1,30,1,0 +#define VER_FILEVERSION_STR "1.30.1" #define APP_MANIFEST 1 A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "icons/geany.ico" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 241402: Bump version in preparation for 1.30.1
by Colomban Wendling 17 Mar '17

17 Mar '17

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 17 Mar 2017 19:19:56 UTC Commit: 241402972769b617dfaf1a2fbbc60f0b9f903ed7 https://github.com/geany/geany/commit/241402972769b617dfaf1a2fbbc60f0b9f903… Log Message: ----------- Bump version in preparation for 1.30.1 Modified Paths: -------------- NEWS configure.ac doc/geany.txt geany.exe.manifest geany_private.rc Modified: NEWS 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,6 @@ +Geany 1.30.1 (unreleased) + + Geany 1.30 (March 05, 2017) General Modified: configure.ac 2 lines 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.30], +AC_INIT([Geany], [1.30.1], [https://sourceforge.net/tracker/?group_id=153444&atid=787791]) AC_CONFIG_SRCDIR([src/geany.h]) AC_CONFIG_AUX_DIR([build-aux]) Modified: doc/geany.txt 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,4 @@ -.. |(version)| replace:: 1.30 +.. |(version)| replace:: 1.30.1 .. -*- reStructuredText -*- ======= Modified: geany.exe.manifest 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity - version="1.30.0.0" + version="1.30.1.0" processorArchitecture="X86" name="Geany" type="win32" /> Modified: geany_private.rc 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,8 @@ #include <windows.h> // include for version info constants -#define VER_FILEVERSION 1,30,0,0 -#define VER_FILEVERSION_STR "1.30" +#define VER_FILEVERSION 1,30,1,0 +#define VER_FILEVERSION_STR "1.30.1" #define APP_MANIFEST 1 A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "icons/geany.ico" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] ffb71f: Update of Greek translation
by Frank Lanitz 17 Mar '17

17 Mar '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Fri, 17 Mar 2017 14:56:00 UTC Commit: ffb71f95b3024501e10849ed8ba6a95a065c606d https://github.com/geany/geany/commit/ffb71f95b3024501e10849ed8ba6a95a065c6… Log Message: ----------- Update of Greek translation Modified Paths: -------------- po/el.po Modified: po/el.po 1826 lines changed, 804 insertions(+), 1022 deletions(-) =================================================================== No diff available, check online -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 751421: GTK: Fix popup positioning on monitors not positioned at 0, 0
by Colomban Wendling 17 Mar '17

17 Mar '17

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 17 Mar 2017 12:59:48 UTC Commit: 7514212d32d3a562051c03ee2e9522ba3c13bf1f https://github.com/geany/geany/commit/7514212d32d3a562051c03ee2e9522ba3c13b… Log Message: ----------- GTK: Fix popup positioning on monitors not positioned at 0,0 Fixes #1422. X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1920/ X-Scintilla-Commit-ID: 8e0cb37c4972cd66b33293b88031acf453685cfd Modified Paths: -------------- scintilla/gtk/PlatGTK.cxx Modified: scintilla/gtk/PlatGTK.cxx 34 lines changed, 14 insertions(+), 20 deletions(-) =================================================================== @@ -1059,25 +1059,21 @@ void Window::SetPositionRelative(PRectangle rc, Window relativeTo) { GdkWindow *wndRelativeTo = WindowFromWidget(PWidget(relativeTo.wid)); gdk_window_get_origin(wndRelativeTo, &ox, &oy); ox += rc.left; - if (ox < 0) - ox = 0; oy += rc.top; - if (oy < 0) - oy = 0; - GdkRectangle rcScreen = MonitorRectangleForWidget(PWidget(relativeTo.wid)); + GdkRectangle rcMonitor = MonitorRectangleForWidget(PWidget(relativeTo.wid)); /* do some corrections to fit into screen */ int sizex = rc.right - rc.left; int sizey = rc.bottom - rc.top; - const int screenWidth = rcScreen.width; - const int screenHeight = rcScreen.height; - if (sizex > screenWidth) - ox = 0; /* the best we can do */ - else if (ox + sizex > screenWidth) - ox = screenWidth - sizex; - if (oy + sizey > screenHeight) - oy = screenHeight - sizey; + if (sizex > rcMonitor.width || ox < rcMonitor.x) + ox = rcMonitor.x; /* the best we can do */ + else if (ox + sizex > rcMonitor.x + rcMonitor.width) + ox = rcMonitor.x + rcMonitor.width - sizex; + if (sizey > rcMonitor.height || oy < rcMonitor.y) + oy = rcMonitor.y; + else if (oy + sizey > rcMonitor.y + rcMonitor.height) + oy = rcMonitor.y + rcMonitor.height - sizey; gtk_window_move(GTK_WINDOW(PWidget(wid)), ox, oy); @@ -1929,20 +1925,18 @@ void Menu::Show(Point pt, Window &wnd) { // Rely on GTK+ to do the right thing with positioning gtk_menu_popup_at_pointer(widget, NULL); #else - GdkRectangle rcScreen = MonitorRectangleForWidget(PWidget(wnd.GetID())); - const int screenWidth = rcScreen.width; - const int screenHeight = rcScreen.height; + GdkRectangle rcMonitor = MonitorRectangleForWidget(PWidget(wnd.GetID())); GtkRequisition requisition; #if GTK_CHECK_VERSION(3,0,0) gtk_widget_get_preferred_size(GTK_WIDGET(widget), NULL, &requisition); #else gtk_widget_size_request(GTK_WIDGET(widget), &requisition); #endif - if ((pt.x + requisition.width) > screenWidth) { - pt.x = screenWidth - requisition.width; + if ((pt.x + requisition.width) > rcMonitor.x + rcMonitor.width) { + pt.x = rcMonitor.x + rcMonitor.width - requisition.width; } - if ((pt.y + requisition.height) > screenHeight) { - pt.y = screenHeight - requisition.height; + if ((pt.y + requisition.height) > rcMonitor.y + rcMonitor.height) { + pt.y = rcMonitor.y + rcMonitor.height - requisition.height; } gtk_menu_popup(widget, NULL, NULL, MenuPositionFunc, GINT_TO_POINTER((static_cast<int>(pt.y) << 16) | static_cast<int>(pt.x)), 0, -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 2a2b8d: Small update of German translation
by Frank Lanitz 15 Mar '17

15 Mar '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Wed, 15 Mar 2017 14:42:04 UTC Commit: 2a2b8d11b8ab84cc80039c951ef11ee498d9e209 https://github.com/geany/geany/commit/2a2b8d11b8ab84cc80039c951ef11ee498d9e… Log Message: ----------- Small update of German translation Modified Paths: -------------- po/de.po Modified: po/de.po 100 lines changed, 50 insertions(+), 50 deletions(-) =================================================================== @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Geany 1.30\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-19 19:13+0100\n" +"POT-Creation-Date: 2017-03-15 15:41+0100\n" "PO-Revision-Date: 2015-03-31 07:10+0200\n" "Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <geany-i18n(a)uvena.de>\n" @@ -2275,15 +2275,15 @@ msgstr "Andere:" #: ../src/about.c:48 msgid "" -"Copyright (c) 2005-2016\n" +"Copyright (c) 2005-2017\n" "Colomban Wendling\n" "Nick Treleaven\n" "Matthew Brush\n" "Enrico Tröger\n" "Frank Lanitz\n" "All rights reserved." msgstr "" -"Copyright (c) 2005-2016\n" +"Copyright (c) 2005-2017\n" "Colomban Wendling\n" "Nick Treleaven\n" "Matthew Brush\n" @@ -2977,7 +2977,7 @@ msgstr "Datei »%s« wurde gespeichert." msgid "Wrap search and find again?" msgstr "Suche vom Dokumentanfang bzw. -ende neu beginnen?" -#: ../src/document.c:2460 ../src/search.c:1366 ../src/search.c:1419 +#: ../src/document.c:2460 ../src/search.c:1368 ../src/search.c:1421 #: ../src/search.c:2222 ../src/search.c:2223 #, c-format msgid "No matches found for \"%s\"." @@ -3550,7 +3550,7 @@ msgstr "Neue Zeile vor der aktuellen einfügen" msgid "Insert New Line After Current" msgstr "Neue Zeile hinter der aktuellen Einfügen" -#: ../src/keybindings.c:529 ../src/search.c:464 +#: ../src/keybindings.c:529 ../src/search.c:466 msgid "Find" msgstr "Suchen" @@ -3562,11 +3562,11 @@ msgstr "Weitersuchen" msgid "Find Previous" msgstr "Vorheriges" -#: ../src/keybindings.c:540 ../src/search.c:617 +#: ../src/keybindings.c:540 ../src/search.c:619 msgid "Replace" msgstr "Ersetzen" -#: ../src/keybindings.c:542 ../src/search.c:867 +#: ../src/keybindings.c:542 ../src/search.c:869 msgid "Find in Files" msgstr "In Dateien suchen" @@ -4089,7 +4089,7 @@ msgstr "" "Für das Plugin »%s« beginnt die Erweiterung »%s« mit einem Punkt. Bitte " "korrigiere dies." -#: ../src/pluginutils.c:411 +#: ../src/pluginutils.c:427 msgid "Configure Plugins" msgstr "Plugins konfigurieren" @@ -4352,7 +4352,7 @@ msgstr "Projektverzeichnis konnte nicht erstellt werden (%s)." msgid "Project file could not be written (%s)." msgstr "Projektdatei konnte nicht geschrieben werden (%s)." -#: ../src/project.c:779 ../src/search.c:627 +#: ../src/project.c:779 ../src/search.c:629 msgid "_Replace" msgstr "_Ersetzen" @@ -4371,35 +4371,35 @@ msgstr "Auswahl des Projektdateinamens" msgid "Project \"%s\" opened." msgstr "Projekt »%s« geöffnet." -#: ../src/search.c:308 ../src/search.c:960 +#: ../src/search.c:310 ../src/search.c:962 msgid "_Use regular expressions" msgstr "Reguläre Ausdrücke _benutzen" -#: ../src/search.c:311 +#: ../src/search.c:313 msgid "" "Use Perl-like regular expressions. For detailed information about using " "regular expressions, please refer to the manual." msgstr "" "Benutze Perl-ähnliche reguläre Ausdrücke. Für weitere Informationen über " "reguläre Ausdrücke konsultieren Sie bitte die Dokumentation." -#: ../src/search.c:316 +#: ../src/search.c:318 msgid "Use _escape sequences" msgstr "S_onderzeichen maskieren" -#: ../src/search.c:320 +#: ../src/search.c:322 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode characters) with the " "corresponding control characters" msgstr "" "Ersetzt \\\\, \\t, \\n, \\r und \\uXXXX (Unicode-Zeichen) mit den " "entsprechenden Sonderzeichen" -#: ../src/search.c:323 +#: ../src/search.c:325 msgid "Use multi-line matchin_g" msgstr "_Mehrzeilen-Erkennung (multi-line matching) benutzen" -#: ../src/search.c:328 +#: ../src/search.c:330 msgid "" "Perform regular expression matching on the whole buffer at once rather than " "line by line, allowing matches to span multiple lines. In this mode, " @@ -4411,98 +4411,98 @@ msgstr "" "mehrere Zeilen gehen. In diesem Modus sind Zeilenumbrüche »normale« Zeichen " "und können in das Suchmuster integriert werden." -#: ../src/search.c:341 +#: ../src/search.c:343 msgid "Search _backwards" msgstr "_Rückwärts suchen" -#: ../src/search.c:347 ../src/search.c:969 +#: ../src/search.c:349 ../src/search.c:971 msgid "C_ase sensitive" msgstr "_Groß-/Kleinschreibung beachten" -#: ../src/search.c:351 ../src/search.c:974 +#: ../src/search.c:353 ../src/search.c:976 msgid "Match only a _whole word" msgstr "N_ur ganze Wörter finden" -#: ../src/search.c:355 +#: ../src/search.c:357 msgid "Match from s_tart of word" msgstr "_Wortanfänge finden" -#: ../src/search.c:471 +#: ../src/search.c:473 msgid "_Previous" msgstr "_Vorheriges" -#: ../src/search.c:476 +#: ../src/search.c:478 msgid "_Next" msgstr "_Nächstes" -#: ../src/search.c:480 ../src/search.c:638 ../src/search.c:877 +#: ../src/search.c:482 ../src/search.c:640 ../src/search.c:879 msgid "_Search for:" msgstr "Suc_he nach:" #. Now add the multiple match options -#: ../src/search.c:508 +#: ../src/search.c:510 msgid "_Find All" msgstr "_Alle finden" -#: ../src/search.c:515 +#: ../src/search.c:517 msgid "_Mark" msgstr "_Markieren" -#: ../src/search.c:517 +#: ../src/search.c:519 msgid "Mark all matches in the current document" msgstr "Markiert alle Treffer innerhalb des aktuellen Dokumentes" -#: ../src/search.c:522 ../src/search.c:697 +#: ../src/search.c:524 ../src/search.c:699 msgid "In Sessi_on" msgstr "In Sit_zung" -#: ../src/search.c:527 ../src/search.c:702 +#: ../src/search.c:529 ../src/search.c:704 msgid "_In Document" msgstr "_Im Dokument" #. close window checkbox -#: ../src/search.c:533 ../src/search.c:715 +#: ../src/search.c:535 ../src/search.c:717 msgid "Close _dialog" msgstr "_Diesen Dialog schließen" -#: ../src/search.c:537 ../src/search.c:719 +#: ../src/search.c:539 ../src/search.c:721 msgid "Disable this option to keep the dialog open" msgstr "Deaktivieren Sie diese Option um das Dialogfenster offen zu halten." -#: ../src/search.c:632 +#: ../src/search.c:634 msgid "Replace & Fi_nd" msgstr "Ersetzen und _Finden" -#: ../src/search.c:641 +#: ../src/search.c:643 msgid "Replace wit_h:" msgstr "Erse_tzen durch:" #. Now add the multiple replace options -#: ../src/search.c:690 +#: ../src/search.c:692 msgid "Re_place All" msgstr "_Alle ersetzen" -#: ../src/search.c:707 +#: ../src/search.c:709 msgid "In Se_lection" msgstr "I_n Auswahl" -#: ../src/search.c:709 +#: ../src/search.c:711 msgid "Replace all matches found in the currently selected text" msgstr "Ersetze alle Treffer im aktuell markierten Text" -#: ../src/search.c:826 +#: ../src/search.c:828 msgid "all" msgstr "alle" -#: ../src/search.c:828 +#: ../src/search.c:830 msgid "project" msgstr "Projekt" -#: ../src/search.c:830 +#: ../src/search.c:832 msgid "custom" msgstr "benutzerdefiniert" -#: ../src/search.c:834 +#: ../src/search.c:836 msgid "" "All: search all files in the directory\n" "Project: use file patterns defined in the project settings\n" @@ -4513,55 +4513,55 @@ msgstr "" "sind\n" "Benutzerdefiniert: Manuelles angeben der Dateimuster" -#: ../src/search.c:896 +#: ../src/search.c:898 msgid "Fi_les:" msgstr "Fi_lter:" -#: ../src/search.c:908 +#: ../src/search.c:910 msgid "File patterns, e.g. *.c *.h" msgstr "Dateinamensmuster, z.B. *.c *.h" -#: ../src/search.c:920 +#: ../src/search.c:922 msgid "_Directory:" msgstr "_Verzeichnis:" -#: ../src/search.c:939 +#: ../src/search.c:941 msgid "E_ncoding:" msgstr "_Kodierung" -#: ../src/search.c:963 +#: ../src/search.c:965 msgid "See grep's manual page for more information" msgstr "" "Für mehr Informationen konsultieren Sie bitte die Dokumentation von »grep«" -#: ../src/search.c:965 +#: ../src/search.c:967 msgid "_Recurse in subfolders" msgstr "_In Unterverzeichnissen" -#: ../src/search.c:978 +#: ../src/search.c:980 msgid "_Invert search results" msgstr "Su_chmuster umkehren" -#: ../src/search.c:982 +#: ../src/search.c:984 msgid "Invert the sense of matching, to select non-matching lines" msgstr "Invertiert die Trefferliste" -#: ../src/search.c:999 +#: ../src/search.c:1001 msgid "E_xtra options:" msgstr "_Zus. Optionen:" -#: ../src/search.c:1007 +#: ../src/search.c:1009 msgid "Other options to pass to Grep" msgstr "Andere Argumente, die an grep übergeben werden sollen" -#: ../src/search.c:1369 ../src/search.c:2228 ../src/search.c:2231 +#: ../src/search.c:1371 ../src/search.c:2228 ../src/search.c:2231 #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." msgstr[0] "%d Treffer für »%s« gefunden." msgstr[1] "%d Treffer für »%s« gefunden." -#: ../src/search.c:1425 +#: ../src/search.c:1427 #, c-format msgid "Replaced %u matches in %u documents." msgstr "%u Treffer in %u Dokumenten ersetzt" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2017