Branch: refs/heads/master
Author: Frank Lanitz <frank(a)frank.uvena.de>
Committer: Frank Lanitz <frank(a)frank.uvena.de>
Date: Wed, 27 May 2015 19:59:27 UTC
Commit: b5702f03dc04d774a165ff9e023ade0af38fec1e
https://github.com/geany/geany/commit/b5702f03dc04d774a165ff9e023ade0af38fe…
Log Message:
-----------
Update of German translation
Modified Paths:
--------------
po/de.po
Modified: po/de.po
49 lines changed, 37 insertions(+), 12 deletions(-)
===================================================================
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Geany 1.24\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-18 07:55+0200\n"
+"POT-Creation-Date: 2015-05-27 21:53+0200\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"
@@ -1641,7 +1641,7 @@ msgstr ""
msgid "<b>Terminal</b>"
msgstr "<b>Terminal</b>"
-#: ../data/geany.glade.h:334 ../src/prefs.c:1619 ../src/vte.c:300
+#: ../data/geany.glade.h:334 ../src/prefs.c:1619 ../src/vte.c:308
msgid "Terminal"
msgstr "Terminal"
@@ -2366,6 +2366,7 @@ msgid "Process failed (%s)"
msgstr "Prozess fehlgeschlagen (%s)"
#: ../src/build.c:813
+#, c-format
msgid "Invalid working directory \"%s\""
msgstr "Ungültiges Arbeitsverzeichnis »%s«!"
@@ -3722,12 +3723,12 @@ msgstr "Tastenkürzel"
msgid "The following keyboard shortcuts are configurable:"
msgstr "Die folgenden Tastenkürzel sind frei definierbar:"
-#: ../src/keyfile.c:1011
+#: ../src/keyfile.c:1018
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:1238
+#: ../src/keyfile.c:1245
msgid "Failed to load one or more session files."
msgstr ""
"Eine oder mehrere Datei(en) aus der letzten Sitzung konnte(n) nicht geladen "
@@ -4499,6 +4500,33 @@ msgstr ""
" Dies ist ein schwerwiegendes Problem, so dass Geany nun beendet werden "
"muss. "
+#: ../src/spawn.c:122
+#, c-format
+msgid "Text was empty (or contained only whitespace)"
+msgstr "Text war leer (oder hat nur Leerzeichen enthalten)"
+
+#: ../src/spawn.c:137 ../src/spawn.c:183
+#, c-format
+msgid "Text ended before matching quote was found for %c. (The text was '%s')"
+msgstr "Text hörte vor dem schließenden Zeichen für %c auf. (Der Text war »%s«)"
+
+#: ../src/spawn.c:145 ../src/spawn.c:159
+#, c-format
+msgid "A quoted Windows program name must be entirely inside the quotes"
+msgstr ""
+"Ein Windows-Programm-Name in Anführungszeichen muss den kompletten "
+"Namen beinhalten."
+
+#. or SPAWN error?
+#: ../src/spawn.c:235
+msgid "Program '%s' not found"
+msgstr "Programm »%s« nicht gefunden."
+
+#: ../src/spawn.c:272
+
+msgid "TerminateProcess() failed: %s"
+msgstr "TerminateProcess() fehlgeschlagen: %s"
+
#: ../src/stash.c:1137
msgid "Name"
msgstr "Name"
@@ -5320,24 +5348,24 @@ msgstr "CR"
msgid "LF"
msgstr "LF"
-#: ../src/vte.c:469
+#: ../src/vte.c:477
#, c-format
msgid "invalid VTE library \"%s\": missing symbol \"%s\""
msgstr "Ungültige VTE-Bibliothek \"%s\": Es fehlt das Symbol \"%s\""
-#: ../src/vte.c:618
+#: ../src/vte.c:626
msgid "_Set Path From Document"
msgstr "Pfad des Dokumentes _übernehmen"
-#: ../src/vte.c:623
+#: ../src/vte.c:631
msgid "_Restart Terminal"
msgstr "Terminal _neustarten"
-#: ../src/vte.c:646
+#: ../src/vte.c:654
msgid "_Input Methods"
msgstr "Eingabe_methoden"
-#: ../src/vte.c:739
+#: ../src/vte.c:747
msgid ""
"Directory not changed because the terminal may contain some input (press Ctrl"
"+C or Enter to clear it)."
@@ -5883,9 +5911,6 @@ msgstr "Oben und Unten"
#~ msgid "Cannot parse extra options: %s"
#~ msgstr "Konnte die zusätzlichen Optionen nicht analysieren: %s"
-#~ msgid "Command not found"
-#~ msgstr "Kommando konnte nicht gefunden werden"
-
#~ msgid "Process timed out after %.02f s!"
#~ msgstr "Der Prozess hat das Zeitlimit nach %.02f s erreicht!"
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Jiří Techet <techet(a)gmail.com>
Committer: Jiří Techet <techet(a)gmail.com>
Date: Mon, 06 Apr 2015 17:19:55 UTC
Commit: 942d4c6b7fbc10eaf984b4c6d51fcf4efd56f2fa
https://github.com/geany/geany/commit/942d4c6b7fbc10eaf984b4c6d51fcf4efd56f…
Log Message:
-----------
Start bash as a login shell in VTE under OS X
Graphical applications on OS X are started using launchd and don't inherit
shell's environment variables so we don't get the PS1 value. Do the same
as the OS X terminal emulator which runs the shell as a login shell (and yes,
on OS X .bash_profile is read for shells started in the terminal application
instead of .bashrc).
Modified Paths:
--------------
src/keyfile.c
Modified: src/keyfile.c
7 lines changed, 7 insertions(+), 0 deletions(-)
===================================================================
@@ -861,6 +861,13 @@ static void load_dialog_prefs(GKeyFile *config)
struct passwd *pw = getpwuid(getuid());
const gchar *shell = (pw != NULL) ? pw->pw_shell : "/bin/sh";
+#ifdef __APPLE__
+ /* Geany is started using launchd on OS X and we don't get any environment variables
+ * so PS1 isn't defined. Start as a login shell to read the corresponding config files. */
+ if (strcmp(shell, "/bin/bash") == 0)
+ shell = "/bin/bash -l";
+#endif
+
vc = g_new0(VteConfig, 1);
vte_info.dir = utils_get_setting_string(config, "VTE", "last_dir", NULL);
if ((vte_info.dir == NULL || utils_str_equal(vte_info.dir, "")) && pw != NULL)
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Jiří Techet <techet(a)gmail.com>
Committer: Jiří Techet <techet(a)gmail.com>
Date: Mon, 06 Apr 2015 17:12:34 UTC
Commit: ed3142d0dfacded023fc78d4bd2f0a5b81fe588b
https://github.com/geany/geany/commit/ed3142d0dfacded023fc78d4bd2f0a5b81fe5…
Log Message:
-----------
Use editor's default font also for VTE
On OS X Monospace 10 is too small (and using non-standard font).
As we already have a special OS X font for the editor, use this value
(having identical fonts both for the editor and VTE seems to be a
good default).
Modified Paths:
--------------
src/keyfile.c
Modified: src/keyfile.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -875,7 +875,7 @@ static void load_dialog_prefs(GKeyFile *config)
"send_selection_unsafe", FALSE);
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", "Monospace 10");
+ 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);
vc->scroll_on_out = utils_get_setting_boolean(config, "VTE", "scroll_on_out", TRUE);
vc->enable_bash_keys = utils_get_setting_boolean(config, "VTE", "enable_bash_keys", TRUE);
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Tue, 26 May 2015 11:26:52 UTC
Commit: 4b9f816a0388f90c4d1a56e6f9a2bb52abb2d37a
https://github.com/geany/geany/commit/4b9f816a0388f90c4d1a56e6f9a2bb52abb2d…
Log Message:
-----------
Update NEWS
Note that although the last Scintilla update was a pre-release update,
the final 3.5.6 release has no changes.
Modified Paths:
--------------
NEWS
Modified: NEWS
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -50,7 +50,7 @@ Geany 1.25 (unreleased)
(Issue#483).
Editor
- * Update Scintilla to version 3.5.3 (#1041).
+ * Update Scintilla to version 3.5.6 (#1041).
* Do not comment out blank lines when toggling comments (PR#79, Igor
Shaula).
* Improve handling of Verilog strings and comments.
--------------
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: Sun, 24 May 2015 08:58:21 UTC
Commit: 3748895e32211de1ee71de02c52821dbae17ef75
https://github.com/geany/geany/commit/3748895e32211de1ee71de02c52821dbae17e…
Log Message:
-----------
Merge pull request #504 from philippwiesemann/update-links
Update some links
Modified Paths:
--------------
HACKING
po/de.po
Modified: HACKING
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -98,7 +98,7 @@ See `Committing`_ for more information.
Windows tools
-------------
-* Git: http://git-scm.com/ and http://code.google.com/p/msysgit/
+* Git: http://git-scm.com/ and http://msysgit.github.io/
* diff, grep, etc: http://mingw.org/ or http://unxutils.sourceforge.net/
See also the 'Building on Windows' document on the website.
@@ -498,7 +498,7 @@ first (scintilla or ctags).
If you want to reuse an existing lexer and/or tag parser, making a
custom filetype is probably easier - it doesn't require any
changes to the source code. Follow instructions in the manual:
-http://geany.org/manual/geany.html#custom-filetypes. Don't forget to
+http://geany.org/manual/index.html#custom-filetypes. Don't forget to
update the ``[Groups]`` section in ``filetype_extensions.conf``.
.. warning::
Modified: po/de.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -5,7 +5,7 @@
# Frank Lanitz <frank(a)frank.uvena.de> 2006 - 2015
# Dominic Hopf <dh(a)dmaphy.de> 2008 - 2009
#
-# Basic guidelines for this translation: http://i18n.xfce.org/wiki/team_de
+# Basic guidelines for this translation: http://wiki.xfce.org/de/translations
#
msgid ""
msgstr ""
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Philipp Wiesemann <philipp.wiesemann(a)arcor.de>
Committer: Philipp Wiesemann <philipp.wiesemann(a)arcor.de>
Date: Fri, 22 May 2015 21:14:47 UTC
Commit: c1533332a79ead73c6d55021d82c705dc4972c9b
https://github.com/geany/geany/commit/c1533332a79ead73c6d55021d82c705dc4972…
Log Message:
-----------
Update link in translation file
The old link was an empty page.
Modified Paths:
--------------
po/de.po
Modified: po/de.po
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -5,7 +5,7 @@
# Frank Lanitz <frank(a)frank.uvena.de> 2006 - 2015
# Dominic Hopf <dh(a)dmaphy.de> 2008 - 2009
#
-# Basic guidelines for this translation: http://i18n.xfce.org/wiki/team_de
+# Basic guidelines for this translation: http://wiki.xfce.org/de/translations
#
msgid ""
msgstr ""
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).