Commits October 2021

commits@lists.geany.org

1 participants
51 discussions

[geany/www.geany.org] 05900b: Add matrix channel reference to website
by Enrico Tröger 08 Oct '21

08 Oct '21

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Fri, 08 Oct 2021 09:57:54 UTC Commit: 05900be25f962c7914ef58955971d1602c8875c9 https://github.com/geany/www.geany.org/commit/05900be25f962c7914ef58955971d… Log Message: ----------- Add matrix channel reference to website Modified Paths: -------------- geany/templates/home.html page_content/about/geany.md Modified: geany/templates/home.html 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -137,7 +137,8 @@ <h2 class="text-center">Great Community</h2> that contribute improvements and fixes across numerous platforms including <a href="{% url "page" "support/mailing-lists" %}">The Mailing Lists</a>, - <a href="https://github.com/geany">Github</a> and + <a href="https://github.com/geany">Github</a>, + Matrix <a href="https://matrix.to/#/#geany:matrix.org">#geany:matrix.org</a> and <a href="https://twitter.com/GeanyIDE/">Twitter</a>. <a class="btn btn-default" href="{% url "page" "contribute" %}">Get Involved »</a> <a class="btn btn-default" href="{% url "page" "about/donate" %}">Donate »</a> Modified: page_content/about/geany.md 5 lines changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -35,10 +35,11 @@ The code is licensed under the terms of the [GNU General Public Licence][3]. ## Contact -To contact us for general questions or feedback, either use one of our [mailing lists][4] or the [Github issue tracker][5]. +To contact us for general questions or feedback, either use one of our [mailing lists][4], the Matrix channel [#geany:matrix.org][5] or the [Github issue tracker][5]. [1]: /about/filetypes/ [2]: /support/plugins/ [3]: https://www.gnu.org/licenses/gpl-2.0.en.html [4]: /support/mailing-lists - [5]: https://github.com/geany/geany/issues + [5]: https://matrix.to/#/#geany:matrix.org + [6]: https://github.com/geany/geany/issues -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/www.geany.org] 12f369: Add Python 3.10 to Tox, remove Python 3.6
by Enrico Tröger 08 Oct '21

08 Oct '21

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Fri, 08 Oct 2021 09:30:39 UTC Commit: 12f369fc744db91c5abb8b3759b48a7336538fc7 https://github.com/geany/www.geany.org/commit/12f369fc744db91c5abb8b3759b48… Log Message: ----------- Add Python 3.10 to Tox, remove Python 3.6 Modified Paths: -------------- .travis.yml tox.ini Modified: .travis.yml 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -18,7 +18,6 @@ language: python cache: pip python: - - "3.6" - "3.7" - "3.8" - "3.9" Modified: tox.ini 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -15,7 +15,7 @@ skip_missing_interpreters = true skipsdist = true envlist = - py36,py37,py38,py39 + py37,py38,py39,py310 geany_modules = geany latest_version news nightlybuilds pastebin static_docs -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/www.geany.org] 2f42fb: Use f-strings and other minor linting fixes, reported by PyLint
by Enrico Tröger 08 Oct '21

