Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Tue, 05 Mar 2013 22:47:37 UTC
Commit: 5b2366964938b54005eec39d392fc5cbea81682b
https://github.com/geany/geany/commit/5b2366964938b54005eec39d392fc5cbea816…
Log Message:
-----------
Fix replacing file name in headers upon save as
The code used a Scintilla-specific regex escape (\<) which doesn't work
anymore since the time we switched to full PCRE (which uses \b). So,
update the regular expression to PCRE.
Also, properly escape the name to search in the unlikely case it has
regular expression escapes in it; and properly check for word
boundaries even when not searching with an extension.
Modified Paths:
--------------
src/document.c
Modified: src/document.c
5 files changed, 3 insertions(+), 2 deletions(-)
===================================================================
@@ -1362,10 +1362,11 @@ static void replace_header_filename(GeanyDocument *doc)
g_return_if_fail(doc != NULL);
g_return_if_fail(doc->file_type != NULL);
+ filebase = g_regex_escape_string(GEANY_STRING_UNTITLED, -1);
if (doc->file_type->extension)
- filebase = g_strconcat("\\<", GEANY_STRING_UNTITLED, "\\.\\w+", NULL);
+ SETPTR(filebase, g_strconcat("\\b", filebase, "\\.\\w+", NULL));
else
- filebase = g_strdup(GEANY_STRING_UNTITLED);
+ SETPTR(filebase, g_strconcat("\\b", filebase, "\\b", NULL));
filename = g_path_get_basename(doc->file_name);
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Frank Lanitz <frank(a)frank.uvena.de>
Committer: Frank Lanitz <frank(a)frank.uvena.de>
Date: Tue, 05 Mar 2013 18:44:31 UTC
Commit: 77e142bb73cb12777a37ae792784b171b667d0c4
https://github.com/geany/geany/commit/77e142bb73cb12777a37ae792784b171b667d…
Log Message:
-----------
Update of Slovenian translation
Modified Paths:
--------------
po/sl.po
Modified: po/sl.po
27 files changed, 12 insertions(+), 15 deletions(-)
===================================================================
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Geany 1.23\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-02-23 14:24+0100\n"
-"PO-Revision-Date: 2013-02-27 00:09+0100\n"
+"PO-Revision-Date: 2013-03-04 11:25+0100\n"
"Last-Translator: Jože Klepec <joze.klepec(a)siol.net>\n"
"Language-Team: Slovenian <lugos-slo(a)lugos.si>\n"
"Language: sl\n"
@@ -584,7 +584,7 @@ msgstr "Uporabi pokazatelje, da prikažeš napake prevajanja"
# squiggly=twisty!-->wavy
#: ../data/geany.glade.h:133
msgid "Whether to use indicators (a squiggly underline) to highlight the lines where the compiler found a warning or an error"
-msgstr "Ali naj bodo v uporabi pokazatelji (valovito podčrtavanje), ki poudarijo vrstice kjer je prevajalnik našel opozorilo ali napako"
+msgstr "Ali naj bodo v uporabi pokazatelji (valovito podčrtavanje), ki poudarijo vrstice, kjer je prevajalnik našel opozorilo ali napako"
#: ../data/geany.glade.h:134
msgid "Newline strips trailing spaces"
@@ -967,7 +967,7 @@ msgstr "Ustvari nove dokumente iz ukazne vrstice"
# "Open"!="Create"; "Ustvari"=="Create"; "Start"=="Začni"; "Začni"==nonsense_translation;
#: ../data/geany.glade.h:227
msgid "Start a new file for each command-line filename that doesn't exist"
-msgstr "Odpre novo datoteko za vsako datoteko iz ukazne vrstice, ki ne obstaja"
+msgstr "Odpre novo datoteko za vsako ime datoteke iz ukazne vrstice, ki ne obstaja"
#: ../data/geany.glade.h:228
msgid "Default end of line characters:"
@@ -1075,9 +1075,9 @@ msgid "Browser:"
msgstr "Brskalnik:"
#: ../data/geany.glade.h:254
-#, fuzzy, no-c-format
+#, no-c-format
msgid "A terminal emulator command (%c is substituted with the Geany run script filename)"
-msgstr "Ukaz terminalskega emultorja (%c se zamenja z datoteko Geany zagonske )"
+msgstr "Ukaz terminalskega posnemovalnika (%c se zamenja z imenom datoteke Geany zagonske skripte)"
#: ../data/geany.glade.h:255
msgid "Path (and possibly additional arguments) to your favorite browser"
@@ -2070,7 +2070,7 @@ msgstr "spodletela zamenjava %%p, ni aktivnega projekta"
#: ../src/build.c:786
msgid "Process failed, no working directory"
-msgstr "Spodletela proces, ni delovne mape."
+msgstr "Spodletel proces, ni delovne mape."
#: ../src/build.c:811
#, c-format
@@ -2862,7 +2862,7 @@ msgstr "Baltsko"
msgid "Central European"
msgstr "Srednjeevropsko"
-# ISO-IR-111 ni na voljo pod Windows
+# ISO-IR-111 ni na voljo pod Windows (this comment could be wrong, see Hebrew)
#. ISO-IR-111 not available on Windows
#: ../src/encodings.c:83
#: ../src/encodings.c:84
@@ -2890,7 +2890,7 @@ msgstr "Romunsko"
msgid "Arabic"
msgstr "Arabsko"
-# sploh ni na voljo, ? (je samo, potrebuješ nameščeno potrebno kodno stran)
+# sploh ni na voljo, ? (je samo, potrebuješ nameščeno potrebno kodno stran / it is, you need installed codepage)
#. not available at all, ?
#: ../src/encodings.c:96
#: ../src/encodings.c:98
@@ -4014,7 +4014,7 @@ msgstr "Projektne datoteke datoteke ni bilo možno zapisati"
msgid "Project \"%s\" created."
msgstr "Projekt \"%s\" ustvarjen."
-# V izvirniku - could not be loaded, ne: opened!
+# V izvirniku - could not be loaded, ne: opened! Vendar: "nalaganje" velja za internet in je neprimeren izraz.
#: ../src/project.c:241
#: ../src/project.c:273
#: ../src/project.c:953
@@ -4340,9 +4340,6 @@ msgstr "Iskanje ni bilo uspešno."
msgid "Bad regex: %s"
msgstr "Slab regularni izraz:: %s"
-# Probably correct wording of first sentence: Program Geany tried to access to the UNIX domain socket of another socket logged in as another user.
-# And probably proper wording of last sentence: This is a fatal error and Geany will now have to quit.
-# need reword - approved by Jože Klepec
#. TODO maybe this message needs a rewording
#: ../src/socket.c:228
msgid ""
@@ -4502,11 +4499,11 @@ msgstr "Zapisi"
#: ../src/symbols.c:752
msgid "Parts"
-msgstr ""
+msgstr "Delci"
#: ../src/symbols.c:753
msgid "Assembly"
-msgstr ""
+msgstr "Zbirnik"
#: ../src/symbols.c:754
msgid "Steps"
@@ -5075,7 +5072,7 @@ msgstr "R/P"
msgid "MOD"
msgstr "MOD"
-# assuming pos=position
+# pos=position >> poz(izicija)
#: ../src/ui_utils.c:331
#, c-format
msgid "pos: %d"
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Frank Lanitz <frank(a)frank.uvena.de>
Committer: Frank Lanitz <frank(a)frank.uvena.de>
Date: Tue, 05 Mar 2013 18:35:46 UTC
Commit: bf7a399ac9ef4bdbe02feaf53696dd62ca70214c
https://github.com/geany/geany/commit/bf7a399ac9ef4bdbe02feaf53696dd62ca702…
Log Message:
-----------
Update of Brasilian Portugese translation
Modified Paths:
--------------
po/pt_BR.po
Modified: po/pt_BR.po
3262 files changed, 1547 insertions(+), 1715 deletions(-)
===================================================================
No diff available, check online
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Enrico Troeger <enrico.troeger(a)uvena.de>
Committer: Enrico Troeger <enrico.troeger(a)uvena.de>
Date: Sun, 03 Mar 2013 22:33:25 UTC
Commit: 775ef628688c69de34640e12666aed5762a80dff
https://github.com/geany/geany/commit/775ef628688c69de34640e12666aed5762a80…
Log Message:
-----------
Set the working directory on Windows very early to also help code which uses relative resource paths
Modified Paths:
--------------
src/main.c
Modified: src/main.c
25 files changed, 14 insertions(+), 11 deletions(-)
===================================================================
@@ -376,6 +376,18 @@ static void get_line_and_column_from_filename(gchar *filename, gint *line, gint
}
+#ifdef G_OS_WIN32
+static void change_working_directory_on_windows(const gchar *install_dir)
+{
+ /* On Windows, change the working directory to the Geany installation path to not lock
+ * the directory of a file passed as command line argument (see bug #2626124).
+ * This also helps if plugins or other code uses relative paths to load
+ * any additional resources (e.g. share/geany-plugins/...). */
+ win32_set_working_directory(install_dir);
+}
+#endif
+
+
static void setup_paths(void)
{
gchar *data_dir;
@@ -390,6 +402,8 @@ static void setup_paths(void)
data_dir = g_build_filename(install_dir, "data", NULL); /* e.g. C:\Program Files\geany\data */
doc_dir = g_build_filename(install_dir, "doc", NULL);
+ change_working_directory_on_windows(install_dir);
+
g_free(install_dir);
#else
data_dir = g_build_filename(GEANY_DATADIR, "geany", NULL); /* e.g. /usr/share/geany */
@@ -1143,17 +1157,6 @@ gint main(gint argc, gchar **argv)
}
#endif
-#ifdef G_OS_WIN32
- {
- gchar *dir;
- /* On Windows, change the working directory to the Geany installation path to not lock
- * the directory of a file passed as command line argument (see bug #2626124). */
- dir = win32_get_installation_dir();
- win32_set_working_directory(dir);
- g_free(dir);
- }
-#endif
-
/* when we are really done with setting everything up and the main event loop is running,
* tell other components, mainly plugins, that startup is complete */
g_idle_add_full(G_PRIORITY_LOW, send_startup_complete, NULL, NULL);
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).