Branch: refs/heads/master
Author: Pavel Roschin <roshin(a)scriptumplus.ru>
Committer: Pavel Roschin <roshin(a)scriptumplus.ru>
Date: Sat, 07 Nov 2015 22:05:12 UTC
Commit: 5c72d5409080a292275b47696e5ee392577c4fbe
https://github.com/geany/geany/commit/5c72d5409080a292275b47696e5ee392577c4…
Log Message:
-----------
Update of Russian translation
Modified Paths:
--------------
po/ru.po
Modified: po/ru.po
63 lines changed, 33 insertions(+), 30 deletions(-)
===================================================================
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: Geany 1.25\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-11-01 19:03+0100\n"
-"PO-Revision-Date: 2015-06-22 11:01+0300\n"
+"PO-Revision-Date: 2015-11-08 01:01+0300\n"
"Last-Translator: Pavel Roschin <rpg89(at)post(dot)ru>\n"
"Language-Team: Russian <ru(a)li.org>\n"
"Language: ru\n"
@@ -1574,7 +1574,6 @@ msgid "Follow path of the current file"
msgstr "Устанавливать путь вслед за текущим файлом"
#: ../data/geany.glade.h:328
-#, fuzzy
msgid "Whether to execute \"cd $path\" when you switch between opened files"
msgstr ""
"Выполнять ли \"cd $path\", когда вы переключаетесь между открытыми файлами"
@@ -2222,7 +2221,6 @@ msgid "Other:"
msgstr "Прочие:"
#: ../src/about.c:48
-#, fuzzy
msgid ""
"Copyright (c) 2005-2015\n"
"Colomban Wendling\n"
@@ -2232,7 +2230,7 @@ msgid ""
"Frank Lanitz\n"
"All rights reserved."
msgstr ""
-"Copyright (c) 2005-2014\n"
+"Copyright (c) 2005-2015\n"
"Colomban Wendling\n"
"Nick Treleaven\n"
"Matthew Brush\n"
@@ -2348,12 +2346,13 @@ msgstr ""
"(нажмите Ctrl+C или Enter, чтобы очистить терминал)."
#: ../src/build.c:912
-#, fuzzy, c-format
+#, c-format
msgid ""
"Cannot execute terminal command \"%s\": %s. Check the path setting in "
"Preferences."
msgstr ""
-"Не могу выполнить утилиту grep '%s'; проверьте путь, заданный в настройках."
+"Не могу выполнить команду \"%s\": %s. Проверьте правильность пути в "
+"настройках."
#: ../src/build.c:1020
msgid "Compilation failed."
@@ -2535,19 +2534,17 @@ msgstr "Не удалось открыть файл %s (файл не найде
#: ../src/callbacks.c:1473
msgid "Check the path setting in Filetype configuration."
-msgstr ""
+msgstr "Проверьте правильность пути в настройках типов файлов."
#: ../src/callbacks.c:1478
-#, fuzzy
msgid "Check the path setting in Preferences."
-msgstr ""
-"Не могу выполнить утилиту grep '%s'; проверьте путь, заданный в настройках."
+msgstr "Проверьте правильность пути в настройках."
#. G_SHELL_ERROR is parsing error, it may be caused by %s word with quotes
#: ../src/callbacks.c:1491
-#, fuzzy, c-format
+#, c-format
msgid "Cannot execute context action command \"%s\": %s. %s"
-msgstr "Не удалось выполнить внешнюю команду '%s' (%s)."
+msgstr "Не удалось выполнить команду контекстного действия \"%s\": %s. %s"
#: ../src/dialogs.c:160 ../src/document.c:2308 ../src/document.c:2373
#: ../src/document.c:2381
@@ -2798,7 +2795,7 @@ msgstr ", только чтение"
#: ../src/document.c:1627
msgid "Discard history"
-msgstr ""
+msgstr "Сброс истории"
#: ../src/document.c:1628
msgid ""
@@ -2807,11 +2804,14 @@ msgid ""
"will not be displayed again but Your choice can be changed in the various "
"preferences."
msgstr ""
+"Предыдущее состояние буфера находится в истории и отмена действия "
+"восстанавливает его. Вы можете отключить данное поведение, выполняя сброс "
+"истории при перезагрузке. Данное сообщение не будет отображаться повторно, но "
+"ваш выбор может быть изменён в настройках \"Разное\"."
#: ../src/document.c:1632
-#, fuzzy
msgid "The file has been reloaded."
-msgstr "Документ закрыт."
+msgstr "Файл был загружен заново."
#: ../src/document.c:1662
msgid "Any unsaved changes will be lost."
@@ -3920,9 +3920,8 @@ msgid "Switch to Document"
msgstr "Перейти к документу"
#: ../src/notebook.c:451
-#, fuzzy
msgid "Open in New _Window"
-msgstr "Открыть в _Geany"
+msgstr "Открыть в новом _окне"
#: ../src/plugins.c:223
#, c-format
@@ -3943,6 +3942,9 @@ msgid ""
"<i>Other plugins depend on this. Disable them first to allow deactivation.</"
"i>\n"
msgstr ""
+"\n"
+"<i>Этот модуль нужен для работы других. Отключите сначала зависимые модули.</"
+"i>\n"
#. Four allocations is less than ideal but meh
#: ../src/plugins.c:1602
@@ -4111,12 +4113,13 @@ msgstr ""
"%s"
#: ../src/printing.c:615
-#, fuzzy, c-format
+#, c-format
msgid ""
"Cannot execute print command \"%s\": %s. Check the path setting in "
"Preferences."
msgstr ""
-"Не могу выполнить утилиту grep '%s'; проверьте путь, заданный в настройках."
+"Не могу запустить команду печати \"%s\": %s. Проверьте правильность пути в "
+"настройках."
#: ../src/printing.c:622
#, c-format
@@ -4464,11 +4467,11 @@ msgid "%s %s -- %s (in directory: %s)"
msgstr "%s %s -- %s (в каталоге: %s)"
#: ../src/search.c:1718
-#, fuzzy, c-format
+#, c-format
msgid ""
"Cannot execute grep tool \"%s\": %s. Check the path setting in Preferences."
msgstr ""
-"Не могу выполнить утилиту grep '%s'; проверьте путь, заданный в настройках."
+"Не могу запустить утилиту grep \"%s\": %s. Проверьте правильность пути в настройках."
#: ../src/search.c:1758
#, c-format
@@ -4508,9 +4511,8 @@ msgstr ""
"Дальнейшее продолжение работы невозможно."
#: ../src/spawn.c:90 ../src/spawn.c:140 ../src/spawn.c:184
-#, fuzzy
msgid "Text ended before matching quote was found"
-msgstr "Не найдена парная кавычка для %c. (Текст команды: '%s')"
+msgstr "Текст команды завершился до того, как была найдена парная кавычка"
#. TL note: from glib
#: ../src/spawn.c:126
@@ -4523,18 +4525,16 @@ msgstr ""
"Экранированная команда Windows должна быть полностью заключена в кавычки"
#: ../src/spawn.c:254
-#, fuzzy
msgid "Program not found"
-msgstr "Команда '%s' не найдена"
+msgstr "Программа не найдена"
#: ../src/spawn.c:668
-#, fuzzy
msgid "Failed to change to the working directory"
-msgstr "Ошибка: не указан рабочий каталог"
+msgstr "Не удалось сменить рабочий каталог"
#: ../src/spawn.c:673
msgid "Unknown error executing child process"
-msgstr ""
+msgstr "Неизвестная ошибка при запуске дочернего процесса"
#: ../src/stash.c:1150
msgid "Name"
@@ -4931,6 +4931,8 @@ msgid ""
"Cannot execute command \"%s\" from the template: %s. Check the path in the "
"template."
msgstr ""
+"Не удалось запустить команду \"%s\" из шаблона: %s. Проверьте корректность "
+"пути в шаблоне."
#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build"
#: ../src/toolbar.c:58
@@ -5106,12 +5108,13 @@ msgid "The executed custom command exited with an unsuccessful exit code."
msgstr "Выполненная команда пользователя завершилась с ошибкой."
#: ../src/tools.c:242
-#, fuzzy, c-format
+#, c-format
msgid ""
"Cannot execute custom command \"%s\": %s. Check the path setting in Custom "
"Commands."
msgstr ""
-"Не могу выполнить утилиту grep '%s'; проверьте путь, заданный в настройках."
+"Не удалось выполнить пользовательскую команду \"%s\": %s. Проверьте "
+"правильность пути в пользовательских командах."
#: ../src/tools.c:357 ../src/tools.c:620
msgid "Set Custom Commands"
--------------
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: Thu, 05 Nov 2015 08:53:05 UTC
Commit: 756d4abdb2155271a28a53835433dd021cb8998a
https://github.com/geany/geany/commit/756d4abdb2155271a28a53835433dd021cb89…
Log Message:
-----------
Merge pull request #733 from peter-scholtens/master
After update of ./waf updatepo
Modified Paths:
--------------
po/nl.po
Modified: po/nl.po
90 lines changed, 52 insertions(+), 38 deletions(-)
===================================================================
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Geany 1.25\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-01 19:03+0100\n"
+"POT-Creation-Date: 2015-11-04 21:35+0100\n"
"PO-Revision-Date: 2014-11-13 17:31+0100\n"
"Last-Translator: Peter Scholtens <peter.scholtens(a)xs4all.nl>\n"
"Language-Team: Dutch <geany-i18n(a)uvena.de>\n"
@@ -1254,7 +1254,9 @@ msgstr "Browser:"
msgid ""
"A terminal emulator command (%c is substituted with the Geany run script "
"filename)"
-msgstr "Een terminalemulatorcommando (%c wordt vervangen door het Geany runscript bestandsnaam)"
+msgstr ""
+"Een terminalemulatorcommando (%c wordt vervangen door het Geany runscript "
+"bestandsnaam)"
#: ../data/geany.glade.h:258
msgid "Path (and possibly additional arguments) to your favorite browser"
@@ -1385,7 +1387,7 @@ msgstr "_Wijzigen"
msgid "<b>Keyboard shortcuts</b>"
msgstr "<b>Sneltoetsen</b>"
-#: ../data/geany.glade.h:286 ../src/plugins.c:1891 ../src/plugins.c:1928
+#: ../data/geany.glade.h:286 ../src/plugins.c:1894 ../src/plugins.c:1931
#: ../src/prefs.c:1613
msgid "Keybindings"
msgstr "Sneltoetsen"
@@ -2121,8 +2123,8 @@ msgstr "Eigenschappen"
msgid "Filename:"
msgstr "Bestandsnaam:"
-#: ../data/geany.glade.h:460 ../src/project.c:169 ../plugins/classbuilder.c:467
-#: ../plugins/classbuilder.c:477
+#: ../data/geany.glade.h:460 ../src/project.c:169
+#: ../plugins/classbuilder.c:467 ../plugins/classbuilder.c:477
msgid "Name:"
msgstr "Naam:"
@@ -2241,7 +2243,8 @@ msgid ""
"Enrico Tröger\n"
"Frank Lanitz\n"
"All rights reserved."
-msgstr "Auteursrecht (c) 2005-2015\n"
+msgstr ""
+"Auteursrecht (c) 2005-2015\n"
"Colomban Wendling\n"
"Nick Treleaven\n"
"Matthew Brush\n"
@@ -2340,6 +2343,7 @@ msgid "Process failed (%s)"
msgstr "Proces mislukt (%s)"
#: ../src/build.c:813
+#, c-format
msgid "Invalid working directory \"%s\""
msgstr "Kan werkmap niet veranderen naar '%s'"
@@ -2353,16 +2357,18 @@ msgstr ""
msgid ""
"File not executed because the terminal may contain some input (press Ctrl+C "
"or Enter to clear it)."
-msgstr "Bestand niet uitgevoerd omdat de terminal wellicht invoer bevat (druk "
-"Ctrl+C of Enter om op te schonen."
+msgstr ""
+"Bestand niet uitgevoerd omdat de terminal wellicht invoer bevat (druk Ctrl+C "
+"of Enter om op te schonen."
#: ../src/build.c:912
+#, c-format
msgid ""
"Cannot execute terminal command \"%s\": %s. Check the path setting in "
"Preferences."
msgstr ""
-"Kan terminalprogramma '%s' niet uitvoeren: %s; controleer de padinstelling in "
-"Voorkeuren."
+"Kan terminalprogramma '%s' niet uitvoeren: %s; controleer de padnaaminstelling "
+"in Voorkeuren."
#: ../src/build.c:1020
msgid "Compilation failed."
@@ -2477,8 +2483,8 @@ msgid ""
"%d, %e, %f, %p, %l are substituted in command and directory fields, see "
"manual for details."
msgstr ""
-"%d, %e, %f, %p, %l worden vervangen in de commando- en directoryvelden, zie de "
-"handleiding voor details."
+"%d, %e, %f, %p, %l worden vervangen in de commando- en directoryvelden, zie "
+"de handleiding voor details."
#: ../src/build.c:2167
msgid "Set Build Commands"
@@ -2552,6 +2558,7 @@ msgstr "Controleer padinstellingen bij Voorkeuren."
#. G_SHELL_ERROR is parsing error, it may be caused by %s word with quotes
#: ../src/callbacks.c:1491
+#, c-format
msgid "Cannot execute context action command \"%s\": %s. %s"
msgstr "Kan situatie specifieke commando '%s' niet uitvoeren (%s. %s)."
@@ -2813,10 +2820,12 @@ msgid ""
"it. You can disable this by discarding the history upon reload. This message "
"will not be displayed again but Your choice can be changed in the various "
"preferences."
-msgstr "De vorige toestand van de buffer is opgeslagen in de geschiedenis en "
-"Ongedaan Maken haalt deze terug. Je kunt dit uitschakelen door de geschiedenis "
-"bij herladen uit te zetten. Deze mededeling zal niet opnieuw worden weegegeven "
-"maar je keuze kan gewijzigd worden in de diverse voorkeuren."
+msgstr ""
+"De vorige toestand van de buffer is opgeslagen in de geschiedenis en "
+"Ongedaan Maken haalt deze terug. Je kunt dit uitschakelen door de "
+"geschiedenis bij herladen uit te zetten. Deze mededeling zal niet opnieuw "
+"worden weegegeven maar je keuze kan gewijzigd worden in de diverse "
+"voorkeuren."
#: ../src/document.c:1632
msgid "The file has been reloaded."
@@ -2845,8 +2854,8 @@ msgid ""
"An error occurred while converting the file from UTF-8 in \"%s\". The file "
"remains unsaved."
msgstr ""
-"Er deed zich een fout voor tijdens het omzetten van het bestand van UTF-8 "
-"in \"%s\". Het bestand blijft onopgeslagen."
+"Er deed zich een fout voor tijdens het omzetten van het bestand van UTF-8 in "
+"\"%s\". Het bestand blijft onopgeslagen."
#: ../src/document.c:1912
#, c-format
@@ -3945,18 +3954,17 @@ msgstr ""
msgid "_Plugin Manager"
msgstr "_Plugin beheer"
-#: ../src/plugins.c:1600
+#: ../src/plugins.c:1603
msgid ""
"\n"
"<i>Other plugins depend on this. Disable them first to allow deactivation.</"
"i>\n"
msgstr ""
"\n"
-"<i>Andere plug-ins zijn hiervan afhankelijk. Schakel die eerst uit.</"
-"i>\n"
+"<i>Andere plug-ins zijn hiervan afhankelijk. Schakel die eerst uit.</i>\n"
#. Four allocations is less than ideal but meh
-#: ../src/plugins.c:1602
+#: ../src/plugins.c:1605
#, c-format
msgid ""
"Version:\t%s\n"
@@ -3967,23 +3975,23 @@ msgstr ""
"Auteur(s):\t%s\n"
"Bestandsnaam:\t%s"
-#: ../src/plugins.c:1630
+#: ../src/plugins.c:1633
msgid "No plugins available."
msgstr "Geen plugins beschikbaar"
-#: ../src/plugins.c:1762
+#: ../src/plugins.c:1765
msgid "Active"
msgstr "Actief"
-#: ../src/plugins.c:1769
+#: ../src/plugins.c:1772
msgid "Plugin"
msgstr "Plugin"
-#: ../src/plugins.c:1876
+#: ../src/plugins.c:1879
msgid "Plugins"
msgstr "Plugins"
-#: ../src/plugins.c:1917
+#: ../src/plugins.c:1920
msgid "Choose which plugins should be loaded at startup:"
msgstr "Kies welke plugins bij het starten geladen moeten worden:"
@@ -4126,6 +4134,7 @@ msgstr ""
"%s"
#: ../src/printing.c:615
+#, c-format
msgid ""
"Cannot execute print command \"%s\": %s. Check the path setting in "
"Preferences."
@@ -4165,7 +4174,8 @@ msgstr "Projectnaam"
msgid ""
"Path of the file representing the project and storing its settings. It "
"should normally have the \"%s\" extension."
-msgstr "Pad naar het bestand dat het project representeerd and instellingen bewaard. "
+msgstr ""
+"Pad naar het bestand dat het project representeerd and instellingen bewaard. "
"Het heeft normaliter de '%s' extensie."
#: ../src/project.c:212 ../src/project.c:484
@@ -4480,11 +4490,12 @@ msgid "%s %s -- %s (in directory: %s)"
msgstr "%s %s -- %s (in map: %s)"
#: ../src/search.c:1718
+#, c-format
msgid ""
"Cannot execute grep tool \"%s\": %s. Check the path setting in Preferences."
msgstr ""
-"Kan hulpprogramma grep '%s' niet uitvoeren: %s; controleer de padinstelling in "
-"Voorkeuren."
+"Kan hulpprogramma grep '%s' niet uitvoeren: %s; controleer de padinstelling "
+"in Voorkeuren."
#: ../src/search.c:1758
#, c-format
@@ -4942,7 +4953,9 @@ msgstr "Omzetting van sjabloon bestand '%s' naar UTF-8 mislukt"
msgid ""
"Cannot execute command \"%s\" from the template: %s. Check the path in the "
"template."
-msgstr "Kan commando '%s' van sjabloon '%s' niet uitvoeren. Controleer pad in sjabloon"
+msgstr ""
+"Kan commando '%s' van sjabloon '%s' niet uitvoeren. Controleer pad in "
+"sjabloon"
#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build"
#: ../src/toolbar.c:58
@@ -5126,7 +5139,7 @@ msgid ""
"Cannot execute custom command \"%s\": %s. Check the path setting in Custom "
"Commands."
msgstr ""
-"Kon aangepaste commando '%s' niet uitvoeren; controleer de padinstelling in "
+"Kon aangepaste commando '%s' niet uitvoeren: %s; controleer de padnaaminstelling in "
"Aangepaste Commando's."
#: ../src/tools.c:357 ../src/tools.c:620
@@ -5321,8 +5334,7 @@ msgstr ""
#: ../src/ui_utils.c:747
msgid "Date format string could not be converted (possibly too long)."
-msgstr ""
-"Datumformaatstring kon niet omgezet worden (waarschijnlijk te lang)."
+msgstr "Datumformaatstring kon niet omgezet worden (waarschijnlijk te lang)."
#: ../src/ui_utils.c:822
msgid "_Set Custom Date Format"
@@ -5409,8 +5421,9 @@ msgstr "_Invoermethoden"
msgid ""
"Directory not changed because the terminal may contain some input (press Ctrl"
"+C or Enter to clear it)."
-msgstr "Map niet gewijzigd omdat de terminal wellicht invoer bevat (druk "
-"Ctrl+C of Enter om op te schonen."
+msgstr ""
+"Map niet gewijzigd omdat de terminal wellicht invoer bevat (druk Ctrl+C of "
+"Enter om op te schonen."
#: ../src/win32.c:211
msgid "Geany project files"
@@ -5536,8 +5549,9 @@ msgstr "HTML Karakters"
msgid "Inserts HTML character entities like '&'."
msgstr "Voeg HTML karakters toe zoals '&'."
-#: ../plugins/htmlchars.c:40 ../plugins/export.c:38 ../plugins/filebrowser.c:51
-#: ../plugins/saveactions.c:44 ../plugins/splitwindow.c:35
+#: ../plugins/htmlchars.c:40 ../plugins/export.c:38
+#: ../plugins/filebrowser.c:51 ../plugins/saveactions.c:44
+#: ../plugins/splitwindow.c:35
msgid "The Geany developer team"
msgstr "Het Geany ontwikkelingsteam"
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Peter C. S. Scholtens <peter.scholtens(a)xs4all.nl>
Committer: Peter C. S. Scholtens <peter.scholtens(a)xs4all.nl>
Date: Wed, 04 Nov 2015 20:47:36 UTC
Commit: 2d2445152e3bfbb5fed310be194e4dc24eff4111
https://github.com/geany/geany/commit/2d2445152e3bfbb5fed310be194e4dc24eff4…
Log Message:
-----------
After update of ./waf updatepo
Modified Paths:
--------------
po/nl.po
Modified: po/nl.po
90 lines changed, 52 insertions(+), 38 deletions(-)
===================================================================
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Geany 1.25\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-01 19:03+0100\n"
+"POT-Creation-Date: 2015-11-04 21:35+0100\n"
"PO-Revision-Date: 2014-11-13 17:31+0100\n"
"Last-Translator: Peter Scholtens <peter.scholtens(a)xs4all.nl>\n"
"Language-Team: Dutch <geany-i18n(a)uvena.de>\n"
@@ -1254,7 +1254,9 @@ msgstr "Browser:"
msgid ""
"A terminal emulator command (%c is substituted with the Geany run script "
"filename)"
-msgstr "Een terminalemulatorcommando (%c wordt vervangen door het Geany runscript bestandsnaam)"
+msgstr ""
+"Een terminalemulatorcommando (%c wordt vervangen door het Geany runscript "
+"bestandsnaam)"
#: ../data/geany.glade.h:258
msgid "Path (and possibly additional arguments) to your favorite browser"
@@ -1385,7 +1387,7 @@ msgstr "_Wijzigen"
msgid "<b>Keyboard shortcuts</b>"
msgstr "<b>Sneltoetsen</b>"
-#: ../data/geany.glade.h:286 ../src/plugins.c:1891 ../src/plugins.c:1928
+#: ../data/geany.glade.h:286 ../src/plugins.c:1894 ../src/plugins.c:1931
#: ../src/prefs.c:1613
msgid "Keybindings"
msgstr "Sneltoetsen"
@@ -2121,8 +2123,8 @@ msgstr "Eigenschappen"
msgid "Filename:"
msgstr "Bestandsnaam:"
-#: ../data/geany.glade.h:460 ../src/project.c:169 ../plugins/classbuilder.c:467
-#: ../plugins/classbuilder.c:477
+#: ../data/geany.glade.h:460 ../src/project.c:169
+#: ../plugins/classbuilder.c:467 ../plugins/classbuilder.c:477
msgid "Name:"
msgstr "Naam:"
@@ -2241,7 +2243,8 @@ msgid ""
"Enrico Tröger\n"
"Frank Lanitz\n"
"All rights reserved."
-msgstr "Auteursrecht (c) 2005-2015\n"
+msgstr ""
+"Auteursrecht (c) 2005-2015\n"
"Colomban Wendling\n"
"Nick Treleaven\n"
"Matthew Brush\n"
@@ -2340,6 +2343,7 @@ msgid "Process failed (%s)"
msgstr "Proces mislukt (%s)"
#: ../src/build.c:813
+#, c-format
msgid "Invalid working directory \"%s\""
msgstr "Kan werkmap niet veranderen naar '%s'"
@@ -2353,16 +2357,18 @@ msgstr ""
msgid ""
"File not executed because the terminal may contain some input (press Ctrl+C "
"or Enter to clear it)."
-msgstr "Bestand niet uitgevoerd omdat de terminal wellicht invoer bevat (druk "
-"Ctrl+C of Enter om op te schonen."
+msgstr ""
+"Bestand niet uitgevoerd omdat de terminal wellicht invoer bevat (druk Ctrl+C "
+"of Enter om op te schonen."
#: ../src/build.c:912
+#, c-format
msgid ""
"Cannot execute terminal command \"%s\": %s. Check the path setting in "
"Preferences."
msgstr ""
-"Kan terminalprogramma '%s' niet uitvoeren: %s; controleer de padinstelling in "
-"Voorkeuren."
+"Kan terminalprogramma '%s' niet uitvoeren: %s; controleer de padnaaminstelling "
+"in Voorkeuren."
#: ../src/build.c:1020
msgid "Compilation failed."
@@ -2477,8 +2483,8 @@ msgid ""
"%d, %e, %f, %p, %l are substituted in command and directory fields, see "
"manual for details."
msgstr ""
-"%d, %e, %f, %p, %l worden vervangen in de commando- en directoryvelden, zie de "
-"handleiding voor details."
+"%d, %e, %f, %p, %l worden vervangen in de commando- en directoryvelden, zie "
+"de handleiding voor details."
#: ../src/build.c:2167
msgid "Set Build Commands"
@@ -2552,6 +2558,7 @@ msgstr "Controleer padinstellingen bij Voorkeuren."
#. G_SHELL_ERROR is parsing error, it may be caused by %s word with quotes
#: ../src/callbacks.c:1491
+#, c-format
msgid "Cannot execute context action command \"%s\": %s. %s"
msgstr "Kan situatie specifieke commando '%s' niet uitvoeren (%s. %s)."
@@ -2813,10 +2820,12 @@ msgid ""
"it. You can disable this by discarding the history upon reload. This message "
"will not be displayed again but Your choice can be changed in the various "
"preferences."
-msgstr "De vorige toestand van de buffer is opgeslagen in de geschiedenis en "
-"Ongedaan Maken haalt deze terug. Je kunt dit uitschakelen door de geschiedenis "
-"bij herladen uit te zetten. Deze mededeling zal niet opnieuw worden weegegeven "
-"maar je keuze kan gewijzigd worden in de diverse voorkeuren."
+msgstr ""
+"De vorige toestand van de buffer is opgeslagen in de geschiedenis en "
+"Ongedaan Maken haalt deze terug. Je kunt dit uitschakelen door de "
+"geschiedenis bij herladen uit te zetten. Deze mededeling zal niet opnieuw "
+"worden weegegeven maar je keuze kan gewijzigd worden in de diverse "
+"voorkeuren."
#: ../src/document.c:1632
msgid "The file has been reloaded."
@@ -2845,8 +2854,8 @@ msgid ""
"An error occurred while converting the file from UTF-8 in \"%s\". The file "
"remains unsaved."
msgstr ""
-"Er deed zich een fout voor tijdens het omzetten van het bestand van UTF-8 "
-"in \"%s\". Het bestand blijft onopgeslagen."
+"Er deed zich een fout voor tijdens het omzetten van het bestand van UTF-8 in "
+"\"%s\". Het bestand blijft onopgeslagen."
#: ../src/document.c:1912
#, c-format
@@ -3945,18 +3954,17 @@ msgstr ""
msgid "_Plugin Manager"
msgstr "_Plugin beheer"
-#: ../src/plugins.c:1600
+#: ../src/plugins.c:1603
msgid ""
"\n"
"<i>Other plugins depend on this. Disable them first to allow deactivation.</"
"i>\n"
msgstr ""
"\n"
-"<i>Andere plug-ins zijn hiervan afhankelijk. Schakel die eerst uit.</"
-"i>\n"
+"<i>Andere plug-ins zijn hiervan afhankelijk. Schakel die eerst uit.</i>\n"
#. Four allocations is less than ideal but meh
-#: ../src/plugins.c:1602
+#: ../src/plugins.c:1605
#, c-format
msgid ""
"Version:\t%s\n"
@@ -3967,23 +3975,23 @@ msgstr ""
"Auteur(s):\t%s\n"
"Bestandsnaam:\t%s"
-#: ../src/plugins.c:1630
+#: ../src/plugins.c:1633
msgid "No plugins available."
msgstr "Geen plugins beschikbaar"
-#: ../src/plugins.c:1762
+#: ../src/plugins.c:1765
msgid "Active"
msgstr "Actief"
-#: ../src/plugins.c:1769
+#: ../src/plugins.c:1772
msgid "Plugin"
msgstr "Plugin"
-#: ../src/plugins.c:1876
+#: ../src/plugins.c:1879
msgid "Plugins"
msgstr "Plugins"
-#: ../src/plugins.c:1917
+#: ../src/plugins.c:1920
msgid "Choose which plugins should be loaded at startup:"
msgstr "Kies welke plugins bij het starten geladen moeten worden:"
@@ -4126,6 +4134,7 @@ msgstr ""
"%s"
#: ../src/printing.c:615
+#, c-format
msgid ""
"Cannot execute print command \"%s\": %s. Check the path setting in "
"Preferences."
@@ -4165,7 +4174,8 @@ msgstr "Projectnaam"
msgid ""
"Path of the file representing the project and storing its settings. It "
"should normally have the \"%s\" extension."
-msgstr "Pad naar het bestand dat het project representeerd and instellingen bewaard. "
+msgstr ""
+"Pad naar het bestand dat het project representeerd and instellingen bewaard. "
"Het heeft normaliter de '%s' extensie."
#: ../src/project.c:212 ../src/project.c:484
@@ -4480,11 +4490,12 @@ msgid "%s %s -- %s (in directory: %s)"
msgstr "%s %s -- %s (in map: %s)"
#: ../src/search.c:1718
+#, c-format
msgid ""
"Cannot execute grep tool \"%s\": %s. Check the path setting in Preferences."
msgstr ""
-"Kan hulpprogramma grep '%s' niet uitvoeren: %s; controleer de padinstelling in "
-"Voorkeuren."
+"Kan hulpprogramma grep '%s' niet uitvoeren: %s; controleer de padinstelling "
+"in Voorkeuren."
#: ../src/search.c:1758
#, c-format
@@ -4942,7 +4953,9 @@ msgstr "Omzetting van sjabloon bestand '%s' naar UTF-8 mislukt"
msgid ""
"Cannot execute command \"%s\" from the template: %s. Check the path in the "
"template."
-msgstr "Kan commando '%s' van sjabloon '%s' niet uitvoeren. Controleer pad in sjabloon"
+msgstr ""
+"Kan commando '%s' van sjabloon '%s' niet uitvoeren. Controleer pad in "
+"sjabloon"
#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build"
#: ../src/toolbar.c:58
@@ -5126,7 +5139,7 @@ msgid ""
"Cannot execute custom command \"%s\": %s. Check the path setting in Custom "
"Commands."
msgstr ""
-"Kon aangepaste commando '%s' niet uitvoeren; controleer de padinstelling in "
+"Kon aangepaste commando '%s' niet uitvoeren: %s; controleer de padnaaminstelling in "
"Aangepaste Commando's."
#: ../src/tools.c:357 ../src/tools.c:620
@@ -5321,8 +5334,7 @@ msgstr ""
#: ../src/ui_utils.c:747
msgid "Date format string could not be converted (possibly too long)."
-msgstr ""
-"Datumformaatstring kon niet omgezet worden (waarschijnlijk te lang)."
+msgstr "Datumformaatstring kon niet omgezet worden (waarschijnlijk te lang)."
#: ../src/ui_utils.c:822
msgid "_Set Custom Date Format"
@@ -5409,8 +5421,9 @@ msgstr "_Invoermethoden"
msgid ""
"Directory not changed because the terminal may contain some input (press Ctrl"
"+C or Enter to clear it)."
-msgstr "Map niet gewijzigd omdat de terminal wellicht invoer bevat (druk "
-"Ctrl+C of Enter om op te schonen."
+msgstr ""
+"Map niet gewijzigd omdat de terminal wellicht invoer bevat (druk Ctrl+C of "
+"Enter om op te schonen."
#: ../src/win32.c:211
msgid "Geany project files"
@@ -5536,8 +5549,9 @@ msgstr "HTML Karakters"
msgid "Inserts HTML character entities like '&'."
msgstr "Voeg HTML karakters toe zoals '&'."
-#: ../plugins/htmlchars.c:40 ../plugins/export.c:38 ../plugins/filebrowser.c:51
-#: ../plugins/saveactions.c:44 ../plugins/splitwindow.c:35
+#: ../plugins/htmlchars.c:40 ../plugins/export.c:38
+#: ../plugins/filebrowser.c:51 ../plugins/saveactions.c:44
+#: ../plugins/splitwindow.c:35
msgid "The Geany developer team"
msgstr "Het Geany ontwikkelingsteam"
--------------
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: Wed, 04 Nov 2015 20:35:13 UTC
Commit: 2f59aa4a9a124f88336c284fd488cf1acce94c94
https://github.com/geany/geany/commit/2f59aa4a9a124f88336c284fd488cf1acce94…
Log Message:
-----------
Force-check document disk status when switching tabs
The document_check_disk_status() guarantees that there's no check
performed when switching pages using Ctrl+Tab - remove the outdated
comment and idle call and perform force-check.
Modified Paths:
--------------
src/callbacks.c
Modified: src/callbacks.c
12 lines changed, 1 insertions(+), 11 deletions(-)
===================================================================
@@ -431,13 +431,6 @@ void on_normal_size1_activate(GtkMenuItem *menuitem, gpointer user_data)
}
-static gboolean delayed_check_disk_status(gpointer data)
-{
- document_check_disk_status(data, FALSE);
- return FALSE;
-}
-
-
/* Changes window-title after switching tabs and lots of other things.
* note: using 'after' makes Scintilla redraw before the UI, appearing more responsive */
static void on_notebook1_switch_page_after(GtkNotebook *notebook, gpointer page,
@@ -462,10 +455,7 @@ static void on_notebook1_switch_page_after(GtkNotebook *notebook, gpointer page,
sidebar_update_tag_list(doc, FALSE);
document_highlight_tags(doc);
- /* We delay the check to avoid weird fast, unintended switching of notebook pages when
- * the 'file has changed' dialog is shown while the switch event is not yet completely
- * finished. So, we check after the switch has been performed to be safe. */
- g_idle_add(delayed_check_disk_status, doc);
+ document_check_disk_status(doc, TRUE);
#ifdef HAVE_VTE
vte_cwd((doc->real_path != NULL) ? doc->real_path : doc->file_name, FALSE);
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).