08 Oct '21

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Fri, 08 Oct 2021 09:23:07 UTC Commit: 2f42fbf7c4e70bb0a9956a1073402c74b130df9f https://github.com/geany/www.geany.org/commit/2f42fbf7c4e70bb0a9956a1073402… Log Message: ----------- Use f-strings and other minor linting fixes, reported by PyLint Modified Paths: -------------- geany/decorators.py geany/management/commands/dump_database.py geany/settings.py geany/sitemaps.py geany/templatetags/geany_tags.py geany/urls_legacy.py geany/wsgi.py latest_version/models.py latest_version/releases.py news/admin.py news/views.py nightlybuilds/models.py pastebin/api/create.py pastebin/management/commands/cleanup_snippets.py pastebin/management/commands/generate_snippets_css.py pastebin/models.py pastebin/views.py static_docs/generate_i18n_statistics.py static_docs/github_client.py static_docs/views.py Modified: geany/decorators.py 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -52,7 +52,7 @@ def do_cache(function): def wrapped(*args, **kwargs): cache_key = key if cache_key is None: - cache_key = '%s.%s' % ((function.__module__, function.__name__)) + cache_key = f'{function.__module__}.{function.__name__}' if args and not ignore_arguments: cache_args = args # don't include 'self' in arguments @@ -61,10 +61,10 @@ def wrapped(*args, **kwargs): cache_args = args[1:] if cache_args: cache_args_repr = repr(cache_args).encode('utf-8') - cache_key = '%s.args%s' % (cache_key, hexlify(cache_args_repr)) + cache_key = f'{cache_key}.args{hexlify(cache_args_repr)}' if kwargs and not ignore_arguments: kwargs_repr = repr(kwargs).encode('utf-8') - cache_key = '%s.kwargs%s' % (cache_key, hexlify(kwargs_repr)) + cache_key = f'{cache_key}.kwargs{hexlify(kwargs_repr)}' result = _djcache.get(cache_key) if result is None: result = function(*args, **kwargs) Modified: geany/management/commands/dump_database.py 10 lines changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -47,7 +47,7 @@ def _dump_main_database(self): # ---------------------------------------------------------------------- def _remove_sensitive_information_from_dump(self): # remove potential sensitive information - with open('database.json') as data_input: + with open('database.json', encoding='utf-8') as data_input: data = load(data_input) for record in data: model = record['model'] @@ -82,7 +82,7 @@ def _remove_sensitive_information_from_dump(self): data.append(user) # write data back to the database file - with open('database.json', 'w') as output: + with open('database.json', 'w', encoding='utf-8') as output: dump(data, output, indent=2) # ---------------------------------------------------------------------- @@ -116,10 +116,10 @@ def _dump_nightly_builds_database(self): # merge the nightly build dump files filenames = (database_nightlybuilds_filename, database_nightlybuild_targets_filename) - records = list() - with open('database_nightlybuilds.json', 'w') as output: + records = [] + with open('database_nightlybuilds.json', 'w', encoding='utf-8') as output: for filename in filenames: - with open(filename) as infile: + with open(filename, encoding='utf-8') as infile: data = load(infile) records.extend(data) Modified: geany/settings.py 7 lines changed, 4 insertions(+), 3 deletions(-) =================================================================== @@ -257,7 +257,7 @@ MEDIA_ROOT = os.path.join(PROJECT_ROOT, *MEDIA_URL.strip("/").split("/")) # Package/module name to import the root urlpatterns from for the project. -ROOT_URLCONF = "%s.urls" % PROJECT_APP +ROOT_URLCONF = f'{PROJECT_APP}.urls' TEMPLATES = [ { @@ -630,11 +630,12 @@ def skip_404_not_found(record): if os.path.exists(filename): from importlib.util import module_from_spec, spec_from_file_location import sys - module_name = '{}.local_settings'.format(PROJECT_APP) # pylint: disable=invalid-name + module_name = f'{PROJECT_APP}.local_settings' # pylint: disable=invalid-name spec = spec_from_file_location(module_name, filename) # pylint: disable=invalid-name module = module_from_spec(spec) # pylint: disable=invalid-name sys.modules[module_name] = module - exec(open(filename, 'rb').read()) # pylint: disable=exec-used + with open(filename, 'rb') as local_config: + exec(local_config.read()) # pylint: disable=exec-used #################### Modified: geany/sitemaps.py 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -95,7 +95,7 @@ class StaticSitemap(sitemaps.Sitemap): def __init__(self, domain, patterns, exclude_views=None): self._domain = domain self._patterns = patterns - self._exclude_views = exclude_views or list() + self._exclude_views = exclude_views or [] self._site = None self._url_mapping = {} self._get_site() @@ -131,7 +131,7 @@ def _resolve_url(self, url): # ---------------------------------------------------------------------- def get_dynamic_items(self): - return list() + return [] # ---------------------------------------------------------------------- def changefreq(self, obj): # pylint: disable=unused-argument @@ -151,7 +151,7 @@ class SitemapRegistry: # ---------------------------------------------------------------------- def __init__(self): - self._sitemap_generators = list() + self._sitemap_generators = [] self._static_items = None self._site = None @@ -179,7 +179,7 @@ def _get_static_items(self): # ---------------------------------------------------------------------- def _get_items(self, item_generator_name): - items = list() + items = [] for generator_class, url_patterns, site_domain, exclude_views in self._sitemap_generators: site_domain = self._get_site_domain_or_default(site_domain) generator = generator_class( Modified: geany/templatetags/geany_tags.py 7 lines changed, 4 insertions(+), 3 deletions(-) =================================================================== @@ -38,7 +38,7 @@ def render(self, context): rendered_content = content_template.render(context) context[self._target_var_name] = rendered_content except (template.VariableDoesNotExist, template.TemplateSyntaxError) as exc: - return 'Error rendering: {}'.format(exc) + return f'Error rendering: {exc}' return '' @@ -52,8 +52,9 @@ def do_evaluate(parser, token): # pylint: disable=unused-argument try: _, variable, _, target_var_name = token.split_contents() except ValueError as exc: + token_name = token.contents.split()[1] raise template.TemplateSyntaxError( - '{!r} tag requires a single argument'.format(token.contents.split()[1])) from exc + f'{token_name!r} tag requires a single argument') from exc return EvaluateNode(variable, target_var_name) @@ -63,6 +64,6 @@ def add_css(field, css): # read existing CSS classes css_classes = field.field.widget.attrs.get('class', '') # add new ones - css_classes = '{} {}'.format(css_classes, css) + css_classes = f'{css_classes} {css}' # render the widget return field.as_widget(attrs={'class': css_classes}) Modified: geany/urls_legacy.py 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -189,13 +189,13 @@ def _add_url_mappings(mapping, urlpatterns_): old_url = old_url[1:] url_pattern = url( - r'^{}$'.format(old_url), + fr'^{old_url}$', RedirectView.as_view(url=new_url, permanent=True)) urlpatterns_.append(url_pattern) # add pattern variant with trailing slash if old_url[-1] != '/': url_pattern = url( - r'^{}/$'.format(old_url), + fr'^{old_url}/$', RedirectView.as_view(url=new_url, permanent=True)) urlpatterns_.append(url_pattern) Modified: geany/wsgi.py 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -14,7 +14,7 @@ os.environ.setdefault( - "DJANGO_SETTINGS_MODULE", - "{}.settings".format(real_project_name("geany"))) + 'DJANGO_SETTINGS_MODULE', + f'{real_project_name("geany")}.settings') application = get_wsgi_application() Modified: latest_version/models.py 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -48,4 +48,4 @@ def save(self, *args, **kwargs): # pylint: disable=signature-differs # ---------------------------------------------------------------------- def __str__(self): - return '{} {}'.format(self.name, self.version) + return f'{self.name} {self.version}' Modified: latest_version/releases.py 15 lines changed, 6 insertions(+), 9 deletions(-) =================================================================== @@ -93,7 +93,7 @@ def provide(self): # ---------------------------------------------------------------------- def _fetch_releases_from_filesystem(self): - self._release_files = list() + self._release_files = [] if not self._releases_directory: return @@ -109,10 +109,10 @@ def _fetch_releases_from_filesystem(self): # ---------------------------------------------------------------------- def _group_releases_by_type(self): - self._release_files_by_version = dict() + self._release_files_by_version = {} release_types = self._get_release_types() for release_type in release_types: - self._release_files_by_version[release_type] = list() + self._release_files_by_version[release_type] = [] for filename in self._release_files: for release_type in release_types: @@ -122,7 +122,7 @@ def _group_releases_by_type(self): # ---------------------------------------------------------------------- def _get_release_types(self): - return RELEASE_TYPES.get(self._releases_directory, dict()) + return RELEASE_TYPES.get(self._releases_directory, {}) # ---------------------------------------------------------------------- def _factor_release_versions(self): @@ -139,14 +139,11 @@ def _determine_latest_version(self, release_type): release_types = self._get_release_types() try: latest_version = sorted_versions.pop() - logger.debug( - 'Latest version found for "{}": {}'.format(release_type, latest_version)) + logger.debug('Latest version found for "%s": %s', release_type, latest_version) except IndexError: fallback_filename = release_types[release_type]['fallback_filename'] latest_version = fallback_filename.format(version=self._fallback_version) logger.debug( - 'Latest version found for "{}": {} (fallback)'.format( - release_type, - latest_version)) + 'Latest version found for "%s": %s (fallback)', release_type, latest_version) return latest_version Modified: news/admin.py 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -42,7 +42,7 @@ def _toggle_many_published(self, request, queryset): for newspost in queryset: self._toggle_newspost_published_status(newspost) rows_updated += 1 - self.message_user(request, "{} News posts were successfully changed.".format(rows_updated)) + self.message_user(request, f'{rows_updated} News posts were successfully changed.') # ---------------------------------------------------------------------- def _toggle_newspost_published_status(self, newspost): @@ -52,7 +52,7 @@ def _toggle_newspost_published_status(self, newspost): newspost.status = CONTENT_STATUS_PUBLISHED newspost.save() - _toggle_many_published.short_description = "Toggle the published status of selected News posts" + _toggle_many_published.short_description = 'Toggle the published status of selected News posts' admin.site.register(NewsPost, NewsPostAdmin) Modified: news/views.py 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -59,7 +59,7 @@ def post(self, request, *args, **kwargs): # pylint: disable=unused-argument try: newspost = NewsPost.objects.get(slug=newspost_slug) except NewsPost.DoesNotExist: - error_message = 'News post item for "{}" could not be found'.format(newspost_slug) + error_message = f'News post item for "{newspost_slug}" could not be found' result = dict(error=error_message) else: # adapt to dict Modified: nightlybuilds/models.py 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -36,7 +36,7 @@ class Meta: # ---------------------------------------------------------------------- def __str__(self): - return '{} {}'.format(self.name, self.arch) + return f'{self.name} {self.arch}' class NightlyBuild(models.Model): @@ -71,4 +71,4 @@ def get_status_text(self): # ---------------------------------------------------------------------- def __str__(self): - return '{} {}'.format(self.build_date, self.nightly_build_target) + return f'{self.build_date} {self.nightly_build_target}' Modified: pastebin/api/create.py 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -96,7 +96,7 @@ def _validate_passed_fields(self): additional_fields = provided_fields.difference(self.valid_fields) if additional_fields: raise SnippetValidationError( - 'Invalid fields provided (%s)' % ','.join(additional_fields)) + f'Invalid fields provided ({",".join(additional_fields)})') # ---------------------------------------------------------------------- def _validate_against_snippet_form(self): @@ -109,7 +109,7 @@ def _validate_against_snippet_form(self): # validate if not snippet_form.is_valid(): errors = '\n'.join( - ['%s: %s' % (k, v.as_text()) for k, v in snippet_form.errors.items()]) + [f'{k}: {v.as_text()}' for k, v in snippet_form.errors.items()]) raise SnippetValidationError(errors) self._snippet_form = snippet_form Modified: pastebin/management/commands/cleanup_snippets.py 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -35,10 +35,10 @@ def add_arguments(self, parser): # ---------------------------------------------------------------------- def handle(self, *args, **options): deleteable_snippets = Snippet.objects.filter(expires__lte=timezone.now()) - sys.stdout.write('{} snippets gets deleted:\n'.format(deleteable_snippets.count())) + sys.stdout.write(f'{deleteable_snippets.count()} snippets gets deleted:\n') for deleteable_snippet in deleteable_snippets: sys.stdout.write( - u'- {} ({})\n'.format(deleteable_snippet.secret_id, deleteable_snippet.expires)) + f'- {deleteable_snippet.secret_id} ({deleteable_snippet.expires})\n') if options.get('dry_run'): sys.stdout.write('Dry run - Doing nothing! *crossingfingers*\n') else: Modified: pastebin/management/commands/generate_snippets_css.py 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -22,6 +22,6 @@ class Command(BaseCommand): # ---------------------------------------------------------------------- def handle(self, *args, **options): - with open('pastebin/static/css/pygments.css', 'w') as css_file: + with open('pastebin/static/css/pygments.css', 'w', encoding='utf-8') as css_file: # You can change style and the html class here: css_file.write(HtmlFormatter(style='colorful').get_style_defs('.highlight')) Modified: pastebin/models.py 12 lines changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -83,13 +83,13 @@ def _readable_delta(self, from_seconds, until_seconds=None): # show a fuzzy but useful approximation of the time delta if delta.days: - return '%d days ago' % (delta.days) + return f'{delta.days} days ago' elif delta_hours: - return '%d hours ago' % (delta_hours) + return f'{delta_hours} hours ago' elif delta_minutes: - return '%d minutes ago' % (delta_minutes) + return f'{delta_minutes} minutes ago' else: - return '%d seconds ago' % (delta.seconds) + return f'{delta.seconds} seconds ago' # ---------------------------------------------------------------------- def get_linecount(self): @@ -123,7 +123,7 @@ def get_absolute_url(self): # ---------------------------------------------------------------------- def __str__(self): - return '{}'.format(self.secret_id) + return f'{self.secret_id}' class SpamwordManager(models.Manager): @@ -141,4 +141,4 @@ class Spamword(models.Model): # ---------------------------------------------------------------------- def __str__(self): - return '{}'.format(self.word) + return f'{self.word}' Modified: pastebin/views.py 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -52,7 +52,7 @@ def _get_snippet_list(no_content=False): snippet_list = list(queryset[:max_snippets]) cache.set(cache_key, snippet_list, CACHE_TIMEOUT_24HOURS) except ValueError: - snippet_list = list() + snippet_list = [] return snippet_list @@ -203,7 +203,7 @@ def post(self, request): site = self._get_site(request) absolute_url = snippet.get_absolute_url() - result = 'https://{}{}'.format(site.domain, absolute_url) + result = f'https://{site.domain}{absolute_url}' return HttpResponse(result, content_type='text/plain') # ---------------------------------------------------------------------- Modified: static_docs/generate_i18n_statistics.py 18 lines changed, 9 insertions(+), 9 deletions(-) =================================================================== @@ -134,7 +134,7 @@ def _update_pot_file(self): # ---------------------------------------------------------------------- def _factor_pot_filename(self): - return join(self._destination_path, '{}.pot'.format(self._domain)) + return join(self._destination_path, f'{self._domain}.pot') # ---------------------------------------------------------------------- def _execute_command(self, command): @@ -150,11 +150,11 @@ def _execute_command(self, command): output_utf8 = output.decode('utf-8') return output_utf8 except CalledProcessError as exc: + command_line = ' '.join(command) + error_message = exc.output.decode('utf-8') raise ValueError( - 'Command: "{}" exited with code {}: {}'.format( - ' '.join(command), - exc.returncode, - exc.output.decode('utf-8'))) from exc + f'Command: "{command_line}" exited with code {exc.returncode}: {error_message}' + ) from exc # ---------------------------------------------------------------------- def _fetch_pot_stats(self): @@ -172,7 +172,7 @@ def _read_po_translation_statistics(self, filename): fuzzy = match.group('fuzzy') untranslated = match.group('untranslated') else: - raise ValueError('Unable to parse msgfmt output: {}'.format(output)) + raise ValueError(f'Unable to parse msgfmt output: {output}') return TranslationStatistics( translated=int(translated) if translated is not None else 0, @@ -181,7 +181,7 @@ def _read_po_translation_statistics(self, filename): # ---------------------------------------------------------------------- def _fetch_message_catalogs(self): - self._message_catalogs = list() + self._message_catalogs = [] for po_filename in listdir(self._source_path): basename, extension = splitext(po_filename) if extension == '.po': @@ -198,7 +198,7 @@ def _fetch_message_catalogs(self): # ---------------------------------------------------------------------- def _read_last_translator(self, filename): filename = join(self._source_path, filename) - with open(filename) as file_: + with open(filename, encoding='utf-8') as file_: for line in file_: if line.startswith('"Last-Translator:'): match = LAST_TRANSLATOR_REGEXP.match(line) @@ -252,5 +252,5 @@ def _factor_overall_statistics(self): # ---------------------------------------------------------------------- def _write_overall_statistics(self): output_filename = join(self._destination_path, self._target_filename) - with open(output_filename, 'w') as output_file: + with open(output_filename, 'w', encoding='utf-8') as output_file: dump(self._overall_statistics, output_file, cls=SimpleObjectToJSONEncoder) Modified: static_docs/github_client.py 35 lines changed, 12 insertions(+), 23 deletions(-) =================================================================== @@ -37,11 +37,7 @@ def __init__(self, auth_token=None): def get_file_contents(self, filename, user=None, repository=None): user = user or GITHUB_USER repository = repository or GITHUB_REPOSITORY - url = '{api_base_url}repos/{user}/{repository}/contents/{filename}'.format( - api_base_url=GITHUB_API_URL, - user=user, - repository=repository, - filename=filename) + url = f'{GITHUB_API_URL}repos/{user}/{repository}/contents/{filename}' response = self._request(url) response_json = response.json() @@ -71,16 +67,17 @@ def _request(self, url, status_404_expected=False): # ---------------------------------------------------------------------- def _factor_authorization_header(self): - auth = '{}:x-oauth-basic'.format(self._auth_token) + auth = f'{self._auth_token}:x-oauth-basic' auth_encoded = auth.encode('ascii') - basic_auth_value = 'Basic {}'.format(standard_b64encode(auth_encoded).decode()) + auth_base64 = standard_b64encode(auth_encoded).decode() + basic_auth_value = f'Basic {auth_base64}' return {'Authorization': basic_auth_value} # ---------------------------------------------------------------------- def _log_rate_limit(self, response): rate_limit_remaining = int(response.headers['X-RateLimit-Remaining']) rate_limit = response.headers['X-RateLimit-Limit'] - log_message = 'Github rate limits: {}/{}'.format(rate_limit_remaining, rate_limit) + log_message = f'Github rate limits: {rate_limit_remaining}/{rate_limit}' if rate_limit_remaining > 0: logger.info(log_message) else: @@ -99,19 +96,20 @@ def _log_request(self, response, status_404_expected): else: reason = response.reason - log_message = 'Requesting "{} {}" took {}s: {} ({})'.format( + log_message = 'Requesting "%s %s" took %0.3fs: %s (%s)' + log_message_args = ( response.request.method, response.request.url, response.elapsed.total_seconds(), response.status_code, reason) if response.status_code == 200: - logger.info(log_message) + logger.info(log_message, *log_message_args) elif response.status_code == 404 and status_404_expected: - logger.info(log_message) + logger.info(log_message, *log_message_args) else: - logger.warning(log_message) + logger.warning(log_message, *log_message_args) # ---------------------------------------------------------------------- def _parse_fetch_file_response(self, response_json): @@ -124,12 +122,7 @@ def _parse_fetch_file_response(self, response_json): # ---------------------------------------------------------------------- def get_release_by_tag(self, tag_name): - url = '{api_base_url}repos/{user}/{repository}/releases/tags/{tag_name}'.format( - api_base_url=GITHUB_API_URL, - user=GITHUB_USER, - repository=GITHUB_REPOSITORY, - tag_name=tag_name) - + url = f'{GITHUB_API_URL}repos/{GITHUB_USER}/{GITHUB_REPOSITORY}/releases/tags/{tag_name}' response = self._request(url, status_404_expected=True) if response: response_json = response.json() @@ -139,11 +132,7 @@ def get_release_by_tag(self, tag_name): # ---------------------------------------------------------------------- def get_latest_release(self): - url = '{api_base_url}repos/{user}/{repository}/releases/latest'.format( - api_base_url=GITHUB_API_URL, - user=GITHUB_USER, - repository=GITHUB_REPOSITORY) - + url = f'{GITHUB_API_URL}repos/{GITHUB_USER}/{GITHUB_REPOSITORY}/releases/latest' response = self._request(url) response_json = response.json() return response_json Modified: static_docs/views.py 14 lines changed, 7 insertions(+), 7 deletions(-) =================================================================== @@ -53,7 +53,7 @@ def __init__(self): # ---------------------------------------------------------------------- def __repr__(self): - return 'Geany %s (%s)' % (self.version, self.release_date) + return f'Geany {self.version} ({self.release_date})' class StaticDocsView(TemplateView): @@ -98,7 +98,7 @@ def _get_release_notes(self): # ---------------------------------------------------------------------- def _parse_news_file(self): - releases = list() + releases = [] current_release = None current_release_notes = None for line in self._file_contents.splitlines(): @@ -116,13 +116,13 @@ def _parse_news_file(self): current_release.version = version current_release.release_date = date releases.append(current_release) - current_release_notes = list() + current_release_notes = [] else: line = line.lstrip() # remove any indentation if line and not line.startswith('*'): # we got a section: make it bold and add an additional new line # to make Markdown recognise the following lines as list - current_release_notes.append('**{}**\n'.format(line)) + current_release_notes.append(f'**{line}**\n') else: current_release_notes.append(line) @@ -197,7 +197,7 @@ def _get_release_from_github(self, version=None): # ---------------------------------------------------------------------- def _convert_version_to_tag_name(self, version): if version.count('.') == 1: - return '{}.0'.format(version) + return f'{version}.0' return version @@ -247,7 +247,7 @@ def _get_i18n_statistics(self): filename = os.path.join( settings.STATIC_DOCS_GEANY_DESTINATION_DIR, settings.STATIC_DOCS_GEANY_I18N_STATISTICS_FILENAME) - with open(filename) as input_file: + with open(filename, encoding='utf-8') as input_file: return json.load(input_file) @@ -284,7 +284,7 @@ def _get_theme_index(self): # theme index has been changed remotely? if theme_index_md5_hash != cached_theme_index_md5_hash or theme_index is None: - logger.debug('Refresh theme index from Github (MD5: {})'.format(theme_index_md5_hash)) + logger.debug('Refresh theme index from Github (MD5: %s)', theme_index_md5_hash) # query whole theme index theme_index = self._query_parse_themes_index() # cache it for later -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/www.geany.org] 00ccba: Update Pygments generated CSS rules
by Enrico Tröger 08 Oct '21

08 Oct '21

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Fri, 08 Oct 2021 09:22:10 UTC Commit: 00ccbad061aa2a9c2124638370e56ec347949673 https://github.com/geany/www.geany.org/commit/00ccbad061aa2a9c2124638370e56… Log Message: ----------- Update Pygments generated CSS rules Modified Paths: -------------- pastebin/static/css/pygments.css Modified: pastebin/static/css/pygments.css 7 lines changed, 6 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,10 @@ +pre { line-height: 125%; } +td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; } +span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; } +td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } +span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } .highlight .hll { background-color: #ffffcc } -.highlight { background: #ffffff; } +.highlight { background: #ffffff; } .highlight .c { color: #888888 } /* Comment */ .highlight .err { color: #FF0000; background-color: #FFAAAA } /* Error */ .highlight .k { color: #008800; font-weight: bold } /* Keyword */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 5b307b: Update of Greek translation
by Frank Lanitz 04 Oct '21

04 Oct '21

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 04 Oct 2021 18:57:10 UTC Commit: 5b307bc05dbb055a06dc83c1d749ffab46e259e4 https://github.com/geany/geany/commit/5b307bc05dbb055a06dc83c1d749ffab46e25… Log Message: ----------- Update of Greek translation Modified Paths: -------------- po/el.po Modified: po/el.po 43 lines changed, 22 insertions(+), 21 deletions(-) =================================================================== @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: Geany 1.32\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-09-21 19:03+0200\n" -"PO-Revision-Date: 2020-10-12 14:10+0300\n" +"POT-Creation-Date: 2021-10-01 02:11+0000\n" +"PO-Revision-Date: 2021-10-01 11:29+0300\n" "Last-Translator: Michael Misirlis <mmisirlis(a)gmail.com>\n" "Language-Team: Greek\n" "Language: el\n" @@ -144,7 +144,7 @@ msgstr "Βασικό" #: ../data/geany.glade.h:25 msgid "Current chars" -msgstr "Τρέχον χαρακτήρες" +msgstr "Τρέχοντες χαρακτήρες" #: ../data/geany.glade.h:26 msgid "Match braces" @@ -1741,7 +1741,7 @@ msgstr "Εν_τολές" #: ../data/geany.glade.h:357 ../src/keybindings.c:437 msgid "Cu_t Current Line(s)" -msgstr "Απο_κοπή τρέχουσας γραμμής(ών)" +msgstr "Απο_κοπή Τρέχουσας Γραμμής(ών)" #: ../data/geany.glade.h:358 ../src/keybindings.c:434 msgid "_Copy Current Line(s)" @@ -2424,7 +2424,7 @@ msgstr "Η μεταγλώττιση ολοκληρώθηκε με επιτυχί #: ../src/build.c:1272 msgid "Custom Text" -msgstr "Προσαρμοσμένο κείμενο" +msgstr "Προσαρμοσμένο Κείμενο" #: ../src/build.c:1273 msgid "Enter custom text here, all entered text is appended to the command." @@ -2574,11 +2574,12 @@ msgstr[1] "%d αρχεία αποθηκεύτηκαν." #: ../src/callbacks.c:353 msgid "Changes detected, reloading all will lose any changes and history." msgstr "" +"Εντοπίστηκαν αλλαγές, η επαναφόρτωση όλων θα έχει ως αποτέλεσμα να χαθούν " +"τυχόν αλλαγές και ιστορικό." #: ../src/callbacks.c:354 -#, fuzzy msgid "Are you sure you want to reload all files?" -msgstr "Είστε σίγουροι ότι θέλετε να επαναφορτώσετε '%s';" +msgstr "Είστε σίγουροι ότι θέλετε να επαναφορτώσετε όλα τα αρχεία;" #: ../src/callbacks.c:935 ../src/keybindings.c:567 msgid "Go to Line" @@ -3385,9 +3386,8 @@ msgid "Reload file" msgstr "Επαναφόρτωση αρχείου" #: ../src/keybindings.c:359 -#, fuzzy msgid "Reload all files" -msgstr "Επαναφόρτωση αρχείου" +msgstr "Επαναφόρτωση όλων των αρχείων" #: ../src/keybindings.c:361 msgid "Re-open last closed tab" @@ -4932,14 +4932,12 @@ msgid "Classes" msgstr "Κλάσεις" #: ../src/symbols.c:628 -#, fuzzy msgid "Fields" -msgstr "Πήγαινε στο πεδίο" +msgstr "Πεδία" #: ../src/symbols.c:632 -#, fuzzy msgid "Unknowns" -msgstr "άγνωστο" +msgstr "Άγνωστα" #: ../src/symbols.c:640 msgid "Anchors" @@ -5526,7 +5524,7 @@ msgstr "_Χρησιμοποιείστε προσαρμοσμένη διάταξ #: ../src/ui_utils.c:729 msgid "Custom Date Format" -msgstr "Προσαρμοσμένη διάταξη ημερομηνίας" +msgstr "Προσαρμοσμένη Μορφή Ημερομηνίας" #: ../src/ui_utils.c:730 msgid "" @@ -6046,9 +6044,9 @@ msgid "Backup Copy: File could not be saved (%s)." msgstr "Αντίγραφο ασφαλείας: Δεν ήταν δυνατή η αποθήκευση του αρχείου (%s)." #: ../plugins/saveactions.c:286 -#, fuzzy, c-format +#, c-format msgid "Instant Save filename could not be generated (%s)." -msgstr "Το αρχείο του έργου δεν ήταν δυνατόν να γραφεί (%s)." +msgstr "Αδυναμία δημιουργίας αρχείου Άμεσης Αποθήκευσης (%s)." #: ../plugins/saveactions.c:386 #, c-format @@ -6063,9 +6061,8 @@ msgid "Select Directory" msgstr "Επιλογή φακέλου" #: ../plugins/saveactions.c:544 -#, fuzzy msgid "Instantsave directory does not exist or is not writable." -msgstr "Ο φάκελος για αντίγραφα ασφαλείας δεν υπάρχει ή δεν είναι εγγράψιμος." +msgstr "Ο φάκελος Άμεσης Αποθήκευσης δεν υπάρχει ή δεν είναι εγγράψιμος." #: ../plugins/saveactions.c:561 msgid "Backup directory does not exist or is not writable." @@ -6106,17 +6103,17 @@ msgstr "Απο_θήκευση όλων των ανοιγμένων αρχείω #: ../plugins/saveactions.c:711 msgid "Instant Save" -msgstr "Στιγμιαία αποθήκευση" +msgstr "Άμεση Αποθήκευση" #: ../plugins/saveactions.c:721 -#, fuzzy msgid "Default _filetype to use for new files:" -msgstr "_Τύπος αρχείου για πρόσφατα δημιουργημένα αρχεία:" +msgstr "_Τύπος αρχείου για νέα αρχεία:" #: ../plugins/saveactions.c:742 #, c-format msgid "_Directory to save files in (leave empty to use the default: %s):" msgstr "" +"Φάκελο_ς για αποθήκευση αρχείων (αφήστε κενό για χρήση της προεπιλογής: %s):" #: ../plugins/saveactions.c:766 msgid "" @@ -6125,6 +6122,10 @@ msgid "" "you will need to cleanup instantly saved files manually. The Instant Save " "plugin will not delete the created files." msgstr "" +" Εάν ορίσετε τον φάκελο Άμεσης Αποθήκευσης σε έναν φάκελοπου δεν " +"καθαρίζεται αυτόματα,\n" +"θα χρειαστεί να καθαρίσετε τα σχετικά αρχεία με μη αυτόματο τρόπο. Το " +"πρόσθετο Instant Save δεν θα διαγράψει τα δημιουργημένα αρχεία. " #: ../plugins/saveactions.c:784 msgid "Backup Copy" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 4c9287: Update Japanese translation
by Frank Lanitz 04 Oct '21

04 Oct '21

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 04 Oct 2021 18:55:46 UTC Commit: 4c92873fb98b3aa6b58db11411786ff4621e9a3c https://github.com/geany/geany/commit/4c92873fb98b3aa6b58db11411786ff4621e9… Log Message: ----------- Update Japanese translation Modified Paths: -------------- po/ja.po Modified: po/ja.po 28 lines changed, 13 insertions(+), 15 deletions(-) =================================================================== @@ -2488,12 +2488,11 @@ msgstr[0] "%d 個のファイルを保存しました" #: ../src/callbacks.c:353 msgid "Changes detected, reloading all will lose any changes and history." -msgstr "" +msgstr "変更を検出しました。全て再読み込みすると変更と履歴が失われます。" #: ../src/callbacks.c:354 -#, fuzzy msgid "Are you sure you want to reload all files?" -msgstr "'%s' を再読み込みしてもよろしいですか?" +msgstr "全てのファイルを再読み込みしてもよろしいですか?" #: ../src/callbacks.c:935 ../src/keybindings.c:567 msgid "Go to Line" @@ -3290,9 +3289,8 @@ msgid "Reload file" msgstr "再読み込み" #: ../src/keybindings.c:359 -#, fuzzy msgid "Reload all files" -msgstr "再読み込み" +msgstr "全ファイルを再読み込み" #: ../src/keybindings.c:361 msgid "Re-open last closed tab" @@ -4809,12 +4807,10 @@ msgid "Classes" msgstr "クラス" #: ../src/symbols.c:628 -#, fuzzy msgid "Fields" -msgstr "項目に移動" +msgstr "項目" #: ../src/symbols.c:632 -#, fuzzy msgid "Unknowns" msgstr "不明" @@ -5905,9 +5901,9 @@ msgid "Backup Copy: File could not be saved (%s)." msgstr "バックアップ: ファイルが保存できません(%s)" #: ../plugins/saveactions.c:286 -#, fuzzy, c-format +#, c-format msgid "Instant Save filename could not be generated (%s)." -msgstr "プロジェクトファイルが書き込めません（%s）" +msgstr "簡易保存ファイル名が生成できません（%s）" #: ../plugins/saveactions.c:386 #, c-format @@ -5921,9 +5917,8 @@ msgid "Select Directory" msgstr "ディレクトリを選択" #: ../plugins/saveactions.c:544 -#, fuzzy msgid "Instantsave directory does not exist or is not writable." -msgstr "バックアップディレクトリが存在しないか書き込めません" +msgstr "簡易保存ディレクトリが存在しないか書き込めません" #: ../plugins/saveactions.c:561 msgid "Backup directory does not exist or is not writable." @@ -5967,14 +5962,13 @@ msgid "Instant Save" msgstr "簡易保存" #: ../plugins/saveactions.c:721 -#, fuzzy msgid "Default _filetype to use for new files:" -msgstr "新しく作成するファイルのファイルの種類(_F):" +msgstr "新規ファイルの既定のファイル種類(_F):" #: ../plugins/saveactions.c:742 #, c-format msgid "_Directory to save files in (leave empty to use the default: %s):" -msgstr "" +msgstr "保存先ディレクトリ(_D)(空欄にすると規定値を使用: %s)" #: ../plugins/saveactions.c:766 msgid "" @@ -5983,6 +5977,10 @@ msgid "" "you will need to cleanup instantly saved files manually. The Instant Save " "plugin will not delete the created files." msgstr "" +"簡易保存ディレクトリに設定したディレクトリは" +"自動的に作成されません、\n" +"簡易保存されたファイルは手作業でクリーンアップする必要があります。" +"館員保存プラグインは作成されたファイルを削除しません。" #: ../plugins/saveactions.c:784 msgid "Backup Copy" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 8d22d7: Windows: Do not manually realize the main window prematurely
by Enrico Tröger 03 Oct '21

03 Oct '21

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 03 Oct 2021 09:38:32 UTC Commit: 8d22d7551b9ddbd145a8c2a3128598a44ad05a04 https://github.com/geany/geany/commit/8d22d7551b9ddbd145a8c2a3128598a44ad05… Log Message: ----------- Windows: Do not manually realize the main window prematurely This has been added in 9431eea24 but seems no longer necessary and actually causes problems with setting the message window height. After each start of Geany, the message window will be set a bit lower until it is not visible anymore at all. The manual realize step was maybe necessary with older GTK2 versions but actually works contrarily on recent GTK3 builds. Fixes #2591. Modified Paths: -------------- src/libmain.c Modified: src/libmain.c 5 lines changed, 0 insertions(+), 5 deletions(-) =================================================================== @@ -1209,11 +1209,6 @@ gint main_lib(gint argc, gchar **argv) build_menu_update(doc); sidebar_update_tag_list(doc, FALSE); -#ifdef G_OS_WIN32 - /* Manually realise the main window to be able to set the position but don't show it. - * We don't set the position after showing the window to avoid flickering. */ - gtk_widget_realize(main_widgets.window); -#endif setup_window_position(); /* finally show the window */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] bc8be1: Merge pull request #2908 from andrej-herceg/sk-po
by Frank Lanitz 02 Oct '21

02 Oct '21

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sat, 02 Oct 2021 07:41:58 UTC Commit: bc8be1fb820c7f0884d77dbe5a550a706a5af560 https://github.com/geany/geany/commit/bc8be1fb820c7f0884d77dbe5a550a706a5af… Log Message: ----------- Merge pull request #2908 from andrej-herceg/sk-po Update of Slovak translation Modified Paths: -------------- po/sk.po Modified: po/sk.po 70 lines changed, 35 insertions(+), 35 deletions(-) =================================================================== @@ -2,14 +2,14 @@ # Copyright (C) 2006 The Geany contributors. # This file is distributed under the same license as the Geany package. # Tomáš Havlas <tomas.havlas(a)raven-systems.eu>, 2014. -# Andrej Herceg <chrono.i18n(a)gmail.com>, 2015-2020. +# Andrej Herceg <chrono.i18n(a)gmail.com>, 2015-2021. # msgid "" msgstr "" "Project-Id-Version: Geany 1.37\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-09-21 19:03+0200\n" -"PO-Revision-Date: 2020-10-12 14:20+0200\n" +"PO-Revision-Date: 2021-09-26 16:57+0200\n" "Last-Translator: Andrej Herceg <chrono.i18n(a)gmail.com>\n" "Language-Team: Slovak\n" "Language: sk\n" @@ -387,7 +387,7 @@ msgid "" "Project dialog." msgstr "" "Ak je povolené, pri vytváraní nových projektov je súbor projektu štandardne " -"uložený v koreňovom adresári projektu, namiesto umiestnenia toho priečinku o " +"uložený v koreňovom adresári projektu, namiesto umiestnenia toho adresára o " "úroveň vyššie. Cestu k súboru je stále možné zmeniť pri vytváraní projektu." #: ../data/geany.glade.h:76 @@ -607,7 +607,7 @@ msgstr "S_ystémové nastavenie" #: ../data/geany.glade.h:126 msgid "_Small icons" -msgstr "_Maĺé ikony" +msgstr "_Malé ikony" #: ../data/geany.glade.h:127 msgid "_Very small icons" @@ -2444,7 +2444,7 @@ msgstr "Kliknite pre nastavenie označenia položky v ponuke" #: ../src/build.c:1973 ../src/build.c:1975 #, c-format msgid "%s commands" -msgstr "Príkazy pre: %s" +msgstr "Príkazy pre %s" #: ../src/build.c:1975 msgid "No filetype" @@ -2472,7 +2472,7 @@ msgid "" "%d, %e, %f, %p, %l are substituted in command and directory fields, see " "manual for details." msgstr "" -"%d, %e, %f, %p, %l sú nahradené v poliach pre príkaz a priečinok, viď manuál " +"%d, %e, %f, %p, %l sú nahradené v poliach pre príkaz a adresár, viď manuál " "pre viac detailov." #: ../src/build.c:2223 @@ -2517,11 +2517,12 @@ msgstr[2] "%d súborov uložených." #: ../src/callbacks.c:353 msgid "Changes detected, reloading all will lose any changes and history." msgstr "" +"Boli zistené zmeny. Znova načítanie všetkých súborov spôsobí stratu zmien a " +"histórie." #: ../src/callbacks.c:354 -#, fuzzy msgid "Are you sure you want to reload all files?" -msgstr "Ste si istý, že chcete znova načítať „%s“?" +msgstr "Ste si istý, že chcete znova načítať všetky súbory?" #: ../src/callbacks.c:935 ../src/keybindings.c:567 msgid "Go to Line" @@ -2707,7 +2708,7 @@ msgid "" "new file)." msgstr "" "Nastala chyba, alebo nebolo možné získať informácie o súbore (napr. z nového " -"súboru)" +"súboru)." #: ../src/dialogs.c:1203 ../src/dialogs.c:1204 ../src/dialogs.c:1205 #: ../src/dialogs.c:1211 ../src/dialogs.c:1212 ../src/dialogs.c:1213 @@ -2755,7 +2756,7 @@ msgid "" "supported." msgstr "" "Súbor „%s“ pravdepodobne nie je textový súbor, alebo jeho kódovanie nie je " -"podporované" +"podporované." #: ../src/document.c:1028 #, c-format @@ -2768,7 +2769,7 @@ msgstr "" "Súbor „%s“ nebolo možné správne otvoriť a bol orezaný. Toto môže nastať " "pokiaľ súbor obsahuje znak NULL. Uloženie takéhoto súboru môže spôsobiť " "stratu dát.\n" -"Súbor bol otvorený len na čítanie" +"Súbor bol otvorený len na čítanie." #: ../src/document.c:1240 msgid "Spaces" @@ -3319,12 +3320,11 @@ msgstr "Zavrieť všetky" #: ../src/keybindings.c:357 msgid "Reload file" -msgstr "Znova načítať" +msgstr "Znova načítať súbor" #: ../src/keybindings.c:359 -#, fuzzy msgid "Reload all files" -msgstr "Znova načítať" +msgstr "Znova načítať všetky súbory" #: ../src/keybindings.c:361 msgid "Re-open last closed tab" @@ -3796,7 +3796,7 @@ msgstr "STĹPEC" #: ../src/libmain.c:121 msgid "Use alternate configuration directory DIR" -msgstr "Použiť alternatívny priečinok ADRESÁR pre konfiguráciu" +msgstr "Použiť alternatívny adresár ADRESÁR pre konfiguráciu" #: ../src/libmain.c:121 msgid "DIR" @@ -4421,7 +4421,7 @@ msgstr "_Hľadaný výraz:" #. Now add the multiple match options #: ../src/search.c:509 msgid "_Find All" -msgstr "Nájsť všetky_" +msgstr "Ná_jsť všetky" #: ../src/search.c:516 msgid "_Mark" @@ -4497,11 +4497,11 @@ msgstr "Medzerami oddelený zoznam vzorov pre názvy súborov (napr. „*.c *.h #: ../src/search.c:926 msgid "_Directory:" -msgstr "_Adresár" +msgstr "_Adresár:" #: ../src/search.c:945 msgid "E_ncoding:" -msgstr "_Kódovanie" +msgstr "_Kódovanie:" #: ../src/search.c:969 msgid "See grep's manual page for more information" @@ -4846,14 +4846,12 @@ msgid "Classes" msgstr "Triedy" #: ../src/symbols.c:628 -#, fuzzy msgid "Fields" -msgstr "Pole prejsť na" +msgstr "Polia" #: ../src/symbols.c:632 -#, fuzzy msgid "Unknowns" -msgstr "neznáme" +msgstr "Neznáme" #: ../src/symbols.c:640 msgid "Anchors" @@ -5597,7 +5595,7 @@ msgstr "Zdrojový súbor:" #: ../plugins/classbuilder.c:484 msgid "Inheritance" -msgstr "Dedičnosť:" +msgstr "Dedičnosť" #: ../plugins/classbuilder.c:486 msgid "Base class:" @@ -5645,7 +5643,7 @@ msgstr "Je singleton" #: ../plugins/classbuilder.c:575 msgid "Constructor type:" -msgstr "Typ konštruktoru" +msgstr "Typ konštruktoru:" #: ../plugins/classbuilder.c:1087 msgid "Create Cla_ss" @@ -5711,7 +5709,7 @@ msgstr "Rôzne znaky" #: ../plugins/htmlchars.c:365 ../plugins/filebrowser.c:1202 #: ../plugins/saveactions.c:569 msgid "Plugin configuration directory could not be created." -msgstr "Nie je možné vytvoriť priečinok pre konfiguráciu zásuvného modulu." +msgstr "Nie je možné vytvoriť adresár pre konfiguráciu zásuvného modulu." #: ../plugins/htmlchars.c:486 msgid "Special Characters" @@ -5949,9 +5947,9 @@ msgid "Backup Copy: File could not be saved (%s)." msgstr "Záložná kópia: Nie je možné uložiť súbor (%s)." #: ../plugins/saveactions.c:286 -#, fuzzy, c-format +#, c-format msgid "Instant Save filename could not be generated (%s)." -msgstr "Nie je možné zapísať súbor projektu (%s)." +msgstr "Nie je možné vytvoriť názov súboru pre okamžité uloženie (%s)." #: ../plugins/saveactions.c:386 #, c-format @@ -5964,16 +5962,15 @@ msgstr[2] "Automatické uloženie: %d súborov uložených." #. initialize the dialog #: ../plugins/saveactions.c:454 msgid "Select Directory" -msgstr "Vybrať priečinok" +msgstr "Vybrať adresár" #: ../plugins/saveactions.c:544 -#, fuzzy msgid "Instantsave directory does not exist or is not writable." -msgstr "Záložný priečinok neexistuje, alebo do neho nie je možné zapisovať" +msgstr "Adresár pre okamžité uloženie neexistuje, alebo do neho nie je možné zapisovať." #: ../plugins/saveactions.c:561 msgid "Backup directory does not exist or is not writable." -msgstr "Záložný priečinok neexistuje, alebo do neho nie je možné zapisovať" +msgstr "Záložný adresár neexistuje, alebo do neho nie je možné zapisovať." #: ../plugins/saveactions.c:642 msgid "Auto Save" @@ -6013,14 +6010,13 @@ msgid "Instant Save" msgstr "Okamžité uloženie" #: ../plugins/saveactions.c:721 -#, fuzzy msgid "Default _filetype to use for new files:" -msgstr "Súborový _typ pre novo vytvorené súbory" +msgstr "Predvolený _typ súboru pre nové súbory:" #: ../plugins/saveactions.c:742 #, c-format msgid "_Directory to save files in (leave empty to use the default: %s):" -msgstr "" +msgstr "_Adresár pre ukladanie súborov (nechajte prázdne pre použitie predvoleného: %s):" #: ../plugins/saveactions.c:766 msgid "" @@ -6029,14 +6025,18 @@ msgid "" "you will need to cleanup instantly saved files manually. The Instant Save " "plugin will not delete the created files." msgstr "" +"Ak použijete ako adresár pre okamžité ukladanie adresár, ktorý nie je " +"automaticky čistený,\n" +"musíte okamžite uložené súbory čistiť manuálne. Zásuvný modul pre okamžité " +"uloženie nemaže vytvárané súbory." #: ../plugins/saveactions.c:784 msgid "Backup Copy" msgstr "Záložná kópia" #: ../plugins/saveactions.c:794 msgid "_Directory to save backup files in:" -msgstr "_Adresár pre ukladanie záložných kópií" +msgstr "_Adresár pre ukladanie záložných kópií:" #: ../plugins/saveactions.c:817 msgid "Date/_Time format for backup files (\"man strftime\" for details):" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 1f7906: Merge pull request #2909 from xhacker/zh-CN-update
by Frank Lanitz 02 Oct '21

02 Oct '21

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sat, 02 Oct 2021 07:41:40 UTC Commit: 1f7906373eae66912b47011f78a5761018cfec34 https://github.com/geany/geany/commit/1f7906373eae66912b47011f78a5761018cfe… Log Message: ----------- Merge pull request #2909 from xhacker/zh-CN-update Update zh_CN localization Modified Paths: -------------- po/zh_CN.po Modified: po/zh_CN.po 33 lines changed, 15 insertions(+), 18 deletions(-) =================================================================== @@ -11,14 +11,14 @@ msgstr "" "Project-Id-Version: Geany 1.36\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-09-21 19:03+0200\n" -"PO-Revision-Date: 2020-10-13 23:07+0800\n" +"PO-Revision-Date: 2021-09-27 14:34+0800\n" "Last-Translator: Dongyuan 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 2.4.1\n" +"X-Generator: Poedit 3.0\n" "Plural-Forms: nplurals=1; plural=0;\n" #: ../geany.desktop.in.h:1 ../data/geany.glade.h:343 @@ -2421,12 +2421,11 @@ msgstr[0] "%d个文件已保存。" #: ../src/callbacks.c:353 msgid "Changes detected, reloading all will lose any changes and history." -msgstr "" +msgstr "检测到了修改，重新载入所有文件会导致修改和历史丢失。" #: ../src/callbacks.c:354 -#, fuzzy msgid "Are you sure you want to reload all files?" -msgstr "您确定要重新载入“%s”吗？" +msgstr "您确定要重新载入所有文件吗？" #: ../src/callbacks.c:935 ../src/keybindings.c:567 msgid "Go to Line" @@ -3210,9 +3209,8 @@ msgid "Reload file" msgstr "重新载入文件" #: ../src/keybindings.c:359 -#, fuzzy msgid "Reload all files" -msgstr "重新载入文件" +msgstr "重新载入所有文件" #: ../src/keybindings.c:361 msgid "Re-open last closed tab" @@ -4703,12 +4701,10 @@ msgid "Classes" msgstr "类" #: ../src/symbols.c:628 -#, fuzzy msgid "Fields" -msgstr "定位框" +msgstr "字段" #: ../src/symbols.c:632 -#, fuzzy msgid "Unknowns" msgstr "未知" @@ -5786,9 +5782,9 @@ msgid "Backup Copy: File could not be saved (%s)." msgstr "备份复制：无法保存文件 (%s)。" #: ../plugins/saveactions.c:286 -#, fuzzy, c-format +#, c-format msgid "Instant Save filename could not be generated (%s)." -msgstr "项目文件无法写入 (%s)。" +msgstr "无法生成实时保存文件名 (%s)。" #: ../plugins/saveactions.c:386 #, c-format @@ -5802,9 +5798,8 @@ msgid "Select Directory" msgstr "选择目录" #: ../plugins/saveactions.c:544 -#, fuzzy msgid "Instantsave directory does not exist or is not writable." -msgstr "备份目录不存在或不可写。" +msgstr "实时保存目录不存在或不可写。" #: ../plugins/saveactions.c:561 msgid "Backup directory does not exist or is not writable." @@ -5845,17 +5840,16 @@ msgstr "保存全部打开的文件(_V)" #: ../plugins/saveactions.c:711 msgid "Instant Save" -msgstr "立即保存" +msgstr "实时保存" #: ../plugins/saveactions.c:721 -#, fuzzy msgid "Default _filetype to use for new files:" -msgstr "新打开文件使用的文件类型(_F)：" +msgstr "新文件默认使用的文件类型(_F)：" #: ../plugins/saveactions.c:742 #, c-format msgid "_Directory to save files in (leave empty to use the default: %s):" -msgstr "" +msgstr "保存文件用的目录（留空以使用默认值：%s）(_D)：" #: ../plugins/saveactions.c:766 msgid "" @@ -5864,6 +5858,9 @@ msgid "" "you will need to cleanup instantly saved files manually. The Instant Save " "plugin will not delete the created files." msgstr "" +"如果您的实时保存目录不会自动清空，\n" +"您将需要手动清空实时保存的文件。实时保存插件不会删除创建的文件。\n" +"" #: ../plugins/saveactions.c:784 msgid "Backup Copy" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 5cc6f1: Merge pull request #2913 from seqizz/g_trupdate
by Frank Lanitz 02 Oct '21

02 Oct '21

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sat, 02 Oct 2021 07:41:26 UTC Commit: 5cc6f1a46d1b901624071522cd39a60ca283590d https://github.com/geany/geany/commit/5cc6f1a46d1b901624071522cd39a60ca2835… Log Message: ----------- Merge pull request #2913 from seqizz/g_trupdate Update Turkish translation Modified Paths: -------------- po/tr.po Modified: po/tr.po 39 lines changed, 21 insertions(+), 18 deletions(-) =================================================================== @@ -1,29 +1,29 @@ # Turkish translations for geany package. # Copyright (C) 2006 The Geany contributors. # This file is distributed under the same license as the geany package. -# Gürkan Gür <seqizz(a)gmail.com> 2008 - 2014 +# Gürkan Gür <seqizz(a)gmail.com> 2008 - 2021 msgid "" msgstr "" "Project-Id-Version: Geany 1.30\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-09-21 19:03+0200\n" -"PO-Revision-Date: 2021-03-17 19:18+0300\n" +"PO-Revision-Date: 2021-10-01 21:03+0200\n" "Last-Translator: Gürkan Gür <seqizz(a)gmail.com>\n" "Language-Team: Gürkan Gür <seqizz(a)gmail.com>\n" "Language: tr_TR\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 ? 0 : 1;\n" -"X-Generator: Poedit 2.4.2\n" +"X-Generator: Poedit 2.4.3\n" #: ../geany.desktop.in.h:1 ../data/geany.glade.h:343 msgid "Geany" msgstr "Geany" #: ../geany.desktop.in.h:2 msgid "Integrated Development Environment" -msgstr "Tümleşik Geliştirme Ortamı" +msgstr "Entegre Geliştirme Ortamı" #: ../geany.desktop.in.h:3 msgid "A fast and lightweight IDE using GTK+" @@ -2505,11 +2505,12 @@ msgstr[1] "%d dosya kaydedildi." #: ../src/callbacks.c:353 msgid "Changes detected, reloading all will lose any changes and history." msgstr "" +"Yeniden yükleme durumunda dosyalarda yapılan değişiklikler ve geçmiş bilgisi " +"kaybolacak." #: ../src/callbacks.c:354 -#, fuzzy msgid "Are you sure you want to reload all files?" -msgstr "Yeniden yüklemek istediğinize emin misiniz '%s'?" +msgstr "Tüm dosyaları yeniden yüklemek istediğinize emin misiniz?" #: ../src/callbacks.c:935 ../src/keybindings.c:567 msgid "Go to Line" @@ -2893,7 +2894,7 @@ msgstr "\"%s\" dosyası diskte bulunamadı!" #: ../src/document.c:2125 #, c-format msgid "Cannot save read-only document '%s'!" -msgstr "Salt okunur döküman '%s' kaydedilemez! " +msgstr "Salt okunur döküman '%s' kaydedilemez!" #: ../src/document.c:2193 #, c-format @@ -3309,9 +3310,8 @@ msgid "Reload file" msgstr "Yeniden yükle" #: ../src/keybindings.c:359 -#, fuzzy msgid "Reload all files" -msgstr "Yeniden yükle" +msgstr "Tüm dosyaları yeniden yükle" #: ../src/keybindings.c:361 msgid "Re-open last closed tab" @@ -4836,14 +4836,12 @@ msgid "Classes" msgstr "Sınıflar" #: ../src/symbols.c:628 -#, fuzzy msgid "Fields" -msgstr "Alana Git" +msgstr "Alanlar" #: ../src/symbols.c:632 -#, fuzzy msgid "Unknowns" -msgstr "bilinmeyen" +msgstr "Bilinmeyenler" #: ../src/symbols.c:640 msgid "Anchors" @@ -5936,9 +5934,9 @@ msgid "Backup Copy: File could not be saved (%s)." msgstr "Yedek Kopya: Dosya kaydedilemedi (%s)." #: ../plugins/saveactions.c:286 -#, fuzzy, c-format +#, c-format msgid "Instant Save filename could not be generated (%s)." -msgstr "Proje dosyası yazılamadı (%s)." +msgstr "Hızlı Kayıt dosyası üretilemedi (%s)." #: ../plugins/saveactions.c:386 #, c-format @@ -5953,9 +5951,8 @@ msgid "Select Directory" msgstr "Dizin Seç" #: ../plugins/saveactions.c:544 -#, fuzzy msgid "Instantsave directory does not exist or is not writable." -msgstr "Yedek için seçilen dizin yok ya da yazılabilir durumda değil." +msgstr "Hızlı Kayıt dizini bulunamadı veya yazılabilir değil." #: ../plugins/saveactions.c:561 msgid "Backup directory does not exist or is not writable." @@ -5996,7 +5993,7 @@ msgstr "Bütün a_çık dosyaları kaydet" #: ../plugins/saveactions.c:711 msgid "Instant Save" -msgstr "Anlık Kayıt" +msgstr "Hızlı Kayıt" #: ../plugins/saveactions.c:721 msgid "Default _filetype to use for new files:" @@ -6006,6 +6003,8 @@ msgstr "Yeni açılan dosyalar için dosya t_ürü:" #, c-format msgid "_Directory to save files in (leave empty to use the default: %s):" msgstr "" +"_Dosyaların kaydedileceği dizin (öntanımlı dizini kullanmak için boş " +"bırakın: %s):" #: ../plugins/saveactions.c:766 msgid "" @@ -6014,6 +6013,10 @@ msgid "" "you will need to cleanup instantly saved files manually. The Instant Save " "plugin will not delete the created files." msgstr "" +"Hızlı Kayıt dizini olarak otomatik olarak temizlenmeyen bir dizin " +"seçerseniz,\n" +"bu dizini elle temizlemeniz gerekir. Hızlı Kayıt eklentisi oluşturulan " +"dosyaları silmemektedir." #: ../plugins/saveactions.c:784 msgid "Backup Copy" -------------- 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 October 2021