diff --git a/NEWS b/NEWS index 2a1b238..0afd9f2 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,69 @@ +2024-03-24 meld 3.22.2 +====================== + + Fixes: + + * Fix incorrect DLL paths in Windows build (Kai Willadsen) + * Remove upstream deprecated 32-bit Windows build (Kai Willadsen) + + * Issues fixed: #824 + + Translations: + + * Daniel Rusek (cs) + + +2024-02-18 meld 3.22.1 +====================== + + Fixes: + + * Work around layout sizing issue (Kai Willadsen) + * Fix broken search context (t-gergely) + * Fix issues with pane contents swapping missing warnings and incorrectly + handling blank or version-controlled panes (Helly Guo) + * Fix go-to-line accelerator conflict with previous-conflict (Kai Willadsen) + * Fix unintended requirement on Adwaita cursors (Kai Willadsen) + * Fix incorrect cut/copy/paste sensitivity on pane change (Kai Willadsen) + * Fix multi-row selection in folder and version control view (Kai Willadsen) + * Fix missing pull/push version control icons (Kai Willadsen) + * Refresh highlighting theme when dark theme preference changes (Kai + Willadsen) + * Remove filter and conflict buttons from new comparison tab (Kai Willadsen) + * Fix scroll not working in file action gutter (Kai Willadsen) + * Fix line number rendering when changing font sizes (Kai Willadsen) + * Fix overview map not redrawing on text wrap toggle (Kai Willadsen) + * Set minimum width for notebook labels (Kai Willadsen) + * Improve notebook label ellipsization (Kai Willadsen) + * Fix Meson byte-compilation support with DESTDIR (Kai Willadsen) + + * Issues fixed: #709, #713, #715, #724, #726, #729, #733, #736, #767, #769, + #780, #785, #787, #795, #796, #796, #797, #798 + + Translations: + + * Anders Jonsson (sv) + * Asier Sarasua Garmendia (eu) + * Balázs Úr (hu) + * Daniel Rusek (cs) + * Ekaterine Papava (ka) + * Emin Tufan Çetin (tr) + * Enrico Nicoletto (pt_BR) + * Fran Dieguez (gl) + * Hugo Carvalho (pt) + * Jiri Grönroos (fi) + * Jürgen Benvenuti (de) + * Kukuh Syafaat (id) + * Martin (sl) + * Philipp Kiemle (de) + * Piotr Drąg (pl) + * Rafael Fontenelle (pt_BR) + * Sergej A (ru) + * Yuri Chornoivan (uk) + * Мирослав Николић (sr) + + 2022-09-04 meld 3.22.0 ====================== diff --git a/bin/meld b/bin/meld index 44672b8..6bb77f1 100755 --- a/bin/meld +++ b/bin/meld @@ -107,7 +107,7 @@ elif frozen: meld.conf.frozen() # TODO: Possibly move to elib.intl -import gettext # noqa: E402, I100 +import gettext # noqa: E402, I001 locale_domain = meld.conf.__package__ locale_dir = meld.conf.LOCALEDIR @@ -256,8 +256,7 @@ def check_requirements(): def setup_resources(): - from gi.repository import Gio - from gi.repository import GtkSource + from gi.repository import Gio, GtkSource resource_filename = meld.conf.APPLICATION_ID + ".gresource" resource_file = os.path.join(meld.conf.DATADIR, resource_filename) diff --git a/data/org.gnome.MeldDevel.json b/data/org.gnome.MeldDevel.json index acfdd27..31f18b6 100644 --- a/data/org.gnome.MeldDevel.json +++ b/data/org.gnome.MeldDevel.json @@ -54,7 +54,8 @@ "sources": [ { "type": "git", - "url": "https://gitlab.gnome.org/GNOME/meld.git" + "url": "https://gitlab.gnome.org/GNOME/meld.git", + "branch": "main" } ], "config-opts": [ diff --git a/data/org.gnome.meld.appdata.xml.in.in b/data/org.gnome.meld.appdata.xml.in.in index 89704c7..f3d7cc3 100644 --- a/data/org.gnome.meld.appdata.xml.in.in +++ b/data/org.gnome.meld.appdata.xml.in.in @@ -52,6 +52,30 @@ meld + + +

+ This is a stable release in the 3.22 series. +

+
    +
  • Fixed Windows build
    • +
  • Updated translations
    • +
+ + + + +

+ This is a stable release in the 3.22 series. Fixes include: +

+
    +
  • Fixed several layout and sizing issues
    • +
  • Improved consistency of swap-panes action
    • +
  • Fixed menu item sensitivity in several cases
    • +
  • Updated translations
    • +
+ +

diff --git a/debian/changelog b/debian/changelog index 982ad1b..43d4c21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +meld (3.22.2-1) unstable; urgency=medium + + * New upstream release + + -- Jeremy Bícha Mon, 01 Apr 2024 12:09:55 -0400 + +meld (3.22.1-2) unstable; urgency=medium + + * Replace Depends: libgtk-3-0 with gir1.2-gtk-3.0 (Closes: #1067193) + + -- Jeremy Bícha Tue, 19 Mar 2024 16:52:04 -0400 + +meld (3.22.1-1) unstable; urgency=medium + + * New upstream release + * Stop using debian/control.in and dh-sequence-gnome + * Update standards version to 4.6.2, no changes needed + + -- Jeremy Bícha Mon, 19 Feb 2024 16:32:18 -0500 + meld (3.22.0-2) unstable; urgency=medium [ Debian Janitor ] diff --git a/debian/control b/debian/control index 68d8161..cd34e97 100644 --- a/debian/control +++ b/debian/control @@ -1,14 +1,9 @@ -# This file is autogenerated. DO NOT EDIT! -# -# Modifications should be made to debian/control.in instead. -# This file is regenerated automatically in the clean target. Source: meld Section: gnome Priority: optional Maintainer: Debian GNOME Maintainers -Uploaders: Emilio Pozuelo Monfort , Jeremy Bicha +Uploaders: Emilio Pozuelo Monfort , Jeremy Bícha Build-Depends: debhelper-compat (= 13), - dh-sequence-gnome, dh-sequence-python3, libgtk-3-dev, libgtksourceview-4-dev, @@ -19,7 +14,7 @@ Build-Depends: debhelper-compat (= 13), intltool, itstool, libxml2-utils -Standards-Version: 4.6.1 +Standards-Version: 4.6.2 Rules-Requires-Root: no Vcs-Browser: https://salsa.debian.org/gnome-team/meld Vcs-Git: https://salsa.debian.org/gnome-team/meld.git @@ -29,7 +24,7 @@ Package: meld Architecture: all Depends: ${python3:Depends}, ${misc:Depends}, - libgtk-3-0 (>= 3.20), + gir1.2-gtk-3.0, python3-gi (>= 3.20), python3-gi-cairo, gir1.2-gtksource-4, diff --git a/debian/gbp.conf b/debian/gbp.conf index 4ed071a..24fddb5 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,6 +1,6 @@ [DEFAULT] pristine-tar = True -debian-branch = debian/master +debian-branch = debian/latest upstream-branch = upstream/latest [buildpackage] diff --git a/dev-requirements.txt b/dev-requirements.txt index 88e0674..1f50fc5 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,8 +1,3 @@ -flake8==5.0.4 -flake8-isort==4.2.0 -mccabe==0.7.0 -pep8-naming==0.13.1 -pre-commit==2.20.0 -pycodestyle==2.9.1 -pyflakes==2.5.0 +ruff~=0.1.8 +pre-commit~=3.6.0 pytest==7.1.2 diff --git a/maint b/maint old mode 100755 new mode 100644 index b12edd8..7d92d51 --- a/maint +++ b/maint @@ -428,7 +428,7 @@ def dist(): call_with_output(cmd, echo_stdout=False) click.echo('Creating distribution...') - cmd = ['ninja', '-C', build_dir, 'dist'] + cmd = ['meson', 'dist', '-C', build_dir] call_with_output(cmd, echo_stdout=False) if not os.path.exists(dist_archive_path): diff --git a/meld/accelerators.py b/meld/accelerators.py index b5ddf3d..57cc763 100644 --- a/meld/accelerators.py +++ b/meld/accelerators.py @@ -28,7 +28,7 @@ 'win.new-tab': 'N', 'win.stop': 'Escape', # File comparison actions - 'view.file-previous-conflict': 'I', + 'view.file-previous-conflict': 'J', 'view.file-next-conflict': 'K', 'view.file-push-left': 'Left', 'view.file-push-right': 'Right', diff --git a/meld/actiongutter.py b/meld/actiongutter.py index e9ea5bc..178331a 100644 --- a/meld/actiongutter.py +++ b/meld/actiongutter.py @@ -178,7 +178,8 @@ def do_realize(self): Gdk.EventMask.LEAVE_NOTIFY_MASK | Gdk.EventMask.POINTER_MOTION_MASK | Gdk.EventMask.BUTTON_PRESS_MASK | - Gdk.EventMask.BUTTON_RELEASE_MASK + Gdk.EventMask.BUTTON_RELEASE_MASK | + Gdk.EventMask.SCROLL_MASK ) self.connect('notify::action-mode', lambda *args: self.queue_draw()) diff --git a/meld/build_helpers.py b/meld/build_helpers.py index 0d67f9b..3240d66 100644 --- a/meld/build_helpers.py +++ b/meld/build_helpers.py @@ -41,11 +41,6 @@ 'install paths may be incorrect', file=sys.stderr) windows_build = os.name == 'nt' -if windows_build: - import cx_Freeze - command_base = cx_Freeze -else: - command_base = distutils def has_help(self): @@ -64,7 +59,7 @@ def has_data(self): return "build_data" in self.distribution.cmdclass -command_base.command.build.Build.sub_commands.extend([ +distutils.command.build.build.sub_commands.extend([ ("build_i18n", has_i18n), ("build_icons", has_icons), ("build_help", has_help), diff --git a/meld/chunkmap.py b/meld/chunkmap.py index a19c942..dd416d0 100644 --- a/meld/chunkmap.py +++ b/meld/chunkmap.py @@ -15,7 +15,7 @@ import collections import logging -from typing import List, Mapping, Tuple +from typing import Any, List, Mapping, Tuple import cairo from gi.repository import Gdk, GObject, Gtk @@ -283,6 +283,15 @@ class TextViewChunkMap(ChunkMap): ), ) + def do_realize(self): + + def force_redraw(*args: Any) -> None: + self._cached_map = None + self.queue_draw() + + self.textview.connect("notify::wrap-mode", force_redraw) + return ChunkMap.do_realize(self) + def get_height_scale(self): adjustments = [ self.props.adjustment, diff --git a/meld/conf.py.in b/meld/conf.py.in index 343b9ca..eb400de 100644 --- a/meld/conf.py.in +++ b/meld/conf.py.in @@ -4,7 +4,7 @@ import sys from pathlib import Path __package__ = "meld" -__version__ = "3.22.0" +__version__ = "3.22.2" APPLICATION_NAME = 'Meld' APPLICATION_ID = 'org.gnome.Meld' @@ -43,6 +43,7 @@ def frozen(): global DATADIR, LOCALEDIR, DATADIR_IS_UNINSTALLED melddir = os.path.dirname(sys.executable) + os.add_dll_directory(os.path.join(melddir, "lib")) DATADIR = os.path.join(melddir, "share", "meld") LOCALEDIR = os.path.join(melddir, "share", "mo") diff --git a/meld/diffgrid.py b/meld/diffgrid.py index c03e4ab..dbbe234 100644 --- a/meld/diffgrid.py +++ b/meld/diffgrid.py @@ -278,9 +278,10 @@ def realize(self, widget): Gdk.EventMask.ENTER_NOTIFY_MASK | Gdk.EventMask.LEAVE_NOTIFY_MASK | Gdk.EventMask.POINTER_MOTION_MASK) - attr.cursor = Gdk.Cursor.new_for_display(widget.get_display(), - Gdk.CursorType. - SB_H_DOUBLE_ARROW) + attr.cursor = Gdk.Cursor.new_from_name( + widget.get_display(), + "col-resize", + ) attr_mask = (Gdk.WindowAttributesType.X | Gdk.WindowAttributesType.Y | Gdk.WindowAttributesType.CURSOR) diff --git a/meld/dirdiff.py b/meld/dirdiff.py index 5e3f946..2c3ecec 100644 --- a/meld/dirdiff.py +++ b/meld/dirdiff.py @@ -1401,11 +1401,11 @@ def on_treeview_cursor_changed(self, view): @Gtk.Template.Callback() def on_treeview_popup_menu(self, treeview): - tree.TreeviewCommon.on_treeview_popup_menu(self, treeview) + return tree.TreeviewCommon.on_treeview_popup_menu(self, treeview) @Gtk.Template.Callback() def on_treeview_button_press_event(self, treeview, event): - tree.TreeviewCommon.on_treeview_button_press_event( + return tree.TreeviewCommon.on_treeview_button_press_event( self, treeview, event) @with_focused_pane diff --git a/meld/filediff.py b/meld/filediff.py index d298774..3a5d0f0 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -740,6 +740,9 @@ def on_current_diff_changed(self, *args): self.set_action_enabled('previous-pane', pane > 0) self.set_action_enabled('next-pane', pane < self.num_panes - 1) self.set_action_enabled('swap-2-panes', self.num_panes == 2) + + self.update_text_actions_sensitivity() + # FIXME: don't queue_draw() on everything... just on what changed self.queue_draw() @@ -1122,7 +1125,7 @@ def on_textview_drag_data_received( @Gtk.Template.Callback() def on_textview_focus_in_event(self, view, event): self.focus_pane = view - self.findbar.textview = view + self.findbar.set_text_view(self.focus_pane) self.on_cursor_position_changed(view.get_buffer(), None, True) self._set_save_action_sensitivity() self._set_merge_action_sensitivity() @@ -2557,9 +2560,33 @@ def clear_sync_points(self, *args): self.refresh_comparison() def action_swap(self, *args): - buffer0 = self.textbuffer[0] - buffer1 = self.textbuffer[1] - self.set_files([buffer1.data.gfile, buffer0.data.gfile]) + buffers = self.textbuffer[:self.num_panes] + gfiles = [buf.data.gfile for buf in buffers] + + have_unnamed_files = any(gfile is None for gfile in gfiles) + have_modified_files = any(buf.get_modified() for buf in buffers) + + if have_unnamed_files or have_modified_files: + misc.error_dialog( + primary=_("Can't swap unsaved files"), + secondary=_( + "Files must be saved to disk before swapping panes." + ) + ) + return + + if self.meta.get("tablabel", None): + misc.error_dialog( + primary=_("Can't swap version control comparisons"), + secondary=_( + "Swapping panes is not supported in version control mode." + ) + ) + return + + self.set_labels([self.filelabel[1].props.label, + self.filelabel[0].props.label]) + self.set_files([gfiles[1], gfiles[0]]) FileDiff.set_css_name('meld-file-diff') diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py index baea2d2..f3106ed 100644 --- a/meld/gutterrendererchunk.py +++ b/meld/gutterrendererchunk.py @@ -14,6 +14,7 @@ # along with this program. If not, see . import math +from typing import Any from gi.repository import Gdk, GtkSource, Pango @@ -137,8 +138,29 @@ def __init__(self, from_pane, to_pane, linediffer): meld_settings = get_meld_settings() meld_settings.connect('changed', self.on_setting_changed) + self.font_string = meld_settings.font.to_string() self.on_setting_changed(meld_settings, 'style-scheme') + self.connect("notify::view", self.on_view_changed) + + def on_view_changed(self, *args: Any) -> None: + if not self.get_view(): + return + + self.get_view().connect("style-updated", self.on_view_style_updated) + + def on_view_style_updated(self, view: GtkSource.View) -> None: + stylecontext = view.get_style_context() + # We should be using stylecontext.get_property, but it doesn't work + # for reasons that according to the GTK code are "Yuck". + font = stylecontext.get_font(stylecontext.get_state()) + font_string = font.to_string() + need_recalculate = font_string != self.font_string + + buf = self.get_view().get_buffer() + self.font_string = font_string + self.recalculate_size(buf, force=need_recalculate) + def do_change_buffer(self, old_buffer): if old_buffer: old_buffer.disconnect(self.changed_handler_id) @@ -157,13 +179,17 @@ def _measure_markup(self, markup): w, h = layout.get_size() return w / Pango.SCALE, h / Pango.SCALE - def recalculate_size(self, buf): + def recalculate_size( + self, + buf: GtkSource.Buffer, + force: bool = False, + ) -> None: # Always calculate display size for at least two-digit line counts num_lines = max(buf.get_line_count(), 99) num_digits = int(math.ceil(math.log(num_lines, 10))) - if num_digits == self.num_line_digits: + if num_digits == self.num_line_digits and not force: return self.num_line_digits = num_digits diff --git a/meld/newdifftab.py b/meld/newdifftab.py index 7b4e17e..a7c97df 100644 --- a/meld/newdifftab.py +++ b/meld/newdifftab.py @@ -173,9 +173,15 @@ def on_button_new_blank_clicked(self, *args): tab = self.diff_methods[self.diff_type](gfiles) self.emit('diff-created', tab) - def on_container_switch_in_event(self, *args): + def on_container_switch_in_event(self, window): self.label_changed.emit(self.label_text, self.tooltip_text) + window.text_filter_button.set_visible(False) + window.folder_filter_button.set_visible(False) + window.vc_filter_button.set_visible(False) + window.next_conflict_button.set_visible(False) + window.previous_conflict_button.set_visible(False) + def on_container_switch_out_event(self, *args): pass diff --git a/meld/resources/meld.gresource.xml b/meld/resources/meld.gresource.xml index 34b07e6..f0e5fbb 100644 --- a/meld/resources/meld.gresource.xml +++ b/meld/resources/meld.gresource.xml @@ -3,8 +3,8 @@ scalable/apps/org.gnome.Meld.svg scalable/apps/org.gnome.MeldDevel.svg - icons/vc-pull-symbolic.svg - icons/vc-push-symbolic.svg + icons/vc-pull-symbolic.svg + icons/vc-push-symbolic.svg gtk/help-overlay.ui diff --git a/meld/resources/ui/filediff.ui b/meld/resources/ui/filediff.ui index 2ea4502..2bf9491 100644 --- a/meld/resources/ui/filediff.ui +++ b/meld/resources/ui/filediff.ui @@ -551,6 +551,7 @@ textview0 textview1 GTK_ICON_LOOKUP_DIR_LTR + 1 @@ -565,6 +566,7 @@ textview1 textview0 GTK_ICON_LOOKUP_DIR_RTL + 3 @@ -579,6 +581,7 @@ textview1 textview2 GTK_ICON_LOOKUP_DIR_LTR + 5 @@ -593,6 +596,7 @@ textview2 textview1 GTK_ICON_LOOKUP_DIR_RTL + 7 diff --git a/meld/resources/ui/notebook-label.ui b/meld/resources/ui/notebook-label.ui index 270e93a..92e77ef 100644 --- a/meld/resources/ui/notebook-label.ui +++ b/meld/resources/ui/notebook-label.ui @@ -13,7 +13,9 @@ True + PANGO_ELLIPSIZE_MIDDLE True + 150 diff --git a/meld/settings.py b/meld/settings.py index fc2d6c4..628853d 100644 --- a/meld/settings.py +++ b/meld/settings.py @@ -16,7 +16,7 @@ import sys from typing import Optional -from gi.repository import Gio, GObject, Gtk, GtkSource, Pango +from gi.repository import Gio, GObject, GtkSource, Pango import meld.conf import meld.filters @@ -52,11 +52,7 @@ def on_setting_changed(self, settings, key): elif key in ('use-system-font', 'custom-font'): self.font = self._current_font_from_gsetting() self.emit('changed', 'font') - elif key == 'prefer-dark-theme': - gtk_settings = Gtk.Settings.get_default() - prefer_dark = settings.get_boolean(key) - gtk_settings.props.gtk_application_prefer_dark_theme = prefer_dark - elif key in ('style-scheme'): + elif key in ('style-scheme', 'prefer-dark-theme'): self.style_scheme = self._style_scheme_from_gsettings() self.emit('changed', 'style-scheme') @@ -64,7 +60,8 @@ def _style_scheme_from_gsettings(self): from meld.style import set_base_style_scheme manager = GtkSource.StyleSchemeManager.get_default() scheme = manager.get_scheme(settings.get_string('style-scheme')) - set_base_style_scheme(scheme) + prefer_dark = settings.get_boolean("prefer-dark-theme") + set_base_style_scheme(scheme, prefer_dark) return scheme def _filters_from_gsetting(self, key, filt_type): diff --git a/meld/style.py b/meld/style.py index f22cce1..d9bc591 100644 --- a/meld/style.py +++ b/meld/style.py @@ -18,7 +18,7 @@ import enum from typing import Mapping, Optional, Tuple -from gi.repository import Gdk, GtkSource +from gi.repository import Gdk, Gtk, GtkSource from meld.conf import _ @@ -33,11 +33,16 @@ class MeldStyleScheme(enum.Enum): def set_base_style_scheme( - new_style_scheme: GtkSource.StyleScheme) -> GtkSource.StyleScheme: + new_style_scheme: GtkSource.StyleScheme, + prefer_dark: bool, +) -> GtkSource.StyleScheme: global base_style_scheme global style_scheme + gtk_settings = Gtk.Settings.get_default() + gtk_settings.props.gtk_application_prefer_dark_theme = prefer_dark + style_scheme = new_style_scheme # Get our text background colour by checking the 'text' style of diff --git a/meld/ui/filebutton.py b/meld/ui/filebutton.py index b985b93..dfdcf5e 100644 --- a/meld/ui/filebutton.py +++ b/meld/ui/filebutton.py @@ -74,7 +74,7 @@ def do_clicked(self) -> None: local_only=self.local_only ) - if self.file: + if self.file and self.file.get_path(): dialog.set_file(self.file) response = dialog.run() diff --git a/meld/ui/msgarea.py b/meld/ui/msgarea.py index f3246ff..e7fc659 100644 --- a/meld/ui/msgarea.py +++ b/meld/ui/msgarea.py @@ -45,7 +45,7 @@ def layout_text_and_icon(icon_name, primary_text, secondary_text=None): secondary_label = Gtk.Label( "{}".format(secondary_text), wrap=True, - wrap_mode=Pango.WrapMode.WORD_CHAR, + wrap_mode=Pango.WrapMode.WORD, use_markup=True, xalign=0, can_focus=True, diff --git a/meld/vcview.py b/meld/vcview.py index f98b89b..3e8b1c9 100644 --- a/meld/vcview.py +++ b/meld/vcview.py @@ -860,11 +860,11 @@ def on_consoleview_populate_popup(self, textview, menu): @Gtk.Template.Callback() def on_treeview_popup_menu(self, treeview): - tree.TreeviewCommon.on_treeview_popup_menu(self, treeview) + return tree.TreeviewCommon.on_treeview_popup_menu(self, treeview) @Gtk.Template.Callback() def on_treeview_button_press_event(self, treeview, event): - tree.TreeviewCommon.on_treeview_button_press_event( + return tree.TreeviewCommon.on_treeview_button_press_event( self, treeview, event) @Gtk.Template.Callback() diff --git a/meson.build b/meson.build index eea1336..1de14c0 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project( 'meld', - version: '3.22.0', + version: '3.22.2', meson_version: '>= 0.49.0', ) diff --git a/meson_post_install.py b/meson_post_install.py index 79bc1ac..c6955e6 100644 --- a/meson_post_install.py +++ b/meson_post_install.py @@ -1,5 +1,6 @@ #!/usr/bin/env python3 +import os import sys from compileall import compile_dir from os import environ, path @@ -18,5 +19,11 @@ # Byte-compilation is enabled by passing the site-packages path to this script if len(sys.argv) > 1: print('Byte-compiling Python module...') + destdir = os.getenv("DESTDIR", "") python_source_install_path = sys.argv[1] - compile_dir(path.join(python_source_install_path, 'meld'), optimize=1) + if destdir: + # The install path here will be absolute, so we can't use join() + install_path = destdir + os.path.sep + python_source_install_path + else: + install_path = python_source_install_path + compile_dir(os.path.join(install_path, "meld"), optimize=1) diff --git a/po/LINGUAS b/po/LINGUAS index 66e505e..cefea0b 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -21,6 +21,7 @@ hu id it ja +ka ko nb ne diff --git a/po/cs.po b/po/cs.po index 713df99..f7c3bdd 100644 --- a/po/cs.po +++ b/po/cs.po @@ -10,16 +10,16 @@ msgid "" msgstr "" "Project-Id-Version: meld\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2022-03-27 00:52+0000\n" -"PO-Revision-Date: 2022-04-03 11:41+0200\n" -"Last-Translator: Marek Černocký \n" +"POT-Creation-Date: 2024-02-18 01:47+0000\n" +"PO-Revision-Date: 2024-03-15 20:44+0100\n" +"Last-Translator: Daniel Rusek \n" "Language-Team: čeština \n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Gtranslator 2.91.7\n" +"X-Generator: Poedit 3.4.2\n" #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11 #: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17 @@ -526,361 +526,375 @@ msgstr "Aktualizovat porovnání" #: meld/resources/gtk/help-overlay.ui:54 msgctxt "shortcut window" +msgid "Open externally" +msgstr "Otevřít externě" + +#: meld/resources/gtk/help-overlay.ui:61 +msgctxt "shortcut window" msgid "Fullscreen" msgstr "Celá obrazovka" -#: meld/resources/gtk/help-overlay.ui:63 +#: meld/resources/gtk/help-overlay.ui:68 +msgctxt "shortcut window" +msgid "Swap left and right panes" +msgstr "Přehodit levý a pravý panel" + +#: meld/resources/gtk/help-overlay.ui:77 msgctxt "shortcut window" msgid "Panes" msgstr "Panely" -#: meld/resources/gtk/help-overlay.ui:68 +#: meld/resources/gtk/help-overlay.ui:82 msgctxt "shortcut window" msgid "Previous comparison pane" msgstr "Předchozí panel s porovnáním" -#: meld/resources/gtk/help-overlay.ui:75 +#: meld/resources/gtk/help-overlay.ui:89 msgctxt "shortcut window" msgid "Next comparison pane" msgstr "Následující panel s porovnáním" -#: meld/resources/gtk/help-overlay.ui:84 +#: meld/resources/gtk/help-overlay.ui:98 msgctxt "shortcut window" msgid "Changes" msgstr "Změny" -#: meld/resources/gtk/help-overlay.ui:89 +#: meld/resources/gtk/help-overlay.ui:103 msgctxt "shortcut window" msgid "Go to previous change" msgstr "Přejít na předchozí změnu" -#: meld/resources/gtk/help-overlay.ui:96 +#: meld/resources/gtk/help-overlay.ui:110 msgctxt "shortcut window" msgid "Go to next change" msgstr "Přejít na následující změnu" -#: meld/resources/gtk/help-overlay.ui:105 +#: meld/resources/gtk/help-overlay.ui:119 msgctxt "shortcut window" msgid "Tabs" msgstr "Karty" -#: meld/resources/gtk/help-overlay.ui:110 +#: meld/resources/gtk/help-overlay.ui:124 msgctxt "shortcut window" msgid "Go to previous tab" msgstr "Přejít na předchozí kartu" -#: meld/resources/gtk/help-overlay.ui:117 +#: meld/resources/gtk/help-overlay.ui:131 msgctxt "shortcut window" msgid "Go to next tab" msgstr "Přejít na následující kartu" -#: meld/resources/gtk/help-overlay.ui:124 +#: meld/resources/gtk/help-overlay.ui:138 msgctxt "shortcut window" msgid "Switch to tab" msgstr "Přepnout na kartu" -#: meld/resources/gtk/help-overlay.ui:131 +#: meld/resources/gtk/help-overlay.ui:145 msgctxt "shortcut window" msgid "Move tab left" msgstr "Přesunout kartu doleva" -#: meld/resources/gtk/help-overlay.ui:138 +#: meld/resources/gtk/help-overlay.ui:152 msgctxt "shortcut window" msgid "Move tab right" msgstr "Přesunout kartu doprava" -#: meld/resources/gtk/help-overlay.ui:147 +#: meld/resources/gtk/help-overlay.ui:161 msgctxt "shortcut window" msgid "Editing" msgstr "Úpravy" -#: meld/resources/gtk/help-overlay.ui:152 +#: meld/resources/gtk/help-overlay.ui:166 msgctxt "shortcut window" msgid "Undo" msgstr "Zpět" -#: meld/resources/gtk/help-overlay.ui:159 +#: meld/resources/gtk/help-overlay.ui:173 msgctxt "shortcut window" msgid "Redo" msgstr "Znovu" -#: meld/resources/gtk/help-overlay.ui:166 +#: meld/resources/gtk/help-overlay.ui:180 msgctxt "shortcut window" msgid "Cut" msgstr "Vyjmout" -#: meld/resources/gtk/help-overlay.ui:173 +#: meld/resources/gtk/help-overlay.ui:187 msgctxt "shortcut window" msgid "Copy" msgstr "Kopírovat" -#: meld/resources/gtk/help-overlay.ui:180 +#: meld/resources/gtk/help-overlay.ui:194 msgctxt "shortcut window" msgid "Paste" msgstr "Vložit" -#: meld/resources/gtk/help-overlay.ui:187 +#: meld/resources/gtk/help-overlay.ui:201 msgctxt "shortcut window" msgid "Find" msgstr "Hledat" -#: meld/resources/gtk/help-overlay.ui:194 +#: meld/resources/gtk/help-overlay.ui:208 msgctxt "shortcut window" msgid "Find Next" msgstr "Najít následující" -#: meld/resources/gtk/help-overlay.ui:201 +#: meld/resources/gtk/help-overlay.ui:215 msgctxt "shortcut window" msgid "Find Previous" msgstr "Najít předchozí" -#: meld/resources/gtk/help-overlay.ui:208 +#: meld/resources/gtk/help-overlay.ui:222 msgctxt "shortcut window" msgid "Replace" msgstr "Nahradit" -#: meld/resources/gtk/help-overlay.ui:217 +#: meld/resources/gtk/help-overlay.ui:231 msgctxt "shortcut window" msgid "File comparison" msgstr "Porovnávání souborů" -#: meld/resources/gtk/help-overlay.ui:222 +#: meld/resources/gtk/help-overlay.ui:236 msgctxt "shortcut window" msgid "Save current file" msgstr "Uložit aktuální soubor" -#: meld/resources/gtk/help-overlay.ui:229 +#: meld/resources/gtk/help-overlay.ui:243 msgctxt "shortcut window" msgid "Save current file to new path" msgstr "Uložit aktuální soubor do nové cesty" -#: meld/resources/gtk/help-overlay.ui:236 +#: meld/resources/gtk/help-overlay.ui:250 msgctxt "shortcut window" msgid "Save all files in comparison" msgstr "Uložit všechny soubory v porovnání" -#: meld/resources/gtk/help-overlay.ui:243 +#: meld/resources/gtk/help-overlay.ui:257 msgctxt "shortcut window" msgid "Previous conflict" msgstr "Předchozí konflikt" -#: meld/resources/gtk/help-overlay.ui:250 +#: meld/resources/gtk/help-overlay.ui:264 msgctxt "shortcut window" msgid "Next conflict" msgstr "Následující konflikt" -#: meld/resources/gtk/help-overlay.ui:257 +#: meld/resources/gtk/help-overlay.ui:271 msgctxt "shortcut window" msgid "Push change to left" msgstr "Vnutit aktuální změnu doleva" -#: meld/resources/gtk/help-overlay.ui:264 +#: meld/resources/gtk/help-overlay.ui:278 msgctxt "shortcut window" msgid "Push change to right" msgstr "Vnutit aktuální změnu doprava" -#: meld/resources/gtk/help-overlay.ui:271 +#: meld/resources/gtk/help-overlay.ui:285 msgctxt "shortcut window" msgid "Pull change from left" msgstr "Vytáhnout změnu zleva" -#: meld/resources/gtk/help-overlay.ui:278 +#: meld/resources/gtk/help-overlay.ui:292 msgctxt "shortcut window" msgid "Pull change from right" msgstr "Vytáhnout změnu zprava" -#: meld/resources/gtk/help-overlay.ui:285 +#: meld/resources/gtk/help-overlay.ui:299 msgctxt "shortcut window" msgid "Copy change above left" msgstr "Kopírovat změnu nad levým blokem" -#: meld/resources/gtk/help-overlay.ui:292 +#: meld/resources/gtk/help-overlay.ui:306 msgctxt "shortcut window" msgid "Copy change below left" msgstr "Kopírovat změnu pod levým blokem" -#: meld/resources/gtk/help-overlay.ui:299 +#: meld/resources/gtk/help-overlay.ui:313 msgctxt "shortcut window" msgid "Copy change above right" msgstr "Kopírovat změnu nad pravým blokem" -#: meld/resources/gtk/help-overlay.ui:306 +#: meld/resources/gtk/help-overlay.ui:320 msgctxt "shortcut window" msgid "Copy change below right" msgstr "Kopírovat změnu pod pravým blokem" -#: meld/resources/gtk/help-overlay.ui:313 -#: meld/resources/gtk/help-overlay.ui:341 +#: meld/resources/gtk/help-overlay.ui:327 +#: meld/resources/gtk/help-overlay.ui:355 msgctxt "shortcut window" msgid "Delete change" msgstr "Smazat změnu" -#: meld/resources/gtk/help-overlay.ui:322 +#: meld/resources/gtk/help-overlay.ui:336 msgctxt "shortcut window" msgid "Folder comparison" msgstr "Porovnávání složek" -#: meld/resources/gtk/help-overlay.ui:327 +#: meld/resources/gtk/help-overlay.ui:341 msgctxt "shortcut window" msgid "Copy to left" msgstr "Kopírovat doleva" -#: meld/resources/gtk/help-overlay.ui:334 +#: meld/resources/gtk/help-overlay.ui:348 msgctxt "shortcut window" msgid "Copy to right" msgstr "Kopírovat doprava" -#: meld/resources/gtk/help-overlay.ui:350 +#: meld/resources/gtk/help-overlay.ui:364 msgctxt "shortcut window" msgid "Version control comparison" msgstr "Porovnávání správy verzí" -#: meld/resources/gtk/help-overlay.ui:355 +#: meld/resources/gtk/help-overlay.ui:369 msgctxt "shortcut window" msgid "Commit to version control" msgstr "Zařadit změny do správy verzí" -#: meld/resources/gtk/help-overlay.ui:362 +#: meld/resources/gtk/help-overlay.ui:376 msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Zobrazit/skrýt výstup konzoly" #: meld/resources/gtk/menus.ui:7 -msgid "Refresh" -msgstr "Aktualizovat" - -#: meld/resources/gtk/menus.ui:12 -msgid "Stop" -msgstr "Zastavit" - -#: meld/resources/gtk/menus.ui:17 -msgid "Fullscreen" -msgstr "Celá obrazovka" - -#: meld/resources/gtk/menus.ui:26 msgid "Save As…" msgstr "Uložit jako…" -#: meld/resources/gtk/menus.ui:30 +#: meld/resources/gtk/menus.ui:11 msgid "Save A_ll" msgstr "Uložit _vše" -#: meld/resources/gtk/menus.ui:34 +#: meld/resources/gtk/menus.ui:15 msgid "Revert files…" msgstr "Vrátit změny souborů…" -#: meld/resources/gtk/menus.ui:38 +#: meld/resources/gtk/menus.ui:19 msgid "Open Externally" msgstr "Otevřít externě" -#: meld/resources/gtk/menus.ui:45 +#: meld/resources/gtk/menus.ui:26 +msgid "Refresh Comparison" +msgstr "Aktualizovat porovnání" + +#: meld/resources/gtk/menus.ui:33 msgid "_Find…" msgstr "_Hledat…" -#: meld/resources/gtk/menus.ui:49 +#: meld/resources/gtk/menus.ui:37 msgid "_Replace…" msgstr "Nah_radit…" -#: meld/resources/gtk/menus.ui:55 +#: meld/resources/gtk/menus.ui:43 msgid "View" msgstr "Zobrazit" -#: meld/resources/gtk/menus.ui:59 +#: meld/resources/gtk/menus.ui:47 +msgid "Fullscreen" +msgstr "Celá obrazovka" + +#: meld/resources/gtk/menus.ui:52 msgid "Overview Map" msgstr "Přehledovou mapu" -#: meld/resources/gtk/menus.ui:63 +#: meld/resources/gtk/menus.ui:56 msgid "Version control console" msgstr "Konzola správy verzí" -#: meld/resources/gtk/menus.ui:67 +#: meld/resources/gtk/menus.ui:60 msgid "Lock scrolling" msgstr "Uzamknout posouvání" +#: meld/resources/gtk/menus.ui:67 +msgid "Swap left and right panes" +msgstr "Přehodit levý a pravý panel" + #: meld/resources/gtk/menus.ui:73 msgid "Comparison" msgstr "Porovnání" -#: meld/resources/gtk/menus.ui:77 +#: meld/resources/gtk/menus.ui:75 +msgid "Stop" +msgstr "Zastavit" + +#: meld/resources/gtk/menus.ui:81 msgid "Merge All from Left" msgstr "Sloučit vše zleva" -#: meld/resources/gtk/menus.ui:81 +#: meld/resources/gtk/menus.ui:85 msgid "Merge All from Right" msgstr "Sloučit vše zprava" -#: meld/resources/gtk/menus.ui:85 +#: meld/resources/gtk/menus.ui:89 msgid "Merge All" msgstr "Sloučit vše" -#: meld/resources/gtk/menus.ui:92 +#: meld/resources/gtk/menus.ui:96 msgid "Format as Patch…" msgstr "Formátovat jako záplatu…" -#: meld/resources/gtk/menus.ui:101 +#: meld/resources/gtk/menus.ui:105 msgid "_Preferences" msgstr "_Předvolby" -#: meld/resources/gtk/menus.ui:105 +#: meld/resources/gtk/menus.ui:109 msgid "Keyboard Shortcuts" msgstr "Klávesové zkratky" -#: meld/resources/gtk/menus.ui:109 +#: meld/resources/gtk/menus.ui:113 msgid "_Help" msgstr "Nápo_věda" -#: meld/resources/gtk/menus.ui:114 +#: meld/resources/gtk/menus.ui:118 msgid "_About Meld" msgstr "O _aplikaci Meld" -#: meld/resources/gtk/menus.ui:127 +#: meld/resources/gtk/menus.ui:131 msgid "File status" msgstr "Stav souboru" -#: meld/resources/gtk/menus.ui:129 +#: meld/resources/gtk/menus.ui:133 msgid "Same" msgstr "Stejné" -#: meld/resources/gtk/menus.ui:133 +#: meld/resources/gtk/menus.ui:137 msgid "New" msgstr "Nové" -#: meld/resources/gtk/menus.ui:137 meld/resources/gtk/menus.ui:160 -#: meld/vc/_vc.py:76 +#: meld/resources/gtk/menus.ui:141 meld/resources/gtk/menus.ui:164 +#: meld/vc/_vc.py:77 msgid "Modified" msgstr "Změněné" -#: meld/resources/gtk/menus.ui:147 +#: meld/resources/gtk/menus.ui:151 msgid "Ignore filename case" msgstr "Ignorovat velikost písmen v názvu souboru" -#: meld/resources/gtk/menus.ui:151 +#: meld/resources/gtk/menus.ui:155 msgid "Normalize Unicode paths" msgstr "Normalizovat cesty v Unikódu" -#: meld/resources/gtk/menus.ui:164 +#: meld/resources/gtk/menus.ui:168 msgid "Normal" msgstr "Normální" -#: meld/resources/gtk/menus.ui:168 meld/vc/_vc.py:70 +#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:71 msgid "Unversioned" msgstr "Neverzováno" -#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:69 +#: meld/resources/gtk/menus.ui:176 meld/vc/_vc.py:70 msgid "Ignored" msgstr "Ignorované" -#: meld/resources/gtk/menus.ui:179 +#: meld/resources/gtk/menus.ui:183 msgid "Flatten folders" msgstr "Zploštit složky" #: meld/resources/ui/about-dialog.ui:8 msgid "" "Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2021 Kai Willadsen" +"Copyright © 2009-2022 Kai Willadsen" msgstr "" "Copyright © 2002 – 2009 Stephen Kennedy\n" -"Copyright © 2009 – 2021 Kai Willadsen" +"Copyright © 2009 – 2022 Kai Willadsen" #: meld/resources/ui/about-dialog.ui:14 msgid "translator-credits" @@ -934,7 +948,7 @@ msgid "Column Name" msgstr "Název sloupce" #: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128 -#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:741 +#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:745 msgid "_Remove" msgstr "_Odstranit" @@ -1141,7 +1155,7 @@ msgstr "Soubor 1" #. Create icon and filename CellRenderer #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217 -#: meld/dirdiff.py:602 +#: meld/dirdiff.py:603 msgid "Name" msgstr "Název" @@ -1181,7 +1195,7 @@ msgstr "Prošlo přes okraj" msgid "Replace _All" msgstr "Nahradit _vše" -#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1230 meld/iohelpers.py:117 +#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1231 meld/iohelpers.py:117 msgid "_Replace" msgstr "Nahradi_t" @@ -1250,7 +1264,7 @@ msgstr "_Prázdné porovnávání" msgid "C_ompare" msgstr "P_orovnat" -#: meld/resources/ui/notebook-label.ui:24 +#: meld/resources/ui/notebook-label.ui:26 msgid "Close Tab" msgstr "Zavřít kartu" @@ -1567,7 +1581,7 @@ msgstr "Pokud se změny neuloží, budou trvale ztraceny." msgid "Close _without Saving" msgstr "Zavřít _bez uložení" -#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1228 +#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1229 #: meld/iohelpers.py:56 meld/iohelpers.py:116 msgid "_Cancel" msgstr "_Zrušit" @@ -1656,11 +1670,11 @@ msgstr "Doplnění" msgid "Console output" msgstr "Výstup konzoly" -#: meld/actiongutter.py:247 +#: meld/actiongutter.py:255 msgid "Copy _up" msgstr "Kopírovat nahor_u" -#: meld/actiongutter.py:248 +#: meld/actiongutter.py:256 msgid "Copy _down" msgstr "Kopírovat _dolů" @@ -1677,53 +1691,53 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: meld/dirdiff.py:623 meld/preferences.py:132 +#: meld/dirdiff.py:624 meld/preferences.py:132 msgid "Size" msgstr "Velikost" #. Create date-time CellRenderer -#: meld/dirdiff.py:631 meld/preferences.py:133 +#: meld/dirdiff.py:632 meld/preferences.py:133 msgid "Modification time" msgstr "Čas změny" #. Create ISO-format date-time CellRenderer -#: meld/dirdiff.py:639 meld/preferences.py:134 +#: meld/dirdiff.py:640 meld/preferences.py:134 msgid "Modification time (ISO)" msgstr "Čas změny (ISO)" #. Create permissions CellRenderer -#: meld/dirdiff.py:647 meld/preferences.py:135 +#: meld/dirdiff.py:648 meld/preferences.py:135 msgid "Permissions" msgstr "Oprávnění" -#: meld/dirdiff.py:900 +#: meld/dirdiff.py:901 #, python-brace-format msgid "{filename} (scanning…)" msgstr "{filename} (kontroluje se…)" -#: meld/dirdiff.py:932 meld/dirdiff.py:964 +#: meld/dirdiff.py:933 meld/dirdiff.py:965 #, python-brace-format msgid "[{label}] Scanning {folder}" msgstr "[{label}] Kontroluje se {folder}" -#: meld/dirdiff.py:1100 +#: meld/dirdiff.py:1101 #, python-brace-format msgid "[{label}] Done" msgstr "[{label}] Hotovo" -#: meld/dirdiff.py:1113 +#: meld/dirdiff.py:1114 msgid "Folder {} is being compared to itself" msgstr "Složka {} je porovnávána sama se sebou" -#: meld/dirdiff.py:1119 +#: meld/dirdiff.py:1120 msgid "Folders have no differences" msgstr "Mezi složkami není žádný rozdíl" -#: meld/dirdiff.py:1121 +#: meld/dirdiff.py:1122 msgid "Contents of scanned files in folders are identical." msgstr "Obsah kontrolovaných souborů ve složkách je stejný." -#: meld/dirdiff.py:1123 +#: meld/dirdiff.py:1124 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1731,46 +1745,46 @@ msgstr "" "Kontrolované soubory ve složkách vypadají stejně, ale nebyl kontrolován " "jejich obsah." -#: meld/dirdiff.py:1126 +#: meld/dirdiff.py:1127 msgid "File filters are in use, so not all files have been scanned." msgstr "" "Jsou používány filtry souborů, takže ne všechny soubory byly kontrolovány." -#: meld/dirdiff.py:1128 +#: meld/dirdiff.py:1129 msgid "Text filters are in use and may be masking content differences." msgstr "" "Jsou používány textové filtry a může dojít k zamaskování rozdílů mezi " "soubory." -#: meld/dirdiff.py:1144 meld/filediff.py:1980 +#: meld/dirdiff.py:1145 meld/filediff.py:2000 msgid "Hide" msgstr "Skrýt" -#: meld/dirdiff.py:1146 meld/filediff.py:1982 meld/filediff.py:2012 -#: meld/filediff.py:2014 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 +#: meld/dirdiff.py:1147 meld/filediff.py:2002 meld/filediff.py:2032 +#: meld/filediff.py:2034 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 msgid "Hi_de" msgstr "_Skrýt" -#: meld/dirdiff.py:1155 +#: meld/dirdiff.py:1156 msgid "Multiple errors occurred while scanning this folder" msgstr "Při skenování této složky došlo k několika chybám" -#: meld/dirdiff.py:1156 +#: meld/dirdiff.py:1157 msgid "Files with invalid encodings found" msgstr "Nalezeny soubory s neplatným kódováním" #. TRANSLATORS: This is followed by a list of files -#: meld/dirdiff.py:1158 +#: meld/dirdiff.py:1159 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "" "Některé soubory měly neplatné kódování. Názvy jsou přibližně následující:" -#: meld/dirdiff.py:1160 +#: meld/dirdiff.py:1161 msgid "Files hidden by case insensitive comparison" msgstr "Soubory skryty porovnáním nerozlišujícím velikost písmen" #. TRANSLATORS: This is followed by a list of files -#: meld/dirdiff.py:1162 +#: meld/dirdiff.py:1163 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1778,17 +1792,17 @@ msgstr "" "Provádí se porovnání nerozlišující velikost písmen na systému souborů " "rozlišujícím velikost písmen. Některé soubory v této složce jsou skryté:" -#: meld/dirdiff.py:1173 +#: meld/dirdiff.py:1174 #, python-brace-format msgid "“{first_file}” hidden by “{second_file}”" msgstr "„{first_file}“ skryto v „{second_file}“" -#: meld/dirdiff.py:1235 +#: meld/dirdiff.py:1236 #, python-format msgid "Replace folder “%s”?" msgstr "Nahradit složku „%s“?" -#: meld/dirdiff.py:1237 +#: meld/dirdiff.py:1238 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1797,11 +1811,11 @@ msgstr "" "V „%s“ již existuje jiná složka se stejným názvem.\n" "Pokud stávající složku nahradíte, budou všechny soubory v ní ztraceny." -#: meld/dirdiff.py:1250 +#: meld/dirdiff.py:1251 msgid "Error copying file" msgstr "Chyba při kopírování souboru" -#: meld/dirdiff.py:1251 +#: meld/dirdiff.py:1252 #, python-brace-format msgid "" "Couldn’t copy {source}\n" @@ -1814,19 +1828,23 @@ msgstr "" "\n" "{error}" -#: meld/dirdiff.py:1276 meld/vcview.py:764 +#: meld/dirdiff.py:1277 meld/vcview.py:768 msgid "Error deleting {}" msgstr "Chyba při mazání {}" -#: meld/dirdiff.py:1819 +#: meld/dirdiff.py:1825 msgid "No folder" msgstr "Žádná složka" -#: meld/filediff.py:1156 +#: meld/dirdiff.py:1838 +msgid "Folder comparison:" +msgstr "Porovnávání složek:" + +#: meld/filediff.py:1171 msgid "Comparison results will be inaccurate" msgstr "Výsledky porovnávání budou nepřesné" -#: meld/filediff.py:1158 +#: meld/filediff.py:1173 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1834,93 +1852,97 @@ msgstr "" "Filtr změnil počet řádků v souboru, což není podporováno. Porovnání nebude " "správné." -#: meld/filediff.py:1230 +#: meld/filediff.py:1245 msgid "Mark conflict as resolved?" msgstr "Označit konflikt jako vyřešený?" -#: meld/filediff.py:1232 +#: meld/filediff.py:1247 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "Pokud byl konflikt vyřešen úspěšně, můžete jej označit za vyřešený." -#: meld/filediff.py:1235 +#: meld/filediff.py:1250 msgid "Cancel" msgstr "Zrušit" -#: meld/filediff.py:1236 +#: meld/filediff.py:1251 msgid "Mark _Resolved" msgstr "Označi_t za vyřešené" -#: meld/filediff.py:1427 meld/filediff.py:1443 +#: meld/filediff.py:1442 meld/filediff.py:1458 msgid "Add Synchronization Point" msgstr "Přidat synchronizační bod" -#: meld/filediff.py:1431 +#: meld/filediff.py:1446 msgid "Remove Synchronization Point" msgstr "Odebrat synchronizační bod" -#: meld/filediff.py:1435 +#: meld/filediff.py:1450 msgid "Move Synchronization Point" msgstr "Přesunout synchronizační bod" -#: meld/filediff.py:1439 +#: meld/filediff.py:1454 msgid "Match Synchronization Point" msgstr "Porovnat synchronizační bod" -#: meld/filediff.py:1463 +#: meld/filediff.py:1478 msgid "Clear Synchronization Points" msgstr "Vymazat synchronizační body" -#: meld/filediff.py:1654 +#: meld/filediff.py:1538 +msgid "File comparison:" +msgstr "Porovnávání souborů:" + +#: meld/filediff.py:1674 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Vyskytl se problém při otevírání souboru „%s“." -#: meld/filediff.py:1663 +#: meld/filediff.py:1683 #, python-format msgid "File %s appears to be a binary file." msgstr "Soubor %s je zřejmě binární." -#: meld/filediff.py:1665 +#: meld/filediff.py:1685 msgid "Do you want to open the file using the default application?" msgstr "Chcete soubor otevřít pomocí výchozí aplikace?" -#: meld/filediff.py:1667 +#: meld/filediff.py:1687 msgid "Open" msgstr "Otevřít" -#: meld/filediff.py:1689 +#: meld/filediff.py:1709 #, python-format msgid "[%s] Merging files" msgstr "[%s] Slučují se soubory" -#: meld/filediff.py:1703 +#: meld/filediff.py:1723 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Počítají se rozdíly" -#: meld/filediff.py:1763 +#: meld/filediff.py:1783 #, python-format msgid "File %s has changed on disk" msgstr "Soubor „%s“ byl změněn na disku." -#: meld/filediff.py:1764 +#: meld/filediff.py:1784 msgid "Do you want to reload the file?" msgstr "Chcete soubor znovu načíst?" -#: meld/filediff.py:1766 +#: meld/filediff.py:1786 msgid "_Reload" msgstr "Zno_vu načíst" -#: meld/filediff.py:1936 +#: meld/filediff.py:1956 msgid "File {} is being compared to itself" msgstr "Soubor {} je porovnáván sám se sebou" -#: meld/filediff.py:1945 +#: meld/filediff.py:1965 msgid "Files are identical" msgstr "Soubory jsou stejné" -#: meld/filediff.py:1958 +#: meld/filediff.py:1978 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1928,11 +1950,11 @@ msgstr "" "Jsou používány textové filtry a může dojít k zamaskování rozdílů mezi " "soubory. Chcete porovnat nefiltrované soubory?" -#: meld/filediff.py:1963 +#: meld/filediff.py:1983 msgid "Files differ in line endings only" msgstr "Soubory se liší pouze zakončením řádků" -#: meld/filediff.py:1965 +#: meld/filediff.py:1985 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1941,15 +1963,15 @@ msgstr "" "Soubory jsou shodné, vyjma rozdílného zakončení řádků:\n" "%s" -#: meld/filediff.py:1985 +#: meld/filediff.py:2005 msgid "Show without filters" msgstr "Zobrazit bez filtrů" -#: meld/filediff.py:2007 +#: meld/filediff.py:2027 msgid "Change highlighting incomplete" msgstr "Změnit zvýraznění neúplných" -#: meld/filediff.py:2008 +#: meld/filediff.py:2028 msgid "" "Some changes were not highlighted because they were too large. You can force " "Meld to take longer to highlight larger changes, though this may be slow." @@ -1958,19 +1980,19 @@ msgstr "" "přimět k používání větší délky, aby se zvýraznily i rozsáhlé změny, ale může " "to pak být pomalé." -#: meld/filediff.py:2016 +#: meld/filediff.py:2036 msgid "Keep highlighting" msgstr "Zachovat zvýrazňování" -#: meld/filediff.py:2018 +#: meld/filediff.py:2038 msgid "_Keep highlighting" msgstr "Z_achovat zvýrazňování" -#: meld/filediff.py:2031 +#: meld/filediff.py:2051 msgid "Saving failed" msgstr "Ukládání selhalo" -#: meld/filediff.py:2032 +#: meld/filediff.py:2052 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." @@ -1978,36 +2000,36 @@ msgstr "" "Jestli jste provedli nějaký důležité změny, zvažte jejich zkopírování do " "jiné aplikace nebo souboru, abyste o ně nepřišli." -#: meld/filediff.py:2041 +#: meld/filediff.py:2061 msgid "Save Left Pane As" msgstr "Uložení levého panelu jako" -#: meld/filediff.py:2043 +#: meld/filediff.py:2063 msgid "Save Middle Pane As" msgstr "Uložení prostředního panelu jako" -#: meld/filediff.py:2045 +#: meld/filediff.py:2065 msgid "Save Right Pane As" msgstr "Uložení pravého panelu jako" -#: meld/filediff.py:2056 +#: meld/filediff.py:2076 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "Soubor „%s“ byl od doby, co jste jej otevřeli, změněn." -#: meld/filediff.py:2058 +#: meld/filediff.py:2078 msgid "If you save it, any external changes will be lost." msgstr "Pokud jej uložíte, budou vnější změny ztraceny." -#: meld/filediff.py:2061 +#: meld/filediff.py:2081 msgid "Save Anyway" msgstr "Přesto uložit" -#: meld/filediff.py:2062 +#: meld/filediff.py:2082 msgid "Don’t Save" msgstr "Neukládat" -#: meld/filediff.py:2104 +#: meld/filediff.py:2124 msgid "" "File “{}” contains characters that can’t be encoded using its current " "encoding “{}”." @@ -2015,7 +2037,7 @@ msgstr "" "Soubor {} obsahuje znaky, které nelze zakódovat pomocí jeho akuálního " "kódování „{}“." -#: meld/filediff.py:2108 meld/patchdialog.py:138 +#: meld/filediff.py:2128 meld/patchdialog.py:138 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -2024,16 +2046,16 @@ msgstr "" "Nezdařilo se uložit soubor z důvodu:\n" "%s" -#: meld/filediff.py:2112 meld/patchdialog.py:137 +#: meld/filediff.py:2132 meld/patchdialog.py:137 #, python-format msgid "Could not save file %s." msgstr "Nezdařilo se uložit soubor %s." -#: meld/filediff.py:2522 +#: meld/filediff.py:2542 msgid "Live comparison updating disabled" msgstr "Živá aktualizace porovnání zakázána" -#: meld/filediff.py:2523 +#: meld/filediff.py:2543 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2043,6 +2065,22 @@ msgstr "" "zakázána. Možnost aktualizovat porovnávání ručně vám ale zůstává a živé " "aktualizace se obnoví ve chvíli, kdy jsou synchronizační body smazány." +#: meld/filediff.py:2571 +msgid "Can't swap unsaved files" +msgstr "Nelze přehodit neuložené soubory" + +#: meld/filediff.py:2573 +msgid "Files must be saved to disk before swapping panes." +msgstr "Před přehozením panelů musí být soubory uloženy na disk." + +#: meld/filediff.py:2580 +msgid "Can't swap version control comparisons" +msgstr "Nelze přehodit srovnání správy verzí" + +#: meld/filediff.py:2582 +msgid "Swapping panes is not supported in version control mode." +msgstr "Přehození panelů není podporováno v režimu správy verzí." + #: meld/iohelpers.py:41 msgid "Deleting remote folders is not supported" msgstr "Mazání vzdálených složení nen podporované" @@ -2222,10 +2260,10 @@ msgstr "vzorek" msgid "Version control:" msgstr "Správa verzí:" -#: meld/style.py:91 +#: meld/style.py:96 msgid "Couldn’t find colour scheme details for {}; this is a bad install" msgstr "" -"Ve schématu barev se nezdařilo najít údajd pro {}. Jedná se o chybnou " +"Ve schématu barev se nezdařilo najít údaje pro {}. Jedná se o chybnou " "instalaci." #: meld/ui/bufferselectors.py:110 @@ -2303,51 +2341,51 @@ msgstr "Žádný" msgid "Rev %s" msgstr "Revize %s" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Merged" msgstr "sloučené" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Base" msgstr "základní" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Local" msgstr "místní" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Remote" msgstr "vzdálené" -#: meld/vc/_vc.py:73 +#: meld/vc/_vc.py:74 msgid "Error" msgstr "Chyba" -#: meld/vc/_vc.py:75 +#: meld/vc/_vc.py:76 msgid "Newly added" msgstr "Nově přidáno" -#: meld/vc/_vc.py:77 +#: meld/vc/_vc.py:78 msgid "Renamed" msgstr "Přejmenováno" -#: meld/vc/_vc.py:78 +#: meld/vc/_vc.py:79 msgid "Conflict" msgstr "Konflikt" -#: meld/vc/_vc.py:79 +#: meld/vc/_vc.py:80 msgid "Removed" msgstr "Odstraněno" -#: meld/vc/_vc.py:80 +#: meld/vc/_vc.py:81 msgid "Missing" msgstr "Schází" -#: meld/vc/_vc.py:81 +#: meld/vc/_vc.py:82 msgid "Not present" msgstr "Není přítomno" -#: meld/vc/_vc.py:82 +#: meld/vc/_vc.py:83 msgid "Scanning…" msgstr "Prochází se…" @@ -2380,67 +2418,68 @@ msgstr "V této složce nebyl nalezen žádný platný systém správy verzí" msgid "Choose which version control system to use" msgstr "Vyberte, který systém správy verzí se má použít" -#. TRANSLATORS: This is the location of the directory being viewed -#: meld/vcview.py:412 +#. TRANSLATORS: This is the name of the version control +#. system being used, e.g., "Git" or "Subversion" +#: meld/vcview.py:414 #, python-brace-format -msgid "Location: {path}" -msgstr "Umístění: {path}" +msgid "{vc} comparison:" +msgstr "Porovnání {vc}:" #. Initial yield so when we add this to our tasks, we don't #. create iterators that may be invalidated. -#: meld/vcview.py:419 +#: meld/vcview.py:423 msgid "Scanning repository" msgstr "Prochází se repozitář" -#: meld/vcview.py:448 +#: meld/vcview.py:452 #, python-format msgid "Scanning %s" msgstr "Prochází se %s" -#: meld/vcview.py:487 +#: meld/vcview.py:491 msgid "(Empty)" msgstr "(Prázdný)" -#: meld/vcview.py:535 +#: meld/vcview.py:539 #, python-format msgid "%s — local" msgstr "%s — místní" -#: meld/vcview.py:536 +#: meld/vcview.py:540 #, python-format msgid "%s — remote" msgstr "%s — vzdálený" -#: meld/vcview.py:544 +#: meld/vcview.py:548 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (místní, sloučený, vzdálený)" -#: meld/vcview.py:549 +#: meld/vcview.py:553 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (vzdálený, sloučený, místní)" -#: meld/vcview.py:560 +#: meld/vcview.py:564 #, python-format msgid "%s — repository" msgstr "%s — repozitář" -#: meld/vcview.py:566 +#: meld/vcview.py:570 #, python-format msgid "%s (working, repository)" msgstr "%s (pracovní, repozitář)" -#: meld/vcview.py:570 +#: meld/vcview.py:574 #, python-format msgid "%s (repository, working)" msgstr "%s (repozitář, pracovní)" -#: meld/vcview.py:735 +#: meld/vcview.py:739 msgid "Remove folder and all its files?" msgstr "Odstranit složku a všechny soubory v ní?" -#: meld/vcview.py:737 +#: meld/vcview.py:741 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2448,6 +2487,13 @@ msgstr "" "Tímto se ze správy verzí odstraní všechny vybrané soubory a složky (a " "všechny soubory v těchto složkách)." -#: meld/vcview.py:850 +#: meld/vcview.py:854 msgid "Clear" msgstr "Vymazat" + +#~ msgid "Refresh" +#~ msgstr "Aktualizovat" + +#, python-brace-format +#~ msgid "Location: {path}" +#~ msgstr "Umístění: {path}" diff --git a/po/de.po b/po/de.po index 845dbce..437a71a 100644 --- a/po/de.po +++ b/po/de.po @@ -12,23 +12,22 @@ # Wolfgang Stöggl , 2019. # Philipp Kiemle , 2021. # Tim Sabsch , 2022. -# Jürgen Benvenuti , 2022. +# Jürgen Benvenuti , 2022, 2023. # msgid "" msgstr "" "Project-Id-Version: meld master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2022-07-10 20:06+0000\n" -"PO-Revision-Date: 2022-07-29 21:30+0200\n" -"Last-Translator: Jürgen Benvenuti \n" -"Language-Team: Deutsch \n" +"POT-Creation-Date: 2023-06-24 22:30+0000\n" +"PO-Revision-Date: 2023-07-14 11:11+0200\n" +"Last-Translator: Philipp Kiemle \n" +"Language-Team: German \n" "Language: de\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);\n" -"X-Generator: Poedit 3.1.1\n" -"X-Poedit-Bookmarks: -1,351,-1,-1,-1,-1,-1,-1,-1,-1\n" +"X-Generator: Poedit 3.0.1\n" #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11 #: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17 @@ -57,9 +56,9 @@ msgid "" msgstr "" "Meld ist ein visuelles Vergleichs- und Zusammenführungsprogramm, das an " "Entwickler gerichtet ist. Meld hilft Ihnen beim Vergleichen von Dateien, " -"Ordern und versionierten Projekten. Es stellt Zwei- und Drei-Wege-Vergleiche " -"für Dateien und Ordner zur Verfügung. Die Versionskontrollsysteme Git, " -"Mercurial, Bazaar und Subversion werden unterstützt." +"Ordnern und versionierten Projekten. Es stellt Zwei- und Drei-Wege-" +"Vergleiche für Dateien und Ordner zur Verfügung. Die Versionskontrollsysteme " +"Git, Mercurial, Bazaar und Subversion werden unterstützt." #: data/org.gnome.meld.appdata.xml.in.in:21 msgid "" @@ -548,370 +547,375 @@ msgstr "Vergleich aktualisieren" #: meld/resources/gtk/help-overlay.ui:54 msgctxt "shortcut window" +msgid "Open externally" +msgstr "Extern öffnen" + +#: meld/resources/gtk/help-overlay.ui:61 +msgctxt "shortcut window" msgid "Fullscreen" msgstr "Vollbild" -#: meld/resources/gtk/help-overlay.ui:61 +#: meld/resources/gtk/help-overlay.ui:68 msgctxt "shortcut window" msgid "Swap left and right panes" msgstr "Linken und rechten Bereich tauschen" -#: meld/resources/gtk/help-overlay.ui:70 +#: meld/resources/gtk/help-overlay.ui:77 msgctxt "shortcut window" msgid "Panes" msgstr "Bereiche" -#: meld/resources/gtk/help-overlay.ui:75 +#: meld/resources/gtk/help-overlay.ui:82 msgctxt "shortcut window" msgid "Previous comparison pane" msgstr "Vorheriger Vergleichsbereich" -#: meld/resources/gtk/help-overlay.ui:82 +#: meld/resources/gtk/help-overlay.ui:89 msgctxt "shortcut window" msgid "Next comparison pane" msgstr "Nächster Vergleichsbereich" -#: meld/resources/gtk/help-overlay.ui:91 +#: meld/resources/gtk/help-overlay.ui:98 msgctxt "shortcut window" msgid "Changes" msgstr "Änderungen" -#: meld/resources/gtk/help-overlay.ui:96 +#: meld/resources/gtk/help-overlay.ui:103 msgctxt "shortcut window" msgid "Go to previous change" msgstr "Zur vorherigen Änderung gehen" -#: meld/resources/gtk/help-overlay.ui:103 +#: meld/resources/gtk/help-overlay.ui:110 msgctxt "shortcut window" msgid "Go to next change" msgstr "Zur nächsten Änderung gehen" -#: meld/resources/gtk/help-overlay.ui:112 +#: meld/resources/gtk/help-overlay.ui:119 msgctxt "shortcut window" msgid "Tabs" msgstr "Reiter" -#: meld/resources/gtk/help-overlay.ui:117 +#: meld/resources/gtk/help-overlay.ui:124 msgctxt "shortcut window" msgid "Go to previous tab" msgstr "Zum vorherigen Reiter wechseln" -#: meld/resources/gtk/help-overlay.ui:124 +#: meld/resources/gtk/help-overlay.ui:131 msgctxt "shortcut window" msgid "Go to next tab" msgstr "Zum nächsten Reiter wechseln" -#: meld/resources/gtk/help-overlay.ui:131 +#: meld/resources/gtk/help-overlay.ui:138 msgctxt "shortcut window" msgid "Switch to tab" msgstr "Zum Reiter wechseln" -#: meld/resources/gtk/help-overlay.ui:138 +#: meld/resources/gtk/help-overlay.ui:145 msgctxt "shortcut window" msgid "Move tab left" msgstr "Reiter nach links verschieben" -#: meld/resources/gtk/help-overlay.ui:145 +#: meld/resources/gtk/help-overlay.ui:152 msgctxt "shortcut window" msgid "Move tab right" msgstr "Reiter nach rechts verschieben" -#: meld/resources/gtk/help-overlay.ui:154 +#: meld/resources/gtk/help-overlay.ui:161 msgctxt "shortcut window" msgid "Editing" msgstr "Bearbeitung" -#: meld/resources/gtk/help-overlay.ui:159 +#: meld/resources/gtk/help-overlay.ui:166 msgctxt "shortcut window" msgid "Undo" msgstr "Rückgängig" -#: meld/resources/gtk/help-overlay.ui:166 +#: meld/resources/gtk/help-overlay.ui:173 msgctxt "shortcut window" msgid "Redo" msgstr "Wiederholen" -#: meld/resources/gtk/help-overlay.ui:173 +#: meld/resources/gtk/help-overlay.ui:180 msgctxt "shortcut window" msgid "Cut" msgstr "Ausschneiden" -#: meld/resources/gtk/help-overlay.ui:180 +#: meld/resources/gtk/help-overlay.ui:187 msgctxt "shortcut window" msgid "Copy" msgstr "Kopieren" -#: meld/resources/gtk/help-overlay.ui:187 +#: meld/resources/gtk/help-overlay.ui:194 msgctxt "shortcut window" msgid "Paste" msgstr "Einfügen" -#: meld/resources/gtk/help-overlay.ui:194 +#: meld/resources/gtk/help-overlay.ui:201 msgctxt "shortcut window" msgid "Find" msgstr "Suchen" -#: meld/resources/gtk/help-overlay.ui:201 +#: meld/resources/gtk/help-overlay.ui:208 msgctxt "shortcut window" msgid "Find Next" msgstr "Weitersuchen" -#: meld/resources/gtk/help-overlay.ui:208 +#: meld/resources/gtk/help-overlay.ui:215 msgctxt "shortcut window" msgid "Find Previous" msgstr "Rückwärts suchen" -#: meld/resources/gtk/help-overlay.ui:215 +#: meld/resources/gtk/help-overlay.ui:222 msgctxt "shortcut window" msgid "Replace" msgstr "Ersetzen" -#: meld/resources/gtk/help-overlay.ui:224 +#: meld/resources/gtk/help-overlay.ui:231 msgctxt "shortcut window" msgid "File comparison" msgstr "Dateivergleich" -#: meld/resources/gtk/help-overlay.ui:229 +#: meld/resources/gtk/help-overlay.ui:236 msgctxt "shortcut window" msgid "Save current file" msgstr "Aktuelle Datei speichern" -#: meld/resources/gtk/help-overlay.ui:236 +#: meld/resources/gtk/help-overlay.ui:243 msgctxt "shortcut window" msgid "Save current file to new path" msgstr "Aktuelle Datei an einem anderen Ort speichern" -#: meld/resources/gtk/help-overlay.ui:243 +#: meld/resources/gtk/help-overlay.ui:250 msgctxt "shortcut window" msgid "Save all files in comparison" msgstr "Alle Dateien im aktuellen Vergleich speichern" -#: meld/resources/gtk/help-overlay.ui:250 +#: meld/resources/gtk/help-overlay.ui:257 msgctxt "shortcut window" msgid "Previous conflict" msgstr "Vorheriger Konflikt" -#: meld/resources/gtk/help-overlay.ui:257 +#: meld/resources/gtk/help-overlay.ui:264 msgctxt "shortcut window" msgid "Next conflict" msgstr "Nächster Konflikt" -#: meld/resources/gtk/help-overlay.ui:264 +#: meld/resources/gtk/help-overlay.ui:271 msgctxt "shortcut window" msgid "Push change to left" msgstr "Änderung nach links schieben" -#: meld/resources/gtk/help-overlay.ui:271 +#: meld/resources/gtk/help-overlay.ui:278 msgctxt "shortcut window" msgid "Push change to right" msgstr "Änderung nach rechts schieben" -#: meld/resources/gtk/help-overlay.ui:278 +#: meld/resources/gtk/help-overlay.ui:285 msgctxt "shortcut window" msgid "Pull change from left" msgstr "Änderung von links ziehen" -#: meld/resources/gtk/help-overlay.ui:285 +#: meld/resources/gtk/help-overlay.ui:292 msgctxt "shortcut window" msgid "Pull change from right" msgstr "Änderung von rechts ziehen" -#: meld/resources/gtk/help-overlay.ui:292 +#: meld/resources/gtk/help-overlay.ui:299 msgctxt "shortcut window" msgid "Copy change above left" msgstr "Änderung über den linken Teil kopieren" -#: meld/resources/gtk/help-overlay.ui:299 +#: meld/resources/gtk/help-overlay.ui:306 msgctxt "shortcut window" msgid "Copy change below left" msgstr "Änderung unter den linken Teil kopieren" -#: meld/resources/gtk/help-overlay.ui:306 +#: meld/resources/gtk/help-overlay.ui:313 msgctxt "shortcut window" msgid "Copy change above right" msgstr "Änderung über den rechten Teil kopieren" -#: meld/resources/gtk/help-overlay.ui:313 +#: meld/resources/gtk/help-overlay.ui:320 msgctxt "shortcut window" msgid "Copy change below right" msgstr "Änderung unter den rechten Teil kopieren" -#: meld/resources/gtk/help-overlay.ui:320 -#: meld/resources/gtk/help-overlay.ui:348 +#: meld/resources/gtk/help-overlay.ui:327 +#: meld/resources/gtk/help-overlay.ui:355 msgctxt "shortcut window" msgid "Delete change" msgstr "Änderung löschen" -#: meld/resources/gtk/help-overlay.ui:329 +#: meld/resources/gtk/help-overlay.ui:336 msgctxt "shortcut window" msgid "Folder comparison" msgstr "Ordnervergleiche" -#: meld/resources/gtk/help-overlay.ui:334 +#: meld/resources/gtk/help-overlay.ui:341 msgctxt "shortcut window" msgid "Copy to left" msgstr "Nach links kopieren" -#: meld/resources/gtk/help-overlay.ui:341 +#: meld/resources/gtk/help-overlay.ui:348 msgctxt "shortcut window" msgid "Copy to right" msgstr "Nach rechts kopieren" -#: meld/resources/gtk/help-overlay.ui:357 +#: meld/resources/gtk/help-overlay.ui:364 msgctxt "shortcut window" msgid "Version control comparison" msgstr "Versionskontrollvergleich" -#: meld/resources/gtk/help-overlay.ui:362 +#: meld/resources/gtk/help-overlay.ui:369 msgctxt "shortcut window" msgid "Commit to version control" msgstr "Änderungen in die Versionskontrolle einspielen" -#: meld/resources/gtk/help-overlay.ui:369 +#: meld/resources/gtk/help-overlay.ui:376 msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Konsolenausgabe anzeigen/verbergen" #: meld/resources/gtk/menus.ui:7 -msgid "Refresh" -msgstr "Aktualisieren" - -#: meld/resources/gtk/menus.ui:12 -msgid "Stop" -msgstr "Stop" - -#: meld/resources/gtk/menus.ui:17 -msgid "Fullscreen" -msgstr "Vollbild" - -#: meld/resources/gtk/menus.ui:26 msgid "Save As…" msgstr "Speichern unter …" -#: meld/resources/gtk/menus.ui:30 +#: meld/resources/gtk/menus.ui:11 msgid "Save A_ll" msgstr "A_lles speichern" -#: meld/resources/gtk/menus.ui:34 +#: meld/resources/gtk/menus.ui:15 msgid "Revert files…" msgstr "Dateien wiederherstellen …" -#: meld/resources/gtk/menus.ui:38 +#: meld/resources/gtk/menus.ui:19 msgid "Open Externally" msgstr "Extern öffnen" -#: meld/resources/gtk/menus.ui:45 +#: meld/resources/gtk/menus.ui:26 +msgid "Refresh Comparison" +msgstr "Vergleich aktualisieren" + +#: meld/resources/gtk/menus.ui:33 msgid "_Find…" msgstr "_Suchen …" -#: meld/resources/gtk/menus.ui:49 +#: meld/resources/gtk/menus.ui:37 msgid "_Replace…" msgstr "E_rsetzen …" -#: meld/resources/gtk/menus.ui:55 +#: meld/resources/gtk/menus.ui:43 msgid "View" msgstr "Ansicht" -#: meld/resources/gtk/menus.ui:59 +#: meld/resources/gtk/menus.ui:47 +msgid "Fullscreen" +msgstr "Vollbild" + +#: meld/resources/gtk/menus.ui:52 msgid "Overview Map" msgstr "Übersichtskarte" -#: meld/resources/gtk/menus.ui:63 +#: meld/resources/gtk/menus.ui:56 msgid "Version control console" msgstr "Versionskontrollkonsole" -#: meld/resources/gtk/menus.ui:67 +#: meld/resources/gtk/menus.ui:60 msgid "Lock scrolling" msgstr "Rollen sperren" -#: meld/resources/gtk/menus.ui:74 +#: meld/resources/gtk/menus.ui:67 msgid "Swap left and right panes" msgstr "Linken und rechten Bereich tauschen" -#: meld/resources/gtk/menus.ui:80 +#: meld/resources/gtk/menus.ui:73 msgid "Comparison" msgstr "Vergleich" -#: meld/resources/gtk/menus.ui:84 +#: meld/resources/gtk/menus.ui:75 +msgid "Stop" +msgstr "Stop" + +#: meld/resources/gtk/menus.ui:81 msgid "Merge All from Left" msgstr "Alle Änderungen von links zusammenführen" -#: meld/resources/gtk/menus.ui:88 +#: meld/resources/gtk/menus.ui:85 msgid "Merge All from Right" msgstr "Alle Änderungen von rechts zusammenführen" -#: meld/resources/gtk/menus.ui:92 +#: meld/resources/gtk/menus.ui:89 msgid "Merge All" msgstr "Alles zusammenfügen" -#: meld/resources/gtk/menus.ui:99 +#: meld/resources/gtk/menus.ui:96 msgid "Format as Patch…" msgstr "Als Patch formatieren …" -#: meld/resources/gtk/menus.ui:108 +#: meld/resources/gtk/menus.ui:105 msgid "_Preferences" msgstr "_Einstellungen" -#: meld/resources/gtk/menus.ui:112 +#: meld/resources/gtk/menus.ui:109 msgid "Keyboard Shortcuts" msgstr "Tastenkombinationen" -#: meld/resources/gtk/menus.ui:116 +#: meld/resources/gtk/menus.ui:113 msgid "_Help" msgstr "_Hilfe" -#: meld/resources/gtk/menus.ui:121 +#: meld/resources/gtk/menus.ui:118 msgid "_About Meld" msgstr "_Info zu Meld" -#: meld/resources/gtk/menus.ui:134 +#: meld/resources/gtk/menus.ui:131 msgid "File status" msgstr "Dateizustand" -#: meld/resources/gtk/menus.ui:136 +#: meld/resources/gtk/menus.ui:133 msgid "Same" msgstr "Identisch" -#: meld/resources/gtk/menus.ui:140 +#: meld/resources/gtk/menus.ui:137 msgid "New" msgstr "Neu" -#: meld/resources/gtk/menus.ui:144 meld/resources/gtk/menus.ui:167 -#: meld/vc/_vc.py:76 +#: meld/resources/gtk/menus.ui:141 meld/resources/gtk/menus.ui:164 +#: meld/vc/_vc.py:77 msgid "Modified" msgstr "Geändert" -#: meld/resources/gtk/menus.ui:154 +#: meld/resources/gtk/menus.ui:151 msgid "Ignore filename case" msgstr "Groß-/Kleinschreibung in Dateinamen ignorieren" -#: meld/resources/gtk/menus.ui:158 +#: meld/resources/gtk/menus.ui:155 msgid "Normalize Unicode paths" msgstr "Unicode-Pfade vereinheitlichen" -#: meld/resources/gtk/menus.ui:171 +#: meld/resources/gtk/menus.ui:168 msgid "Normal" msgstr "Normal" -#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70 +#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:71 msgid "Unversioned" msgstr "Nicht versioniert" -#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69 +#: meld/resources/gtk/menus.ui:176 meld/vc/_vc.py:70 msgid "Ignored" msgstr "Ignoriert" -#: meld/resources/gtk/menus.ui:186 +#: meld/resources/gtk/menus.ui:183 msgid "Flatten folders" msgstr "Ordner einklappen" #: meld/resources/ui/about-dialog.ui:8 msgid "" "Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2021 Kai Willadsen" +"Copyright © 2009-2022 Kai Willadsen" msgstr "" "Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2021 Kai Willadsen" +"Copyright © 2009-2022 Kai Willadsen" #: meld/resources/ui/about-dialog.ui:14 msgid "translator-credits" @@ -1492,7 +1496,7 @@ msgid "" "separated by spaces." msgstr "" "Wenn ein Ordnervergleich durchgeführt wird, haben Sie die Möglichkeit, " -"Dateien und Ordner nach Namen herauszufiltern. Jedes Muster ist dabei eine " +"Dateien und Ordner nach Namen auszuschließen. Jedes Muster ist dabei eine " "durch Leerzeichen getrennte Liste von Befehlszeilenplatzhaltern." #: meld/resources/ui/preferences.ui:1494 @@ -1606,7 +1610,7 @@ msgstr "Wenn Sie nicht speichern, gehen die Änderungen verloren." #: meld/resources/ui/save-confirm-dialog.ui:24 msgid "Close _without Saving" -msgstr "Schließen _ohne zu Speichern" +msgstr "Schließen, _ohne zu speichern" #: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1229 #: meld/iohelpers.py:56 meld/iohelpers.py:116 @@ -1697,11 +1701,11 @@ msgstr "Extra" msgid "Console output" msgstr "Konsolenausgabe" -#: meld/actiongutter.py:247 +#: meld/actiongutter.py:254 msgid "Copy _up" msgstr "Nach _oben kopieren" -#: meld/actiongutter.py:248 +#: meld/actiongutter.py:255 msgid "Copy _down" msgstr "Nach _unten kopieren" @@ -1783,12 +1787,12 @@ msgstr "" "Textfilter werden verwendet, welche Unterschiede zwischen Dateien maskieren " "könnten." -#: meld/dirdiff.py:1145 meld/filediff.py:1985 +#: meld/dirdiff.py:1145 meld/filediff.py:2000 msgid "Hide" msgstr "Verbergen" -#: meld/dirdiff.py:1147 meld/filediff.py:1987 meld/filediff.py:2017 -#: meld/filediff.py:2019 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 +#: meld/dirdiff.py:1147 meld/filediff.py:2002 meld/filediff.py:2032 +#: meld/filediff.py:2034 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 msgid "Hi_de" msgstr "Ver_bergen" @@ -1869,11 +1873,11 @@ msgstr "Kein Ordner" msgid "Folder comparison:" msgstr "Ordnervergleich:" -#: meld/filediff.py:1158 +#: meld/filediff.py:1171 msgid "Comparison results will be inaccurate" msgstr "Ergebnisse werden ungenau sein" -#: meld/filediff.py:1160 +#: meld/filediff.py:1173 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1882,99 +1886,99 @@ msgstr "" "nicht unterstützt, deshalb wird ein Vergleich keine korrekten Ergebnisse " "liefern." -#: meld/filediff.py:1232 +#: meld/filediff.py:1245 msgid "Mark conflict as resolved?" msgstr "Konflikt als _gelöst markieren?" -#: meld/filediff.py:1234 +#: meld/filediff.py:1247 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "" "Wenn der Konflikt erfolgreich gelöst wurde, können Sie ihn jetzt als gelöst " "markieren." -#: meld/filediff.py:1237 +#: meld/filediff.py:1250 msgid "Cancel" msgstr "Abbrechen" -#: meld/filediff.py:1238 +#: meld/filediff.py:1251 msgid "Mark _Resolved" msgstr "Als _gelöst markieren" -#: meld/filediff.py:1429 meld/filediff.py:1445 +#: meld/filediff.py:1442 meld/filediff.py:1458 msgid "Add Synchronization Point" msgstr "Synchronisationspunkt hinzufügen" -#: meld/filediff.py:1433 +#: meld/filediff.py:1446 msgid "Remove Synchronization Point" msgstr "Synchronisationspunkt entfernen" -#: meld/filediff.py:1437 +#: meld/filediff.py:1450 msgid "Move Synchronization Point" msgstr "Synchronisationspunkt verschieben" -#: meld/filediff.py:1441 +#: meld/filediff.py:1454 msgid "Match Synchronization Point" msgstr "An Synchronisationspunkt anpassen" -#: meld/filediff.py:1465 +#: meld/filediff.py:1478 msgid "Clear Synchronization Points" msgstr "Synchronisationspunkte entfernen" -#: meld/filediff.py:1525 +#: meld/filediff.py:1538 msgid "File comparison:" msgstr "Dateivergleich:" -#: meld/filediff.py:1659 +#: meld/filediff.py:1674 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Beim Öffnen der Datei »%s« ist ein Fehler aufgetreten." -#: meld/filediff.py:1668 +#: meld/filediff.py:1683 #, python-format msgid "File %s appears to be a binary file." msgstr "Datei %s scheint eine Binärdatei zu sein." -#: meld/filediff.py:1670 +#: meld/filediff.py:1685 msgid "Do you want to open the file using the default application?" msgstr "Gewählte Datei in der vorgegebenen externen Anwendung öffnen?" -#: meld/filediff.py:1672 +#: meld/filediff.py:1687 msgid "Open" msgstr "Öffnen" -#: meld/filediff.py:1694 +#: meld/filediff.py:1709 #, python-format msgid "[%s] Merging files" msgstr "[%s] Dateien werden zusammengeführt" -#: meld/filediff.py:1708 +#: meld/filediff.py:1723 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Unterschiede werden berechnet" -#: meld/filediff.py:1768 +#: meld/filediff.py:1783 #, python-format msgid "File %s has changed on disk" msgstr "Die Datei %s wurde auf dem Datenträger geändert" -#: meld/filediff.py:1769 +#: meld/filediff.py:1784 msgid "Do you want to reload the file?" msgstr "Möchten Sie die Datei neu laden?" -#: meld/filediff.py:1771 +#: meld/filediff.py:1786 msgid "_Reload" msgstr "_Neu laden" -#: meld/filediff.py:1941 +#: meld/filediff.py:1956 msgid "File {} is being compared to itself" msgstr "Die Datei »{}« wird mit sich selbst verglichen" -#: meld/filediff.py:1950 +#: meld/filediff.py:1965 msgid "Files are identical" msgstr "Dateien sind identisch" -#: meld/filediff.py:1963 +#: meld/filediff.py:1978 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1982,11 +1986,11 @@ msgstr "" "Textfilter werden verwendet, welche Unterschiede zwischen Dateien maskieren " "könnten. Wollen Sie die ungefilterten Dateien vergleichen?" -#: meld/filediff.py:1968 +#: meld/filediff.py:1983 msgid "Files differ in line endings only" msgstr "Dateien unterscheiden sich nur in den Zeilenendungen" -#: meld/filediff.py:1970 +#: meld/filediff.py:1985 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1995,15 +1999,15 @@ msgstr "" "Dateien sind identisch, abgesehen von unterschiedlichen Zeilenenden:\n" "%s" -#: meld/filediff.py:1990 +#: meld/filediff.py:2005 msgid "Show without filters" msgstr "Ungefiltert anzeigen" -#: meld/filediff.py:2012 +#: meld/filediff.py:2027 msgid "Change highlighting incomplete" msgstr "Änderungsmarkierung unvollständig" -#: meld/filediff.py:2013 +#: meld/filediff.py:2028 msgid "" "Some changes were not highlighted because they were too large. You can force " "Meld to take longer to highlight larger changes, though this may be slow." @@ -2012,19 +2016,19 @@ msgstr "" "Sie können Meld zur Hervorhebung längerer Änderungen zwingen, was jedoch " "langsam sein könnte." -#: meld/filediff.py:2021 +#: meld/filediff.py:2036 msgid "Keep highlighting" msgstr "Hervorhebung fortführen" -#: meld/filediff.py:2023 +#: meld/filediff.py:2038 msgid "_Keep highlighting" msgstr "Hervorhebung _fortführen" -#: meld/filediff.py:2036 +#: meld/filediff.py:2051 msgid "Saving failed" msgstr "Speichern ist fehlgeschlagen" -#: meld/filediff.py:2037 +#: meld/filediff.py:2052 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." @@ -2032,37 +2036,37 @@ msgstr "" "Bitte denken Sie darüber nach, kritische Änderungen in ein anderes Programm " "oder eine andere Datei zu kopieren, um Datenverlust zu vermeiden." -#: meld/filediff.py:2046 +#: meld/filediff.py:2061 msgid "Save Left Pane As" msgstr "Linken Bereich speichern unter" -#: meld/filediff.py:2048 +#: meld/filediff.py:2063 msgid "Save Middle Pane As" msgstr "Mittleren Bereich speichern unter" -#: meld/filediff.py:2050 +#: meld/filediff.py:2065 msgid "Save Right Pane As" msgstr "Rechten Bereich speichern unter" -#: meld/filediff.py:2061 +#: meld/filediff.py:2076 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "" "Die Datei %s wurde auf dem Datenträger geändert, seit sie geöffnet wurde" -#: meld/filediff.py:2063 +#: meld/filediff.py:2078 msgid "If you save it, any external changes will be lost." msgstr "Wenn Sie speichern, gehen externe Änderungen verloren." -#: meld/filediff.py:2066 +#: meld/filediff.py:2081 msgid "Save Anyway" msgstr "Dennoch speichern" -#: meld/filediff.py:2067 +#: meld/filediff.py:2082 msgid "Don’t Save" msgstr "Nicht speichern" -#: meld/filediff.py:2109 +#: meld/filediff.py:2124 msgid "" "File “{}” contains characters that can’t be encoded using its current " "encoding “{}”." @@ -2070,7 +2074,7 @@ msgstr "" "Die Datei »{}« enthält Zeichen, die mit der aktuellen Kodierung »{}« nicht " "kodierbar sind." -#: meld/filediff.py:2113 meld/patchdialog.py:138 +#: meld/filediff.py:2128 meld/patchdialog.py:138 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -2079,16 +2083,16 @@ msgstr "" "Datei konnte nicht gespeichert werden:\n" "%s" -#: meld/filediff.py:2117 meld/patchdialog.py:137 +#: meld/filediff.py:2132 meld/patchdialog.py:137 #, python-format msgid "Could not save file %s." msgstr "Datei %s konnte nicht gespeichert werden." -#: meld/filediff.py:2527 +#: meld/filediff.py:2542 msgid "Live comparison updating disabled" msgstr "Direkte Vergleichsaktualisierung deaktiviert" -#: meld/filediff.py:2528 +#: meld/filediff.py:2543 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2099,6 +2103,25 @@ msgstr "" "aktualisieren. Die direkten Aktualisierungen werden beim Löschen der " "Synchronisierungspunkte wieder fortgeführt." +#: meld/filediff.py:2571 +msgid "Can't swap unsaved files" +msgstr "Ungespeicherte Dateien können nicht getauscht werden" + +#: meld/filediff.py:2573 +msgid "Files must be saved to disk before swapping panes." +msgstr "" +"Dateien müssen auf einen Datenträger gespeichert werden vor dem Tauschen der " +"Bereiche." + +#: meld/filediff.py:2580 +msgid "Can't swap version control comparisons" +msgstr "Versionskontrollvergleiche können nicht getauscht werden" + +#: meld/filediff.py:2582 +msgid "Swapping panes is not supported in version control mode." +msgstr "" +"Das Tauschen der Bereiche wird nicht unterstützt im Versionskontrollmodus." + #: meld/iohelpers.py:41 msgid "Deleting remote folders is not supported" msgstr "Löschen entfernter Ordner wird nicht unterstützt" @@ -2283,7 +2306,7 @@ msgstr "Muster" msgid "Version control:" msgstr "Versionskontrolle:" -#: meld/style.py:91 +#: meld/style.py:96 msgid "Couldn’t find colour scheme details for {}; this is a bad install" msgstr "" "Farbschema-Details für {} konnten nicht gefunden werden, die Installation " @@ -2362,51 +2385,51 @@ msgstr "Nichts" msgid "Rev %s" msgstr "Rev %s" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Merged" msgstr "Zusammengeführt" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Base" msgstr "Basis" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Local" msgstr "Lokal" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Remote" msgstr "Gegenstelle" -#: meld/vc/_vc.py:73 +#: meld/vc/_vc.py:74 msgid "Error" msgstr "Fehler" -#: meld/vc/_vc.py:75 +#: meld/vc/_vc.py:76 msgid "Newly added" msgstr "Kürzlich hinzugefügt" -#: meld/vc/_vc.py:77 +#: meld/vc/_vc.py:78 msgid "Renamed" msgstr "Umbenannt" -#: meld/vc/_vc.py:78 +#: meld/vc/_vc.py:79 msgid "Conflict" msgstr "Konflikt" -#: meld/vc/_vc.py:79 +#: meld/vc/_vc.py:80 msgid "Removed" msgstr "Entfernt" -#: meld/vc/_vc.py:80 +#: meld/vc/_vc.py:81 msgid "Missing" msgstr "Fehlend" -#: meld/vc/_vc.py:81 +#: meld/vc/_vc.py:82 msgid "Not present" msgstr "Nicht vorhanden" -#: meld/vc/_vc.py:82 +#: meld/vc/_vc.py:83 msgid "Scanning…" msgstr "Wird durchsucht …" @@ -2512,6 +2535,9 @@ msgstr "" msgid "Clear" msgstr "Leeren" +#~ msgid "Refresh" +#~ msgstr "Aktualisieren" + #, python-brace-format #~ msgid "Location: {path}" #~ msgstr "Ort: {path}" diff --git a/po/eu.po b/po/eu.po index 19ec5e7..10d5a86 100644 --- a/po/eu.po +++ b/po/eu.po @@ -21,8 +21,8 @@ msgid "" msgstr "Project-Id-Version: meld master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2022-04-03 09:43+0000\n" -"PO-Revision-Date: 2022-04-08 10:00+0100\n" +"POT-Creation-Date: 2022-10-30 22:10+0000\n" +"PO-Revision-Date: 2022-12-03 10:00+0100\n" "Last-Translator: Asier Sarasua Garmendia \n" "Language-Team: Basque \n" "Language: eu\n" @@ -459,360 +459,374 @@ msgstr "Freskatu konparazioa" #: meld/resources/gtk/help-overlay.ui:54 msgctxt "shortcut window" +msgid "Open externally" +msgstr "Ireki kanpotik" + +#: meld/resources/gtk/help-overlay.ui:61 +msgctxt "shortcut window" msgid "Fullscreen" msgstr "Pantaila osoa" -#: meld/resources/gtk/help-overlay.ui:63 +#: meld/resources/gtk/help-overlay.ui:68 +msgctxt "shortcut window" +msgid "Swap left and right panes" +msgstr "Trukatu ezkerreko eta eskuineko panelak" + +#: meld/resources/gtk/help-overlay.ui:77 msgctxt "shortcut window" msgid "Panes" msgstr "Panelak" -#: meld/resources/gtk/help-overlay.ui:68 +#: meld/resources/gtk/help-overlay.ui:82 msgctxt "shortcut window" msgid "Previous comparison pane" msgstr "Aurreko konparazio-panela" -#: meld/resources/gtk/help-overlay.ui:75 +#: meld/resources/gtk/help-overlay.ui:89 msgctxt "shortcut window" msgid "Next comparison pane" msgstr "Hurrengo konparazio-panela" -#: meld/resources/gtk/help-overlay.ui:84 +#: meld/resources/gtk/help-overlay.ui:98 msgctxt "shortcut window" msgid "Changes" msgstr "Aldaketak" -#: meld/resources/gtk/help-overlay.ui:89 +#: meld/resources/gtk/help-overlay.ui:103 msgctxt "shortcut window" msgid "Go to previous change" msgstr "Joan aurreko aldaketara" -#: meld/resources/gtk/help-overlay.ui:96 +#: meld/resources/gtk/help-overlay.ui:110 msgctxt "shortcut window" msgid "Go to next change" msgstr "Joan hurrengo aldaketara" -#: meld/resources/gtk/help-overlay.ui:105 +#: meld/resources/gtk/help-overlay.ui:119 msgctxt "shortcut window" msgid "Tabs" msgstr "Fitxak" -#: meld/resources/gtk/help-overlay.ui:110 +#: meld/resources/gtk/help-overlay.ui:124 msgctxt "shortcut window" msgid "Go to previous tab" msgstr "Joan aurreko fitxara" -#: meld/resources/gtk/help-overlay.ui:117 +#: meld/resources/gtk/help-overlay.ui:131 msgctxt "shortcut window" msgid "Go to next tab" msgstr "Joan hurrengo fitxara" -#: meld/resources/gtk/help-overlay.ui:124 +#: meld/resources/gtk/help-overlay.ui:138 msgctxt "shortcut window" msgid "Switch to tab" msgstr "Aldatu fitxara" -#: meld/resources/gtk/help-overlay.ui:131 +#: meld/resources/gtk/help-overlay.ui:145 msgctxt "shortcut window" msgid "Move tab left" msgstr "Eraman fitxa ezkerrera" -#: meld/resources/gtk/help-overlay.ui:138 +#: meld/resources/gtk/help-overlay.ui:152 msgctxt "shortcut window" msgid "Move tab right" msgstr "Eraman fitxa eskuinera" -#: meld/resources/gtk/help-overlay.ui:147 +#: meld/resources/gtk/help-overlay.ui:161 msgctxt "shortcut window" msgid "Editing" msgstr "Edizioa" -#: meld/resources/gtk/help-overlay.ui:152 +#: meld/resources/gtk/help-overlay.ui:166 msgctxt "shortcut window" msgid "Undo" msgstr "Desegin" -#: meld/resources/gtk/help-overlay.ui:159 +#: meld/resources/gtk/help-overlay.ui:173 msgctxt "shortcut window" msgid "Redo" msgstr "Berregin" -#: meld/resources/gtk/help-overlay.ui:166 +#: meld/resources/gtk/help-overlay.ui:180 msgctxt "shortcut window" msgid "Cut" msgstr "Ebaki" -#: meld/resources/gtk/help-overlay.ui:173 +#: meld/resources/gtk/help-overlay.ui:187 msgctxt "shortcut window" msgid "Copy" msgstr "Kopiatu" -#: meld/resources/gtk/help-overlay.ui:180 +#: meld/resources/gtk/help-overlay.ui:194 msgctxt "shortcut window" msgid "Paste" msgstr "Itsatsi" -#: meld/resources/gtk/help-overlay.ui:187 +#: meld/resources/gtk/help-overlay.ui:201 msgctxt "shortcut window" msgid "Find" msgstr "Bilatu" -#: meld/resources/gtk/help-overlay.ui:194 +#: meld/resources/gtk/help-overlay.ui:208 msgctxt "shortcut window" msgid "Find Next" msgstr "Bilatu hurrengoa" -#: meld/resources/gtk/help-overlay.ui:201 +#: meld/resources/gtk/help-overlay.ui:215 msgctxt "shortcut window" msgid "Find Previous" msgstr "Bilatu aurrekoa" -#: meld/resources/gtk/help-overlay.ui:208 +#: meld/resources/gtk/help-overlay.ui:222 msgctxt "shortcut window" msgid "Replace" msgstr "Ordeztu" -#: meld/resources/gtk/help-overlay.ui:217 +#: meld/resources/gtk/help-overlay.ui:231 msgctxt "shortcut window" msgid "File comparison" msgstr "Fitxategi-konparazioa" -#: meld/resources/gtk/help-overlay.ui:222 +#: meld/resources/gtk/help-overlay.ui:236 msgctxt "shortcut window" msgid "Save current file" msgstr "Gorde uneko fitxategia" -#: meld/resources/gtk/help-overlay.ui:229 +#: meld/resources/gtk/help-overlay.ui:243 msgctxt "shortcut window" msgid "Save current file to new path" msgstr "Gorde uneko fitxategia bide berrian" -#: meld/resources/gtk/help-overlay.ui:236 +#: meld/resources/gtk/help-overlay.ui:250 msgctxt "shortcut window" msgid "Save all files in comparison" msgstr "Gorde fitxategi guztiak konparazioan" -#: meld/resources/gtk/help-overlay.ui:243 +#: meld/resources/gtk/help-overlay.ui:257 msgctxt "shortcut window" msgid "Previous conflict" msgstr "Aurreko gatazka" -#: meld/resources/gtk/help-overlay.ui:250 +#: meld/resources/gtk/help-overlay.ui:264 msgctxt "shortcut window" msgid "Next conflict" msgstr "Hurrengo gatazka" -#: meld/resources/gtk/help-overlay.ui:257 +#: meld/resources/gtk/help-overlay.ui:271 msgctxt "shortcut window" msgid "Push change to left" msgstr "Bidali aldaketa ezkerrera" -#: meld/resources/gtk/help-overlay.ui:264 +#: meld/resources/gtk/help-overlay.ui:278 msgctxt "shortcut window" msgid "Push change to right" msgstr "Bidali aldaketa eskuinera" -#: meld/resources/gtk/help-overlay.ui:271 +#: meld/resources/gtk/help-overlay.ui:285 msgctxt "shortcut window" msgid "Pull change from left" msgstr "Ekarri aldaketa ezkerretik" -#: meld/resources/gtk/help-overlay.ui:278 +#: meld/resources/gtk/help-overlay.ui:292 msgctxt "shortcut window" msgid "Pull change from right" msgstr "Ekarri aldaketa eskuinetik" -#: meld/resources/gtk/help-overlay.ui:285 +#: meld/resources/gtk/help-overlay.ui:299 msgctxt "shortcut window" msgid "Copy change above left" msgstr "Kopiatu aldaketa ezkerraren gainean" -#: meld/resources/gtk/help-overlay.ui:292 +#: meld/resources/gtk/help-overlay.ui:306 msgctxt "shortcut window" msgid "Copy change below left" msgstr "Kopiatu aldaketa ezkerraren azpian" -#: meld/resources/gtk/help-overlay.ui:299 +#: meld/resources/gtk/help-overlay.ui:313 msgctxt "shortcut window" msgid "Copy change above right" msgstr "Kopiatu aldaketa eskuinaren gainean" -#: meld/resources/gtk/help-overlay.ui:306 +#: meld/resources/gtk/help-overlay.ui:320 msgctxt "shortcut window" msgid "Copy change below right" msgstr "Kopiatu aldaketa eskuinaren azpian" -#: meld/resources/gtk/help-overlay.ui:313 -#: meld/resources/gtk/help-overlay.ui:341 +#: meld/resources/gtk/help-overlay.ui:327 +#: meld/resources/gtk/help-overlay.ui:355 msgctxt "shortcut window" msgid "Delete change" msgstr "Ezabatu aldaketa" -#: meld/resources/gtk/help-overlay.ui:322 +#: meld/resources/gtk/help-overlay.ui:336 msgctxt "shortcut window" msgid "Folder comparison" msgstr "Karpeta-konparazioa" -#: meld/resources/gtk/help-overlay.ui:327 +#: meld/resources/gtk/help-overlay.ui:341 msgctxt "shortcut window" msgid "Copy to left" msgstr "Ezkerrean kopiatzen du" -#: meld/resources/gtk/help-overlay.ui:334 +#: meld/resources/gtk/help-overlay.ui:348 msgctxt "shortcut window" msgid "Copy to right" msgstr "Eskuinean kopiatzen du" -#: meld/resources/gtk/help-overlay.ui:350 +#: meld/resources/gtk/help-overlay.ui:364 msgctxt "shortcut window" msgid "Version control comparison" msgstr "Bertsio-kontrolaren konparazioa" -#: meld/resources/gtk/help-overlay.ui:355 +#: meld/resources/gtk/help-overlay.ui:369 msgctxt "shortcut window" msgid "Commit to version control" msgstr "Egikaritu bertsio-kontrolera" -#: meld/resources/gtk/help-overlay.ui:362 +#: meld/resources/gtk/help-overlay.ui:376 msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Erakutsi/ezkutatu kontsolaren irteera" #: meld/resources/gtk/menus.ui:7 -msgid "Refresh" -msgstr "Freskatu" - -#: meld/resources/gtk/menus.ui:12 -msgid "Stop" -msgstr "Gelditu" - -#: meld/resources/gtk/menus.ui:17 -msgid "Fullscreen" -msgstr "Pantaila osoa" - -#: meld/resources/gtk/menus.ui:26 msgid "Save As…" msgstr "Gorde honela…" -#: meld/resources/gtk/menus.ui:30 +#: meld/resources/gtk/menus.ui:11 msgid "Save A_ll" msgstr "Gorde _denak" -#: meld/resources/gtk/menus.ui:34 +#: meld/resources/gtk/menus.ui:15 msgid "Revert files…" msgstr "Alderantzikatu fitxategiak…" -#: meld/resources/gtk/menus.ui:38 +#: meld/resources/gtk/menus.ui:19 msgid "Open Externally" msgstr "Ireki kanpotik" -#: meld/resources/gtk/menus.ui:45 +#: meld/resources/gtk/menus.ui:26 +msgid "Refresh Comparison" +msgstr "Freskatu konparazioa" + +#: meld/resources/gtk/menus.ui:33 msgid "_Find…" msgstr "_Bilatu…" -#: meld/resources/gtk/menus.ui:49 +#: meld/resources/gtk/menus.ui:37 msgid "_Replace…" msgstr "_Ordeztu…" -#: meld/resources/gtk/menus.ui:55 +#: meld/resources/gtk/menus.ui:43 msgid "View" msgstr "Ikusi" -#: meld/resources/gtk/menus.ui:59 +#: meld/resources/gtk/menus.ui:47 +msgid "Fullscreen" +msgstr "Pantaila osoa" + +#: meld/resources/gtk/menus.ui:52 msgid "Overview Map" msgstr "Ikuspegi orokorraren mapa" -#: meld/resources/gtk/menus.ui:63 +#: meld/resources/gtk/menus.ui:56 msgid "Version control console" msgstr "Bertsio-kontrolaren kontsola" -#: meld/resources/gtk/menus.ui:67 +#: meld/resources/gtk/menus.ui:60 msgid "Lock scrolling" msgstr "Blokeatu korritzea" +#: meld/resources/gtk/menus.ui:67 +msgid "Swap left and right panes" +msgstr "Trukatu ezkerreko eta eskuineko panelak" + #: meld/resources/gtk/menus.ui:73 msgid "Comparison" msgstr "Konparazioa" -#: meld/resources/gtk/menus.ui:77 +#: meld/resources/gtk/menus.ui:75 +msgid "Stop" +msgstr "Gelditu" + +#: meld/resources/gtk/menus.ui:81 msgid "Merge All from Left" msgstr "Batu guztiak ezkerretik" -#: meld/resources/gtk/menus.ui:81 +#: meld/resources/gtk/menus.ui:85 msgid "Merge All from Right" msgstr "Batu guztiak eskuinetik" -#: meld/resources/gtk/menus.ui:85 +#: meld/resources/gtk/menus.ui:89 msgid "Merge All" msgstr "Batu guztiak" -#: meld/resources/gtk/menus.ui:92 +#: meld/resources/gtk/menus.ui:96 msgid "Format as Patch…" msgstr "Formateatu adabaki gisa…" -#: meld/resources/gtk/menus.ui:101 +#: meld/resources/gtk/menus.ui:105 msgid "_Preferences" msgstr "_Hobespenak" -#: meld/resources/gtk/menus.ui:105 +#: meld/resources/gtk/menus.ui:109 msgid "Keyboard Shortcuts" msgstr "Laster-teklak" -#: meld/resources/gtk/menus.ui:109 +#: meld/resources/gtk/menus.ui:113 msgid "_Help" msgstr "_Laguntza" -#: meld/resources/gtk/menus.ui:114 +#: meld/resources/gtk/menus.ui:118 msgid "_About Meld" msgstr "Meld aplikazioari _buruz" -#: meld/resources/gtk/menus.ui:127 +#: meld/resources/gtk/menus.ui:131 msgid "File status" msgstr "Fitxategiaren egoera" -#: meld/resources/gtk/menus.ui:129 +#: meld/resources/gtk/menus.ui:133 msgid "Same" msgstr "Berdinak" -#: meld/resources/gtk/menus.ui:133 +#: meld/resources/gtk/menus.ui:137 msgid "New" msgstr "Berria" -#: meld/resources/gtk/menus.ui:137 meld/resources/gtk/menus.ui:160 -#: meld/vc/_vc.py:76 +#: meld/resources/gtk/menus.ui:141 meld/resources/gtk/menus.ui:164 +#: meld/vc/_vc.py:77 msgid "Modified" msgstr "Aldatze-data" -#: meld/resources/gtk/menus.ui:147 +#: meld/resources/gtk/menus.ui:151 msgid "Ignore filename case" msgstr "Ez ikusi egin fitxategi-izeneko maiuskula/minuskulei" -#: meld/resources/gtk/menus.ui:151 +#: meld/resources/gtk/menus.ui:155 msgid "Normalize Unicode paths" msgstr "Normalizatu Unicode bide-izenak" -#: meld/resources/gtk/menus.ui:164 +#: meld/resources/gtk/menus.ui:168 msgid "Normal" msgstr "Arrunta" -#: meld/resources/gtk/menus.ui:168 meld/vc/_vc.py:70 +#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:71 msgid "Unversioned" msgstr "Bertsiorik gabekoa" -#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:69 +#: meld/resources/gtk/menus.ui:176 meld/vc/_vc.py:70 msgid "Ignored" msgstr "Ez ikusi eginda" -#: meld/resources/gtk/menus.ui:179 +#: meld/resources/gtk/menus.ui:183 msgid "Flatten folders" msgstr "Berdindu karpetak" #: meld/resources/ui/about-dialog.ui:8 msgid "" "Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2021 Kai Willadsen" +"Copyright © 2009-2022 Kai Willadsen" msgstr "Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2021 Kai Willadsen" +"Copyright © 2009-2022 Kai Willadsen" #: meld/resources/ui/about-dialog.ui:14 msgid "translator-credits" @@ -863,7 +877,7 @@ msgid "Column Name" msgstr "Zutabe-izena" #: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128 -#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:741 +#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:745 msgid "_Remove" msgstr "_Kendu" @@ -1067,7 +1081,7 @@ msgstr "1. fitxategia" #. Create icon and filename CellRenderer #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217 -#: meld/dirdiff.py:602 +#: meld/dirdiff.py:603 msgid "Name" msgstr "Izena" @@ -1107,7 +1121,7 @@ msgstr "Itzulbiratuta" msgid "Replace _All" msgstr "Ordeztu _denak" -#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1230 meld/iohelpers.py:117 +#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1231 meld/iohelpers.py:117 msgid "_Replace" msgstr "_Ordeztu" @@ -1482,7 +1496,7 @@ msgstr "Gordetzen ez baduzu, aldaketak betiko galduko dira." msgid "Close _without Saving" msgstr "Itxi gorde _gabe" -#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1228 +#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1229 #: meld/iohelpers.py:56 meld/iohelpers.py:116 msgid "_Cancel" msgstr "_Utzi" @@ -1571,11 +1585,11 @@ msgstr "Gehigarria" msgid "Console output" msgstr "Kontsolaren irteera" -#: meld/actiongutter.py:247 +#: meld/actiongutter.py:254 msgid "Copy _up" msgstr "Kopiatu _goian" -#: meld/actiongutter.py:248 +#: meld/actiongutter.py:255 msgid "Copy _down" msgstr "Kopiatu _behean" @@ -1592,110 +1606,110 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: meld/dirdiff.py:623 meld/preferences.py:132 +#: meld/dirdiff.py:624 meld/preferences.py:132 msgid "Size" msgstr "Tamaina" #. Create date-time CellRenderer -#: meld/dirdiff.py:631 meld/preferences.py:133 +#: meld/dirdiff.py:632 meld/preferences.py:133 msgid "Modification time" msgstr "Aldatze-ordua" #. Create ISO-format date-time CellRenderer -#: meld/dirdiff.py:639 meld/preferences.py:134 +#: meld/dirdiff.py:640 meld/preferences.py:134 msgid "Modification time (ISO)" msgstr "Aldaketa-ordua (ISO)" #. Create permissions CellRenderer -#: meld/dirdiff.py:647 meld/preferences.py:135 +#: meld/dirdiff.py:648 meld/preferences.py:135 msgid "Permissions" msgstr "Baimenak" -#: meld/dirdiff.py:900 +#: meld/dirdiff.py:901 #, python-brace-format msgid "{filename} (scanning…)" msgstr "{filename} (eskaneatzen…)" -#: meld/dirdiff.py:932 meld/dirdiff.py:964 +#: meld/dirdiff.py:933 meld/dirdiff.py:965 #, python-brace-format msgid "[{label}] Scanning {folder}" msgstr "[{label}] Eskaneatzen {folder}" -#: meld/dirdiff.py:1100 +#: meld/dirdiff.py:1101 #, python-brace-format msgid "[{label}] Done" msgstr "[{label}] Egina" -#: meld/dirdiff.py:1113 +#: meld/dirdiff.py:1114 msgid "Folder {} is being compared to itself" msgstr "{} karpeta bere buruarekin konparatzen" -#: meld/dirdiff.py:1119 +#: meld/dirdiff.py:1120 msgid "Folders have no differences" msgstr "Karpetek ez dute diferentziarik" -#: meld/dirdiff.py:1121 +#: meld/dirdiff.py:1122 msgid "Contents of scanned files in folders are identical." msgstr "Karpetetan eskaneatutako fitxategien edukiak berdinak dira." -#: meld/dirdiff.py:1123 +#: meld/dirdiff.py:1124 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." msgstr "Karpetetan eskaneatutako fitxategiek berdinak dirudite, baina edukiak ez dira eskaneatu." -#: meld/dirdiff.py:1126 +#: meld/dirdiff.py:1127 msgid "File filters are in use, so not all files have been scanned." msgstr "Fitxategi-iragazkiak indarrean daudenez, ez dira fitxategi guztiak eskaneatu." -#: meld/dirdiff.py:1128 +#: meld/dirdiff.py:1129 msgid "Text filters are in use and may be masking content differences." msgstr "Testu-fitxategiak indarrean daudenez, beharbada edukien diferentziak ezkutuan geratu dira." -#: meld/dirdiff.py:1144 meld/filediff.py:1980 +#: meld/dirdiff.py:1145 meld/filediff.py:1997 msgid "Hide" msgstr "Ezkutatu" -#: meld/dirdiff.py:1146 meld/filediff.py:1982 meld/filediff.py:2012 -#: meld/filediff.py:2014 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 +#: meld/dirdiff.py:1147 meld/filediff.py:1999 meld/filediff.py:2029 +#: meld/filediff.py:2031 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 msgid "Hi_de" msgstr "_Ezkutatu" -#: meld/dirdiff.py:1155 +#: meld/dirdiff.py:1156 msgid "Multiple errors occurred while scanning this folder" msgstr "Erroreak gertatu dira karpeta hau eskaneatzean" -#: meld/dirdiff.py:1156 +#: meld/dirdiff.py:1157 msgid "Files with invalid encodings found" msgstr "Kodeketa baliogabea duten fitxategiak aurkitu dira" #. TRANSLATORS: This is followed by a list of files -#: meld/dirdiff.py:1158 +#: meld/dirdiff.py:1159 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "Fitxategi batzuen kodeketa okerra da. Hauek dira fitxategi-izenak:" -#: meld/dirdiff.py:1160 +#: meld/dirdiff.py:1161 msgid "Files hidden by case insensitive comparison" msgstr "Fitxategiren bat ezkutatu da, konparazioan maiuskulak/minuskulak ez bereizteagatik" #. TRANSLATORS: This is followed by a list of files -#: meld/dirdiff.py:1162 +#: meld/dirdiff.py:1163 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" msgstr "Maiuskulak/minuskulak bereizten ez dituen konparazio bat egiten ari zara, maiuskulak/minuskulak bereizten dituen fitxategi-sistema batean. Karpeta honetako fitxategi hauek ezkutatu dira:" -#: meld/dirdiff.py:1173 +#: meld/dirdiff.py:1174 #, python-brace-format msgid "“{first_file}” hidden by “{second_file}”" msgstr "“{first_file}” ezkutatu du “{second_file}” fitxategiak" -#: meld/dirdiff.py:1235 +#: meld/dirdiff.py:1236 #, python-format msgid "Replace folder “%s”?" msgstr "Ordeztu “%s” karpeta?" -#: meld/dirdiff.py:1237 +#: meld/dirdiff.py:1238 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1703,11 +1717,11 @@ msgid "" msgstr "Badago izen bereko beste karpeta bat “%s”(e)n.\n" "Lehendik dagoen karpeta ordezten baduzu, bertako fitxategi guztiak galdu egingo dira." -#: meld/dirdiff.py:1250 +#: meld/dirdiff.py:1251 msgid "Error copying file" msgstr "Errorea fitxategia kopiatzean" -#: meld/dirdiff.py:1251 +#: meld/dirdiff.py:1252 #, python-brace-format msgid "" "Couldn’t copy {source}\n" @@ -1719,121 +1733,129 @@ msgstr "Ezin da {source} kopiatu\n" "\n" "{error}" -#: meld/dirdiff.py:1276 meld/vcview.py:764 +#: meld/dirdiff.py:1277 meld/vcview.py:768 msgid "Error deleting {}" msgstr "Errorea {} ezabatzean" -#: meld/dirdiff.py:1819 +#: meld/dirdiff.py:1825 msgid "No folder" msgstr "Karpetarik ez" -#: meld/filediff.py:1156 +#: meld/dirdiff.py:1838 +msgid "Folder comparison:" +msgstr "Karpeta-konparazioa:" + +#: meld/filediff.py:1168 msgid "Comparison results will be inaccurate" msgstr "Konparazioaren emaitzak ez dira zehatzak izango" -#: meld/filediff.py:1158 +#: meld/filediff.py:1170 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." msgstr "Iragazki batek fitxategiko lerro kopurua aldatu du, eta hori ez dago onartuta. Konparazioa ez da zehatza izango." -#: meld/filediff.py:1230 +#: meld/filediff.py:1242 msgid "Mark conflict as resolved?" msgstr "Markatu gatazka ebatzita bezala?" -#: meld/filediff.py:1232 +#: meld/filediff.py:1244 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "Gatazka ongi ebatzi bada, ebatzita bezala marka dezakezu orain." -#: meld/filediff.py:1235 +#: meld/filediff.py:1247 msgid "Cancel" msgstr "Utzi" -#: meld/filediff.py:1236 +#: meld/filediff.py:1248 msgid "Mark _Resolved" msgstr "Markatu _ebatzita" -#: meld/filediff.py:1427 meld/filediff.py:1443 +#: meld/filediff.py:1439 meld/filediff.py:1455 msgid "Add Synchronization Point" msgstr "Gehitu sinkronizazio-puntua" -#: meld/filediff.py:1431 +#: meld/filediff.py:1443 msgid "Remove Synchronization Point" msgstr "Kendu sinkronizazio-puntua" -#: meld/filediff.py:1435 +#: meld/filediff.py:1447 msgid "Move Synchronization Point" msgstr "Aldatu lekuz sinkronizazio-puntua" -#: meld/filediff.py:1439 +#: meld/filediff.py:1451 msgid "Match Synchronization Point" msgstr "Parekatu sinkronizazio-puntua" -#: meld/filediff.py:1463 +#: meld/filediff.py:1475 msgid "Clear Synchronization Points" msgstr "Garbitu sinkronizazio-puntuak" -#: meld/filediff.py:1654 +#: meld/filediff.py:1535 +msgid "File comparison:" +msgstr "Fitxategi-konparazioa:" + +#: meld/filediff.py:1671 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Arazo bat egon da '%s' fitxategia irekitzean." -#: meld/filediff.py:1663 +#: meld/filediff.py:1680 #, python-format msgid "File %s appears to be a binary file." msgstr "Badirudi %s fitxategia bitarra dela." -#: meld/filediff.py:1665 +#: meld/filediff.py:1682 msgid "Do you want to open the file using the default application?" msgstr "Fitxategia ireki nahi duzu aplikazio lehenetsia erabilita?" -#: meld/filediff.py:1667 +#: meld/filediff.py:1684 msgid "Open" msgstr "Ireki" -#: meld/filediff.py:1689 +#: meld/filediff.py:1706 #, python-format msgid "[%s] Merging files" msgstr "[%s] Fitxategiak konbinatzen" -#: meld/filediff.py:1703 +#: meld/filediff.py:1720 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Diferentziak kalkulatzen" -#: meld/filediff.py:1763 +#: meld/filediff.py:1780 #, python-format msgid "File %s has changed on disk" msgstr "'%s' fitxategia diskoan aldatu da" -#: meld/filediff.py:1764 +#: meld/filediff.py:1781 msgid "Do you want to reload the file?" msgstr "Nahi duzu fitxategia berriro kargatzea?" -#: meld/filediff.py:1766 +#: meld/filediff.py:1783 msgid "_Reload" msgstr "Bir_kargatu" -#: meld/filediff.py:1936 +#: meld/filediff.py:1953 msgid "File {} is being compared to itself" msgstr "{} fitxategia bere buruarekin konparatzen" -#: meld/filediff.py:1945 +#: meld/filediff.py:1962 msgid "Files are identical" msgstr "Fitxategiak berdinak dira" -#: meld/filediff.py:1958 +#: meld/filediff.py:1975 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" msgstr "Testu-iragazkiak erabiltzen ari dira fitxategiak, eta baliteke iragazki horiek fitxategien arteko diferentziak ezkutatzea. Iragazi gabeko fitxategiak konparatu nahi dituzu?" -#: meld/filediff.py:1963 +#: meld/filediff.py:1980 msgid "Files differ in line endings only" msgstr "Fitxategien diferentziak lerro-amaieretan soilik daude" -#: meld/filediff.py:1965 +#: meld/filediff.py:1982 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1841,74 +1863,74 @@ msgid "" msgstr "Fitxategiak berdinak dira, lerro-amaieretan salbu:\n" "%s" -#: meld/filediff.py:1985 +#: meld/filediff.py:2002 msgid "Show without filters" msgstr "Erakutsi iragazkirik gabe" -#: meld/filediff.py:2007 +#: meld/filediff.py:2024 msgid "Change highlighting incomplete" msgstr "Aldaketen nabarmentzea osatu gabe" -#: meld/filediff.py:2008 +#: meld/filediff.py:2025 msgid "" "Some changes were not highlighted because they were too large. You can force " "Meld to take longer to highlight larger changes, though this may be slow." msgstr "Aldaketa batzuk ez dira nabarmendu handiegiak direlako. Derrigor diezaiokezu Meld-i aldaketa handiak nabarmentzeko, nahiz eta halakoetan motelagoa izan." -#: meld/filediff.py:2016 +#: meld/filediff.py:2033 msgid "Keep highlighting" msgstr "Mantendu nabarmentzea" -#: meld/filediff.py:2018 +#: meld/filediff.py:2035 msgid "_Keep highlighting" msgstr "_Mantendu nabarmentzea" -#: meld/filediff.py:2031 +#: meld/filediff.py:2048 msgid "Saving failed" msgstr "Gordetzeak huts egin du" -#: meld/filediff.py:2032 +#: meld/filediff.py:2049 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." msgstr "Kopiatu edozein aldaketa kritiko beste programa edo fitxategi batean, datuak galtzea eragozteko." -#: meld/filediff.py:2041 +#: meld/filediff.py:2058 msgid "Save Left Pane As" msgstr "Gorde ezkerreko panela honela" -#: meld/filediff.py:2043 +#: meld/filediff.py:2060 msgid "Save Middle Pane As" msgstr "Gorde erdiko panela honela" -#: meld/filediff.py:2045 +#: meld/filediff.py:2062 msgid "Save Right Pane As" msgstr "Gorde eskuineko panela honela" -#: meld/filediff.py:2056 +#: meld/filediff.py:2073 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "'%s' fitxategia diskoan aldatu egin da (ireki zenetik)" -#: meld/filediff.py:2058 +#: meld/filediff.py:2075 msgid "If you save it, any external changes will be lost." msgstr "Gordetzen baduzu, kanpoko edozer aldaketa galdu egingo da." -#: meld/filediff.py:2061 +#: meld/filediff.py:2078 msgid "Save Anyway" msgstr "Gorde dena den" -#: meld/filediff.py:2062 +#: meld/filediff.py:2079 msgid "Don’t Save" msgstr "Ez gorde" -#: meld/filediff.py:2104 +#: meld/filediff.py:2121 msgid "" "File “{}” contains characters that can’t be encoded using its current " "encoding “{}”." msgstr "“{}” fitxategiak dituen zenbait karaktere ezin dira kodetu “{}” kodeketa erabilita." -#: meld/filediff.py:2108 meld/patchdialog.py:138 +#: meld/filediff.py:2125 meld/patchdialog.py:138 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -1916,22 +1938,38 @@ msgid "" msgstr "Ezin izan da fitxategia gorde honakoagatik:\n" "%s" -#: meld/filediff.py:2112 meld/patchdialog.py:137 +#: meld/filediff.py:2129 meld/patchdialog.py:137 #, python-format msgid "Could not save file %s." msgstr "Ezin izan da %s fitxategia gorde." -#: meld/filediff.py:2522 +#: meld/filediff.py:2539 msgid "Live comparison updating disabled" msgstr "Konparazioaren zuzeneko eguneraketa desgaituta" -#: meld/filediff.py:2523 +#: meld/filediff.py:2540 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " "resume when synchronization points are cleared." msgstr "Konparazioen zuzeneko eguneraketa desgaitu egiten da sinkronizazio-puntuak aktibo daudenean. Hala ere, konparazioak eskuz freskatu ditzakezu, eta zuzeneko eguneraketak jarraitu egingo dute sinkronizazio-puntuak garbitzen direnean." +#: meld/filediff.py:2568 +msgid "Can't swap unsaved files" +msgstr "Ezin dira gorde gabeko fitxategiak trukatu" + +#: meld/filediff.py:2570 +msgid "Files must be saved to disk before swapping panes." +msgstr "Fitxategiak diskoan gorde behar dira panelak trukatu baino lehen." + +#: meld/filediff.py:2577 +msgid "Can't swap version control comparisons" +msgstr "Ezin dira bertsio-kontrolen konparazioak trukatu" + +#: meld/filediff.py:2579 +msgid "Swapping panes is not supported in version control mode." +msgstr "Panelak trukatzea ez da onartzen bertsio-kontrolaren moduan." + #: meld/iohelpers.py:41 msgid "Deleting remote folders is not supported" msgstr "Urruneko karpetak ezabatzea ez dago onartuta" @@ -2186,51 +2224,51 @@ msgstr "Bat ere ez" msgid "Rev %s" msgstr "%s erreb." -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Merged" msgstr "Batua" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Base" msgstr "Oinarria" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Local" msgstr "Lokala" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Remote" msgstr "Urrunekoa" -#: meld/vc/_vc.py:73 +#: meld/vc/_vc.py:74 msgid "Error" msgstr "Errorea" -#: meld/vc/_vc.py:75 +#: meld/vc/_vc.py:76 msgid "Newly added" msgstr "Berriki gehitua" -#: meld/vc/_vc.py:77 +#: meld/vc/_vc.py:78 msgid "Renamed" msgstr "Izena aldatua" -#: meld/vc/_vc.py:78 +#: meld/vc/_vc.py:79 msgid "Conflict" msgstr "Gatazka" -#: meld/vc/_vc.py:79 +#: meld/vc/_vc.py:80 msgid "Removed" msgstr "Kendua" -#: meld/vc/_vc.py:80 +#: meld/vc/_vc.py:81 msgid "Missing" msgstr "Falta da" -#: meld/vc/_vc.py:81 +#: meld/vc/_vc.py:82 msgid "Not present" msgstr "Ez dago" -#: meld/vc/_vc.py:82 +#: meld/vc/_vc.py:83 msgid "Scanning…" msgstr "Eskaneatzen..." @@ -2263,76 +2301,84 @@ msgstr "Ez da baliozko bertsio-kontrol sistemarik aurkitu karpeta honetan" msgid "Choose which version control system to use" msgstr "Aukeratu zer bertsio-kontrol sistema erabiliko den" -#. TRANSLATORS: This is the location of the directory being viewed -#: meld/vcview.py:412 +#. TRANSLATORS: This is the name of the version control +#. system being used, e.g., "Git" or "Subversion" +#: meld/vcview.py:414 #, python-brace-format -msgid "Location: {path}" -msgstr "Kokalekua: {path}" +msgid "{vc} comparison:" +msgstr "{vc} konparazioa:" #. Initial yield so when we add this to our tasks, we don't #. create iterators that may be invalidated. -#: meld/vcview.py:419 +#: meld/vcview.py:423 msgid "Scanning repository" msgstr "Biltegia eskaneatzen" -#: meld/vcview.py:448 +#: meld/vcview.py:452 #, python-format msgid "Scanning %s" msgstr "%s eskaneatzen" -#: meld/vcview.py:487 +#: meld/vcview.py:491 msgid "(Empty)" msgstr "(Hutsa)" -#: meld/vcview.py:535 +#: meld/vcview.py:539 #, python-format msgid "%s — local" msgstr "%s — lokala" -#: meld/vcview.py:536 +#: meld/vcview.py:540 #, python-format msgid "%s — remote" msgstr "%s — urrunekoa" -#: meld/vcview.py:544 +#: meld/vcview.py:548 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (lokala, batu, urrunekoa)" -#: meld/vcview.py:549 +#: meld/vcview.py:553 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (urrunekoa, batu, lokala)" -#: meld/vcview.py:560 +#: meld/vcview.py:564 #, python-format msgid "%s — repository" msgstr "%s — biltegia" -#: meld/vcview.py:566 +#: meld/vcview.py:570 #, python-format msgid "%s (working, repository)" msgstr "%s (lanekoa, biltegia)" -#: meld/vcview.py:570 +#: meld/vcview.py:574 #, python-format msgid "%s (repository, working)" msgstr "%s (biltegia, lanekoa)" -#: meld/vcview.py:735 +#: meld/vcview.py:739 msgid "Remove folder and all its files?" msgstr "Kendu karpeta eta bere fitxategi guztiak?" -#: meld/vcview.py:737 +#: meld/vcview.py:741 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." msgstr "Honek hautatutako fitxategi eta karpeta guztiak, baita hautatutako karpeten barruan dauden fitxategi guztiak ere, bertsio-kontroletik kenduko ditu." -#: meld/vcview.py:850 +#: meld/vcview.py:854 msgid "Clear" msgstr "Garbitu" +#~ msgid "Refresh" +#~ msgstr "Freskatu" + +#, python-brace-format +#~ msgid "Location: {path}" +#~ msgstr "Kokalekua: {path}" + #~ msgid "_Update" #~ msgstr "_Eguneratu" diff --git a/po/fi.po b/po/fi.po index 2d4320e..593df41 100644 --- a/po/fi.po +++ b/po/fi.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: meld\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2022-03-10 22:43+0000\n" -"PO-Revision-Date: 2022-03-14 21:45+0200\n" +"POT-Creation-Date: 2022-09-06 06:29+0000\n" +"PO-Revision-Date: 2022-09-09 19:25+0300\n" "Last-Translator: Jiri Grönroos \n" "Language-Team: suomi \n" "Language: fi\n" @@ -19,7 +19,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 3.0.1\n" +"X-Generator: Poedit 3.1.1\n" #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11 #: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17 @@ -91,7 +91,7 @@ msgstr "Ikkunan oletustila" #: data/org.gnome.meld.gschema.xml:58 msgid "Prefer application-wide dark theme" -msgstr "" +msgstr "Suosi tummaa teemaa" #: data/org.gnome.meld.gschema.xml:59 msgid "" @@ -117,7 +117,7 @@ msgstr "Sisennysvälin leveys" #: data/org.gnome.meld.gschema.xml:74 msgid "The number of spaces to use for a single indent step" -msgstr "" +msgstr "Yksittäiseen sisennykseen käytettävä välilyöntien määrä" #: data/org.gnome.meld.gschema.xml:78 msgid "Whether to indent using spaces or tabs" @@ -126,6 +126,7 @@ msgstr "Käytetäänkö sisennykseen välilyöntejä vai sarkaimia" #: data/org.gnome.meld.gschema.xml:79 msgid "If true, any new indentation will use spaces instead of tabs." msgstr "" +"Jos tosi, kaikki uudet sisentämiset käyttävät välilyöntejä sarkainten sijaan." #: data/org.gnome.meld.gschema.xml:83 meld/resources/ui/statusbar-menu.ui:5 msgid "Show line numbers" @@ -241,7 +242,7 @@ msgstr "" #: data/org.gnome.meld.gschema.xml:159 msgid "The custom editor launch command" -msgstr "" +msgstr "Omavalintaisen muokkaimen käynnistyskomento" #: data/org.gnome.meld.gschema.xml:160 msgid "" @@ -357,7 +358,7 @@ msgstr "" #: data/org.gnome.meld.gschema.xml:218 msgid "Show margin in commit message editor" -msgstr "" +msgstr "Näytä reunus commit-viestimuokkaimessa" #: data/org.gnome.meld.gschema.xml:219 msgid "" @@ -463,371 +464,380 @@ msgstr "Päivitä vertailu" #: meld/resources/gtk/help-overlay.ui:54 msgctxt "shortcut window" +msgid "Open externally" +msgstr "Avaa ulkoisesti" + +#: meld/resources/gtk/help-overlay.ui:61 +msgctxt "shortcut window" msgid "Fullscreen" msgstr "Koko näyttö" -#: meld/resources/gtk/help-overlay.ui:63 +#: meld/resources/gtk/help-overlay.ui:68 +msgctxt "shortcut window" +msgid "Swap left and right panes" +msgstr "Vaihda vasemman ja oikean paneelin sijainti" + +#: meld/resources/gtk/help-overlay.ui:77 msgctxt "shortcut window" msgid "Panes" msgstr "Paneelit" -#: meld/resources/gtk/help-overlay.ui:68 +#: meld/resources/gtk/help-overlay.ui:82 msgctxt "shortcut window" msgid "Previous comparison pane" msgstr "Edellinen vertailupaneeli" -#: meld/resources/gtk/help-overlay.ui:75 +#: meld/resources/gtk/help-overlay.ui:89 msgctxt "shortcut window" msgid "Next comparison pane" msgstr "Seuraava vertailupaneeli" -#: meld/resources/gtk/help-overlay.ui:84 +#: meld/resources/gtk/help-overlay.ui:98 msgctxt "shortcut window" msgid "Changes" msgstr "Muutokset" -#: meld/resources/gtk/help-overlay.ui:89 +#: meld/resources/gtk/help-overlay.ui:103 msgctxt "shortcut window" msgid "Go to previous change" msgstr "Siirry edelliseen muutokseen" -#: meld/resources/gtk/help-overlay.ui:96 +#: meld/resources/gtk/help-overlay.ui:110 msgctxt "shortcut window" msgid "Go to next change" msgstr "Siirry seuraavaan muutokseen" -#: meld/resources/gtk/help-overlay.ui:105 +#: meld/resources/gtk/help-overlay.ui:119 msgctxt "shortcut window" msgid "Tabs" msgstr "Välilehdet" -#: meld/resources/gtk/help-overlay.ui:110 +#: meld/resources/gtk/help-overlay.ui:124 msgctxt "shortcut window" msgid "Go to previous tab" msgstr "Siirry edelliseen välilehteen" -#: meld/resources/gtk/help-overlay.ui:117 +#: meld/resources/gtk/help-overlay.ui:131 msgctxt "shortcut window" msgid "Go to next tab" msgstr "Siirry seuraavaan välilehteen" -#: meld/resources/gtk/help-overlay.ui:124 +#: meld/resources/gtk/help-overlay.ui:138 msgctxt "shortcut window" msgid "Switch to tab" msgstr "Vaihda välilehteen" -#: meld/resources/gtk/help-overlay.ui:131 +#: meld/resources/gtk/help-overlay.ui:145 msgctxt "shortcut window" msgid "Move tab left" msgstr "Siirrä välilehti vasemmalle" -#: meld/resources/gtk/help-overlay.ui:138 +#: meld/resources/gtk/help-overlay.ui:152 msgctxt "shortcut window" msgid "Move tab right" msgstr "Siirrä välilehti oikealle" -#: meld/resources/gtk/help-overlay.ui:147 +#: meld/resources/gtk/help-overlay.ui:161 msgctxt "shortcut window" msgid "Editing" msgstr "Muokkaaminen" -#: meld/resources/gtk/help-overlay.ui:152 +#: meld/resources/gtk/help-overlay.ui:166 msgctxt "shortcut window" msgid "Undo" msgstr "Kumoa" -#: meld/resources/gtk/help-overlay.ui:159 +#: meld/resources/gtk/help-overlay.ui:173 msgctxt "shortcut window" msgid "Redo" msgstr "Tee uudelleen" -#: meld/resources/gtk/help-overlay.ui:166 +#: meld/resources/gtk/help-overlay.ui:180 msgctxt "shortcut window" msgid "Cut" msgstr "Leikkaa" -#: meld/resources/gtk/help-overlay.ui:173 +#: meld/resources/gtk/help-overlay.ui:187 msgctxt "shortcut window" msgid "Copy" msgstr "Kopioi" -#: meld/resources/gtk/help-overlay.ui:180 +#: meld/resources/gtk/help-overlay.ui:194 msgctxt "shortcut window" msgid "Paste" msgstr "Liitä" -#: meld/resources/gtk/help-overlay.ui:187 +#: meld/resources/gtk/help-overlay.ui:201 msgctxt "shortcut window" msgid "Find" msgstr "Etsi" -#: meld/resources/gtk/help-overlay.ui:194 +#: meld/resources/gtk/help-overlay.ui:208 msgctxt "shortcut window" msgid "Find Next" msgstr "Etsi seuraava" -#: meld/resources/gtk/help-overlay.ui:201 +#: meld/resources/gtk/help-overlay.ui:215 msgctxt "shortcut window" msgid "Find Previous" msgstr "Etsi edellinen" -#: meld/resources/gtk/help-overlay.ui:208 +#: meld/resources/gtk/help-overlay.ui:222 msgctxt "shortcut window" msgid "Replace" msgstr "Korvaa" -#: meld/resources/gtk/help-overlay.ui:217 +#: meld/resources/gtk/help-overlay.ui:231 msgctxt "shortcut window" msgid "File comparison" msgstr "Tiedostojen vertailu" -#: meld/resources/gtk/help-overlay.ui:222 +#: meld/resources/gtk/help-overlay.ui:236 msgctxt "shortcut window" msgid "Save current file" msgstr "Tallenna nykyinen tiedosto" -#: meld/resources/gtk/help-overlay.ui:229 +#: meld/resources/gtk/help-overlay.ui:243 msgctxt "shortcut window" msgid "Save current file to new path" msgstr "Tallenna nykyinen tiedosto uuteen polkuun" -#: meld/resources/gtk/help-overlay.ui:236 +#: meld/resources/gtk/help-overlay.ui:250 msgctxt "shortcut window" msgid "Save all files in comparison" msgstr "Tallenna kaikki tiedostot nykyisestä vertailusta" -#: meld/resources/gtk/help-overlay.ui:243 +#: meld/resources/gtk/help-overlay.ui:257 msgctxt "shortcut window" msgid "Previous conflict" msgstr "Edellinen ristiriita" -#: meld/resources/gtk/help-overlay.ui:250 +#: meld/resources/gtk/help-overlay.ui:264 msgctxt "shortcut window" msgid "Next conflict" msgstr "Seuraava ristiriita" -#: meld/resources/gtk/help-overlay.ui:257 +#: meld/resources/gtk/help-overlay.ui:271 msgctxt "shortcut window" msgid "Push change to left" msgstr "Työnnä muutos vasemmalle" -#: meld/resources/gtk/help-overlay.ui:264 +#: meld/resources/gtk/help-overlay.ui:278 msgctxt "shortcut window" msgid "Push change to right" msgstr "Työnnä muutos oikealle" -#: meld/resources/gtk/help-overlay.ui:271 +#: meld/resources/gtk/help-overlay.ui:285 msgctxt "shortcut window" msgid "Pull change from left" msgstr "Vedä muutos vasemmalta" -#: meld/resources/gtk/help-overlay.ui:278 +#: meld/resources/gtk/help-overlay.ui:292 msgctxt "shortcut window" msgid "Pull change from right" msgstr "Vedä muutos oikealta" -#: meld/resources/gtk/help-overlay.ui:285 +#: meld/resources/gtk/help-overlay.ui:299 msgctxt "shortcut window" msgid "Copy change above left" msgstr "Kopioi muutos yläpuolelta vasemmalle" -#: meld/resources/gtk/help-overlay.ui:292 +#: meld/resources/gtk/help-overlay.ui:306 msgctxt "shortcut window" msgid "Copy change below left" msgstr "Kopioi muutos alapuolelta vasemmalle" -#: meld/resources/gtk/help-overlay.ui:299 +#: meld/resources/gtk/help-overlay.ui:313 msgctxt "shortcut window" msgid "Copy change above right" msgstr "Kopioi muutos yläpuolelta oikealle" -#: meld/resources/gtk/help-overlay.ui:306 +#: meld/resources/gtk/help-overlay.ui:320 msgctxt "shortcut window" msgid "Copy change below right" msgstr "Kopioi muutos alapuolelta oikealle" -#: meld/resources/gtk/help-overlay.ui:313 -#: meld/resources/gtk/help-overlay.ui:341 +#: meld/resources/gtk/help-overlay.ui:327 +#: meld/resources/gtk/help-overlay.ui:355 msgctxt "shortcut window" msgid "Delete change" msgstr "Poista muutos" -#: meld/resources/gtk/help-overlay.ui:322 +#: meld/resources/gtk/help-overlay.ui:336 msgctxt "shortcut window" msgid "Folder comparison" msgstr "Kansiovertailu" -#: meld/resources/gtk/help-overlay.ui:327 +#: meld/resources/gtk/help-overlay.ui:341 msgctxt "shortcut window" msgid "Copy to left" msgstr "Kopioi vasemmalle" -#: meld/resources/gtk/help-overlay.ui:334 +#: meld/resources/gtk/help-overlay.ui:348 msgctxt "shortcut window" msgid "Copy to right" msgstr "Kopioi oikealle" -#: meld/resources/gtk/help-overlay.ui:350 +#: meld/resources/gtk/help-overlay.ui:364 msgctxt "shortcut window" msgid "Version control comparison" msgstr "Versionhallinnan vertailu" -#: meld/resources/gtk/help-overlay.ui:355 +#: meld/resources/gtk/help-overlay.ui:369 msgctxt "shortcut window" msgid "Commit to version control" msgstr "Tee commit muutoksista versionhallintaan" -#: meld/resources/gtk/help-overlay.ui:362 +#: meld/resources/gtk/help-overlay.ui:376 msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Näytä/piilota konsolin tuloste" #: meld/resources/gtk/menus.ui:7 -msgid "Refresh" -msgstr "Päivitä" - -#: meld/resources/gtk/menus.ui:12 -msgid "Stop" -msgstr "Pysäytä" - -#: meld/resources/gtk/menus.ui:17 -msgid "Fullscreen" -msgstr "Koko näyttö" - -#: meld/resources/gtk/menus.ui:26 msgid "Save As…" msgstr "Tallenna nimellä…" -#: meld/resources/gtk/menus.ui:30 +#: meld/resources/gtk/menus.ui:11 msgid "Save A_ll" msgstr "Tallenna _kaikki" -#: meld/resources/gtk/menus.ui:34 +#: meld/resources/gtk/menus.ui:15 msgid "Revert files…" msgstr "Palauta tiedostot…" -#: meld/resources/gtk/menus.ui:38 +#: meld/resources/gtk/menus.ui:19 msgid "Open Externally" msgstr "Avaa ulkoisesti" -#: meld/resources/gtk/menus.ui:45 +#: meld/resources/gtk/menus.ui:26 +msgid "Refresh Comparison" +msgstr "Päivitä vertailu" + +#: meld/resources/gtk/menus.ui:33 msgid "_Find…" msgstr "_Etsi…" -#: meld/resources/gtk/menus.ui:49 +#: meld/resources/gtk/menus.ui:37 msgid "_Replace…" msgstr "_Korvaa…" -#: meld/resources/gtk/menus.ui:55 +#: meld/resources/gtk/menus.ui:43 msgid "View" msgstr "Näytä" -#: meld/resources/gtk/menus.ui:59 +#: meld/resources/gtk/menus.ui:47 +msgid "Fullscreen" +msgstr "Koko näyttö" + +#: meld/resources/gtk/menus.ui:52 msgid "Overview Map" msgstr "Yleisnäkymäkartta" -#: meld/resources/gtk/menus.ui:63 +#: meld/resources/gtk/menus.ui:56 msgid "Version control console" msgstr "Versionhallinnan konsoli" -#: meld/resources/gtk/menus.ui:67 +#: meld/resources/gtk/menus.ui:60 msgid "Lock scrolling" msgstr "Lukitse vieritys" +#: meld/resources/gtk/menus.ui:67 +msgid "Swap left and right panes" +msgstr "Vaihda vasemman ja oikean paneelin sijainti" + #: meld/resources/gtk/menus.ui:73 msgid "Comparison" msgstr "Vertailu" -#: meld/resources/gtk/menus.ui:77 +#: meld/resources/gtk/menus.ui:75 +msgid "Stop" +msgstr "Pysäytä" + +#: meld/resources/gtk/menus.ui:81 msgid "Merge All from Left" msgstr "Yhdistä kaikki vasemmalta" -#: meld/resources/gtk/menus.ui:81 +#: meld/resources/gtk/menus.ui:85 msgid "Merge All from Right" msgstr "Yhdistä kaikki oikealta" -#: meld/resources/gtk/menus.ui:85 +#: meld/resources/gtk/menus.ui:89 msgid "Merge All" msgstr "Yhdistä kaikki" -#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:65 -msgid "Add Synchronization Point" -msgstr "Lisää synkronointipiste" - -#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:69 -msgid "Clear Synchronization Points" -msgstr "Tyhjennä synkronointipisteet" - -#: meld/resources/gtk/menus.ui:103 +#: meld/resources/gtk/menus.ui:96 msgid "Format as Patch…" msgstr "Muotoile paikkatiedostoksi…" -#: meld/resources/gtk/menus.ui:112 +#: meld/resources/gtk/menus.ui:105 msgid "_Preferences" msgstr "_Asetukset" -#: meld/resources/gtk/menus.ui:116 +#: meld/resources/gtk/menus.ui:109 msgid "Keyboard Shortcuts" msgstr "Pikanäppäimet" -#: meld/resources/gtk/menus.ui:120 +#: meld/resources/gtk/menus.ui:113 msgid "_Help" msgstr "_Ohje" -#: meld/resources/gtk/menus.ui:125 +#: meld/resources/gtk/menus.ui:118 msgid "_About Meld" msgstr "_Tietoja - Meld" -#: meld/resources/gtk/menus.ui:138 +#: meld/resources/gtk/menus.ui:131 msgid "File status" msgstr "Tiedoston tila" -#: meld/resources/gtk/menus.ui:140 +#: meld/resources/gtk/menus.ui:133 msgid "Same" msgstr "Sama" -#: meld/resources/gtk/menus.ui:144 +#: meld/resources/gtk/menus.ui:137 msgid "New" msgstr "Uusi" -#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171 -#: meld/vc/_vc.py:76 +#: meld/resources/gtk/menus.ui:141 meld/resources/gtk/menus.ui:164 +#: meld/vc/_vc.py:77 msgid "Modified" msgstr "Muokattu" -#: meld/resources/gtk/menus.ui:158 +#: meld/resources/gtk/menus.ui:151 #, fuzzy #| msgid "Ignore Filename Case" msgid "Ignore filename case" msgstr "Älä huomioi kirjainkoon eroja tiedostonimessä" -#: meld/resources/gtk/menus.ui:162 +#: meld/resources/gtk/menus.ui:155 msgid "Normalize Unicode paths" msgstr "Normalisoi Unicode-polut" -#: meld/resources/gtk/menus.ui:175 +#: meld/resources/gtk/menus.ui:168 msgid "Normal" msgstr "Normaali" -#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70 +#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:71 msgid "Unversioned" msgstr "Versioimaton" -#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69 +#: meld/resources/gtk/menus.ui:176 meld/vc/_vc.py:70 msgid "Ignored" msgstr "Huomiotta jätetyt" -#: meld/resources/gtk/menus.ui:190 +#: meld/resources/gtk/menus.ui:183 msgid "Flatten folders" msgstr "Litistetyt kansiot" #: meld/resources/ui/about-dialog.ui:8 +#| msgid "" +#| "Copyright © 2002-2009 Stephen Kennedy\n" +#| "Copyright © 2009-2021 Kai Willadsen" msgid "" "Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2021 Kai Willadsen" +"Copyright © 2009-2022 Kai Willadsen" msgstr "" "Tekijänoikeus © 2002-2009 Stephen Kennedy\n" -"Tekijänoikeus © 2009-2021 Kai Willadsen" +"Tekijänoikeus © 2009-2022 Kai Willadsen" #: meld/resources/ui/about-dialog.ui:14 msgid "translator-credits" @@ -878,7 +888,7 @@ msgid "Column Name" msgstr "Sarakkeen nimi" #: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128 -#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:741 +#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:745 msgid "_Remove" msgstr "_Poista" @@ -1085,7 +1095,7 @@ msgstr "Tiedosto 1" #. Create icon and filename CellRenderer #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217 -#: meld/dirdiff.py:558 +#: meld/dirdiff.py:603 msgid "Name" msgstr "Nimi" @@ -1125,7 +1135,7 @@ msgstr "Rivitetty" msgid "Replace _All" msgstr "K_orvaa kaikki" -#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1184 meld/iohelpers.py:114 +#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1231 meld/iohelpers.py:117 msgid "_Replace" msgstr "_Korvaa" @@ -1511,12 +1521,12 @@ msgstr "Jos et tallenna, muutokset häviävät pysyvästi." msgid "Close _without Saving" msgstr "Sulje _tallentamatta" -#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1183 -#: meld/iohelpers.py:56 meld/iohelpers.py:113 +#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1229 +#: meld/iohelpers.py:56 meld/iohelpers.py:116 msgid "_Cancel" msgstr "_Peru" -#: meld/resources/ui/save-confirm-dialog.ui:52 +#: meld/resources/ui/save-confirm-dialog.ui:55 msgid "_Save" msgstr "_Tallenna" @@ -1600,11 +1610,11 @@ msgstr "" msgid "Console output" msgstr "Konsolin tuloste" -#: meld/actiongutter.py:247 +#: meld/actiongutter.py:254 msgid "Copy _up" msgstr "Kopioi _ylös" -#: meld/actiongutter.py:248 +#: meld/actiongutter.py:255 msgid "Copy _down" msgstr "Kopioi _alas" @@ -1621,53 +1631,53 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: meld/dirdiff.py:579 meld/preferences.py:132 +#: meld/dirdiff.py:624 meld/preferences.py:132 msgid "Size" msgstr "Koko" #. Create date-time CellRenderer -#: meld/dirdiff.py:587 meld/preferences.py:133 +#: meld/dirdiff.py:632 meld/preferences.py:133 msgid "Modification time" msgstr "Muokkausaika" #. Create ISO-format date-time CellRenderer -#: meld/dirdiff.py:595 meld/preferences.py:134 +#: meld/dirdiff.py:640 meld/preferences.py:134 msgid "Modification time (ISO)" msgstr "Muokkausaika (ISO)" #. Create permissions CellRenderer -#: meld/dirdiff.py:603 meld/preferences.py:135 +#: meld/dirdiff.py:648 meld/preferences.py:135 msgid "Permissions" msgstr "Oikeudet" -#: meld/dirdiff.py:855 +#: meld/dirdiff.py:901 #, python-brace-format msgid "{filename} (scanning…)" msgstr "{filename} (kartoitetaan…)" -#: meld/dirdiff.py:887 meld/dirdiff.py:919 +#: meld/dirdiff.py:933 meld/dirdiff.py:965 #, python-brace-format msgid "[{label}] Scanning {folder}" msgstr "[{label}] Kartoitetaan {folder}" -#: meld/dirdiff.py:1055 +#: meld/dirdiff.py:1101 #, python-brace-format msgid "[{label}] Done" msgstr "[{label}] Valmis" -#: meld/dirdiff.py:1068 +#: meld/dirdiff.py:1114 msgid "Folder {} is being compared to itself" msgstr "Kansiota {} vertaillaan itseensä" -#: meld/dirdiff.py:1074 +#: meld/dirdiff.py:1120 msgid "Folders have no differences" msgstr "Kansioilla ei ole eroja" -#: meld/dirdiff.py:1076 +#: meld/dirdiff.py:1122 msgid "Contents of scanned files in folders are identical." msgstr "Kansioissa olevien tiedostojen sisällöt ovat identtisiä sisällöiltään." -#: meld/dirdiff.py:1078 +#: meld/dirdiff.py:1124 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1675,46 +1685,46 @@ msgstr "" "Kartoitetut tiedostot kansioissa vaikuttavat identtisiltä, mutta niiden " "sisältöä ei ole vielä kartoitettu." -#: meld/dirdiff.py:1081 +#: meld/dirdiff.py:1127 msgid "File filters are in use, so not all files have been scanned." msgstr "" "Tiedostosuodattimet ovat käytössä, joten kaikkia tiedostoja ei tarkistettu." -#: meld/dirdiff.py:1083 +#: meld/dirdiff.py:1129 msgid "Text filters are in use and may be masking content differences." msgstr "" "Tekstisuodattimia on käytössä ja ne saattavat naamioida " "sisältöeroavaisuuksia." -#: meld/dirdiff.py:1099 meld/filediff.py:1917 +#: meld/dirdiff.py:1145 meld/filediff.py:1997 msgid "Hide" msgstr "Piilota" -#: meld/dirdiff.py:1101 meld/filediff.py:1919 meld/filediff.py:1949 -#: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 +#: meld/dirdiff.py:1147 meld/filediff.py:1999 meld/filediff.py:2029 +#: meld/filediff.py:2031 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 msgid "Hi_de" msgstr "_Piilota" -#: meld/dirdiff.py:1110 +#: meld/dirdiff.py:1156 msgid "Multiple errors occurred while scanning this folder" msgstr "Tätä kansiota tutkittaessa tapahtui lukuisia virheitä" -#: meld/dirdiff.py:1111 +#: meld/dirdiff.py:1157 msgid "Files with invalid encodings found" msgstr "Virheellisellä merkistökoodauksella varustettuja tiedostoja löytyi" #. TRANSLATORS: This is followed by a list of files -#: meld/dirdiff.py:1113 +#: meld/dirdiff.py:1159 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "" "Joillain tiedostoilla on virheellinen merkistö. Nimet ovat jotain tällaisia:" -#: meld/dirdiff.py:1115 +#: meld/dirdiff.py:1161 msgid "Files hidden by case insensitive comparison" msgstr "" #. TRANSLATORS: This is followed by a list of files -#: meld/dirdiff.py:1117 +#: meld/dirdiff.py:1163 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1722,18 +1732,18 @@ msgstr "" "Suoritat kirjainkoosta riippumatonta vertailua kirjainkoon huomioivassa " "tiedostojärjestelmässä. Seuraavat tiedostot tässä hakemistossa on piilotettu:" -#: meld/dirdiff.py:1128 -#, fuzzy, python-brace-format +#: meld/dirdiff.py:1174 +#, python-brace-format #| msgid "'%s' hidden by '%s'" msgid "“{first_file}” hidden by “{second_file}”" -msgstr "\"%s\" piilottanut \"%s\"" +msgstr "“{first_file}” piilotettu tiedoston “{second_file}” toimesta" -#: meld/dirdiff.py:1187 +#: meld/dirdiff.py:1236 #, python-format msgid "Replace folder “%s”?" msgstr "Korvataanko kansio “%s”?" -#: meld/dirdiff.py:1189 +#: meld/dirdiff.py:1238 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1742,11 +1752,11 @@ msgstr "" "Toinen kansio samalla nimellä on jo olemassa sijainnissa “%s”.\n" "Jos korvaat olemassa olevan kansion, siinä olevat kaikki tiedostot häviävät." -#: meld/dirdiff.py:1202 +#: meld/dirdiff.py:1251 msgid "Error copying file" msgstr "Virhe tiedostoa kopioitaessa" -#: meld/dirdiff.py:1203 +#: meld/dirdiff.py:1252 #, python-brace-format msgid "" "Couldn’t copy {source}\n" @@ -1759,19 +1769,23 @@ msgstr "" "\n" "{error}" -#: meld/dirdiff.py:1228 meld/vcview.py:764 +#: meld/dirdiff.py:1277 meld/vcview.py:768 msgid "Error deleting {}" msgstr "Virhe poistaessa {}" -#: meld/dirdiff.py:1756 +#: meld/dirdiff.py:1825 msgid "No folder" msgstr "Ei kansiota" -#: meld/filediff.py:1149 +#: meld/dirdiff.py:1838 +msgid "Folder comparison:" +msgstr "Kansiovertailu:" + +#: meld/filediff.py:1168 msgid "Comparison results will be inaccurate" msgstr "Vertailutulokset tulevat olemaan epätarkkoja" -#: meld/filediff.py:1151 +#: meld/filediff.py:1170 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1779,74 +1793,99 @@ msgstr "" "Suodatin muutti tiedoston rivien määrää, se ei ole tuettu. Vertailu ei ole " "tarkka." -#: meld/filediff.py:1223 +#: meld/filediff.py:1242 msgid "Mark conflict as resolved?" msgstr "Merkitäänkö ristiriita selvitetyksi?" -#: meld/filediff.py:1225 +#: meld/filediff.py:1244 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "" "Jos ristiriita selvitettiin onnistuneesti, voit merkitä sen selvitetyksi." -#: meld/filediff.py:1227 +#: meld/filediff.py:1247 msgid "Cancel" msgstr "Peru" -#: meld/filediff.py:1228 +#: meld/filediff.py:1248 msgid "Mark _Resolved" msgstr "Merkitse _selvitetyksi" -#: meld/filediff.py:1591 +#: meld/filediff.py:1439 meld/filediff.py:1455 +msgid "Add Synchronization Point" +msgstr "Lisää synkronointipiste" + +#: meld/filediff.py:1443 +msgid "Remove Synchronization Point" +msgstr "Poista synkronointipiste" + +#: meld/filediff.py:1447 +msgid "Move Synchronization Point" +msgstr "Siirrä synkronointipiste" + +#: meld/filediff.py:1451 +#| msgid "Add Synchronization Point" +msgid "Match Synchronization Point" +msgstr "Täsmää synkronointipiste" + +#: meld/filediff.py:1475 +msgid "Clear Synchronization Points" +msgstr "Tyhjennä synkronointipisteet" + +#: meld/filediff.py:1535 +msgid "File comparison:" +msgstr "Tiedostojen vertailu:" + +#: meld/filediff.py:1671 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Ongelma avatessa tiedostoa “%s”." -#: meld/filediff.py:1600 +#: meld/filediff.py:1680 #, python-format msgid "File %s appears to be a binary file." msgstr "%s vaikuttaa binääritiedostolta." -#: meld/filediff.py:1602 +#: meld/filediff.py:1682 msgid "Do you want to open the file using the default application?" msgstr "Haluatko avata tiedoston käyttäen oletussovellusta?" -#: meld/filediff.py:1604 +#: meld/filediff.py:1684 msgid "Open" msgstr "Avaa" -#: meld/filediff.py:1626 +#: meld/filediff.py:1706 #, python-format msgid "[%s] Merging files" msgstr "[%s] Yhdistetään tiedostoja" -#: meld/filediff.py:1640 +#: meld/filediff.py:1720 #, python-format msgid "[%s] Computing differences" msgstr "[%s] lasketaan eroja" -#: meld/filediff.py:1700 +#: meld/filediff.py:1780 #, python-format msgid "File %s has changed on disk" msgstr "Tiedosto %s on muuttunut levyllä" -#: meld/filediff.py:1701 +#: meld/filediff.py:1781 msgid "Do you want to reload the file?" msgstr "Haluatko ladata tiedoston uudelleen?" -#: meld/filediff.py:1703 +#: meld/filediff.py:1783 msgid "_Reload" msgstr "_Lataa uudestaan" -#: meld/filediff.py:1873 +#: meld/filediff.py:1953 msgid "File {} is being compared to itself" msgstr "Tiedostoa {} vertaillaan itseensä" -#: meld/filediff.py:1882 +#: meld/filediff.py:1962 msgid "Files are identical" msgstr "Tiedostot ovat identtiset" -#: meld/filediff.py:1895 +#: meld/filediff.py:1975 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1854,11 +1893,11 @@ msgstr "" "Tekstisuodattimia on käytössä ja ne saattavat naamioida " "sisältöeroavaisuuksia. Haluatko verrata suodattamattomia tiedostoja?" -#: meld/filediff.py:1900 +#: meld/filediff.py:1980 msgid "Files differ in line endings only" msgstr "Tiedostot eroavat toisistaan ainoastaan riviloppujen osalta" -#: meld/filediff.py:1902 +#: meld/filediff.py:1982 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1867,15 +1906,15 @@ msgstr "" "Tiedostot ovat identtisiä riviloppuja lukuun ottamatta:\n" "%s" -#: meld/filediff.py:1922 +#: meld/filediff.py:2002 msgid "Show without filters" msgstr "Näytä ilman suodattimia" -#: meld/filediff.py:1944 +#: meld/filediff.py:2024 msgid "Change highlighting incomplete" msgstr "Muutosten korostaminen vaillinaista" -#: meld/filediff.py:1945 +#: meld/filediff.py:2025 msgid "" "Some changes were not highlighted because they were too large. You can force " "Meld to take longer to highlight larger changes, though this may be slow." @@ -1884,19 +1923,19 @@ msgstr "" "pakottaa Meldin korostamaan myös suuret muutokset, mutta siinä saattaa " "kestää hetki." -#: meld/filediff.py:1953 +#: meld/filediff.py:2033 msgid "Keep highlighting" msgstr "Säilytä korostus" -#: meld/filediff.py:1955 +#: meld/filediff.py:2035 msgid "_Keep highlighting" msgstr "_Säilytä korostus" -#: meld/filediff.py:1968 +#: meld/filediff.py:2048 msgid "Saving failed" msgstr "Tallentaminen epäonnistui" -#: meld/filediff.py:1969 +#: meld/filediff.py:2049 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." @@ -1904,36 +1943,36 @@ msgstr "" "Tärkeiden muutosten kopiointi toiseen ohjelmaan tai tiedostoon on " "suositeltavaa tietojen katoamisen estämiseksi." -#: meld/filediff.py:1978 +#: meld/filediff.py:2058 msgid "Save Left Pane As" msgstr "Tallenna vasen paneeli nimellä" -#: meld/filediff.py:1980 +#: meld/filediff.py:2060 msgid "Save Middle Pane As" msgstr "Tallenna keskipaneeli nimellä" -#: meld/filediff.py:1982 +#: meld/filediff.py:2062 msgid "Save Right Pane As" msgstr "Tallenna oikea paneeli nimellä" -#: meld/filediff.py:1993 +#: meld/filediff.py:2073 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "Tiedosto %s on muuttunut levyllä sen avaamisen jälkeen" -#: meld/filediff.py:1995 +#: meld/filediff.py:2075 msgid "If you save it, any external changes will be lost." msgstr "Jos tallennat sen, kaikki ulkoiset muutokset häviävät pysyvästi." -#: meld/filediff.py:1998 +#: meld/filediff.py:2078 msgid "Save Anyway" msgstr "Tallenna silti" -#: meld/filediff.py:1999 +#: meld/filediff.py:2079 msgid "Don’t Save" msgstr "Älä tallenna" -#: meld/filediff.py:2041 +#: meld/filediff.py:2121 msgid "" "File “{}” contains characters that can’t be encoded using its current " "encoding “{}”." @@ -1941,7 +1980,7 @@ msgstr "" "Tiedosto “{}” sisältää merkkejä, joita ei voi esittää sen nykyisessä " "merkistössä “{}”." -#: meld/filediff.py:2045 meld/patchdialog.py:138 +#: meld/filediff.py:2125 meld/patchdialog.py:138 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -1950,16 +1989,16 @@ msgstr "" "Tiedostoa ei voitu tallentaa, syy:\n" "%s" -#: meld/filediff.py:2049 meld/patchdialog.py:137 +#: meld/filediff.py:2129 meld/patchdialog.py:137 #, python-format msgid "Could not save file %s." msgstr "Tiedoston %s tallentaminen epäonnistui." -#: meld/filediff.py:2450 +#: meld/filediff.py:2539 msgid "Live comparison updating disabled" msgstr "Reaaliaikainen vertailupäivitys poistettu käytöstä" -#: meld/filediff.py:2451 +#: meld/filediff.py:2540 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -1987,16 +2026,16 @@ msgstr "" msgid "This remote location does not support sending items to the trash." msgstr "Tämä etäsijainti ei tue tietueiden lähettämistä roskakoriin." -#: meld/iohelpers.py:57 +#: meld/iohelpers.py:58 msgid "_Delete Permanently" msgstr "_Poista pysyvästi" -#: meld/iohelpers.py:107 +#: meld/iohelpers.py:110 #, python-format msgid "Replace file “%s”?" msgstr "Korvataanko tiedosto “%s”?" -#: meld/iohelpers.py:109 +#: meld/iohelpers.py:112 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -2126,7 +2165,7 @@ msgstr "" msgid "Cannot compare a mixture of files and directories" msgstr "Hakemistoja ja tiedostoja ei voi verrata samanaikaisesti" -#: meld/misc.py:150 +#: meld/misc.py:154 msgid "" "{}\n" "\n" @@ -2138,7 +2177,7 @@ msgstr "" "Meld kohtasi kriittisen virheen suorituksen aikana:\n" "{}" -#: meld/misc.py:201 +#: meld/misc.py:205 msgid "[None]" msgstr "[Ei mitään]" @@ -2231,52 +2270,51 @@ msgstr "Ei mitään" msgid "Rev %s" msgstr "" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Merged" msgstr "Yhdistetty" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Base" msgstr "" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Local" msgstr "Paikallinen" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Remote" msgstr "Etä" -#: meld/vc/_vc.py:73 +#: meld/vc/_vc.py:74 msgid "Error" msgstr "Virhe" -#: meld/vc/_vc.py:75 +#: meld/vc/_vc.py:76 msgid "Newly added" msgstr "Äskettäin lisätty" -#: meld/vc/_vc.py:77 +#: meld/vc/_vc.py:78 msgid "Renamed" msgstr "Nimetty uudelleen" -#: meld/vc/_vc.py:78 +#: meld/vc/_vc.py:79 msgid "Conflict" msgstr "Ristiriita" -#: meld/vc/_vc.py:79 +#: meld/vc/_vc.py:80 msgid "Removed" msgstr "Poistettu" -#: meld/vc/_vc.py:80 +#: meld/vc/_vc.py:81 msgid "Missing" msgstr "Puuttuu" -#: meld/vc/_vc.py:81 +#: meld/vc/_vc.py:82 msgid "Not present" msgstr "Ei läsnä" -#: meld/vc/_vc.py:82 -#| msgid "Scanning %s" +#: meld/vc/_vc.py:83 msgid "Scanning…" msgstr "Kartoitetaan…" @@ -2309,67 +2347,69 @@ msgstr "Tästä kansiosta ei löytynyt kelvollista versionhallintajärjestelmä msgid "Choose which version control system to use" msgstr "Valitse käytettävä versionhallinta" -#. TRANSLATORS: This is the location of the directory being viewed -#: meld/vcview.py:412 +#. TRANSLATORS: This is the name of the version control +#. system being used, e.g., "Git" or "Subversion" +#: meld/vcview.py:414 #, python-brace-format -msgid "Location: {path}" -msgstr "Sijainti: {path}" +#| msgid "New comparison" +msgid "{vc} comparison:" +msgstr "{vc}-vertailu:" #. Initial yield so when we add this to our tasks, we don't #. create iterators that may be invalidated. -#: meld/vcview.py:419 +#: meld/vcview.py:423 msgid "Scanning repository" msgstr "Tutkitaan tietovarastoa" -#: meld/vcview.py:448 +#: meld/vcview.py:452 #, python-format msgid "Scanning %s" msgstr "Tutkitaan %s" -#: meld/vcview.py:487 +#: meld/vcview.py:491 msgid "(Empty)" msgstr "(tyhjä)" -#: meld/vcview.py:535 +#: meld/vcview.py:539 #, python-format msgid "%s — local" msgstr "%s — paikallinen" -#: meld/vcview.py:536 +#: meld/vcview.py:540 #, python-format msgid "%s — remote" msgstr "%s — etä" -#: meld/vcview.py:544 +#: meld/vcview.py:548 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (paikallinen, yhdistäminen, etä)" -#: meld/vcview.py:549 +#: meld/vcview.py:553 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (etä, yhdistäminen, paikallinen)" -#: meld/vcview.py:560 +#: meld/vcview.py:564 #, python-format msgid "%s — repository" msgstr "%s — tietovarasto" -#: meld/vcview.py:566 +#: meld/vcview.py:570 #, python-format msgid "%s (working, repository)" msgstr "%s (työskentely, tietovarasto)" -#: meld/vcview.py:570 +#: meld/vcview.py:574 #, python-format msgid "%s (repository, working)" msgstr "%s (tietovarasto, työskentely)" -#: meld/vcview.py:735 +#: meld/vcview.py:739 msgid "Remove folder and all its files?" msgstr "Poistetaanko kansio ja kaikki sen tiedostot?" -#: meld/vcview.py:737 +#: meld/vcview.py:741 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2377,10 +2417,17 @@ msgstr "" "Tämä poistaa kaikki valitut tiedostot ja kansiot sekä kaikki valituissa " "kansioissa olevat tiedostot versionhallinnasta." -#: meld/vcview.py:850 +#: meld/vcview.py:854 msgid "Clear" msgstr "Tyhjennä" +#~ msgid "Refresh" +#~ msgstr "Päivitä" + +#, python-brace-format +#~ msgid "Location: {path}" +#~ msgstr "Sijainti: {path}" + #~ msgid "_Update" #~ msgstr "_Päivitä" @@ -2610,9 +2657,6 @@ msgstr "Tyhjennä" #~ msgid "Meld Preferences" #~ msgstr "Meldin asetukset" -#~ msgid "File comparison" -#~ msgstr "Tiedostojen vertailu" - #~ msgid "Directory comparison" #~ msgstr "Kansioiden vertailu" diff --git a/po/gl.po b/po/gl.po index d99329d..96cebcc 100644 --- a/po/gl.po +++ b/po/gl.po @@ -8,66 +8,47 @@ # Fran Diéguez , 2009, 2010, 2011, 2012. # Leandro Regueiro , 2012. # Marcos Lans , 2018. -# Fran Dieguez , 2012-2019. +# Fran Dieguez , 2012-2022. # msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: unnamed project\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2019-01-20 20:13+0000\n" -"PO-Revision-Date: 2019-01-29 01:15+0100\n" -"Last-Translator: Fran Dieguez \n" -"Language-Team: Galician \n" +"POT-Creation-Date: 2023-09-16 01:35+0000\n" +"PO-Revision-Date: 2024-01-23 08:15+0100\n" +"Last-Translator: Fran Dieguez \n" +"Language-Team: Galician >\n" "Language: gl\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)\n" -"X-Generator: Gtranslator 3.30.0\n" - -#: ../bin/meld:190 -msgid "Cannot import: " -msgstr "Non é posíbel importar: " - -#: ../bin/meld:193 -#, c-format -msgid "Meld requires %s or higher." -msgstr "Meld require %s ou superior." - -#: ../bin/meld:262 -#, c-format -msgid "" -"Couldn’t load Meld-specific CSS (%s)\n" -"%s" -msgstr "" -"Non foi posíbel cargar o CSS específico de Meld (%s)\n" -"%s" - -#: ../data/org.gnome.meld.desktop.in.h:1 -#: ../data/org.gnome.meld.appdata.xml.in.h:1 -#: ../meld/resources/ui/appwindow.ui.h:1 +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 3.4.1\n" +"X-DL-Team: gl\n" +"X-DL-Module: meld\n" +"X-DL-Branch: main\n" +"X-DL-Domain: po\n" +"X-DL-State: Translating\n" + +#: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11 +#: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17 msgid "Meld" msgstr "Meld" -#: ../data/org.gnome.meld.desktop.in.h:2 +#: data/org.gnome.meld.desktop.in.in:4 msgid "Diff Viewer" msgstr "Visualizador Diff" -#: ../data/org.gnome.meld.desktop.in.h:3 -msgid "Meld Diff Viewer" -msgstr "Visualizador Diff Meld" - -#: ../data/org.gnome.meld.desktop.in.h:4 -#: ../data/org.gnome.meld.appdata.xml.in.h:2 +#: data/org.gnome.meld.desktop.in.in:5 data/org.gnome.meld.appdata.xml.in.in:12 msgid "Compare and merge your files" msgstr "Compare e combine os seus ficheiros" #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! -#: ../data/org.gnome.meld.desktop.in.h:6 +#: data/org.gnome.meld.desktop.in.in:7 msgid "diff;merge;" msgstr "comparar;combinar;" -#: ../data/org.gnome.meld.appdata.xml.in.h:3 +#: data/org.gnome.meld.appdata.xml.in.in:14 msgid "" "Meld is a visual diff and merge tool targeted at developers. Meld helps you " "compare files, directories, and version controlled projects. It provides " @@ -80,7 +61,7 @@ msgstr "" "bandas tanto entre ficheiros como entre cartafoles e acepta moitos sistemas " "de control de versións como Git, Bazaar e Subversion." -#: ../data/org.gnome.meld.appdata.xml.in.h:4 +#: data/org.gnome.meld.appdata.xml.in.in:21 msgid "" "Meld helps you review code changes, understand patches, and makes enormous " "merge conflicts slightly less painful." @@ -88,35 +69,48 @@ msgstr "" "Meld axuda a revisar os cambios no código, a entender os parches e ademais " "fai os enormes conflitos das fusións lixeiramente menos dorosos." -#: ../data/org.gnome.meld.appdata.xml.in.h:5 +#: data/org.gnome.meld.appdata.xml.in.in:51 msgid "The GNOME Project" msgstr "O Proxecto GNOME" -#: ../data/mime/org.gnome.meld.xml.in.h:1 +#: data/mime/org.gnome.meld.xml.in:4 msgid "Meld comparison description" msgstr "Descrición da comparación do Meld" -#: ../data/org.gnome.meld.gschema.xml.h:1 +#: data/org.gnome.meld.gschema.xml:37 msgid "Default window width" msgstr "Largura predeterminada da xanela" -#: ../data/org.gnome.meld.gschema.xml.h:2 +#: data/org.gnome.meld.gschema.xml:41 msgid "Default window height" msgstr "Altura predeterminada da xanela" -#: ../data/org.gnome.meld.gschema.xml.h:3 +#: data/org.gnome.meld.gschema.xml:45 msgid "Default window maximised state" msgstr "Estado predeterminado coa xanela maximizada" -#: ../data/org.gnome.meld.gschema.xml.h:4 +#: data/org.gnome.meld.gschema.xml:49 msgid "Default window fullscreen state" msgstr "Estado de pantalla completa da xanela predeterminada" -#: ../data/org.gnome.meld.gschema.xml.h:5 +#: data/org.gnome.meld.gschema.xml:58 +msgid "Prefer application-wide dark theme" +msgstr "Preferir o tema escuro a nivel aplicación" + +#: data/org.gnome.meld.gschema.xml:59 +msgid "" +"If true, the GTK dark theme variant will be used, if available. Note that " +"this is separate from the syntax highlighting scheme." +msgstr "" +"Se é verdadeiro, usarase a variante do tema escuro de GTK, se está " +"dispoñíbel. Teña en conta que isto está separado do esquema de realzado de " +"sintaxe." + +#: data/org.gnome.meld.gschema.xml:65 msgid "Additional automatically detected text encodings" msgstr "Codificacións de texto adicionais detectadas automaticamente" -#: ../data/org.gnome.meld.gschema.xml.h:6 +#: data/org.gnome.meld.gschema.xml:66 msgid "" "Meld will use these text encodings to try to decode loaded text files before " "trying any other encodings. In addition to the encodings in this list, UTF-8 " @@ -129,36 +123,35 @@ msgstr "" "predeterminada local actual. Poderán usarse outras codificacións dependendo " "do idioma do usuario." -#: ../data/org.gnome.meld.gschema.xml.h:7 +#: data/org.gnome.meld.gschema.xml:73 msgid "Width of an indentation step" msgstr "Largura da sangría" -#: ../data/org.gnome.meld.gschema.xml.h:8 +#: data/org.gnome.meld.gschema.xml:74 msgid "The number of spaces to use for a single indent step" msgstr "Número de espazos a usar nunha sangría" -#: ../data/org.gnome.meld.gschema.xml.h:9 +#: data/org.gnome.meld.gschema.xml:78 msgid "Whether to indent using spaces or tabs" msgstr "Indica se sangrar usando espazos ou tabulacións" -#: ../data/org.gnome.meld.gschema.xml.h:10 +#: data/org.gnome.meld.gschema.xml:79 msgid "If true, any new indentation will use spaces instead of tabs." msgstr "Se se marca, toda sangría nova usará espazos no canto de tabulacións." -#: ../data/org.gnome.meld.gschema.xml.h:11 -#: ../meld/resources/ui/statusbar-menu.ui.h:1 +#: data/org.gnome.meld.gschema.xml:83 meld/resources/ui/statusbar-menu.ui:5 msgid "Show line numbers" -msgstr "Mostrar os números de liña" +msgstr "Mostrar os números de liña" -#: ../data/org.gnome.meld.gschema.xml.h:12 +#: data/org.gnome.meld.gschema.xml:84 msgid "If true, line numbers will be shown in the gutter of file comparisons." msgstr "Se se marca, os números mostraranse na marxe dos ficheiros comparados." -#: ../data/org.gnome.meld.gschema.xml.h:13 +#: data/org.gnome.meld.gschema.xml:88 msgid "Highlight syntax" msgstr "Realzar a sintaxe" -#: ../data/org.gnome.meld.gschema.xml.h:14 +#: data/org.gnome.meld.gschema.xml:89 msgid "" "Whether to highlight syntax in comparisons. Because of Meld’s own color " "highlighting, this is off by default." @@ -166,31 +159,31 @@ msgstr "" "Indica se reslatar a sintaxe nas comparacións. Debido aos resaltes de cor do " "propio Meld, isto está desactivado predeterminadamente." -#: ../data/org.gnome.meld.gschema.xml.h:15 +#: data/org.gnome.meld.gschema.xml:93 msgid "Color scheme to use for syntax highlighting" msgstr "Esquema de cor a usar para resaltar a sintaxe" -#: ../data/org.gnome.meld.gschema.xml.h:16 +#: data/org.gnome.meld.gschema.xml:94 msgid "Used by GtkSourceView to determine colors for syntax highlighting" msgstr "Usado por GtkSourceView para determinar as cores de resalte da sintaxe" -#: ../data/org.gnome.meld.gschema.xml.h:17 -msgid "Displayed whitespace" -msgstr "Mostrar espazos en branco" +#: data/org.gnome.meld.gschema.xml:98 +msgid "Draw whitespace" +msgstr "Debuxar espazos en branco" -#: ../data/org.gnome.meld.gschema.xml.h:18 +#: data/org.gnome.meld.gschema.xml:99 msgid "" -"Selector for individual whitespace character types to be shown. Possible " -"values are 'space', 'tab', 'newline' and 'nbsp'." +"If true, whitespace characters will be drawn in comparisons even if they are " +"not in a changed area." msgstr "" -"Selector de tipos de caracteres de espazo en branco a mostrar. Os valores " -"posíbeis son : «space», «tab», «newline» e «nbsp»." +"Se é verdadeiro, os caracteres de espazos en branco debuxaranse nas " +"comparacións incluso cando non cambiaran nun área." -#: ../data/org.gnome.meld.gschema.xml.h:19 +#: data/org.gnome.meld.gschema.xml:108 msgid "Wrap mode" msgstr "Modo axuste de liña" -#: ../data/org.gnome.meld.gschema.xml.h:20 +#: data/org.gnome.meld.gschema.xml:109 msgid "" "Lines in file comparisons will be wrapped according to this setting, either " "not at all ('none'), at any character ('char') or only at the end of words " @@ -200,12 +193,11 @@ msgstr "" "axuste (Ningún), en calquera carácter (Carácter) ou só ao final da palabra " "(Palabra)." -#: ../data/org.gnome.meld.gschema.xml.h:21 -#: ../meld/resources/ui/statusbar-menu.ui.h:3 +#: data/org.gnome.meld.gschema.xml:116 meld/resources/ui/statusbar-menu.ui:13 msgid "Highlight current line" msgstr "Realzar a liña actual" -#: ../data/org.gnome.meld.gschema.xml.h:22 +#: data/org.gnome.meld.gschema.xml:117 msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." @@ -213,22 +205,22 @@ msgstr "" "Se se marca, a liña que contén o cursor resaltarase nas comparacións de " "ficheiros." -#: ../data/org.gnome.meld.gschema.xml.h:23 +#: data/org.gnome.meld.gschema.xml:121 msgid "Use the system default monospace font" msgstr "Usar o tipo de letra de largo fixo do sistema" -#: ../data/org.gnome.meld.gschema.xml.h:24 +#: data/org.gnome.meld.gschema.xml:122 msgid "" "If false, custom-font will be used instead of the system monospace font." msgstr "" "Se non se marca, usarase o tipo de letra personalizado no canto do tipo " "monoespazo do sistema." -#: ../data/org.gnome.meld.gschema.xml.h:25 +#: data/org.gnome.meld.gschema.xml:126 msgid "Custom font" msgstr "Personalizar tipo de letra" -#: ../data/org.gnome.meld.gschema.xml.h:26 +#: data/org.gnome.meld.gschema.xml:127 msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." @@ -236,22 +228,41 @@ msgstr "" "Tipo de letra personalizado a usar, gardado como unha cadea e analizado como " "unha descrición de tipo de letra de Pango." -#: ../data/org.gnome.meld.gschema.xml.h:27 +#: data/org.gnome.meld.gschema.xml:133 +msgid "Show overview source map" +msgstr "Mostrar mapa de vista xeral de código" + +#: data/org.gnome.meld.gschema.xml:134 +msgid "" +"If true, file comparisons will have paired source maps for compared files." +msgstr "" +"Se é verdadeiro, as comparacións de ficheiros terán ao carón mapas de código " +"para os ficheiros comparados." + +#: data/org.gnome.meld.gschema.xml:139 +msgid "Style of overview map" +msgstr "Estilo do mapa de vista xeral" + +#: data/org.gnome.meld.gschema.xml:140 +msgid "Style options for how the overview map is displayed." +msgstr "Opcións de estilo sobre como se mostra o mapa de vista xeral." + +#: data/org.gnome.meld.gschema.xml:146 msgid "Ignore blank lines when comparing files" msgstr "Ignorar as liñas en branco nas comparacións de ficheiros" -#: ../data/org.gnome.meld.gschema.xml.h:28 +#: data/org.gnome.meld.gschema.xml:147 msgid "" "If true, blank lines will be trimmed when highlighting changes between files." msgstr "" "Se se marca, as liñas en branco eliminaranse ao resaltar os cambios entre " "ficheiros." -#: ../data/org.gnome.meld.gschema.xml.h:29 +#: data/org.gnome.meld.gschema.xml:154 msgid "Use the system default editor" msgstr "Usar o editor predeterminado do sistema" -#: ../data/org.gnome.meld.gschema.xml.h:30 +#: data/org.gnome.meld.gschema.xml:155 msgid "" "If false, custom-editor-command will be used instead of the system editor " "when opening files externally." @@ -259,11 +270,11 @@ msgstr "" "Se non se marca, usarase o editor personalizado no canto do editor do " "sistema para abrir ficheiros externamente." -#: ../data/org.gnome.meld.gschema.xml.h:31 +#: data/org.gnome.meld.gschema.xml:159 msgid "The custom editor launch command" msgstr "Orde para iniciar o editor personalizado" -#: ../data/org.gnome.meld.gschema.xml.h:32 +#: data/org.gnome.meld.gschema.xml:160 msgid "" "The command used to launch a custom editor. Some limited templating is " "supported here; at the moment '{file}' and '{line}' are recognised tokens." @@ -271,11 +282,11 @@ msgstr "" "Orde usada para executar o editor personalizado. Acéptanse algúns modelos " "limitados; polo momento «{file}» e «{line}» son tokens recoñecidos." -#: ../data/org.gnome.meld.gschema.xml.h:33 +#: data/org.gnome.meld.gschema.xml:166 msgid "Columns to display" msgstr "Columnas a mostrar" -#: ../data/org.gnome.meld.gschema.xml.h:34 +#: data/org.gnome.meld.gschema.xml:167 msgid "" "List of column names in folder comparison and whether they should be " "displayed." @@ -283,12 +294,11 @@ msgstr "" "Lista de nomes de columna na comparación de cartafoles e se se deberían " "mostrar." -#: ../data/org.gnome.meld.gschema.xml.h:35 -#: ../meld/resources/ui/preferences.ui.h:25 +#: data/org.gnome.meld.gschema.xml:171 meld/resources/ui/preferences.ui:951 msgid "Ignore symbolic links" msgstr "Ignorar as ligazóns simbólicas" -#: ../data/org.gnome.meld.gschema.xml.h:36 +#: data/org.gnome.meld.gschema.xml:172 msgid "" "If true, folder comparisons do not follow symbolic links when traversing the " "folder tree." @@ -296,11 +306,11 @@ msgstr "" "Se se marca, a comparación de cartafoles non seguirá as ligazóns simbólicas " "ao percorrer a árbore de cartafoles." -#: ../data/org.gnome.meld.gschema.xml.h:37 +#: data/org.gnome.meld.gschema.xml:176 msgid "Use shallow comparison" msgstr "Usar unha comparación superficial" -#: ../data/org.gnome.meld.gschema.xml.h:38 +#: data/org.gnome.meld.gschema.xml:177 msgid "" "If true, folder comparisons compare files based solely on size and mtime, " "considering files to be identical if their size and mtime match, and " @@ -310,11 +320,11 @@ msgstr "" "tamaño e o mtime, considerando que os ficheiros son idénticos se teñen igual " "tamaño e mtime e diferentes no caso contrario." -#: ../data/org.gnome.meld.gschema.xml.h:39 +#: data/org.gnome.meld.gschema.xml:181 msgid "File timestamp resolution" msgstr "Resolución da marca de tempo do ficheiro" -#: ../data/org.gnome.meld.gschema.xml.h:40 +#: data/org.gnome.meld.gschema.xml:182 msgid "" "When comparing based on mtime, this is the minimum difference in nanoseconds " "between two files before they’re considered to have different mtimes. This " @@ -326,12 +336,11 @@ msgstr "" "mtimes. É útil cando se comparan ficheiros entre sistemas de ficheiros con " "distintas resolucións nas marcas de tempo." -#: ../data/org.gnome.meld.gschema.xml.h:41 -#: ../meld/resources/ui/preferences.ui.h:22 +#: data/org.gnome.meld.gschema.xml:186 meld/resources/ui/preferences.ui:852 msgid "Apply text filters during folder comparisons" msgstr "Aplicar filtros de texto nas comparacións de cartafoles" -#: ../data/org.gnome.meld.gschema.xml.h:42 +#: data/org.gnome.meld.gschema.xml:187 msgid "" "If true, folder comparisons that compare file contents also apply active " "text filters and the blank line trimming option, and ignore newline " @@ -342,21 +351,21 @@ msgstr "" "eliminar ás liñas en branco e ignorar as diferenzas na codificación das " "novas liñas." -#: ../data/org.gnome.meld.gschema.xml.h:43 +#: data/org.gnome.meld.gschema.xml:191 msgid "File status filters" msgstr "Filtros do estado do ficheiro" -#: ../data/org.gnome.meld.gschema.xml.h:44 +#: data/org.gnome.meld.gschema.xml:192 msgid "List of statuses used to filter visible files in folder comparison." msgstr "" "Lista de estados usados para filtrar os ficheiros visíbeis na comparación de " "cartafoles." -#: ../data/org.gnome.meld.gschema.xml.h:45 +#: data/org.gnome.meld.gschema.xml:198 msgid "Show the version control console output" msgstr "Mostrar a saída por consola do control de versión" -#: ../data/org.gnome.meld.gschema.xml.h:46 +#: data/org.gnome.meld.gschema.xml:199 msgid "" "If true, a console output section will be shown in version control views, " "showing the commands run for version control operations." @@ -365,11 +374,11 @@ msgstr "" "de versións, mostrando as ordes executadas para as operacións de control de " "versión." -#: ../data/org.gnome.meld.gschema.xml.h:47 +#: data/org.gnome.meld.gschema.xml:203 msgid "Version control pane position" msgstr "Posición do panel de control de versións" -#: ../data/org.gnome.meld.gschema.xml.h:48 +#: data/org.gnome.meld.gschema.xml:204 msgid "" "This is the height of the main version control tree when the console pane is " "shown." @@ -377,13 +386,13 @@ msgstr "" "Altura da árbore principal de control de versións cando se mostra o panel da " "consola." -#: ../data/org.gnome.meld.gschema.xml.h:49 +#: data/org.gnome.meld.gschema.xml:208 msgid "Present version comparisons as left-local/right-remote" msgstr "" "Mostrar as comparacións de versións como «esquerda é local» e «dereita é " "remota»" -#: ../data/org.gnome.meld.gschema.xml.h:50 +#: data/org.gnome.meld.gschema.xml:209 msgid "" "If true, version control comparisons will use a left-is-local, right-is-" "remote scheme to determine what order to present files in panes. Otherwise, " @@ -394,13 +403,13 @@ msgstr "" "presentación dos ficheiros nos paneis. Noutro caso, usarase o esquema " "«esquerda é seu», «dereita é meu»." -#: ../data/org.gnome.meld.gschema.xml.h:51 +#: data/org.gnome.meld.gschema.xml:213 msgid "Order for files in three-way version control merge comparisons" msgstr "" "Orde dos ficheiros nas comparacións de combinacións de control de versións a " "tres bandas" -#: ../data/org.gnome.meld.gschema.xml.h:52 +#: data/org.gnome.meld.gschema.xml:214 msgid "" "Choices for file order are remote/merged/local and local/merged/remote. This " "preference only affects three-way comparisons launched from the version " @@ -411,11 +420,11 @@ msgstr "" "iniciadas desde a vista de control de versións, polo que se usa unicamente " "para resolución de combinacións/conflitos en Meld." -#: ../data/org.gnome.meld.gschema.xml.h:53 +#: data/org.gnome.meld.gschema.xml:218 msgid "Show margin in commit message editor" msgstr "Mostrar a marxe no editor de mensaxes para remitir" -#: ../data/org.gnome.meld.gschema.xml.h:54 +#: data/org.gnome.meld.gschema.xml:219 msgid "" "If true, a guide will be displayed to show what column the margin is at in " "the version control commit message editor." @@ -423,11 +432,11 @@ msgstr "" "Se é certo, aparecerá unha guía para mostrar en que columna está a marxe no " "editor de mensaxes do control de versións para remitir." -#: ../data/org.gnome.meld.gschema.xml.h:55 +#: data/org.gnome.meld.gschema.xml:223 msgid "Margin column in commit message editor" msgstr "Columna da marxe no editor de mensaxes para remitir" -#: ../data/org.gnome.meld.gschema.xml.h:56 +#: data/org.gnome.meld.gschema.xml:224 msgid "" "The column at which to show the margin in the version control commit message " "editor." @@ -435,11 +444,11 @@ msgstr "" "Columna na que mostrar a marxe no editor de mensaxes do control de versións " "para remitir." -#: ../data/org.gnome.meld.gschema.xml.h:57 +#: data/org.gnome.meld.gschema.xml:228 msgid "Automatically hard-wrap commit messages" msgstr "Axuste duro automático das liñas nas mensaxes para remitir" -#: ../data/org.gnome.meld.gschema.xml.h:58 +#: data/org.gnome.meld.gschema.xml:229 msgid "" "If true, the version control commit message editor will hard-wrap (i.e., " "insert line breaks) at the commit margin before commit." @@ -448,22 +457,22 @@ msgstr "" "axuste duro de liñas (inserirá quebras de liña) nas marxes dos elementos " "antes da remisión." -#: ../data/org.gnome.meld.gschema.xml.h:59 +#: data/org.gnome.meld.gschema.xml:233 msgid "Version control status filters" msgstr "Filtros do estado do control de versións" -#: ../data/org.gnome.meld.gschema.xml.h:60 +#: data/org.gnome.meld.gschema.xml:234 msgid "" "List of statuses used to filter visible files in version control comparison." msgstr "" "Lista de estados usados para filtrar ficheiros visíbeis na comparación de " "control de versións." -#: ../data/org.gnome.meld.gschema.xml.h:61 +#: data/org.gnome.meld.gschema.xml:248 msgid "Filename-based filters" msgstr "Filtros baseados nos nomes de fiicheiro" -#: ../data/org.gnome.meld.gschema.xml.h:62 +#: data/org.gnome.meld.gschema.xml:249 msgid "" "List of predefined filename-based filters that, if active, will remove " "matching files from a folder comparison." @@ -472,11 +481,11 @@ msgstr "" "eliminarán, se están activos, os arquivos coincidentes nas comparacións de " "cartafoles." -#: ../data/org.gnome.meld.gschema.xml.h:63 +#: data/org.gnome.meld.gschema.xml:263 msgid "Text-based filters" msgstr "Filtros de texto" -#: ../data/org.gnome.meld.gschema.xml.h:64 +#: data/org.gnome.meld.gschema.xml:264 msgid "" "List of predefined text-based regex filters that, if active, will remove " "text from being used in a file comparison. The text will still be displayed, " @@ -486,644 +495,652 @@ msgstr "" "se están activos, eliminarán partes de texto das comparacións de ficheiros. " "O texto seguirá véndose pero non participará na comparación." -#: ../data/styles/meld-base.xml.h:1 -msgid "Meld base scheme" -msgstr "Esquema base de Meld" +#: data/styles/meld-base.style-scheme.xml.in:1 +msgid "Classic (Meld)" +msgstr "Clásico (Meld)" -#: ../data/styles/meld-base.xml.h:2 +#: data/styles/meld-base.style-scheme.xml.in:3 msgid "Base color scheme for Meld highlighting" msgstr "Esquema de cor base para o realzado de Meld" -#: ../data/styles/meld-dark.xml.h:1 +#: data/styles/meld-dark.style-scheme.xml.in:1 msgid "Meld dark scheme" msgstr "Esquema escuro de Meld" -#: ../data/styles/meld-dark.xml.h:2 +#: data/styles/meld-dark.style-scheme.xml.in:3 msgid "Dark color scheme for Meld highlighting" msgstr "Esquema de cor escuro para o realzado de Meld" -#: ../meld/resources/gtk/help-overlay.ui.h:1 +#: meld/resources/gtk/help-overlay.ui:14 msgctxt "shortcut window" msgid "General" msgstr "Xeral" -#: ../meld/resources/gtk/help-overlay.ui.h:2 +#: meld/resources/gtk/help-overlay.ui:19 msgctxt "shortcut window" msgid "New comparison" msgstr "Nova comparación" -#: ../meld/resources/gtk/help-overlay.ui.h:3 +#: meld/resources/gtk/help-overlay.ui:26 msgctxt "shortcut window" msgid "Close a comparison" msgstr "Pechar unha comparación" -#: ../meld/resources/gtk/help-overlay.ui.h:4 +#: meld/resources/gtk/help-overlay.ui:33 msgctxt "shortcut window" msgid "Quit Meld" msgstr "Saír do Meld" -#: ../meld/resources/gtk/help-overlay.ui.h:5 +#: meld/resources/gtk/help-overlay.ui:40 msgctxt "shortcut window" msgid "Stop the current action" msgstr "Deter a acción actual" -#: ../meld/resources/gtk/help-overlay.ui.h:6 +#: meld/resources/gtk/help-overlay.ui:47 msgctxt "shortcut window" msgid "Refresh comparison" msgstr "Actualizar comparación" -#: ../meld/resources/gtk/help-overlay.ui.h:7 +#: meld/resources/gtk/help-overlay.ui:54 +msgctxt "shortcut window" +msgid "Open externally" +msgstr "Abrir externamente" + +#: meld/resources/gtk/help-overlay.ui:61 msgctxt "shortcut window" msgid "Fullscreen" msgstr "Pantalla completa" -#: ../meld/resources/gtk/help-overlay.ui.h:8 +#: meld/resources/gtk/help-overlay.ui:68 +msgctxt "shortcut window" +msgid "Swap left and right panes" +msgstr "Trocar os paneis esquerdo e dereito" + +#: meld/resources/gtk/help-overlay.ui:77 +msgctxt "shortcut window" +msgid "Panes" +msgstr "Paneis" + +#: meld/resources/gtk/help-overlay.ui:82 +msgctxt "shortcut window" +msgid "Previous comparison pane" +msgstr "Panel de comparación anterior" + +#: meld/resources/gtk/help-overlay.ui:89 +msgctxt "shortcut window" +msgid "Next comparison pane" +msgstr "Panel de comparación seguinte" + +#: meld/resources/gtk/help-overlay.ui:98 +msgctxt "shortcut window" +msgid "Changes" +msgstr "Cambios" + +#: meld/resources/gtk/help-overlay.ui:103 +msgctxt "shortcut window" +msgid "Go to previous change" +msgstr "Ir ao cambio anterior" + +#: meld/resources/gtk/help-overlay.ui:110 +msgctxt "shortcut window" +msgid "Go to next change" +msgstr "Ir ao seguinte cambio" + +#: meld/resources/gtk/help-overlay.ui:119 msgctxt "shortcut window" msgid "Tabs" msgstr "Lapelas" -#: ../meld/resources/gtk/help-overlay.ui.h:9 +#: meld/resources/gtk/help-overlay.ui:124 msgctxt "shortcut window" msgid "Go to previous tab" msgstr "Ir á lapela anterior" -#: ../meld/resources/gtk/help-overlay.ui.h:10 +#: meld/resources/gtk/help-overlay.ui:131 msgctxt "shortcut window" msgid "Go to next tab" msgstr "Ir á lapela seguinte" -#: ../meld/resources/gtk/help-overlay.ui.h:11 +#: meld/resources/gtk/help-overlay.ui:138 msgctxt "shortcut window" msgid "Switch to tab" msgstr "Cambiar á lapela" -#: ../meld/resources/gtk/help-overlay.ui.h:12 +#: meld/resources/gtk/help-overlay.ui:145 msgctxt "shortcut window" msgid "Move tab left" msgstr "Mover lapela á esquerda" -#: ../meld/resources/gtk/help-overlay.ui.h:13 +#: meld/resources/gtk/help-overlay.ui:152 msgctxt "shortcut window" msgid "Move tab right" msgstr "Mover lapela á dereita" -#: ../meld/resources/gtk/help-overlay.ui.h:14 -msgctxt "shortcut window" -msgid "Changes" -msgstr "Cambios" - -#: ../meld/resources/gtk/help-overlay.ui.h:15 -msgctxt "shortcut window" -msgid "Go to previous change" -msgstr "Ir ao cambio anterior" - -#: ../meld/resources/gtk/help-overlay.ui.h:16 -msgctxt "shortcut window" -msgid "Go to next change" -msgstr "Ir ao seguinte cambio" - -#: ../meld/resources/gtk/help-overlay.ui.h:17 +#: meld/resources/gtk/help-overlay.ui:161 msgctxt "shortcut window" msgid "Editing" msgstr "Edición" -#: ../meld/resources/gtk/help-overlay.ui.h:18 +#: meld/resources/gtk/help-overlay.ui:166 msgctxt "shortcut window" msgid "Undo" msgstr "Desfacer" -#: ../meld/resources/gtk/help-overlay.ui.h:19 +#: meld/resources/gtk/help-overlay.ui:173 msgctxt "shortcut window" msgid "Redo" msgstr "Refacer" -#: ../meld/resources/gtk/help-overlay.ui.h:20 +#: meld/resources/gtk/help-overlay.ui:180 msgctxt "shortcut window" msgid "Cut" msgstr "Cortar" -#: ../meld/resources/gtk/help-overlay.ui.h:21 +#: meld/resources/gtk/help-overlay.ui:187 msgctxt "shortcut window" msgid "Copy" msgstr "Copiar" -#: ../meld/resources/gtk/help-overlay.ui.h:22 +#: meld/resources/gtk/help-overlay.ui:194 msgctxt "shortcut window" msgid "Paste" msgstr "Pegar" -#: ../meld/resources/gtk/help-overlay.ui.h:23 +#: meld/resources/gtk/help-overlay.ui:201 msgctxt "shortcut window" msgid "Find" msgstr "Buscar" -#: ../meld/resources/gtk/help-overlay.ui.h:24 +#: meld/resources/gtk/help-overlay.ui:208 msgctxt "shortcut window" msgid "Find Next" msgstr "Buscar seguinte" -#: ../meld/resources/gtk/help-overlay.ui.h:25 +#: meld/resources/gtk/help-overlay.ui:215 msgctxt "shortcut window" msgid "Find Previous" msgstr "Buscar anterior" -#: ../meld/resources/gtk/help-overlay.ui.h:26 +#: meld/resources/gtk/help-overlay.ui:222 msgctxt "shortcut window" msgid "Replace" msgstr "Substituir" -#: ../meld/resources/gtk/help-overlay.ui.h:27 +#: meld/resources/gtk/help-overlay.ui:231 msgctxt "shortcut window" msgid "File comparison" msgstr "Comparación de ficheiros" -#: ../meld/resources/gtk/help-overlay.ui.h:28 +#: meld/resources/gtk/help-overlay.ui:236 msgctxt "shortcut window" msgid "Save current file" msgstr "Gardar o ficheiro actual" -#: ../meld/resources/gtk/help-overlay.ui.h:29 +#: meld/resources/gtk/help-overlay.ui:243 msgctxt "shortcut window" msgid "Save current file to new path" msgstr "Gardar o ficheiro actual nunha ruta nova" -#: ../meld/resources/gtk/help-overlay.ui.h:30 +#: meld/resources/gtk/help-overlay.ui:250 msgctxt "shortcut window" msgid "Save all files in comparison" msgstr "Gardar todos os ficheiros da comparación" -#: ../meld/resources/gtk/help-overlay.ui.h:31 +#: meld/resources/gtk/help-overlay.ui:257 msgctxt "shortcut window" msgid "Previous conflict" msgstr "Conflito anterior" -#: ../meld/resources/gtk/help-overlay.ui.h:32 +#: meld/resources/gtk/help-overlay.ui:264 msgctxt "shortcut window" msgid "Next conflict" msgstr "Seguinte conflito" -#: ../meld/resources/gtk/help-overlay.ui.h:33 +#: meld/resources/gtk/help-overlay.ui:271 msgctxt "shortcut window" msgid "Push change to left" msgstr "Empurrar o cambio á esquerda" -#: ../meld/resources/gtk/help-overlay.ui.h:34 +#: meld/resources/gtk/help-overlay.ui:278 msgctxt "shortcut window" msgid "Push change to right" msgstr "Empurrar o cambio á dereita" -#: ../meld/resources/gtk/help-overlay.ui.h:35 +#: meld/resources/gtk/help-overlay.ui:285 msgctxt "shortcut window" msgid "Pull change from left" msgstr "Traer o cambio desde a esquerda" -#: ../meld/resources/gtk/help-overlay.ui.h:36 +#: meld/resources/gtk/help-overlay.ui:292 msgctxt "shortcut window" msgid "Pull change from right" msgstr "Traer o cambio desde a dereita" -#: ../meld/resources/gtk/help-overlay.ui.h:37 +#: meld/resources/gtk/help-overlay.ui:299 msgctxt "shortcut window" msgid "Copy change above left" msgstr "Copiar o cambio por riba da parte esquerda" -#: ../meld/resources/gtk/help-overlay.ui.h:38 +#: meld/resources/gtk/help-overlay.ui:306 msgctxt "shortcut window" msgid "Copy change below left" msgstr "Copiar o cambio por debaixo da parte esquerda" -#: ../meld/resources/gtk/help-overlay.ui.h:39 +#: meld/resources/gtk/help-overlay.ui:313 msgctxt "shortcut window" msgid "Copy change above right" msgstr "Copiar o cambio por riba da parte dereita" -#: ../meld/resources/gtk/help-overlay.ui.h:40 +#: meld/resources/gtk/help-overlay.ui:320 msgctxt "shortcut window" msgid "Copy change below right" msgstr "Copiar o cambio por debaixo da parte dereita" -#: ../meld/resources/gtk/help-overlay.ui.h:41 +#: meld/resources/gtk/help-overlay.ui:327 +#: meld/resources/gtk/help-overlay.ui:355 msgctxt "shortcut window" msgid "Delete change" msgstr "Eliminar o cambio" -#: ../meld/resources/gtk/help-overlay.ui.h:42 -msgctxt "shortcut window" -msgid "Previous comparison pane" -msgstr "Panel de comparación anterior" - -#: ../meld/resources/gtk/help-overlay.ui.h:43 -msgctxt "shortcut window" -msgid "Next comparison pane" -msgstr "Panel de comparación seguinte" - -#: ../meld/resources/gtk/help-overlay.ui.h:44 +#: meld/resources/gtk/help-overlay.ui:336 msgctxt "shortcut window" msgid "Folder comparison" msgstr "Comparación de cartafoles" -#: ../meld/resources/gtk/help-overlay.ui.h:45 +#: meld/resources/gtk/help-overlay.ui:341 msgctxt "shortcut window" msgid "Copy to left" msgstr "Copiar á esquerda" -#: ../meld/resources/gtk/help-overlay.ui.h:46 +#: meld/resources/gtk/help-overlay.ui:348 msgctxt "shortcut window" msgid "Copy to right" msgstr "Copiar á dereita" -#: ../meld/resources/gtk/help-overlay.ui.h:47 +#: meld/resources/gtk/help-overlay.ui:364 msgctxt "shortcut window" msgid "Version control comparison" msgstr "Comparación de control de versións" -#: ../meld/resources/gtk/help-overlay.ui.h:48 +#: meld/resources/gtk/help-overlay.ui:369 msgctxt "shortcut window" msgid "Commit to version control" msgstr "Remitir ao control de versións" -#: ../meld/resources/gtk/help-overlay.ui.h:49 +#: meld/resources/gtk/help-overlay.ui:376 msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Mostrar/Ocultar saídas da consola" -#: ../meld/resources/gtk/menus.ui.h:1 +#: meld/resources/gtk/menus.ui:7 +msgid "Save As…" +msgstr "Gardar como…" + +#: meld/resources/gtk/menus.ui:11 +msgid "Save A_ll" +msgstr "G_ardar todo" + +#: meld/resources/gtk/menus.ui:15 +msgid "Revert files…" +msgstr "Reverter ficheiros…" + +#: meld/resources/gtk/menus.ui:19 +msgid "Open Externally" +msgstr "Abrir externamente" + +#: meld/resources/gtk/menus.ui:26 +msgid "Refresh Comparison" +msgstr "Actualizar comparación" + +#: meld/resources/gtk/menus.ui:33 +msgid "_Find…" +msgstr "_Buscar…" + +#: meld/resources/gtk/menus.ui:37 +msgid "_Replace…" +msgstr "Substituí_r..." + +#: meld/resources/gtk/menus.ui:43 +msgid "View" +msgstr "Ver" + +#: meld/resources/gtk/menus.ui:47 +msgid "Fullscreen" +msgstr "Pantalla completa" + +#: meld/resources/gtk/menus.ui:52 +msgid "Overview Map" +msgstr "Mapa de vista xeral" + +#: meld/resources/gtk/menus.ui:56 +msgid "Version control console" +msgstr "Consola do control de versións" + +#: meld/resources/gtk/menus.ui:60 +msgid "Lock scrolling" +msgstr "Bloquear desprazamento" + +#: meld/resources/gtk/menus.ui:67 +msgid "Swap left and right panes" +msgstr "Trocar os paneis esquerdo e dereito" + +#: meld/resources/gtk/menus.ui:73 +msgid "Comparison" +msgstr "Comparación" + +#: meld/resources/gtk/menus.ui:75 +msgid "Stop" +msgstr "Deter" + +#: meld/resources/gtk/menus.ui:81 +msgid "Merge All from Left" +msgstr "Combinar todos os cambios desde a esquerda" + +#: meld/resources/gtk/menus.ui:85 +msgid "Merge All from Right" +msgstr "Combinar todos os cambios desde a dereita" + +#: meld/resources/gtk/menus.ui:89 +msgid "Merge All" +msgstr "Combinar todos" + +#: meld/resources/gtk/menus.ui:96 +msgid "Format as Patch…" +msgstr "Formatar como parche…" + +#: meld/resources/gtk/menus.ui:105 msgid "_Preferences" msgstr "Prefere_ncias" -#: ../meld/resources/gtk/menus.ui.h:2 +#: meld/resources/gtk/menus.ui:109 +msgid "Keyboard Shortcuts" +msgstr "Atallos de teclado" + +#: meld/resources/gtk/menus.ui:113 msgid "_Help" msgstr "A_xuda" -#: ../meld/resources/gtk/menus.ui.h:3 -msgid "Keyboard Shortcuts" -msgstr "Atallos de teclado" +#: meld/resources/gtk/menus.ui:118 +msgid "_About Meld" +msgstr "_Sobre o Meld" + +#: meld/resources/gtk/menus.ui:131 +msgid "File status" +msgstr "Estado do ficheiro" + +#: meld/resources/gtk/menus.ui:133 +msgid "Same" +msgstr "Iguais" -#: ../meld/resources/gtk/menus.ui.h:4 -msgid "_About" -msgstr "_Sobre" +#: meld/resources/gtk/menus.ui:137 +msgid "New" +msgstr "Novo" -#: ../meld/resources/gtk/menus.ui.h:5 -msgid "_Quit" -msgstr "_Saír" +#: meld/resources/gtk/menus.ui:141 meld/resources/gtk/menus.ui:164 +#: meld/vc/_vc.py:77 +msgid "Modified" +msgstr "Modificado" -#: ../meld/resources/ui/about-dialog.ui.h:1 -msgid "About Meld" -msgstr "Sobre o Meld" +#: meld/resources/gtk/menus.ui:151 +msgid "Ignore filename case" +msgstr "Ignorar capitalización do nome do ficheiro" -#: ../meld/resources/ui/about-dialog.ui.h:2 +#: meld/resources/gtk/menus.ui:155 +msgid "Normalize Unicode paths" +msgstr "Normalizar rutas Unicode" + +#: meld/resources/gtk/menus.ui:168 +msgid "Normal" +msgstr "Normal" + +#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:71 +msgid "Unversioned" +msgstr "Non versionados" + +#: meld/resources/gtk/menus.ui:176 meld/vc/_vc.py:70 +msgid "Ignored" +msgstr "Ignorado" + +#: meld/resources/gtk/menus.ui:183 +msgid "Flatten folders" +msgstr "Aplanar cartafoles" + +#: meld/resources/ui/about-dialog.ui:8 msgid "" "Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2017 Kai Willadsen" +"Copyright © 2009-2022 Kai Willadsen" msgstr "" -"Dereitos de autor © 2002-2009 Stephen Kennedy\n" -"Dereitos de autor © 2009-2017 Kai Willadsen" - -#: ../meld/resources/ui/about-dialog.ui.h:4 -msgid "Website" -msgstr "Sitio web" +"Copyright © 2002-2009 Stephen Kennedy\n" +"Copyright © 2009-2022 Kai Willadsen" -#: ../meld/resources/ui/about-dialog.ui.h:5 +#: meld/resources/ui/about-dialog.ui:14 msgid "translator-credits" msgstr "" +"Fran Diéguez , 2011-2024\n" "Leandro Regueiro , 2012\n" -"Fran Diéguez , 2011\n" "Proxecto Trasno - Tradución de software libre ao galego , 1999-2012" -#: ../meld/resources/ui/column-list.ui.h:1 -#: ../meld/resources/ui/filter-list.ui.h:1 +#: meld/resources/ui/appwindow.ui:30 +msgid "Start a new comparison" +msgstr "Comezar unha nova comparación" + +#: meld/resources/ui/appwindow.ui:46 +msgid "Open a recent comparison" +msgstr "Abrir unha comparación recente" + +#: meld/resources/ui/appwindow.ui:74 +msgid "Go to the previous change" +msgstr "Ir ao cambio anterior" + +#: meld/resources/ui/appwindow.ui:94 +msgid "Go to the next change" +msgstr "Ir ao seguinte cambio" + +#: meld/resources/ui/appwindow.ui:124 +msgid "Go to the previous conflict" +msgstr "Ir ao conflito anterior" + +#: meld/resources/ui/appwindow.ui:144 +msgid "Go to the next conflict" +msgstr "Ir ao seguinte conflito" + +#: meld/resources/ui/appwindow.ui:193 +msgid "Version Filters" +msgstr "Filtros de versión" + +#: meld/resources/ui/appwindow.ui:208 meld/resources/ui/preferences.ui:1472 +msgid "File Filters" +msgstr "Filtros de ficheiro" + +#: meld/resources/ui/appwindow.ui:223 meld/resources/ui/preferences.ui:1657 +msgid "Text Filters" +msgstr "Filtros de texto" + +#: meld/resources/ui/column-list.ui:37 meld/resources/ui/filter-list.ui:40 msgid "Active" msgstr "Activo" -#: ../meld/resources/ui/column-list.ui.h:2 +#: meld/resources/ui/column-list.ui:50 msgid "Column Name" msgstr "Nome da columna" -#: ../meld/resources/ui/column-list.ui.h:3 -#: ../meld/resources/ui/filter-list.ui.h:7 ../meld/resources/ui/vcview.ui.h:11 -#: ../meld/vcview.py:694 +#: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128 +#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:745 msgid "_Remove" msgstr "_Retirar" -#: ../meld/resources/ui/column-list.ui.h:4 -#: ../meld/resources/ui/filter-list.ui.h:8 +#: meld/resources/ui/column-list.ui:96 meld/resources/ui/filter-list.ui:152 msgid "Move item up" msgstr "Mover o elemento cara arriba" -#: ../meld/resources/ui/column-list.ui.h:5 -#: ../meld/resources/ui/filter-list.ui.h:9 +#: meld/resources/ui/column-list.ui:98 meld/resources/ui/filter-list.ui:154 msgid "Move _Up" msgstr "S_ubir" -#: ../meld/resources/ui/column-list.ui.h:6 -#: ../meld/resources/ui/filter-list.ui.h:10 +#: meld/resources/ui/column-list.ui:112 meld/resources/ui/filter-list.ui:168 msgid "Move item down" msgstr "Mover o elemento cara abaixo" -#: ../meld/resources/ui/column-list.ui.h:7 -#: ../meld/resources/ui/filter-list.ui.h:11 +#: meld/resources/ui/column-list.ui:114 meld/resources/ui/filter-list.ui:170 msgid "Move _Down" msgstr "_Baixar" -#: ../meld/resources/ui/commit-dialog.ui.h:1 +#: meld/resources/ui/commit-dialog.ui:8 msgid "Commit" msgstr "Remitir" -#: ../meld/resources/ui/commit-dialog.ui.h:2 +#: meld/resources/ui/commit-dialog.ui:36 msgid "Commit Files" msgstr "Remitir os ficheiros" -#: ../meld/resources/ui/commit-dialog.ui.h:3 +#: meld/resources/ui/commit-dialog.ui:117 msgid "Log Message" msgstr "Mensaxe de rexistro" -#: ../meld/resources/ui/commit-dialog.ui.h:4 +#: meld/resources/ui/commit-dialog.ui:181 msgid "Previous logs:" msgstr "Rexistros anteriores:" -#: ../meld/resources/ui/commit-dialog.ui.h:5 +#: meld/resources/ui/commit-dialog.ui:259 msgid "Co_mmit" msgstr "Remitir" -#: ../meld/resources/ui/dirdiff.ui.h:1 ../meld/resources/ui/vcview.ui.h:1 -msgid "_Compare" -msgstr "_Comparar" - -#: ../meld/resources/ui/dirdiff.ui.h:2 ../meld/resources/ui/vcview.ui.h:2 -msgid "Compare selected files" -msgstr "Comparar ficheiros seleccionados" - -#: ../meld/resources/ui/dirdiff.ui.h:3 -msgid "Collapse Recursively" -msgstr "Colapsar de forma recursiva" - -#: ../meld/resources/ui/dirdiff.ui.h:4 -#| msgid "Remove folder and all its files?" -msgid "Collapse selected folder and all subfolders" -msgstr "Colapsar os cartafoles seleccionados e todos os subcartafoles" - -#: ../meld/resources/ui/dirdiff.ui.h:5 -msgid "Expand Recursively" -msgstr "Expandir recursivamente" - -#: ../meld/resources/ui/dirdiff.ui.h:6 -#| msgid "Remove folder and all its files?" -msgid "Expand selected folder and all subfolders" -msgstr "Expandir o cartafol selecconado e todos os subcartafoles" - -#: ../meld/resources/ui/dirdiff.ui.h:7 -msgid "Copy to _Left" -msgstr "Copiar á es_querda" - -#: ../meld/resources/ui/dirdiff.ui.h:8 +#: meld/resources/ui/dirdiff-actions.ui:20 msgid "Copy to left" msgstr "Copiar á esquerda" -#: ../meld/resources/ui/dirdiff.ui.h:9 -msgid "Copy to _Right" -msgstr "Copiar á de_reita" - -#: ../meld/resources/ui/dirdiff.ui.h:10 +#: meld/resources/ui/dirdiff-actions.ui:42 msgid "Copy to right" msgstr "Copiar á dereita" -#: ../meld/resources/ui/dirdiff.ui.h:11 +#: meld/resources/ui/dirdiff-actions.ui:66 msgid "Delete selected" msgstr "Eliminar o seleccionado" -#: ../meld/resources/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:959 -#: ../meld/filediff.py:1601 -msgid "Hide" -msgstr "Ocultar" +#: meld/resources/ui/dirdiff-menus.ui:7 +msgid "_Compare selected files" +msgstr "_Comparar ficheiros seleccionados" -#: ../meld/resources/ui/dirdiff.ui.h:13 -msgid "Hide selected" -msgstr "Ocultar o seleccionado" +#: meld/resources/ui/dirdiff-menus.ui:14 +msgid "_Mark selected file" +msgstr "_Marcar o ficheiro seleccionado" -#: ../meld/resources/ui/dirdiff.ui.h:14 -msgid "Ignore Filename Case" -msgstr "Ignorar maiúsculas e minúsculas do nome do ficheiro" +#: meld/resources/ui/dirdiff-menus.ui:18 +msgid "Compare _with marked file" +msgstr "Comparar con ficheiro _marcado" -#: ../meld/resources/ui/dirdiff.ui.h:15 -msgid "" -"Consider differently-cased filenames that are otherwise-identical to be the " -"same" -msgstr "" -"Considerar casos diferentes os nomes de ficheiro que de outro modo serían " -"idénticos" - -#: ../meld/resources/ui/dirdiff.ui.h:16 -msgid "Same" -msgstr "Iguais" - -#: ../meld/resources/ui/dirdiff.ui.h:17 -msgid "Show identical" -msgstr "Mostrar idénticos" +#: meld/resources/ui/dirdiff-menus.ui:25 +msgid "Copy to _left" +msgstr "Copiar á _esquerda" -#: ../meld/resources/ui/dirdiff.ui.h:18 -msgid "New" -msgstr "Novo" - -#: ../meld/resources/ui/dirdiff.ui.h:19 -msgid "Show new" -msgstr "Mostrar novo" +#: meld/resources/ui/dirdiff-menus.ui:29 +msgid "Copy to _right" +msgstr "Copiar á _dereita" -#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:77 -msgid "Modified" -msgstr "Modificado" +#: meld/resources/ui/dirdiff-menus.ui:33 +msgid "_Delete selected" +msgstr "_Eliminar seleccionado" -#: ../meld/resources/ui/dirdiff.ui.h:21 -msgid "Show modified" -msgstr "Mostrar modificados" - -#: ../meld/resources/ui/dirdiff.ui.h:22 -msgid "Filters" -msgstr "Filtros" - -#: ../meld/resources/ui/dirdiff.ui.h:23 -msgid "Set active filters" -msgstr "Estabelecer filtros activos" - -#: ../meld/resources/ui/encoding-selector.ui.h:1 -msgid "Search text encoding…" -msgstr "Buscar a codificación do texto..." - -#: ../meld/resources/ui/filediff.ui.h:1 -msgid "Format as Patch…" -msgstr "Formatar como parche…" - -#: ../meld/resources/ui/filediff.ui.h:2 -msgid "Create a patch using differences between files" -msgstr "Crear un parche usando as diferenzas entre os ficheiros" - -#: ../meld/resources/ui/filediff.ui.h:3 -msgid "Save A_ll" -msgstr "G_ardar todo" - -#: ../meld/resources/ui/filediff.ui.h:4 -msgid "Save all files in the current comparison" -msgstr "Garda todos os ficheiros na comparación actual" - -#: ../meld/resources/ui/filediff.ui.h:5 -msgid "Revert files to their saved versions" -msgstr "Reverte os ficheiros ás súas versións gardadas" - -#: ../meld/resources/ui/filediff.ui.h:6 -msgid "Add Synchronization Point" -msgstr "Engadir punto de sincronización" +#: meld/resources/ui/dirdiff-menus.ui:40 +msgid "Collapse Recursively" +msgstr "Colapsar de forma recursiva" -#: ../meld/resources/ui/filediff.ui.h:7 -msgid "Add a synchronization point for changes between files" -msgstr "Engadir un punto de sincronización para os cambios entre ficheiros" +#: meld/resources/ui/dirdiff-menus.ui:44 +msgid "Expand Recursively" +msgstr "Expandir recursivamente" -#: ../meld/resources/ui/filediff.ui.h:8 -msgid "Clear Synchronization Points" -msgstr "Limpar puntos de sincronización" +#: meld/resources/ui/dirdiff-menus.ui:51 +msgid "_Open Externally" +msgstr "_Abrir externamente" -#: ../meld/resources/ui/filediff.ui.h:9 -msgid "Clear sychronization points for changes between files" -msgstr "Limpar os puntos de sincronización para os cambios entre ficheiros" +#: meld/resources/ui/dirdiff-menus.ui:55 +msgid "_Copy File Paths" +msgstr "_Copiar rutas de ficheiro" -#: ../meld/resources/ui/filediff.ui.h:10 -msgid "Previous Conflict" -msgstr "Conflito anterior" +#: meld/resources/ui/dirdiff.ui:35 meld/resources/ui/dirdiff.ui:76 +#: meld/resources/ui/dirdiff.ui:117 +msgid "Select folder to open in this pane" +msgstr "Seleccionar o cartafol para abrir neste panel" -#: ../meld/resources/ui/filediff.ui.h:11 -msgid "Go to the previous conflict" -msgstr "Ir ao conflito anterior" +#: meld/resources/ui/dirdiff.ui:43 +msgid "Folder 1" +msgstr "Cartafol 1" -#: ../meld/resources/ui/filediff.ui.h:12 -msgid "Next Conflict" -msgstr "Seguinte conflito" +#: meld/resources/ui/dirdiff.ui:84 +msgid "Folder 2" +msgstr "Cartafol 2" -#: ../meld/resources/ui/filediff.ui.h:13 -msgid "Go to the next conflict" -msgstr "Ir ao seguinte conflito" +#: meld/resources/ui/dirdiff.ui:125 +msgid "Folder 3" +msgstr "Cartafol 3" -#: ../meld/resources/ui/filediff.ui.h:14 -msgid "Push to Left" -msgstr "Empurrar á esquerda" +#: meld/resources/ui/encoding-selector.ui:31 +msgid "Search text encoding…" +msgstr "Buscar a codificación do texto..." -#: ../meld/resources/ui/filediff.ui.h:15 +#: meld/resources/ui/filediff-actions.ui:20 msgid "Push current change to the left" msgstr "Empurrar o cambio actual á esquerda" -#: ../meld/resources/ui/filediff.ui.h:16 -msgid "Push to Right" -msgstr "Empurrar á dereita" - -#: ../meld/resources/ui/filediff.ui.h:17 +#: meld/resources/ui/filediff-actions.ui:42 msgid "Push current change to the right" msgstr "Empurrar o cambio actual á dereita" -#: ../meld/resources/ui/filediff.ui.h:18 -msgid "Pull from Left" -msgstr "Traer desde á esquerda" - -#: ../meld/resources/ui/filediff.ui.h:19 -msgid "Pull change from the left" -msgstr "Traer o cambio desde á esquerda" - -#: ../meld/resources/ui/filediff.ui.h:20 -msgid "Pull from Right" -msgstr "Traer desde á dereita" - -#: ../meld/resources/ui/filediff.ui.h:21 -msgid "Pull change from the right" -msgstr "Traer o cambio desde á dereita" +#: meld/resources/ui/filediff-actions.ui:65 +msgid "Copy chunks" +msgstr "Copiar porcións" -#: ../meld/resources/ui/filediff.ui.h:22 -msgid "Copy Above Left" -msgstr "Copiar por enriba da esquerda" +#: meld/resources/ui/filediff-actions.ui:87 +msgid "Delete change" +msgstr "Eliminar o cambio" -#: ../meld/resources/ui/filediff.ui.h:23 +#: meld/resources/ui/filediff-menus.ui:7 msgid "Copy change above the left chunk" msgstr "Copiar o cambio por enriba da parte esquerda" -#: ../meld/resources/ui/filediff.ui.h:24 -msgid "Copy Below Left" -msgstr "Copiar por debaixo da esquerda" - -#: ../meld/resources/ui/filediff.ui.h:25 +#: meld/resources/ui/filediff-menus.ui:11 msgid "Copy change below the left chunk" msgstr "Copiar o cambio por embaixo da parte esquerda" -#: ../meld/resources/ui/filediff.ui.h:26 -msgid "Copy Above Right" -msgstr "Copiar por enriba da dereita" - -#: ../meld/resources/ui/filediff.ui.h:27 +#: meld/resources/ui/filediff-menus.ui:15 msgid "Copy change above the right chunk" msgstr "Copiar o cambio por enriba da parte dereita" -#: ../meld/resources/ui/filediff.ui.h:28 -msgid "Copy Below Right" -msgstr "Copiar por debaixo da dereita" - -#: ../meld/resources/ui/filediff.ui.h:29 +#: meld/resources/ui/filediff-menus.ui:19 msgid "Copy change below the right chunk" msgstr "Copiar o cambio por embaixo da parte dereita" -#: ../meld/resources/ui/filediff.ui.h:30 -msgid "Delete" -msgstr "Eliminar" - -#: ../meld/resources/ui/filediff.ui.h:31 -msgid "Delete change" -msgstr "Eliminar o cambio" - -#: ../meld/resources/ui/filediff.ui.h:32 -msgid "Merge All from Left" -msgstr "Combinar todos os cambios desde a esquerda" - -#: ../meld/resources/ui/filediff.ui.h:33 -msgid "Merge all non-conflicting changes from the left" -msgstr "Combinar todos os cambios non conflitivos desde a esquerda" - -#: ../meld/resources/ui/filediff.ui.h:34 -msgid "Merge All from Right" -msgstr "Combinar todos os cambios desde a dereita" - -#: ../meld/resources/ui/filediff.ui.h:35 -msgid "Merge all non-conflicting changes from the right" -msgstr "Combinar todos os cambios non conflitivos desde a dereita" - -#: ../meld/resources/ui/filediff.ui.h:36 -msgid "Merge All" -msgstr "Combinar todos" +#: meld/resources/ui/filediff-menus.ui:28 +msgid "_Undo" +msgstr "_Desfacer" -#: ../meld/resources/ui/filediff.ui.h:37 -msgid "Merge all non-conflicting changes from left and right panes" -msgstr "" -"Combinar todos os cambios non conflitivos desde os paneis da esquerda e " -"dereita" +#: meld/resources/ui/filediff-menus.ui:32 +msgid "_Redo" +msgstr "_Refacer" -#: ../meld/resources/ui/filediff.ui.h:38 -msgid "Previous Pane" -msgstr "Panel anterior" +#: meld/resources/ui/filediff-menus.ui:39 +msgid "Cu_t" +msgstr "Cor_tar" -#: ../meld/resources/ui/filediff.ui.h:39 -msgid "Move keyboard focus to the previous document in this comparison" -msgstr "Mover o foco do teclado ao documento anterior nesta comparación" +#: meld/resources/ui/filediff-menus.ui:43 +msgid "_Copy" +msgstr "_Copiar" -#: ../meld/resources/ui/filediff.ui.h:40 -msgid "Next Pane" -msgstr "Panel seguinte" +#: meld/resources/ui/filediff-menus.ui:47 +msgid "_Paste" +msgstr "_Pegar" -#: ../meld/resources/ui/filediff.ui.h:41 -msgid "Move keyboard focus to the next document in this comparison" -msgstr "Mover o foco do teclado ao seguinte documento desta comparación" +#: meld/resources/ui/filediff-menus.ui:54 +msgid "Open Containing Folder" +msgstr "Abrir cartafol contedor" -#: ../meld/resources/ui/filediff.ui.h:42 -msgid "Lock Scrolling" -msgstr "Bloquear desprazamento" +#: meld/resources/ui/filediff-menus.ui:58 +msgid "Copy Full Path" +msgstr "Copiar ruta completa" -#: ../meld/resources/ui/filediff.ui.h:43 -msgid "Lock scrolling of all panes" -msgstr "Bloquear o desprazamento de todos os paneis" - -#: ../meld/resources/ui/filediff.ui.h:44 +#: meld/resources/ui/filediff.ui:31 meld/resources/ui/filediff.ui:100 +#: meld/resources/ui/filediff.ui:169 msgid "" "This file can not be written to. You may click here to unlock this file and " "make changes anyway, but these changes must be saved to a new file." @@ -1132,313 +1149,336 @@ msgstr "" "este ficheiro e facer cambios de todas formas, aínda así os cambios debe " "gardalos nun ficheiro novo." -#: ../meld/resources/ui/filediff.ui.h:45 +#: meld/resources/ui/filediff.ui:45 meld/resources/ui/filediff.ui:114 +#: meld/resources/ui/filediff.ui:183 +msgid "Save file in this pane" +msgstr "Gardar o ficheiro neste panel" + +#: meld/resources/ui/filediff.ui:71 meld/resources/ui/filediff.ui:140 +#: meld/resources/ui/filediff.ui:209 +msgid "Open file in this pane" +msgstr "Abrir o ficheiro neste panel" + +#: meld/resources/ui/filediff.ui:79 msgid "File 3" msgstr "Ficheiro 3" -#: ../meld/resources/ui/filediff.ui.h:46 +#: meld/resources/ui/filediff.ui:148 msgid "File 2" msgstr "Ficheiro 2" -#: ../meld/resources/ui/filediff.ui.h:47 +#: meld/resources/ui/filediff.ui:217 meld/resources/ui/vcview.ui:148 msgid "File 1" msgstr "Ficheiro 1" #. Create icon and filename CellRenderer -#: ../meld/resources/ui/filter-list.ui.h:2 ../meld/resources/ui/vcview.ui.h:30 -#: ../meld/dirdiff.py:455 +#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217 +#: meld/dirdiff.py:603 msgid "Name" msgstr "Nome" -#: ../meld/resources/ui/filter-list.ui.h:3 +#: meld/resources/ui/filter-list.ui:68 msgid "Pattern" msgstr "Patrón" -#: ../meld/resources/ui/filter-list.ui.h:4 +#: meld/resources/ui/filter-list.ui:110 msgid "Add new filter" msgstr "Engadir novo filtro" -#: ../meld/resources/ui/filter-list.ui.h:5 ../meld/resources/ui/vcview.ui.h:9 +#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:18 msgid "_Add" msgstr "Eng_adir" -#: ../meld/resources/ui/filter-list.ui.h:6 +#: meld/resources/ui/filter-list.ui:126 msgid "Remove selected filter" msgstr "Retirar o filtro seleccionado" -#: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1041 -#: ../meld/iohelpers.py:113 -msgid "_Replace" -msgstr "Substituí_r" - -#: ../meld/resources/ui/findbar.ui.h:2 -msgid "Replace _All" -msgstr "Substituír _todo" - -#: ../meld/resources/ui/findbar.ui.h:3 -msgid "_Previous" -msgstr "_Anterior" - -#: ../meld/resources/ui/findbar.ui.h:4 -msgid "_Next" -msgstr "Segui_nte" - -#: ../meld/resources/ui/findbar.ui.h:5 -msgid "Find:" -msgstr "Buscar:" - -#: ../meld/resources/ui/findbar.ui.h:6 -msgid "Replace _with:" -msgstr "Substituír _con:" - -#: ../meld/resources/ui/findbar.ui.h:7 +#: meld/resources/ui/findbar.ui:103 msgid "_Match case" msgstr "_Coincidir coa capitalización" -#: ../meld/resources/ui/findbar.ui.h:8 +#: meld/resources/ui/findbar.ui:119 msgid "Who_le word" msgstr "Pa_labra completa" -#: ../meld/resources/ui/findbar.ui.h:9 +#: meld/resources/ui/findbar.ui:135 msgid "Regular e_xpression" msgstr "Expresión regular" -#: ../meld/resources/ui/findbar.ui.h:10 +#: meld/resources/ui/findbar.ui:175 msgid "Wrapped" msgstr "Axustado" -#: ../meld/resources/ui/language-selector.ui.h:1 +#: meld/resources/ui/findbar.ui:193 +msgid "Replace _All" +msgstr "Substituír _todo" + +#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1231 meld/iohelpers.py:117 +msgid "_Replace" +msgstr "Substituí_r" + +#: meld/resources/ui/findbar.ui:226 +msgid "Switch between Find and Find-and-Replace" +msgstr "Trocar entre «Buscar» e «Buscar e substituir»" + +#: meld/resources/ui/language-selector.ui:31 msgid "Search highlight mode…" msgstr "Modo de realce de busca…" -#: ../meld/resources/ui/new-diff-tab.ui.h:1 ../meld/meldwindow.py:532 -#: ../meld/newdifftab.py:53 +#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:342 +#: meld/newdifftab.py:49 msgid "New comparison" msgstr "Nova comparación" -#: ../meld/resources/ui/new-diff-tab.ui.h:2 -msgid "File comparison" -msgstr "Comparación de ficheiros" +#: meld/resources/ui/new-diff-tab.ui:72 +msgid "File" +msgstr "Ficheiro" -#: ../meld/resources/ui/new-diff-tab.ui.h:3 -msgid "Directory comparison" -msgstr "Comparación de directorios" +#: meld/resources/ui/new-diff-tab.ui:121 +msgid "Folder" +msgstr "Cartafol" -#: ../meld/resources/ui/new-diff-tab.ui.h:4 -msgid "Version control view" -msgstr "Mostrar control de versións" +#: meld/resources/ui/new-diff-tab.ui:170 +msgid "Version control" +msgstr "Control de versións" -#: ../meld/resources/ui/new-diff-tab.ui.h:5 +#: meld/resources/ui/new-diff-tab.ui:236 meld/resources/ui/new-diff-tab.ui:357 msgid "_3-way comparison" msgstr "Comparación a _3 bandas" -#: ../meld/resources/ui/new-diff-tab.ui.h:6 -msgid "Select Third File" -msgstr "Seleccionar terceiro ficheiro" +#: meld/resources/ui/new-diff-tab.ui:256 +msgid "Select First File" +msgstr "Seleccionar primeiro ficheiro" -#: ../meld/resources/ui/new-diff-tab.ui.h:7 +#: meld/resources/ui/new-diff-tab.ui:270 msgid "Select Second File" msgstr "Seleccionar segundo ficheiro" -#: ../meld/resources/ui/new-diff-tab.ui.h:8 -msgid "Select First File" -msgstr "Seleccionar primeiro ficheiro" +#: meld/resources/ui/new-diff-tab.ui:285 +msgid "Select Third File" +msgstr "Seleccionar terceiro ficheiro" -#: ../meld/resources/ui/new-diff-tab.ui.h:9 +#: meld/resources/ui/new-diff-tab.ui:321 msgid "Select First Folder" msgstr "Seleccionar primeiro cartafol" -#: ../meld/resources/ui/new-diff-tab.ui.h:10 +#: meld/resources/ui/new-diff-tab.ui:334 msgid "Select Second Folder" msgstr "Seleccionar segundo cartafol" -#: ../meld/resources/ui/new-diff-tab.ui.h:11 +#: meld/resources/ui/new-diff-tab.ui:348 msgid "Select Third Folder" msgstr "Seleccionar terceiro cartafol" -#: ../meld/resources/ui/new-diff-tab.ui.h:12 +#: meld/resources/ui/new-diff-tab.ui:399 msgid "Select A Version-Controlled Folder" msgstr "Seleccionar un cartafol controlado por versións" -#: ../meld/resources/ui/new-diff-tab.ui.h:13 +#: meld/resources/ui/new-diff-tab.ui:448 msgid "_Blank comparison" msgstr "Comparación _baleira" -#: ../meld/resources/ui/new-diff-tab.ui.h:14 +#: meld/resources/ui/new-diff-tab.ui:466 msgid "C_ompare" msgstr "C_omparar" -#: ../meld/resources/ui/notebook-label.ui.h:1 -#| msgid "Close tab" +#: meld/resources/ui/notebook-label.ui:26 msgid "Close Tab" msgstr "Pechar lapela" -#: ../meld/resources/ui/patch-dialog.ui.h:1 +#: meld/resources/ui/patch-dialog.ui:9 msgid "Format as Patch" msgstr "Formatar como parche" -#: ../meld/resources/ui/patch-dialog.ui.h:2 +#: meld/resources/ui/patch-dialog.ui:26 msgid "Copy to Clipboard" msgstr "Copiar ao portapapeis" -#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:165 +#: meld/resources/ui/patch-dialog.ui:57 meld/patchdialog.py:159 msgid "Save Patch" msgstr "Gardar parche" -#: ../meld/resources/ui/patch-dialog.ui.h:4 +#: meld/resources/ui/patch-dialog.ui:88 msgid "Use differences between:" msgstr "Usar as diferencias entre:" -#: ../meld/resources/ui/patch-dialog.ui.h:5 +#: meld/resources/ui/patch-dialog.ui:105 msgid "Left and middle panes" msgstr "Paneis esquerdo e do medio" -#: ../meld/resources/ui/patch-dialog.ui.h:6 +#: meld/resources/ui/patch-dialog.ui:123 msgid "Middle and right panes" msgstr "Paneis dereito e do medio" -#: ../meld/resources/ui/patch-dialog.ui.h:7 +#: meld/resources/ui/patch-dialog.ui:149 msgid "_Reverse patch direction" msgstr "Dirección _inversa do parche" -#: ../meld/resources/ui/preferences.ui.h:1 -#| msgid "_Preferences" +#: meld/resources/ui/path-label.ui:23 +msgid "Path" +msgstr "Ruta" + +#: meld/resources/ui/path-label.ui:62 +msgid "Copy Path" +msgstr "Copiar ruta" + +#: meld/resources/ui/path-label.ui:78 +msgid "Open Folder" +msgstr "Abrir cartafol" + +#: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31 msgid "Preferences" msgstr "Preferencias" -#: ../meld/resources/ui/preferences.ui.h:2 +#: meld/resources/ui/preferences.ui:75 msgid "Font" msgstr "Tipo de letra" -#: ../meld/resources/ui/preferences.ui.h:3 +#: meld/resources/ui/preferences.ui:112 msgid "_Use the system fixed width font" msgstr "Usar o tipo de letra de ancho fixo do sistema" -#: ../meld/resources/ui/preferences.ui.h:4 +#: meld/resources/ui/preferences.ui:136 msgid "_Editor font:" msgstr "Tipo de letra do _editor:" #. TRANSLATORS: This is the status bar label for a group of settings, #. such as text wrapping, show line numbers, whitespace, etc. -#: ../meld/resources/ui/preferences.ui.h:5 ../meld/ui/statusbar.py:282 +#: meld/resources/ui/preferences.ui:198 meld/ui/statusbar.py:291 msgid "Display" msgstr "Pantalla" -#: ../meld/resources/ui/preferences.ui.h:6 +#: meld/resources/ui/preferences.ui:241 msgid "_Tab width:" msgstr "Ancho do _tabulador:" -#: ../meld/resources/ui/preferences.ui.h:7 +#: meld/resources/ui/preferences.ui:274 msgid "_Insert spaces instead of tabs" msgstr "Insertar e_spazos no lugar de tabuladores" -#: ../meld/resources/ui/preferences.ui.h:8 +#: meld/resources/ui/preferences.ui:290 msgid "Enable text _wrapping" msgstr "Activar o a_xuste de texto" -#: ../meld/resources/ui/preferences.ui.h:9 +#: meld/resources/ui/preferences.ui:312 msgid "Do not _split words over two lines" msgstr "Non _dividir as palabras en dúas liñas" -#: ../meld/resources/ui/preferences.ui.h:10 +#: meld/resources/ui/preferences.ui:333 msgid "Highlight _current line" msgstr "Realzar a liña a_ctual" -#: ../meld/resources/ui/preferences.ui.h:11 +#: meld/resources/ui/preferences.ui:349 msgid "Show _line numbers" -msgstr "Mostrar os números de _liña" +msgstr "Mostrar os números de _liña" -#: ../meld/resources/ui/preferences.ui.h:12 +#: meld/resources/ui/preferences.ui:365 msgid "Show w_hitespace" msgstr "Mostrar espazos en _branco" -#: ../meld/resources/ui/preferences.ui.h:13 +#: meld/resources/ui/preferences.ui:381 +msgid "Prefer dark theme" +msgstr "Preferir tema escuro" + +#: meld/resources/ui/preferences.ui:397 msgid "Use s_yntax highlighting" msgstr "Usar realce de _sintaxe" -#: ../meld/resources/ui/preferences.ui.h:14 +#: meld/resources/ui/preferences.ui:420 msgid "Syntax highlighting color scheme:" msgstr "Esquema de cor para o realzado da sintaxe:" -#: ../meld/resources/ui/preferences.ui.h:15 +#: meld/resources/ui/preferences.ui:485 +msgid "Code Overview" +msgstr "Vista xeral do código" + +#: meld/resources/ui/preferences.ui:522 +msgid "Show overview map" +msgstr "Mostrar o mapa de vista xeral" + +#: meld/resources/ui/preferences.ui:545 +msgid "Overview map style:" +msgstr "Estilo do mapa de vista xeral:" + +#: meld/resources/ui/preferences.ui:612 msgid "External Editor" msgstr "Editor externo" -#: ../meld/resources/ui/preferences.ui.h:16 +#: meld/resources/ui/preferences.ui:648 msgid "Use _default system editor" msgstr "Usar o editor pre_definido do sistema" -#: ../meld/resources/ui/preferences.ui.h:17 +#: meld/resources/ui/preferences.ui:671 msgid "Edito_r command:" msgstr "Orde do edito_r:" -#: ../meld/resources/ui/preferences.ui.h:18 +#: meld/resources/ui/preferences.ui:727 msgid "Editor" msgstr "Editor" -#: ../meld/resources/ui/preferences.ui.h:19 +#: meld/resources/ui/preferences.ui:748 msgid "Shallow Comparison" msgstr "Comparación superficial" -#: ../meld/resources/ui/preferences.ui.h:20 +#: meld/resources/ui/preferences.ui:784 msgid "C_ompare files based only on size and timestamp" msgstr "C_omparar ficheiros baseándose só no tamaño e marca de tempo" -#: ../meld/resources/ui/preferences.ui.h:21 +#: meld/resources/ui/preferences.ui:807 msgid "_Timestamp resolution:" msgstr "Resolución da _marca de tempo:" -#: ../meld/resources/ui/preferences.ui.h:23 +#: meld/resources/ui/preferences.ui:871 msgid "Note: enabling text filters may make comparing large files much slower" msgstr "" "Aviso: a activación dos filtros de texto pode facer que a comparación de " "grandes ficheiros sexa moito máis lenta" -#: ../meld/resources/ui/preferences.ui.h:24 +#: meld/resources/ui/preferences.ui:920 msgid "Symbolic Links" msgstr "Ligazóns simbólicas" -#: ../meld/resources/ui/preferences.ui.h:26 +#: meld/resources/ui/preferences.ui:988 msgid "Visible Columns" msgstr "Columnas visíbeis" -#: ../meld/resources/ui/preferences.ui.h:27 +#: meld/resources/ui/preferences.ui:1055 msgid "Folder Comparisons" msgstr "Comparación de cartafoles" -#: ../meld/resources/ui/preferences.ui.h:28 +#: meld/resources/ui/preferences.ui:1077 msgid "Version Comparisons" msgstr "Comparacións de versión" -#: ../meld/resources/ui/preferences.ui.h:29 +#: meld/resources/ui/preferences.ui:1120 msgid "_Order when comparing file revisions:" msgstr "_Orde ao comparar revisións de ficheiros:" -#: ../meld/resources/ui/preferences.ui.h:30 +#: meld/resources/ui/preferences.ui:1167 msgid "Order when _merging files:" msgstr "Orde na co_mbinación de ficheiros:" -#: ../meld/resources/ui/preferences.ui.h:31 +#: meld/resources/ui/preferences.ui:1235 msgid "Commit Messages" msgstr "Mensaxe de remisión" -#: ../meld/resources/ui/preferences.ui.h:32 +#: meld/resources/ui/preferences.ui:1276 msgid "Show _right margin at:" msgstr "Mostrar a marxe de_reita en:" -#: ../meld/resources/ui/preferences.ui.h:33 +#: meld/resources/ui/preferences.ui:1317 msgid "Automatically _break lines at right margin on commit" msgstr "Cor_tar liñas automaticamente na marxe dereita ao remitir" -#: ../meld/resources/ui/preferences.ui.h:34 +#: meld/resources/ui/preferences.ui:1367 msgid "Version Control" msgstr "Control de versións" -#: ../meld/resources/ui/preferences.ui.h:35 +#: meld/resources/ui/preferences.ui:1389 msgid "Filename filters" msgstr "Filtros por nome de ficheiro" -#: ../meld/resources/ui/preferences.ui.h:36 +#: meld/resources/ui/preferences.ui:1427 msgid "" "When performing directory comparisons, you may filter out files and " "directories by name. Each pattern is a list of shell style wildcards " @@ -1448,25 +1488,21 @@ msgstr "" "e cartafoles polo nome. Cada patrón é unha lista de comodíns de shell " "separados por espazos." -#: ../meld/resources/ui/preferences.ui.h:37 ../meld/meldwindow.py:114 -msgid "File Filters" -msgstr "Filtros de ficheiro" - -#: ../meld/resources/ui/preferences.ui.h:38 +#: meld/resources/ui/preferences.ui:1494 msgid "Change trimming" msgstr "Cambiar recortado" -#: ../meld/resources/ui/preferences.ui.h:39 +#: meld/resources/ui/preferences.ui:1530 msgid "Trim blank line differences from the start and end of changes" msgstr "" "Recortar as diferenzas das liñas en branco desde o inicio e remate dos " "cambios" -#: ../meld/resources/ui/preferences.ui.h:40 +#: meld/resources/ui/preferences.ui:1574 msgid "Text filters" msgstr "Filtros de texto" -#: ../meld/resources/ui/preferences.ui.h:41 +#: meld/resources/ui/preferences.ui:1612 msgid "" "When performing file comparisons, you may ignore certain types of changes. " "Each pattern here is a python regular expression which replaces matching " @@ -1480,266 +1516,249 @@ msgstr "" "Se a expresión contén grupos, só o grupos son substituídos. Ver o manual de " "usuario para máis detalles." -#: ../meld/resources/ui/preferences.ui.h:42 -msgid "Text Filters" -msgstr "Filtros de texto" - -#: ../meld/resources/ui/preferences.ui.h:43 +#: meld/resources/ui/preferences.ui:1703 msgid "Left is remote, right is local" msgstr "Á esquerda está o remoto, á dereita o local" -#: ../meld/resources/ui/preferences.ui.h:44 +#: meld/resources/ui/preferences.ui:1707 msgid "Left is local, right is remote" msgstr "Á esquerda está o local, á dereita o remoto" -#: ../meld/resources/ui/preferences.ui.h:45 +#: meld/resources/ui/preferences.ui:1721 +msgid "Simple change map" +msgstr "Mapa de cambios sinxelo" + +#: meld/resources/ui/preferences.ui:1725 +msgid "Compact source map" +msgstr "Mapa de código compacto" + +#: meld/resources/ui/preferences.ui:1729 +msgid "Full source map" +msgstr "Mapa de código completo" + +#: meld/resources/ui/preferences.ui:1743 msgid "Remote, merge, local" msgstr "Remoto, combinar, local" -#: ../meld/resources/ui/preferences.ui.h:46 +#: meld/resources/ui/preferences.ui:1747 msgid "Local, merge, remote" msgstr "Local, combinar, remoto" -#: ../meld/resources/ui/preferences.ui.h:47 +#: meld/resources/ui/preferences.ui:1769 msgid "1ns (ext4)" msgstr "1ns (ext4)" -#: ../meld/resources/ui/preferences.ui.h:48 +#: meld/resources/ui/preferences.ui:1773 msgid "100ns (NTFS)" msgstr "100ns (NTFS)" -#: ../meld/resources/ui/preferences.ui.h:49 +#: meld/resources/ui/preferences.ui:1777 msgid "1s (ext2/ext3)" msgstr "1s (ext2/ext3)" -#: ../meld/resources/ui/preferences.ui.h:50 +#: meld/resources/ui/preferences.ui:1781 msgid "2s (VFAT)" msgstr "2s (VFAT)" -#: ../meld/resources/ui/push-dialog.ui.h:1 +#: meld/resources/ui/push-dialog.ui:9 msgid "Push local commits to remote?" msgstr "Remitir cambios locais ao remoto?" -#: ../meld/resources/ui/push-dialog.ui.h:2 +#: meld/resources/ui/push-dialog.ui:10 msgid "The commits to be pushed are determined by your version control system." msgstr "" "As remisións a enviar determínaas o seu sistema de control de versións." -#: ../meld/resources/ui/push-dialog.ui.h:3 +#: meld/resources/ui/push-dialog.ui:38 msgid "_Push commits" msgstr "_Enviar remisións" -#: ../meld/resources/ui/revert-dialog.ui.h:1 +#: meld/resources/ui/recent-selector.ui:16 +msgid "Search recent comparisons…" +msgstr "Buscar comparacións recentes…" + +#: meld/resources/ui/revert-dialog.ui:9 msgid "Discard unsaved changes to documents?" msgstr "Desexa desbotar os cambios non gardados nos documentos?" -#: ../meld/resources/ui/revert-dialog.ui.h:2 +#: meld/resources/ui/revert-dialog.ui:10 msgid "Changes made to the following documents will be permanently lost:" msgstr "" "Os cambios realizados nos seguintes documentos perderanse permanentemente:" -#: ../meld/resources/ui/revert-dialog.ui.h:3 +#: meld/resources/ui/revert-dialog.ui:39 msgid "_Discard" msgstr "_Desbotar" -#: ../meld/resources/ui/save-confirm-dialog.ui.h:1 +#: meld/resources/ui/save-confirm-dialog.ui:9 msgid "Save changes to documents before closing?" msgstr "Desexa gardar cambios nos documentos antes de gardar?" -#: ../meld/resources/ui/save-confirm-dialog.ui.h:2 +#: meld/resources/ui/save-confirm-dialog.ui:10 msgid "If you don’t save, changes will be permanently lost." msgstr "Se non garda o ficheiro, os seus cambios perderanse permanentemente." -#: ../meld/resources/ui/save-confirm-dialog.ui.h:3 +#: meld/resources/ui/save-confirm-dialog.ui:24 msgid "Close _without Saving" msgstr "Pechar _sen gardar" -#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1040 -#: ../meld/iohelpers.py:58 ../meld/iohelpers.py:112 +#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1229 +#: meld/iohelpers.py:56 meld/iohelpers.py:116 msgid "_Cancel" msgstr "_Cancelar" -#: ../meld/resources/ui/save-confirm-dialog.ui.h:5 +#: meld/resources/ui/save-confirm-dialog.ui:55 msgid "_Save" msgstr "_Gardar" -#: ../meld/resources/ui/statusbar-menu.ui.h:2 -#| msgid "Show w_hitespace" +#: meld/resources/ui/statusbar-menu.ui:9 msgid "Show whitespace" msgstr "Mostrar espazos en branco" -#: ../meld/resources/ui/statusbar-menu.ui.h:4 -#| msgid "Enable text _wrapping" +#: meld/resources/ui/statusbar-menu.ui:17 msgid "Text wrapping" msgstr "Axuste de texto" -#: ../meld/resources/ui/vcview.ui.h:3 +#: meld/resources/ui/vcview-menus.ui:7 +msgid "_Compare" +msgstr "_Comparar" + +#: meld/resources/ui/vcview-menus.ui:11 msgid "Co_mmit…" msgstr "Re_mitir…" -#: ../meld/resources/ui/vcview.ui.h:4 -msgid "Commit changes to version control" -msgstr "Remitir cambios ao control de versións" - -#: ../meld/resources/ui/vcview.ui.h:5 -msgid "_Update" -msgstr "Act_ualizar" - -#: ../meld/resources/ui/vcview.ui.h:6 -msgid "Update working copy from version control" -msgstr "Actualizar a copia local desde o sistema de control de versións" - -#: ../meld/resources/ui/vcview.ui.h:7 -msgid "_Push" -msgstr "_Enviar" - -#: ../meld/resources/ui/vcview.ui.h:8 -msgid "Push local changes to remote" -msgstr "Enviar cambios locais ao remoto" - -#: ../meld/resources/ui/vcview.ui.h:10 -msgid "Add to version control" -msgstr "Engadir ao control de versións" - -#: ../meld/resources/ui/vcview.ui.h:12 -msgid "Remove from version control" -msgstr "Eliminar do control de versións" - -#: ../meld/resources/ui/vcview.ui.h:13 -msgid "Mar_k as Resolved" -msgstr "Marc_ar como solucionado" - -#: ../meld/resources/ui/vcview.ui.h:14 -msgid "Mark as resolved in version control" -msgstr "Marcar como solucionado no control de versións" - -#: ../meld/resources/ui/vcview.ui.h:15 +#: meld/resources/ui/vcview-menus.ui:26 msgid "Re_vert" msgstr "Re_verter" -#: ../meld/resources/ui/vcview.ui.h:16 -msgid "Revert working copy to original state" -msgstr "Reverter a copia local ao seu estado orixinal" - -#: ../meld/resources/ui/vcview.ui.h:17 -msgid "Delete from working copy" -msgstr "Eliminar desde a copia local" - -#: ../meld/resources/ui/vcview.ui.h:18 -msgid "Console" -msgstr "Consola" - -#: ../meld/resources/ui/vcview.ui.h:19 -msgid "Show or hide the version control console output pane" -msgstr "Mostrar ou ocultar o panel de saída da consola do control de versións" +#: meld/resources/ui/vcview-menus.ui:30 +msgid "Delete" +msgstr "Eliminar" -#: ../meld/resources/ui/vcview.ui.h:20 -msgid "_Flatten" -msgstr "Apl_anar" +#: meld/resources/ui/vcview-menus.ui:37 +msgid "Resolve Conflict" +msgstr "Resolver conflito" -#: ../meld/resources/ui/vcview.ui.h:21 -msgid "Flatten directories" -msgstr "Rasar cartafoles" +#: meld/resources/ui/vcview.ui:16 +msgid "Commit changes to version control" +msgstr "Remitir cambios ao control de versións" -#: ../meld/resources/ui/vcview.ui.h:22 -msgid "_Modified" -msgstr "_Modificado" +#: meld/resources/ui/vcview.ui:21 +msgid "Commit…" +msgstr "Remitir…" -#: ../meld/resources/ui/vcview.ui.h:23 -msgid "Show modified files" -msgstr "Mostrar ficheiros modificados" +#: meld/resources/ui/vcview.ui:38 +msgid "Pull remote changes to the local repository" +msgstr "Traer os cambios remotos ao repositorio local" -#: ../meld/resources/ui/vcview.ui.h:24 -msgid "_Normal" -msgstr "_Normal" +#: meld/resources/ui/vcview.ui:51 +msgid "Push local changes to remote" +msgstr "Enviar cambios locais ao remoto" -#: ../meld/resources/ui/vcview.ui.h:25 -msgid "Show normal files" -msgstr "Mostrar ficheiros normais" +#: meld/resources/ui/vcview.ui:74 +msgid "Add to version control" +msgstr "Engadir ao control de versións" -#: ../meld/resources/ui/vcview.ui.h:26 -msgid "Un_versioned" -msgstr "Sen _versión" +#: meld/resources/ui/vcview.ui:87 +msgid "Remove from version control" +msgstr "Eliminar do control de versións" -#: ../meld/resources/ui/vcview.ui.h:27 -msgid "Show unversioned files" -msgstr "Mostrar ficheiros sen versión" +#: meld/resources/ui/vcview.ui:100 +msgid "Revert working copy to original state" +msgstr "Reverter a copia local ao seu estado orixinal" -#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:70 -msgid "Ignored" -msgstr "Ignorado" +#: meld/resources/ui/vcview.ui:113 +msgid "Mark as resolved in version control" +msgstr "Marcar como solucionado no control de versións" -#: ../meld/resources/ui/vcview.ui.h:29 -msgid "Show ignored files" -msgstr "Mostrar ficheiros ignorados" +#: meld/resources/ui/vcview.ui:140 +msgid "Open version controlled folder in this pane" +msgstr "Abrir cartafol controlado en versións neste panel" -#: ../meld/resources/ui/vcview.ui.h:31 ../meld/vcview.py:366 +#: meld/resources/ui/vcview.ui:229 msgid "Location" msgstr "Localización" -#: ../meld/resources/ui/vcview.ui.h:32 +#: meld/resources/ui/vcview.ui:238 msgid "Status" msgstr "Estado" -#: ../meld/resources/ui/vcview.ui.h:33 +#: meld/resources/ui/vcview.ui:247 msgid "Extra" msgstr "Adicional" -#: ../meld/resources/ui/vcview.ui.h:34 +#: meld/resources/ui/vcview.ui:279 msgid "Console output" msgstr "Saída da consola" -#: ../meld/const.py:12 +#: meld/actiongutter.py:255 +msgid "Copy _up" +msgstr "Copiar _arriba" + +#: meld/actiongutter.py:256 +msgid "Copy _down" +msgstr "Copiar _abaixo" + +#: meld/const.py:30 msgid "UNIX (LF)" msgstr "UNIX (LF)" -#: ../meld/const.py:13 +#: meld/const.py:31 msgid "DOS/Windows (CR-LF)" msgstr "DOS/Windows (CR-LF)" -#: ../meld/const.py:14 +#: meld/const.py:32 msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: ../meld/dirdiff.py:476 ../meld/preferences.py:138 +#: meld/dirdiff.py:624 meld/preferences.py:132 msgid "Size" msgstr "Tamaño" #. Create date-time CellRenderer -#: ../meld/dirdiff.py:484 ../meld/preferences.py:139 +#: meld/dirdiff.py:632 meld/preferences.py:133 msgid "Modification time" msgstr "Hora de modificación" +#. Create ISO-format date-time CellRenderer +#: meld/dirdiff.py:640 meld/preferences.py:134 +msgid "Modification time (ISO)" +msgstr "Hora de modificación (ISO)" + #. Create permissions CellRenderer -#: ../meld/dirdiff.py:492 ../meld/preferences.py:140 +#: meld/dirdiff.py:648 meld/preferences.py:135 msgid "Permissions" msgstr "Permisos" -#: ../meld/dirdiff.py:626 -#, python-format -msgid "Hide %s" -msgstr "Ocultar %s" +#: meld/dirdiff.py:901 +#, python-brace-format +msgid "{filename} (scanning…)" +msgstr "{filename} (analizando…)" -#: ../meld/dirdiff.py:768 ../meld/dirdiff.py:791 -#, python-format -msgid "[%s] Scanning %s" -msgstr "[%s] Analizando %s" +#: meld/dirdiff.py:933 meld/dirdiff.py:965 +#, python-brace-format +msgid "[{label}] Scanning {folder}" +msgstr "[{label}] Analizando {folder}" -#: ../meld/dirdiff.py:926 -#, python-format -msgid "[%s] Done" -msgstr "[%s] Feito" +#: meld/dirdiff.py:1101 +#, python-brace-format +msgid "[{label}] Done" +msgstr "[{label}] Feito" -#: ../meld/dirdiff.py:934 +#: meld/dirdiff.py:1114 +msgid "Folder {} is being compared to itself" +msgstr "O cartafol {} está comparándose consigo mesmo" + +#: meld/dirdiff.py:1120 msgid "Folders have no differences" msgstr "Os cartafoles non teñen diferenzas" -#: ../meld/dirdiff.py:936 +#: meld/dirdiff.py:1122 msgid "Contents of scanned files in folders are identical." msgstr "Os contidos dos ficheiros analizados nos cartafoles son idénticos." -#: ../meld/dirdiff.py:938 +#: meld/dirdiff.py:1124 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1747,43 +1766,47 @@ msgstr "" "Os ficheiros analizados nos cartafoles parecen idénticos pero os contidos " "non se comprobaron." -#: ../meld/dirdiff.py:941 +#: meld/dirdiff.py:1127 msgid "File filters are in use, so not all files have been scanned." msgstr "" "Os filtros de ficheiro están en uso, así que non se analizaron todos os " "ficheiros." -#: ../meld/dirdiff.py:943 +#: meld/dirdiff.py:1129 msgid "Text filters are in use and may be masking content differences." msgstr "" "Estanse usando filtros de texto e poden estar enmascarando diferenzas nos " "contidos." -#: ../meld/dirdiff.py:961 ../meld/filediff.py:1603 ../meld/filediff.py:1633 -#: ../meld/filediff.py:1635 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119 +#: meld/dirdiff.py:1145 meld/filediff.py:2000 +msgid "Hide" +msgstr "Ocultar" + +#: meld/dirdiff.py:1147 meld/filediff.py:2002 meld/filediff.py:2032 +#: meld/filediff.py:2034 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 msgid "Hi_de" msgstr "Ocu_ltar" -#: ../meld/dirdiff.py:970 +#: meld/dirdiff.py:1156 msgid "Multiple errors occurred while scanning this folder" msgstr "Producíronse varios erros ao analizar este cartafol" -#: ../meld/dirdiff.py:971 +#: meld/dirdiff.py:1157 msgid "Files with invalid encodings found" msgstr "Atopáronse ficheiros con modificacións non válidas" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:973 +#: meld/dirdiff.py:1159 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "" "Algúns ficheiros teñen unha codificación incorrecta. Os nomes son como isto:" -#: ../meld/dirdiff.py:975 +#: meld/dirdiff.py:1161 msgid "Files hidden by case insensitive comparison" msgstr "Ficheiros agochados por unha comparación non sensíbel a capitalización" #. TRANSLATORS: This is followed by a list of files -#: ../meld/dirdiff.py:977 +#: meld/dirdiff.py:1163 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1792,17 +1815,17 @@ msgstr "" "sistema de ficheiros que diferencia maiúsculas de minúsculas. Algúns " "ficheiros non están visíbeis:" -#: ../meld/dirdiff.py:988 -#, python-format -msgid "“%s” hidden by “%s”" -msgstr "«%s» oculto por «%s»" +#: meld/dirdiff.py:1174 +#, python-brace-format +msgid "“{first_file}” hidden by “{second_file}”" +msgstr "“{first_file}” agochado por “{second_file}”" -#: ../meld/dirdiff.py:1044 +#: meld/dirdiff.py:1236 #, python-format msgid "Replace folder “%s”?" msgstr "Desexa substituír o cartafol «%s»?" -#: ../meld/dirdiff.py:1046 +#: meld/dirdiff.py:1238 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1811,37 +1834,40 @@ msgstr "" "Xa existe outro cartafol co mesmo nome en «%s».\n" "Se substitúe o cartafol existente, perderanse todos os ficheiros nel." -#: ../meld/dirdiff.py:1059 +#: meld/dirdiff.py:1251 msgid "Error copying file" msgstr "Produciuse un erro ao copiar o ficheiro" -#: ../meld/dirdiff.py:1060 -#, python-format +#: meld/dirdiff.py:1252 +#, python-brace-format msgid "" -"Couldn’t copy %s\n" -"to %s.\n" +"Couldn’t copy {source}\n" +"to {dest}.\n" "\n" -"%s" +"{error}" msgstr "" -"Non foi posíbel copiar %s\n" -"en %s.\n" +"Non foi posíbel copiar {source}\n" +"en {dest}.\n" "\n" -"%s" +"{error}" -#: ../meld/dirdiff.py:1085 ../meld/vcview.py:720 -#| msgid "Error deleting %s" +#: meld/dirdiff.py:1277 meld/vcview.py:768 msgid "Error deleting {}" msgstr "Produciuse un erro ao eliminar {}" -#: ../meld/dirdiff.py:1597 +#: meld/dirdiff.py:1825 msgid "No folder" msgstr "Non hai cartafol" -#: ../meld/filediff.py:920 +#: meld/dirdiff.py:1838 +msgid "Folder comparison:" +msgstr "Comparación de cartafoles:" + +#: meld/filediff.py:1171 msgid "Comparison results will be inaccurate" msgstr "Os resultados da comparación serán inexactos" -#: ../meld/filediff.py:922 +#: meld/filediff.py:1173 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1849,64 +1875,97 @@ msgstr "" "Un filtro cambiou o número de liñas do ficheiro, o cal non se acepta. A " "comparación non será exacta." -#: ../meld/filediff.py:994 +#: meld/filediff.py:1245 msgid "Mark conflict as resolved?" msgstr "Marcar como solucionado?" -#: ../meld/filediff.py:996 +#: meld/filediff.py:1247 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "Se se solucionou o conflito, pode marcalo como resolto agora." -#: ../meld/filediff.py:998 +#: meld/filediff.py:1250 msgid "Cancel" msgstr "Cancelar" -#: ../meld/filediff.py:999 +#: meld/filediff.py:1251 msgid "Mark _Resolved" msgstr "Marca_r como solucionado" -#: ../meld/filediff.py:1318 +#: meld/filediff.py:1442 meld/filediff.py:1458 +msgid "Add Synchronization Point" +msgstr "Engadir punto de sincronización" + +#: meld/filediff.py:1446 +msgid "Remove Synchronization Point" +msgstr "Eliminar punto de sincronización" + +#: meld/filediff.py:1450 +msgid "Move Synchronization Point" +msgstr "Mover punto de sincronización" + +#: meld/filediff.py:1454 +msgid "Match Synchronization Point" +msgstr "Coincidir co punto de sincronización" + +#: meld/filediff.py:1478 +msgid "Clear Synchronization Points" +msgstr "Limpar puntos de sincronización" + +#: meld/filediff.py:1538 +msgid "File comparison:" +msgstr "Comparación de ficheiros:" + +#: meld/filediff.py:1674 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Produciuse un erro ao abrir o ficheiro «%s»." -#: ../meld/filediff.py:1326 +#: meld/filediff.py:1683 #, python-format msgid "File %s appears to be a binary file." msgstr "O ficheiro %s semella ser un ficheiro binario." -#: ../meld/filediff.py:1328 +#: meld/filediff.py:1685 msgid "Do you want to open the file using the default application?" msgstr "Desexa abrir o ficheiro co aplicativo predeterminado?" -#: ../meld/filediff.py:1330 +#: meld/filediff.py:1687 msgid "Open" msgstr "Abrir" -#: ../meld/filediff.py:1346 +#: meld/filediff.py:1709 +#, python-format +msgid "[%s] Merging files" +msgstr "[%s] Combinando os ficheiros" + +#: meld/filediff.py:1723 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Calculando as diferenzas" -#: ../meld/filediff.py:1407 +#: meld/filediff.py:1783 #, python-format msgid "File %s has changed on disk" msgstr "O ficheiro %s cambiou no disco" -#: ../meld/filediff.py:1408 +#: meld/filediff.py:1784 msgid "Do you want to reload the file?" msgstr "Desexa recargar o ficheiro?" -#: ../meld/filediff.py:1410 +#: meld/filediff.py:1786 msgid "_Reload" msgstr "_Recargar" -#: ../meld/filediff.py:1566 +#: meld/filediff.py:1956 +msgid "File {} is being compared to itself" +msgstr "O ficheiro {} está comparándose consigo mesmo" + +#: meld/filediff.py:1965 msgid "Files are identical" msgstr "Os ficheiros son idénticos" -#: ../meld/filediff.py:1579 +#: meld/filediff.py:1978 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1914,11 +1973,11 @@ msgstr "" "Se están usando filtros de texto, e poden estar agochando diferenzas entre " "ficheiros. Quere comparar os ficheiros non filtrados?" -#: ../meld/filediff.py:1584 +#: meld/filediff.py:1983 msgid "Files differ in line endings only" msgstr "Os ficheiros só difiren nos finais de liña" -#: ../meld/filediff.py:1586 +#: meld/filediff.py:1985 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1927,15 +1986,15 @@ msgstr "" "Os ficheiros son idénticos excepto nos finais de liña:\n" "%s" -#: ../meld/filediff.py:1606 +#: meld/filediff.py:2005 msgid "Show without filters" msgstr "Mostrar sen filtros" -#: ../meld/filediff.py:1628 +#: meld/filediff.py:2027 msgid "Change highlighting incomplete" msgstr "Cambiar realzado incompleto" -#: ../meld/filediff.py:1629 +#: meld/filediff.py:2028 msgid "" "Some changes were not highlighted because they were too large. You can force " "Meld to take longer to highlight larger changes, though this may be slow." @@ -1944,19 +2003,19 @@ msgstr "" "Meld que vote máis tempo realzando cambios máis largos, porén isto pode ser " "lento." -#: ../meld/filediff.py:1637 +#: meld/filediff.py:2036 msgid "Keep highlighting" msgstr "Manter realzado" -#: ../meld/filediff.py:1639 +#: meld/filediff.py:2038 msgid "_Keep highlighting" msgstr "_Manter realzado" -#: ../meld/filediff.py:1652 +#: meld/filediff.py:2051 msgid "Saving failed" msgstr "Fallou o gardado" -#: ../meld/filediff.py:1653 +#: meld/filediff.py:2052 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." @@ -1964,39 +2023,36 @@ msgstr "" "Considere copiar calquera cambios críticos noutros programas ou ficheiros " "para evitar a perda de datos." -#: ../meld/filediff.py:1662 +#: meld/filediff.py:2061 msgid "Save Left Pane As" msgstr "Gardar panel da esquerda como" -#: ../meld/filediff.py:1664 +#: meld/filediff.py:2063 msgid "Save Middle Pane As" msgstr "Gardar panel intermedio como" -#: ../meld/filediff.py:1666 +#: meld/filediff.py:2065 msgid "Save Right Pane As" msgstr "Gardar panel da dereita como" -#: ../meld/filediff.py:1679 +#: meld/filediff.py:2076 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "O ficheiro «%s» cambiou no disco desde que se abriu" -#: ../meld/filediff.py:1681 +#: meld/filediff.py:2078 msgid "If you save it, any external changes will be lost." msgstr "Se o garda, perderase calquera cambio externo." -#: ../meld/filediff.py:1684 +#: meld/filediff.py:2081 msgid "Save Anyway" msgstr "Gardar de todos os xeitos" -#: ../meld/filediff.py:1685 +#: meld/filediff.py:2082 msgid "Don’t Save" msgstr "Non gardar" -#: ../meld/filediff.py:1727 -#| msgid "" -#| "File “%s” contains characters that can’t be encoded using encoding “%s”.\n" -#| "Would you like to save as UTF-8?" +#: meld/filediff.py:2124 msgid "" "File “{}” contains characters that can’t be encoded using its current " "encoding “{}”." @@ -2004,7 +2060,7 @@ msgstr "" "O ficheiro «{}» contén caracteres non codificábeis usando a codificación " "«{}» actual." -#: ../meld/filediff.py:1731 ../meld/patchdialog.py:144 +#: meld/filediff.py:2128 meld/patchdialog.py:138 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -2013,16 +2069,16 @@ msgstr "" "Non foi posíbel gardar debido a:\n" "%s" -#: ../meld/filediff.py:1735 ../meld/patchdialog.py:143 +#: meld/filediff.py:2132 meld/patchdialog.py:137 #, python-format msgid "Could not save file %s." msgstr "Non foi posíbel gardar o ficheiro %s." -#: ../meld/filediff.py:2128 +#: meld/filediff.py:2542 msgid "Live comparison updating disabled" msgstr "Actualización de comparación en vivo desactivada" -#: ../meld/filediff.py:2129 +#: meld/filediff.py:2543 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2033,50 +2089,50 @@ msgstr "" "as actualizacións en vivo volverán a activarse cando se limpen os puntos de " "sincronización." -#: ../meld/filemerge.py:37 -#, python-format -msgid "[%s] Merging files" -msgstr "[%s] Combinando os ficheiros" +#: meld/filediff.py:2571 +msgid "Can't swap unsaved files" +msgstr "Non é posíbel intercambiar os ficheiros non gardados" -#: ../meld/gutterrendererchunk.py:220 -msgid "Copy _up" -msgstr "Copiar _arriba" +#: meld/filediff.py:2573 +msgid "Files must be saved to disk before swapping panes." +msgstr "Os ficheiros deben gardarse a disco antes de intercambiar os paneis." -#: ../meld/gutterrendererchunk.py:221 -msgid "Copy _down" -msgstr "Copiar _abaixo" +#: meld/filediff.py:2580 +msgid "Can't swap version control comparisons" +msgstr "Non é posíbel intercambiar as comparacións do control de versións" + +#: meld/filediff.py:2582 +msgid "Swapping panes is not supported in version control mode." +msgstr "Non se admite o intercambio de paneis no modo de control de versións." -#: ../meld/iohelpers.py:43 -#| msgid "remote folder “{}” not supported" +#: meld/iohelpers.py:41 msgid "Deleting remote folders is not supported" msgstr "Non se admite eliminar os cartafoles remotos" -#: ../meld/iohelpers.py:45 -#| msgid "Two way directory" +#: meld/iohelpers.py:43 msgid "Not a file or directory" msgstr "Non é un ficheiro ou cartafol" -#: ../meld/iohelpers.py:49 +#: meld/iohelpers.py:47 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?" msgstr "" "«{}» non pode poñerse no lixo. Ten certeza que quere eliminalo " "inmediatamente?" -#: ../meld/iohelpers.py:54 +#: meld/iohelpers.py:52 msgid "This remote location does not support sending items to the trash." msgstr "Esta localización remota non admite enviar elementos ao lixo." -#: ../meld/iohelpers.py:59 -#| msgid "Delete change" +#: meld/iohelpers.py:58 msgid "_Delete Permanently" msgstr "Eliminar de forma _permanente" -#: ../meld/iohelpers.py:106 +#: meld/iohelpers.py:110 #, python-format msgid "Replace file “%s”?" msgstr "Desexa substituír o ficheiro «%s»?" -#: ../meld/iohelpers.py:108 +#: meld/iohelpers.py:112 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -2085,281 +2141,127 @@ msgstr "" "Xa existe un ficheiro con este nome en «%s».\n" "Se substitúe o ficheiro existente, perderanse os seus contidos." -#: ../meld/meldapp.py:169 +#: meld/meldapp.py:188 msgid "wrong number of arguments supplied to --diff" msgstr "número incorrecto de argumentos proporcionado a --diff" -#: ../meld/meldapp.py:174 +#: meld/meldapp.py:193 msgid "Start with an empty window" msgstr "Comezar cunha xanela baleira" -#: ../meld/meldapp.py:175 ../meld/meldapp.py:177 +#: meld/meldapp.py:194 meld/meldapp.py:196 msgid "file" msgstr "ficheiro" -#: ../meld/meldapp.py:175 ../meld/meldapp.py:179 +#: meld/meldapp.py:194 meld/meldapp.py:198 msgid "folder" msgstr "cartafol" -#: ../meld/meldapp.py:176 +#: meld/meldapp.py:195 msgid "Start a version control comparison" msgstr "Comezar unha comparación no control de versións" -#: ../meld/meldapp.py:178 +#: meld/meldapp.py:197 msgid "Start a 2- or 3-way file comparison" msgstr "Comezar unha comparación de ficheiros a 2 ou 3 bandas" -#: ../meld/meldapp.py:180 +#: meld/meldapp.py:199 msgid "Start a 2- or 3-way folder comparison" msgstr "Iniciar comparación de ficheiros a 2/3 bandas" -#: ../meld/meldapp.py:223 +#: meld/meldapp.py:242 #, python-format msgid "Error: %s\n" msgstr "Erro: %s\n" -#: ../meld/meldapp.py:230 +#: meld/meldapp.py:249 msgid "Meld is a file and directory comparison tool." msgstr "Meld é un ferramenta de comparación de ficheiros e cartafoles." -#: ../meld/meldapp.py:234 +#: meld/meldapp.py:253 msgid "Set label to use instead of file name" msgstr "Estabelecer a etiqueta a usar en vez do nome do ficheiro" -#: ../meld/meldapp.py:237 +#: meld/meldapp.py:256 msgid "Open a new tab in an already running instance" msgstr "Abre unha nova lapela nunha instancia en execución" -#: ../meld/meldapp.py:240 +#: meld/meldapp.py:259 msgid "Automatically compare all differing files on startup" msgstr "Comparar automaticamente ao inicio todos os ficheiros distintos" -#: ../meld/meldapp.py:243 +#: meld/meldapp.py:262 msgid "Ignored for compatibility" msgstr "Ignorado para compatibilidade" -#: ../meld/meldapp.py:247 +#: meld/meldapp.py:266 msgid "Set the target file for saving a merge result" msgstr "Definir o ficheiro de destino para gardar o resultado da combinación" -#: ../meld/meldapp.py:250 +#: meld/meldapp.py:269 msgid "Automatically merge files" msgstr "Combinar ficheiros automaticamente" -#: ../meld/meldapp.py:254 +#: meld/meldapp.py:273 msgid "Load a saved comparison from a Meld comparison file" msgstr "" "Cargar unha comparación gardada desde un ficheiro de comparación de Meld" -#: ../meld/meldapp.py:258 +#: meld/meldapp.py:277 msgid "Create a diff tab for the supplied files or folders" msgstr "" "Crear unha lapela coas diferenzas para os directorios ou ficheiros fornecidos" -#: ../meld/meldapp.py:278 +#: meld/meldapp.py:297 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "demasiados argumentos (buscábanse 0-3, obtivéronse %d)" -#: ../meld/meldapp.py:281 +#: meld/meldapp.py:300 msgid "can’t auto-merge less than 3 files" msgstr "non é posíbel combinar automaticamente menos de 3 ficheiros" -#: ../meld/meldapp.py:283 +#: meld/meldapp.py:302 msgid "can’t auto-merge directories" msgstr "non é posíbel combinar automaticamente cartafoles" -#: ../meld/meldapp.py:297 +#: meld/meldapp.py:317 msgid "Error reading saved comparison file" msgstr "Produciuse un erro ao ler o ficheiro de comparación gardado" -#: ../meld/meldapp.py:314 +#: meld/meldapp.py:334 #, python-format msgid "invalid path or URI “%s”" -msgstr "O URI ou a ruta son incorrectos «%s»" +msgstr "URI ou a ruta son incorrectos «%s»" -#: ../meld/meldapp.py:320 +#: meld/meldapp.py:341 msgid "remote folder “{}” not supported" msgstr "cartafol remoto «{}» non compatíbel" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: ../meld/meldbuffer.py:123 +#: meld/meldbuffer.py:115 msgid "" msgstr "" -#: ../meld/melddoc.py:63 +#: meld/melddoc.py:124 msgid "untitled" msgstr "sen título" -#: ../meld/meldwindow.py:56 -msgid "_File" -msgstr "_Ficheiro" - -#: ../meld/meldwindow.py:57 -msgid "_New Comparison…" -msgstr "_Nova comparación…" - -#: ../meld/meldwindow.py:58 -msgid "Start a new comparison" -msgstr "Comezar unha nova comparación" - -#: ../meld/meldwindow.py:61 -msgid "Save the current file" -msgstr "Gardar o ficheiro actual" - -#: ../meld/meldwindow.py:63 -msgid "Save As…" -msgstr "Gardar como…" - -#: ../meld/meldwindow.py:64 -msgid "Save the current file with a different name" -msgstr "Gardar o ficheiro actual con un nome diferente" - -#: ../meld/meldwindow.py:67 -msgid "Close the current file" -msgstr "Pechar o ficheiro actual" - -#: ../meld/meldwindow.py:70 -msgid "_Edit" -msgstr "_Editar" - -#: ../meld/meldwindow.py:72 -msgid "Undo the last action" -msgstr "Desfacer a última acción" - -#: ../meld/meldwindow.py:75 -msgid "Redo the last undone action" -msgstr "Refacer a última acción desfeita" - -#: ../meld/meldwindow.py:77 -msgid "Cut the selection" -msgstr "Cortar a selección" - -#: ../meld/meldwindow.py:79 -msgid "Copy the selection" -msgstr "Copiar a selección" - -#: ../meld/meldwindow.py:81 -msgid "Paste the clipboard" -msgstr "Pegar o contido do portapapeis" - -#: ../meld/meldwindow.py:83 -msgid "Find…" -msgstr "Buscar…" - -#: ../meld/meldwindow.py:83 -msgid "Search for text" -msgstr "Buscar texto" - -#: ../meld/meldwindow.py:85 -msgid "Find Ne_xt" -msgstr "Buscar a _seguinte" - -#: ../meld/meldwindow.py:86 -msgid "Search forwards for the same text" -msgstr "Buscar cara a adiante o mesmo texto" - -#: ../meld/meldwindow.py:88 -msgid "Find _Previous" -msgstr "_Anterior" - -#: ../meld/meldwindow.py:89 -msgid "Search backwards for the same text" -msgstr "Buscar cara a adiante o mesmo texto" - -#: ../meld/meldwindow.py:92 -msgid "_Replace…" -msgstr "Substituí_r..." - -#: ../meld/meldwindow.py:93 -msgid "Find and replace text" -msgstr "Buscar e substituír texto" - -#: ../meld/meldwindow.py:95 -msgid "Go to _Line" -msgstr "Ir á _liña" - -#: ../meld/meldwindow.py:96 -msgid "Go to a specific line" -msgstr "Ir a unha liña específica" - -#: ../meld/meldwindow.py:99 -msgid "_Changes" -msgstr "_Cambios" - -#: ../meld/meldwindow.py:100 -msgid "Next Change" -msgstr "Seguinte cambio" - -#: ../meld/meldwindow.py:101 -msgid "Go to the next change" -msgstr "Ir ao seguinte cambio" - -#: ../meld/meldwindow.py:103 -msgid "Previous Change" -msgstr "Anterior cambio" - -#: ../meld/meldwindow.py:104 -msgid "Go to the previous change" -msgstr "Ir ao cambio anterior" - -#: ../meld/meldwindow.py:106 -msgid "Open Externally" -msgstr "Abrir externamente" - -#: ../meld/meldwindow.py:107 -msgid "Open selected file or directory in the default external application" -msgstr "" -"Abrir o ficheiro ou cartafol seleccionado no aplicativo externo " -"predeterminado" - -#: ../meld/meldwindow.py:111 -msgid "_View" -msgstr "_Ver" - -#: ../meld/meldwindow.py:112 -msgid "File Status" -msgstr "Estado do ficheiro" - -#: ../meld/meldwindow.py:113 -msgid "Version Status" -msgstr "Estado da versión" - -#: ../meld/meldwindow.py:116 -msgid "Stop the current action" -msgstr "Deter a acción actual" - -#: ../meld/meldwindow.py:119 -msgid "Refresh the view" -msgstr "Actualizar a vista" - -#: ../meld/meldwindow.py:123 -msgid "Fullscreen" -msgstr "Pantalla completa" - -#: ../meld/meldwindow.py:124 -msgid "View the comparison in fullscreen" -msgstr "Ver a comparación a pantalla completa" - -#: ../meld/meldwindow.py:133 -msgid "Open Recent" -msgstr "Abrir recentes" +#: meld/meldwindow.py:158 +msgid "Filename" +msgstr "Nome de ficheiro" -#: ../meld/meldwindow.py:134 -msgid "Open recent files" -msgstr "Abrir ficheiros recentes" - -#: ../meld/meldwindow.py:567 +#: meld/meldwindow.py:381 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "" "Precísanse tres ficheiros para a combinación automática, conseguíronse: %r" -#: ../meld/meldwindow.py:588 +#: meld/meldwindow.py:411 msgid "Cannot compare a mixture of files and directories" msgstr "Non é posíbel comparar unha mestura de ficheiros e cartafoles" -#: ../meld/misc.py:155 +#: meld/misc.py:154 msgid "" "{}\n" "\n" @@ -2371,234 +2273,240 @@ msgstr "" "Meld atopou un erro crítico ao executarse:\n" "{}" -#: ../meld/misc.py:237 -#, python-format -msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install" -msgstr "" -"Non foi posíbel atopar os detalles do esquema de cores de %s-%s; esta é unha " -"instalación incorrecta" - -#: ../meld/misc.py:311 +#: meld/misc.py:205 msgid "[None]" msgstr "[Ningún]" -#: ../meld/preferences.py:42 ../meld/preferences.py:135 +#: meld/preferences.py:37 meld/preferences.py:129 msgid "label" msgstr "etiqueta" -#: ../meld/preferences.py:42 ../meld/preferences.py:135 +#: meld/preferences.py:37 meld/preferences.py:129 msgid "pattern" msgstr "patrón" -#: ../meld/recent.py:106 +#: meld/recent.py:111 msgid "Version control:" msgstr "Control de versións:" -#: ../meld/ui/bufferselectors.py:114 +#: meld/style.py:96 +msgid "Couldn’t find colour scheme details for {}; this is a bad install" +msgstr "" +"Non foi posíbel atopar os detalles do esquema de cores de {}; esta é unha " +"instalación incorrecta" + +#: meld/ui/bufferselectors.py:110 #, python-brace-format msgid "{name} ({charset})" msgstr "{name} ({charset})" -#: ../meld/ui/bufferselectors.py:144 ../meld/ui/bufferselectors.py:152 +#: meld/ui/bufferselectors.py:140 meld/ui/bufferselectors.py:148 msgid "Plain Text" msgstr "Texto plano" +#: meld/ui/pathlabel.py:36 +msgid "Unnamed file" +msgstr "Ficheiro sen nome" + #. Abbreviation for line, column so that it will fit in the status bar -#: ../meld/ui/statusbar.py:124 -#, python-format -msgid "Ln %i, Col %i" -msgstr "Li %i, Col %i" +#: meld/ui/statusbar.py:125 +#, python-brace-format +msgid "Ln {line}, Col {column}" +msgstr "Lñ {line}, Col {column}" -#: ../meld/ui/statusbar.py:182 +#: meld/ui/statusbar.py:185 msgid "Line you want to move the cursor to" msgstr "A liña á que quere mover o cursor" -#: ../meld/ui/vcdialogs.py:55 +#: meld/ui/vcdialogs.py:50 msgid "No files will be committed" msgstr "Non se remitirá ningún ficheiro" -#. Translators: First %s is replaced by translated "%d unpushed -#. commits", second %s is replaced by translated "%d branches" -#: ../meld/vc/git.py:92 -#, python-format -msgid "%s in %s" -msgstr "%s en %s" +#. Translators: First element is replaced by translated "%d +#. unpushed commits", second element is replaced by translated +#. "%d branches" +#: meld/vc/git.py:92 +#, python-brace-format +msgid "{unpushed_commits} in {unpushed_branches}" +msgstr "{unpushed_commits} en {unpushed_branches}" -#. Translators: These messages cover the case where there is -#. only one branch, and are not part of another message. -#: ../meld/vc/git.py:93 ../meld/vc/git.py:100 +#: meld/vc/git.py:94 meld/vc/git.py:104 #, python-format msgid "%d unpushed commit" msgid_plural "%d unpushed commits" msgstr[0] "%d remisión sen enviar" msgstr[1] "%d remisións sen enviar" -#: ../meld/vc/git.py:95 +#: meld/vc/git.py:97 #, python-format msgid "%d branch" msgid_plural "%d branches" msgstr[0] "%d rama" msgstr[1] "%d ramas" -#: ../meld/vc/git.py:334 -#, python-format -msgid "Mode changed from %s to %s" -msgstr "Modo cambiado desde %s a %s" +#: meld/vc/git.py:345 +#, python-brace-format +msgid "Mode changed from {old_mode} to {new_mode}" +msgstr "Modo cambiado de {old_mode} a {new_mode}" -#: ../meld/vc/git.py:342 +#: meld/vc/git.py:353 msgid "Partially staged" msgstr "Parcialmente preparado" -#: ../meld/vc/git.py:342 +#: meld/vc/git.py:353 msgid "Staged" msgstr "Preparado" #. Translators: This is the displayed name of a version control system #. when no version control system is actually found. -#: ../meld/vc/_null.py:37 +#: meld/vc/_null.py:38 msgid "None" msgstr "Ningún" -#: ../meld/vc/svn.py:203 +#: meld/vc/svn.py:203 #, python-format msgid "Rev %s" msgstr "Rev %s" -#: ../meld/vc/_vc.py:55 +#: meld/vc/_vc.py:55 msgid "Merged" msgstr "Combinado" -#: ../meld/vc/_vc.py:55 +#: meld/vc/_vc.py:55 msgid "Base" msgstr "Base" -#: ../meld/vc/_vc.py:55 +#: meld/vc/_vc.py:55 msgid "Local" msgstr "Local" -#: ../meld/vc/_vc.py:55 +#: meld/vc/_vc.py:55 msgid "Remote" msgstr "Remoto" -#: ../meld/vc/_vc.py:71 -msgid "Unversioned" -msgstr "Non versionados" - -#: ../meld/vc/_vc.py:74 +#: meld/vc/_vc.py:74 msgid "Error" msgstr "Erro" -#: ../meld/vc/_vc.py:76 +#: meld/vc/_vc.py:76 msgid "Newly added" msgstr "Engadidos recentemente" -#: ../meld/vc/_vc.py:78 +#: meld/vc/_vc.py:78 msgid "Renamed" msgstr "Renomeado" -#: ../meld/vc/_vc.py:79 +#: meld/vc/_vc.py:79 msgid "Conflict" msgstr "Conflito" -#: ../meld/vc/_vc.py:80 +#: meld/vc/_vc.py:80 msgid "Removed" msgstr "Retirado" -#: ../meld/vc/_vc.py:81 +#: meld/vc/_vc.py:81 msgid "Missing" msgstr "Non atopado" -#: ../meld/vc/_vc.py:82 +#: meld/vc/_vc.py:82 msgid "Not present" msgstr "Non presente" +#: meld/vc/_vc.py:83 +msgid "Scanning…" +msgstr "Analizando…" + +#. Translators: This error message is shown when no +#. repository of this type is found. +#: meld/vcview.py:334 +#, python-format +msgid "%(name)s (not found)" +msgstr "%(name)s (non atopado)" + #. Translators: This error message is shown when a version #. control binary isn't installed. -#: ../meld/vcview.py:282 +#: meld/vcview.py:338 #, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "%(name)s (%(cmd)s non instalado)" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: ../meld/vcview.py:286 +#: meld/vcview.py:342 #, python-format -msgid "%(name)s (Invalid repository)" +msgid "%(name)s (invalid repository)" msgstr "%(name)s (repositorio non válido)" -#: ../meld/vcview.py:307 +#: meld/vcview.py:356 msgid "No valid version control system found in this folder" msgstr "Non hai ningún sistema de control de versións válido neste cartafol" -#: ../meld/vcview.py:309 -msgid "Only one version control system found in this folder" -msgstr "Só se atopou un sistema de control de versións neste cartafol" - -#: ../meld/vcview.py:311 +#: meld/vcview.py:358 msgid "Choose which version control system to use" msgstr "Seleccione que sistema de control de versións usar" -#. TRANSLATORS: This is the location of the directory being viewed -#: ../meld/vcview.py:366 -#, python-format -msgid "%s: %s" -msgstr "%s: %s" +#. TRANSLATORS: This is the name of the version control +#. system being used, e.g., "Git" or "Subversion" +#: meld/vcview.py:414 +#, python-brace-format +msgid "{vc} comparison:" +msgstr "Comparación {vc}:" #. Initial yield so when we add this to our tasks, we don't #. create iterators that may be invalidated. -#: ../meld/vcview.py:373 +#: meld/vcview.py:423 msgid "Scanning repository" msgstr "Analizando o repositorio" -#: ../meld/vcview.py:402 +#: meld/vcview.py:452 #, python-format msgid "Scanning %s" msgstr "Analizando %s" -#: ../meld/vcview.py:441 +#: meld/vcview.py:491 msgid "(Empty)" msgstr "(Baleiro)" -#: ../meld/vcview.py:487 +#: meld/vcview.py:539 #, python-format msgid "%s — local" msgstr "%s — local" -#: ../meld/vcview.py:488 +#: meld/vcview.py:540 #, python-format msgid "%s — remote" msgstr "%s — remoto" -#: ../meld/vcview.py:496 +#: meld/vcview.py:548 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (local, combinar, remoto)" -#: ../meld/vcview.py:501 +#: meld/vcview.py:553 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (remoto, combinar, local)" -#: ../meld/vcview.py:512 +#: meld/vcview.py:564 #, python-format msgid "%s — repository" msgstr "%s — repositorio" -#: ../meld/vcview.py:518 +#: meld/vcview.py:570 #, python-format msgid "%s (working, repository)" msgstr "%s (funcionando, repositorio)" -#: ../meld/vcview.py:522 +#: meld/vcview.py:574 #, python-format msgid "%s (repository, working)" msgstr "%s (repositorio, funcionando)" -#: ../meld/vcview.py:688 +#: meld/vcview.py:739 msgid "Remove folder and all its files?" msgstr "Desexa eliminar o cartafol e todos os seus ficheiros?" -#: ../meld/vcview.py:690 +#: meld/vcview.py:741 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2607,10 +2515,324 @@ msgstr "" "ficheiros dentro de calqueda dos cartafoles seleccionados, do control de " "versións." -#: ../meld/vcview.py:804 +#: meld/vcview.py:854 msgid "Clear" msgstr "Limpar" +#~ msgid "Cannot import: " +#~ msgstr "Non é posíbel importar: " + +#, c-format +#~ msgid "Meld requires %s or higher." +#~ msgstr "Meld require %s ou superior." + +#, c-format +#~ msgid "" +#~ "Couldn’t load Meld-specific CSS (%s)\n" +#~ "%s" +#~ msgstr "" +#~ "Non foi posíbel cargar o CSS específico de Meld (%s)\n" +#~ "%s" + +#~ msgid "Meld Diff Viewer" +#~ msgstr "Visualizador Diff Meld" + +#~ msgid "Displayed whitespace" +#~ msgstr "Mostrar espazos en branco" + +#~ msgid "" +#~ "Selector for individual whitespace character types to be shown. Possible " +#~ "values are 'space', 'tab', 'newline' and 'nbsp'." +#~ msgstr "" +#~ "Selector de tipos de caracteres de espazo en branco a mostrar. Os valores " +#~ "posíbeis son : «space», «tab», «newline» e «nbsp»." + +#~ msgid "Meld base scheme" +#~ msgstr "Esquema base de Meld" + +#~ msgid "_About" +#~ msgstr "_Sobre" + +#~ msgid "_Quit" +#~ msgstr "_Saír" + +#~ msgid "Website" +#~ msgstr "Sitio web" + +#~| msgid "Remove folder and all its files?" +#~ msgid "Collapse selected folder and all subfolders" +#~ msgstr "Colapsar os cartafoles seleccionados e todos os subcartafoles" + +#~| msgid "Remove folder and all its files?" +#~ msgid "Expand selected folder and all subfolders" +#~ msgstr "Expandir o cartafol selecconado e todos os subcartafoles" + +#~ msgid "Copy to _Left" +#~ msgstr "Copiar á es_querda" + +#~ msgid "Copy to _Right" +#~ msgstr "Copiar á de_reita" + +#~ msgid "Hide selected" +#~ msgstr "Ocultar o seleccionado" + +#~ msgid "" +#~ "Consider differently-cased filenames that are otherwise-identical to be " +#~ "the same" +#~ msgstr "" +#~ "Considerar casos diferentes os nomes de ficheiro que de outro modo serían " +#~ "idénticos" + +#~ msgid "Show identical" +#~ msgstr "Mostrar idénticos" + +#~ msgid "Show new" +#~ msgstr "Mostrar novo" + +#~ msgid "Show modified" +#~ msgstr "Mostrar modificados" + +#~ msgid "Filters" +#~ msgstr "Filtros" + +#~ msgid "Set active filters" +#~ msgstr "Estabelecer filtros activos" + +#~ msgid "Create a patch using differences between files" +#~ msgstr "Crear un parche usando as diferenzas entre os ficheiros" + +#~ msgid "Save all files in the current comparison" +#~ msgstr "Garda todos os ficheiros na comparación actual" + +#~ msgid "Revert files to their saved versions" +#~ msgstr "Reverte os ficheiros ás súas versións gardadas" + +#~ msgid "Add a synchronization point for changes between files" +#~ msgstr "Engadir un punto de sincronización para os cambios entre ficheiros" + +#~ msgid "Clear sychronization points for changes between files" +#~ msgstr "Limpar os puntos de sincronización para os cambios entre ficheiros" + +#~ msgid "Previous Conflict" +#~ msgstr "Conflito anterior" + +#~ msgid "Push to Left" +#~ msgstr "Empurrar á esquerda" + +#~ msgid "Push to Right" +#~ msgstr "Empurrar á dereita" + +#~ msgid "Pull from Left" +#~ msgstr "Traer desde á esquerda" + +#~ msgid "Pull change from the left" +#~ msgstr "Traer o cambio desde á esquerda" + +#~ msgid "Pull from Right" +#~ msgstr "Traer desde á dereita" + +#~ msgid "Pull change from the right" +#~ msgstr "Traer o cambio desde á dereita" + +#~ msgid "Copy Above Left" +#~ msgstr "Copiar por enriba da esquerda" + +#~ msgid "Copy Below Left" +#~ msgstr "Copiar por debaixo da esquerda" + +#~ msgid "Copy Above Right" +#~ msgstr "Copiar por enriba da dereita" + +#~ msgid "Copy Below Right" +#~ msgstr "Copiar por debaixo da dereita" + +#~ msgid "Merge all non-conflicting changes from the left" +#~ msgstr "Combinar todos os cambios non conflitivos desde a esquerda" + +#~ msgid "Merge all non-conflicting changes from the right" +#~ msgstr "Combinar todos os cambios non conflitivos desde a dereita" + +#~ msgid "Merge all non-conflicting changes from left and right panes" +#~ msgstr "" +#~ "Combinar todos os cambios non conflitivos desde os paneis da esquerda e " +#~ "dereita" + +#~ msgid "Previous Pane" +#~ msgstr "Panel anterior" + +#~ msgid "Move keyboard focus to the previous document in this comparison" +#~ msgstr "Mover o foco do teclado ao documento anterior nesta comparación" + +#~ msgid "Next Pane" +#~ msgstr "Panel seguinte" + +#~ msgid "Move keyboard focus to the next document in this comparison" +#~ msgstr "Mover o foco do teclado ao seguinte documento desta comparación" + +#~ msgid "Lock scrolling of all panes" +#~ msgstr "Bloquear o desprazamento de todos os paneis" + +#~ msgid "_Previous" +#~ msgstr "_Anterior" + +#~ msgid "_Next" +#~ msgstr "Segui_nte" + +#~ msgid "Find:" +#~ msgstr "Buscar:" + +#~ msgid "Replace _with:" +#~ msgstr "Substituír _con:" + +#~ msgid "Directory comparison" +#~ msgstr "Comparación de directorios" + +#~ msgid "Version control view" +#~ msgstr "Mostrar control de versións" + +#~ msgid "_Update" +#~ msgstr "Act_ualizar" + +#~ msgid "Update working copy from version control" +#~ msgstr "Actualizar a copia local desde o sistema de control de versións" + +#~ msgid "_Push" +#~ msgstr "_Enviar" + +#~ msgid "Mar_k as Resolved" +#~ msgstr "Marc_ar como solucionado" + +#~ msgid "Delete from working copy" +#~ msgstr "Eliminar desde a copia local" + +#~ msgid "Console" +#~ msgstr "Consola" + +#~ msgid "Show or hide the version control console output pane" +#~ msgstr "" +#~ "Mostrar ou ocultar o panel de saída da consola do control de versións" + +#~ msgid "_Flatten" +#~ msgstr "Apl_anar" + +#~ msgid "_Modified" +#~ msgstr "_Modificado" + +#~ msgid "Show modified files" +#~ msgstr "Mostrar ficheiros modificados" + +#~ msgid "Show normal files" +#~ msgstr "Mostrar ficheiros normais" + +#~ msgid "Un_versioned" +#~ msgstr "Sen _versión" + +#~ msgid "Show unversioned files" +#~ msgstr "Mostrar ficheiros sen versión" + +#~ msgid "Show ignored files" +#~ msgstr "Mostrar ficheiros ignorados" + +#, python-format +#~ msgid "Hide %s" +#~ msgstr "Ocultar %s" + +#, python-format +#~ msgid "[%s] Scanning %s" +#~ msgstr "[%s] Analizando %s" + +#~ msgid "_New Comparison…" +#~ msgstr "_Nova comparación…" + +#~ msgid "Save the current file" +#~ msgstr "Gardar o ficheiro actual" + +#~ msgid "Save the current file with a different name" +#~ msgstr "Gardar o ficheiro actual con un nome diferente" + +#~ msgid "Close the current file" +#~ msgstr "Pechar o ficheiro actual" + +#~ msgid "_Edit" +#~ msgstr "_Editar" + +#~ msgid "Undo the last action" +#~ msgstr "Desfacer a última acción" + +#~ msgid "Redo the last undone action" +#~ msgstr "Refacer a última acción desfeita" + +#~ msgid "Cut the selection" +#~ msgstr "Cortar a selección" + +#~ msgid "Copy the selection" +#~ msgstr "Copiar a selección" + +#~ msgid "Paste the clipboard" +#~ msgstr "Pegar o contido do portapapeis" + +#~ msgid "Search for text" +#~ msgstr "Buscar texto" + +#~ msgid "Find Ne_xt" +#~ msgstr "Buscar a _seguinte" + +#~ msgid "Search forwards for the same text" +#~ msgstr "Buscar cara a adiante o mesmo texto" + +#~ msgid "Find _Previous" +#~ msgstr "_Anterior" + +#~ msgid "Search backwards for the same text" +#~ msgstr "Buscar cara a adiante o mesmo texto" + +#~ msgid "Find and replace text" +#~ msgstr "Buscar e substituír texto" + +#~ msgid "Go to _Line" +#~ msgstr "Ir á _liña" + +#~ msgid "Go to a specific line" +#~ msgstr "Ir a unha liña específica" + +#~ msgid "_Changes" +#~ msgstr "_Cambios" + +#~ msgid "Next Change" +#~ msgstr "Seguinte cambio" + +#~ msgid "Previous Change" +#~ msgstr "Anterior cambio" + +#~ msgid "Open selected file or directory in the default external application" +#~ msgstr "" +#~ "Abrir o ficheiro ou cartafol seleccionado no aplicativo externo " +#~ "predeterminado" + +#~ msgid "Stop the current action" +#~ msgstr "Deter a acción actual" + +#~ msgid "Refresh the view" +#~ msgstr "Actualizar a vista" + +#~ msgid "View the comparison in fullscreen" +#~ msgstr "Ver a comparación a pantalla completa" + +#~ msgid "Open Recent" +#~ msgstr "Abrir recentes" + +#, python-format +#~ msgid "Ln %i, Col %i" +#~ msgstr "Li %i, Col %i" + +#, python-format +#~ msgid "%s in %s" +#~ msgstr "%s en %s" + +#, python-format +#~ msgid "%s: %s" +#~ msgstr "%s: %s" + #~ msgid "Show toolbar" #~ msgstr "Mostrar a barra de ferramentas" @@ -2684,7 +2906,7 @@ msgstr "Limpar" #~ msgstr "" #~ "Meld é software libre, vostede pode redistribuílo e/ou modificalo baixo " #~ "os termos da Licenza Pública Xeral de GNU publicada pola Free Software " -#~ "Foundation, tanto a versión 2 como as posteriores.\n" +#~ "Foundation, tanto a versión 2 como as posteriores.\n" #~ "\n" #~ "Este programa distribúese coa esperanza de que lle sexa útil, pero SEN " #~ "GARANTÍA NINGUNHA, incluso sen a garantía de MERCANTIBILIDADE ou " @@ -2907,9 +3129,6 @@ msgstr "Limpar" #~ msgid "_Browse..." #~ msgstr "E_xaminar..." -#~ msgid "Path" -#~ msgstr "Ruta" - #~ msgid "Path to file" #~ msgstr "Ruta ao ficheiro" @@ -2919,9 +3138,6 @@ msgstr "Limpar" #~ msgid "Select directory" #~ msgstr "Seleccionar cartafol" -#~ msgid "Select file" -#~ msgstr "Seleccionar ficheiro" - #~ msgid "" #~ "Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:" #~ "Missing:Not present" @@ -2977,9 +3193,6 @@ msgstr "Limpar" #~ msgid "Report a bug" #~ msgstr "Informar dun fallo" -#~ msgid "%d unpushed commits in %d branches" -#~ msgstr "%d remisións sen mandar en %d ramas" - #~ msgid "Choose Files" #~ msgstr "Escoller ficheiros" @@ -3040,9 +3253,6 @@ msgstr "Limpar" #~ msgid "Delete locally" #~ msgstr "Eliminar localmente" -#~ msgid "Show normal" -#~ msgstr "Mostrar normal" - #~ msgid "Non _VC" #~ msgstr "Sen C_V" @@ -3362,9 +3572,6 @@ msgstr "Limpar" #~ msgid "Solid: Filled Quadilaterals" #~ msgstr "Sólido: Cadrados recheos" -#~ msgid "Stop" -#~ msgstr "Deter" - #~ msgid "" #~ "Syntax highlighting is only available if you have gnome-python-desktop " #~ "installed." diff --git a/po/hu.po b/po/hu.po index b48ca2e..80bf922 100644 --- a/po/hu.po +++ b/po/hu.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: meld master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2022-03-27 00:52+0000\n" -"PO-Revision-Date: 2022-03-29 00:57+0200\n" +"POT-Creation-Date: 2022-10-30 22:10+0000\n" +"PO-Revision-Date: 2022-11-06 00:20+0100\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" "Language: hu\n" @@ -19,7 +19,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 19.12.3\n" +"X-Generator: Lokalize 22.08.2\n" #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11 #: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17 @@ -389,7 +389,7 @@ msgid "" "remote scheme to determine what order to present files in panes. Otherwise, " "a left-is-theirs, right-is-mine scheme is used." msgstr "" -"Ha igaz, akkor a verziókövető összehasonlítások a bal-helyi, jobb-távoli " +"Ha igaz, akkor a verziókövetési összehasonlítások a bal-helyi, jobb-távoli " "sémát használják-e a fájlok megjelenítéséhez az ablaktáblákon. Ha nincs " "bejelölve, a bal-övék, jobb-enyém séma kerül felhasználásra." @@ -531,361 +531,375 @@ msgstr "Összehasonlítás frissítése" #: meld/resources/gtk/help-overlay.ui:54 msgctxt "shortcut window" +msgid "Open externally" +msgstr "Megnyitás külsőleg" + +#: meld/resources/gtk/help-overlay.ui:61 +msgctxt "shortcut window" msgid "Fullscreen" msgstr "Teljes képernyő" -#: meld/resources/gtk/help-overlay.ui:63 +#: meld/resources/gtk/help-overlay.ui:68 +msgctxt "shortcut window" +msgid "Swap left and right panes" +msgstr "Bal és jobb ablaktáblák felcserélése" + +#: meld/resources/gtk/help-overlay.ui:77 msgctxt "shortcut window" msgid "Panes" msgstr "Ablaktáblák" -#: meld/resources/gtk/help-overlay.ui:68 +#: meld/resources/gtk/help-overlay.ui:82 msgctxt "shortcut window" msgid "Previous comparison pane" msgstr "Előző összehasonlító ablaktábla" -#: meld/resources/gtk/help-overlay.ui:75 +#: meld/resources/gtk/help-overlay.ui:89 msgctxt "shortcut window" msgid "Next comparison pane" msgstr "Következő összehasonlító ablaktábla" -#: meld/resources/gtk/help-overlay.ui:84 +#: meld/resources/gtk/help-overlay.ui:98 msgctxt "shortcut window" msgid "Changes" msgstr "Változások" -#: meld/resources/gtk/help-overlay.ui:89 +#: meld/resources/gtk/help-overlay.ui:103 msgctxt "shortcut window" msgid "Go to previous change" msgstr "Ugrás az előző változásra" -#: meld/resources/gtk/help-overlay.ui:96 +#: meld/resources/gtk/help-overlay.ui:110 msgctxt "shortcut window" msgid "Go to next change" msgstr "Ugrás a következő változásra" -#: meld/resources/gtk/help-overlay.ui:105 +#: meld/resources/gtk/help-overlay.ui:119 msgctxt "shortcut window" msgid "Tabs" msgstr "Lapok" -#: meld/resources/gtk/help-overlay.ui:110 +#: meld/resources/gtk/help-overlay.ui:124 msgctxt "shortcut window" msgid "Go to previous tab" msgstr "Ugrás az előző lapra" -#: meld/resources/gtk/help-overlay.ui:117 +#: meld/resources/gtk/help-overlay.ui:131 msgctxt "shortcut window" msgid "Go to next tab" msgstr "Ugrás a következő lapra" -#: meld/resources/gtk/help-overlay.ui:124 +#: meld/resources/gtk/help-overlay.ui:138 msgctxt "shortcut window" msgid "Switch to tab" msgstr "Váltás lapra" -#: meld/resources/gtk/help-overlay.ui:131 +#: meld/resources/gtk/help-overlay.ui:145 msgctxt "shortcut window" msgid "Move tab left" msgstr "Lap mozgatása balra" -#: meld/resources/gtk/help-overlay.ui:138 +#: meld/resources/gtk/help-overlay.ui:152 msgctxt "shortcut window" msgid "Move tab right" msgstr "Lap mozgatása jobbra" -#: meld/resources/gtk/help-overlay.ui:147 +#: meld/resources/gtk/help-overlay.ui:161 msgctxt "shortcut window" msgid "Editing" msgstr "Szerkesztés" -#: meld/resources/gtk/help-overlay.ui:152 +#: meld/resources/gtk/help-overlay.ui:166 msgctxt "shortcut window" msgid "Undo" msgstr "Visszavonás" -#: meld/resources/gtk/help-overlay.ui:159 +#: meld/resources/gtk/help-overlay.ui:173 msgctxt "shortcut window" msgid "Redo" msgstr "Mégis" -#: meld/resources/gtk/help-overlay.ui:166 +#: meld/resources/gtk/help-overlay.ui:180 msgctxt "shortcut window" msgid "Cut" msgstr "Kivágás" -#: meld/resources/gtk/help-overlay.ui:173 +#: meld/resources/gtk/help-overlay.ui:187 msgctxt "shortcut window" msgid "Copy" msgstr "Másolás" -#: meld/resources/gtk/help-overlay.ui:180 +#: meld/resources/gtk/help-overlay.ui:194 msgctxt "shortcut window" msgid "Paste" msgstr "Beillesztés" -#: meld/resources/gtk/help-overlay.ui:187 +#: meld/resources/gtk/help-overlay.ui:201 msgctxt "shortcut window" msgid "Find" msgstr "Keresés" -#: meld/resources/gtk/help-overlay.ui:194 +#: meld/resources/gtk/help-overlay.ui:208 msgctxt "shortcut window" msgid "Find Next" msgstr "Következő találat" -#: meld/resources/gtk/help-overlay.ui:201 +#: meld/resources/gtk/help-overlay.ui:215 msgctxt "shortcut window" msgid "Find Previous" msgstr "Előző találat" -#: meld/resources/gtk/help-overlay.ui:208 +#: meld/resources/gtk/help-overlay.ui:222 msgctxt "shortcut window" msgid "Replace" msgstr "Csere" -#: meld/resources/gtk/help-overlay.ui:217 +#: meld/resources/gtk/help-overlay.ui:231 msgctxt "shortcut window" msgid "File comparison" msgstr "Fájl-összehasonlítás" -#: meld/resources/gtk/help-overlay.ui:222 +#: meld/resources/gtk/help-overlay.ui:236 msgctxt "shortcut window" msgid "Save current file" msgstr "Aktuális fájl mentése" -#: meld/resources/gtk/help-overlay.ui:229 +#: meld/resources/gtk/help-overlay.ui:243 msgctxt "shortcut window" msgid "Save current file to new path" msgstr "Aktuális fájl mentése új útvonalra" -#: meld/resources/gtk/help-overlay.ui:236 +#: meld/resources/gtk/help-overlay.ui:250 msgctxt "shortcut window" msgid "Save all files in comparison" msgstr "Minden fájl mentése az összehasonlításban" -#: meld/resources/gtk/help-overlay.ui:243 +#: meld/resources/gtk/help-overlay.ui:257 msgctxt "shortcut window" msgid "Previous conflict" msgstr "Előző ütközés" -#: meld/resources/gtk/help-overlay.ui:250 +#: meld/resources/gtk/help-overlay.ui:264 msgctxt "shortcut window" msgid "Next conflict" msgstr "Következő ütközés" -#: meld/resources/gtk/help-overlay.ui:257 +#: meld/resources/gtk/help-overlay.ui:271 msgctxt "shortcut window" msgid "Push change to left" msgstr "Változás balra küldése" -#: meld/resources/gtk/help-overlay.ui:264 +#: meld/resources/gtk/help-overlay.ui:278 msgctxt "shortcut window" msgid "Push change to right" msgstr "Változás jobbra küldése" -#: meld/resources/gtk/help-overlay.ui:271 +#: meld/resources/gtk/help-overlay.ui:285 msgctxt "shortcut window" msgid "Pull change from left" msgstr "Változás áthúzása balról" -#: meld/resources/gtk/help-overlay.ui:278 +#: meld/resources/gtk/help-overlay.ui:292 msgctxt "shortcut window" msgid "Pull change from right" msgstr "Változás áthúzása jobbról" -#: meld/resources/gtk/help-overlay.ui:285 +#: meld/resources/gtk/help-overlay.ui:299 msgctxt "shortcut window" msgid "Copy change above left" msgstr "Változás másolása a bal oldali fölé" -#: meld/resources/gtk/help-overlay.ui:292 +#: meld/resources/gtk/help-overlay.ui:306 msgctxt "shortcut window" msgid "Copy change below left" msgstr "Változás másolása a bal oldali alá" -#: meld/resources/gtk/help-overlay.ui:299 +#: meld/resources/gtk/help-overlay.ui:313 msgctxt "shortcut window" msgid "Copy change above right" msgstr "Változás másolása a jobb oldali fölé" -#: meld/resources/gtk/help-overlay.ui:306 +#: meld/resources/gtk/help-overlay.ui:320 msgctxt "shortcut window" msgid "Copy change below right" msgstr "Változás másolása a jobb oldali alá" -#: meld/resources/gtk/help-overlay.ui:313 -#: meld/resources/gtk/help-overlay.ui:341 +#: meld/resources/gtk/help-overlay.ui:327 +#: meld/resources/gtk/help-overlay.ui:355 msgctxt "shortcut window" msgid "Delete change" msgstr "Változás törlése" -#: meld/resources/gtk/help-overlay.ui:322 +#: meld/resources/gtk/help-overlay.ui:336 msgctxt "shortcut window" msgid "Folder comparison" msgstr "Mappa-összehasonlítás" -#: meld/resources/gtk/help-overlay.ui:327 +#: meld/resources/gtk/help-overlay.ui:341 msgctxt "shortcut window" msgid "Copy to left" msgstr "Másolás a bal oldalra" -#: meld/resources/gtk/help-overlay.ui:334 +#: meld/resources/gtk/help-overlay.ui:348 msgctxt "shortcut window" msgid "Copy to right" msgstr "Másolás a jobb oldalra" -#: meld/resources/gtk/help-overlay.ui:350 +#: meld/resources/gtk/help-overlay.ui:364 msgctxt "shortcut window" msgid "Version control comparison" -msgstr "Verziókövető-összehasonlítás" +msgstr "Verziókövetési összehasonlítás" -#: meld/resources/gtk/help-overlay.ui:355 +#: meld/resources/gtk/help-overlay.ui:369 msgctxt "shortcut window" msgid "Commit to version control" msgstr "Véglegesítés verziókövetőbe" -#: meld/resources/gtk/help-overlay.ui:362 +#: meld/resources/gtk/help-overlay.ui:376 msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Konzolkimenet megjelenítése/elrejtése" #: meld/resources/gtk/menus.ui:7 -msgid "Refresh" -msgstr "Frissítés" - -#: meld/resources/gtk/menus.ui:12 -msgid "Stop" -msgstr "Leállítás" - -#: meld/resources/gtk/menus.ui:17 -msgid "Fullscreen" -msgstr "Teljes képernyő" - -#: meld/resources/gtk/menus.ui:26 msgid "Save As…" msgstr "Mentés másként…" -#: meld/resources/gtk/menus.ui:30 +#: meld/resources/gtk/menus.ui:11 msgid "Save A_ll" msgstr "Összes men_tése" -#: meld/resources/gtk/menus.ui:34 +#: meld/resources/gtk/menus.ui:15 msgid "Revert files…" msgstr "Fájlok visszaállítása…" -#: meld/resources/gtk/menus.ui:38 +#: meld/resources/gtk/menus.ui:19 msgid "Open Externally" msgstr "Megnyitás alkalmazással" -#: meld/resources/gtk/menus.ui:45 +#: meld/resources/gtk/menus.ui:26 +msgid "Refresh Comparison" +msgstr "Összehasonlítás frissítése" + +#: meld/resources/gtk/menus.ui:33 msgid "_Find…" msgstr "_Keresés…" -#: meld/resources/gtk/menus.ui:49 +#: meld/resources/gtk/menus.ui:37 msgid "_Replace…" msgstr "_Csere…" -#: meld/resources/gtk/menus.ui:55 +#: meld/resources/gtk/menus.ui:43 msgid "View" msgstr "Nézet" -#: meld/resources/gtk/menus.ui:59 +#: meld/resources/gtk/menus.ui:47 +msgid "Fullscreen" +msgstr "Teljes képernyő" + +#: meld/resources/gtk/menus.ui:52 msgid "Overview Map" msgstr "Áttekintő térkép" -#: meld/resources/gtk/menus.ui:63 +#: meld/resources/gtk/menus.ui:56 msgid "Version control console" msgstr "Verziókövető-konzol" -#: meld/resources/gtk/menus.ui:67 +#: meld/resources/gtk/menus.ui:60 msgid "Lock scrolling" msgstr "Görgetés zárolása" +#: meld/resources/gtk/menus.ui:67 +msgid "Swap left and right panes" +msgstr "Bal és jobb ablaktáblák felcserélése" + #: meld/resources/gtk/menus.ui:73 msgid "Comparison" msgstr "Összehasonlítás" -#: meld/resources/gtk/menus.ui:77 +#: meld/resources/gtk/menus.ui:75 +msgid "Stop" +msgstr "Leállítás" + +#: meld/resources/gtk/menus.ui:81 msgid "Merge All from Left" msgstr "Minden egyesítése balról" -#: meld/resources/gtk/menus.ui:81 +#: meld/resources/gtk/menus.ui:85 msgid "Merge All from Right" msgstr "Minden egyesítése jobbról" -#: meld/resources/gtk/menus.ui:85 +#: meld/resources/gtk/menus.ui:89 msgid "Merge All" msgstr "Minden egyesítése" -#: meld/resources/gtk/menus.ui:92 +#: meld/resources/gtk/menus.ui:96 msgid "Format as Patch…" msgstr "Formázás foltként…" -#: meld/resources/gtk/menus.ui:101 +#: meld/resources/gtk/menus.ui:105 msgid "_Preferences" msgstr "_Beállítások" -#: meld/resources/gtk/menus.ui:105 +#: meld/resources/gtk/menus.ui:109 msgid "Keyboard Shortcuts" msgstr "Gyorsbillentyűk" -#: meld/resources/gtk/menus.ui:109 +#: meld/resources/gtk/menus.ui:113 msgid "_Help" msgstr "_Súgó" -#: meld/resources/gtk/menus.ui:114 +#: meld/resources/gtk/menus.ui:118 msgid "_About Meld" msgstr "A Meld _névjegye" -#: meld/resources/gtk/menus.ui:127 +#: meld/resources/gtk/menus.ui:131 msgid "File status" msgstr "Fájlállapot" -#: meld/resources/gtk/menus.ui:129 +#: meld/resources/gtk/menus.ui:133 msgid "Same" msgstr "Egyezik" -#: meld/resources/gtk/menus.ui:133 +#: meld/resources/gtk/menus.ui:137 msgid "New" msgstr "Új" -#: meld/resources/gtk/menus.ui:137 meld/resources/gtk/menus.ui:160 -#: meld/vc/_vc.py:76 +#: meld/resources/gtk/menus.ui:141 meld/resources/gtk/menus.ui:164 +#: meld/vc/_vc.py:77 msgid "Modified" msgstr "Módosítva" -#: meld/resources/gtk/menus.ui:147 +#: meld/resources/gtk/menus.ui:151 msgid "Ignore filename case" msgstr "Kis- és nagybetűk nem különböznek a fájlnévben" -#: meld/resources/gtk/menus.ui:151 +#: meld/resources/gtk/menus.ui:155 msgid "Normalize Unicode paths" msgstr "Unicode útvonalak normalizálása" -#: meld/resources/gtk/menus.ui:164 +#: meld/resources/gtk/menus.ui:168 msgid "Normal" msgstr "Normál" -#: meld/resources/gtk/menus.ui:168 meld/vc/_vc.py:70 +#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:71 msgid "Unversioned" msgstr "Verziózatlan" -#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:69 +#: meld/resources/gtk/menus.ui:176 meld/vc/_vc.py:70 msgid "Ignored" msgstr "Mellőzve" -#: meld/resources/gtk/menus.ui:179 +#: meld/resources/gtk/menus.ui:183 msgid "Flatten folders" msgstr "Könyvtárak simítása" #: meld/resources/ui/about-dialog.ui:8 msgid "" "Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2021 Kai Willadsen" +"Copyright © 2009-2022 Kai Willadsen" msgstr "" "Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2021 Kai Willadsen" +"Copyright © 2009-2022 Kai Willadsen" #: meld/resources/ui/about-dialog.ui:14 msgid "translator-credits" @@ -940,7 +954,7 @@ msgid "Column Name" msgstr "Oszlopnév" #: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128 -#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:741 +#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:745 msgid "_Remove" msgstr "_Eltávolítás" @@ -1146,7 +1160,7 @@ msgstr "1. fájl" #. Create icon and filename CellRenderer #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217 -#: meld/dirdiff.py:602 +#: meld/dirdiff.py:603 msgid "Name" msgstr "Név" @@ -1186,7 +1200,7 @@ msgstr "Körbeért" msgid "Replace _All" msgstr "Öss_zes cseréje" -#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1230 meld/iohelpers.py:117 +#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1231 meld/iohelpers.py:117 msgid "_Replace" msgstr "_Csere" @@ -1571,7 +1585,7 @@ msgstr "Ha nem ment, akkor a változtatások véglegesen elvesznek." msgid "Close _without Saving" msgstr "Bezárás mentés _nélkül" -#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1228 +#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1229 #: meld/iohelpers.py:56 meld/iohelpers.py:116 msgid "_Cancel" msgstr "Mé_gse" @@ -1660,11 +1674,11 @@ msgstr "Extra" msgid "Console output" msgstr "Konzolkimenet" -#: meld/actiongutter.py:247 +#: meld/actiongutter.py:254 msgid "Copy _up" msgstr "Másolás _fel" -#: meld/actiongutter.py:248 +#: meld/actiongutter.py:255 msgid "Copy _down" msgstr "Másolás _le" @@ -1681,53 +1695,53 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: meld/dirdiff.py:623 meld/preferences.py:132 +#: meld/dirdiff.py:624 meld/preferences.py:132 msgid "Size" msgstr "Méret" #. Create date-time CellRenderer -#: meld/dirdiff.py:631 meld/preferences.py:133 +#: meld/dirdiff.py:632 meld/preferences.py:133 msgid "Modification time" msgstr "Módosítási idő" #. Create ISO-format date-time CellRenderer -#: meld/dirdiff.py:639 meld/preferences.py:134 +#: meld/dirdiff.py:640 meld/preferences.py:134 msgid "Modification time (ISO)" msgstr "Módosítási idő (ISO)" #. Create permissions CellRenderer -#: meld/dirdiff.py:647 meld/preferences.py:135 +#: meld/dirdiff.py:648 meld/preferences.py:135 msgid "Permissions" msgstr "Jogosultságok" -#: meld/dirdiff.py:900 +#: meld/dirdiff.py:901 #, python-brace-format msgid "{filename} (scanning…)" msgstr "{filename} (átvizsgálás…)" -#: meld/dirdiff.py:932 meld/dirdiff.py:964 +#: meld/dirdiff.py:933 meld/dirdiff.py:965 #, python-brace-format msgid "[{label}] Scanning {folder}" msgstr "[{label}] {folder} vizsgálata" -#: meld/dirdiff.py:1100 +#: meld/dirdiff.py:1101 #, python-brace-format msgid "[{label}] Done" msgstr "[{label}] Kész" -#: meld/dirdiff.py:1113 +#: meld/dirdiff.py:1114 msgid "Folder {} is being compared to itself" msgstr "A(z) {} mappa saját magával lesz összehasonlítva" -#: meld/dirdiff.py:1119 +#: meld/dirdiff.py:1120 msgid "Folders have no differences" msgstr "A mappák közt nincs eltérés" -#: meld/dirdiff.py:1121 +#: meld/dirdiff.py:1122 msgid "Contents of scanned files in folders are identical." msgstr "A mappákban vizsgált fájlok tartalma azonos." -#: meld/dirdiff.py:1123 +#: meld/dirdiff.py:1124 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1735,46 +1749,46 @@ msgstr "" "A mappákban vizsgált fájlok azonosnak tűnnek, de a tartalom nem lett " "vizsgálva." -#: meld/dirdiff.py:1126 +#: meld/dirdiff.py:1127 msgid "File filters are in use, so not all files have been scanned." msgstr "A fájlszűrők használata miatt nem lett megvizsgálva minden fájl." -#: meld/dirdiff.py:1128 +#: meld/dirdiff.py:1129 msgid "Text filters are in use and may be masking content differences." msgstr "" "Szöveges szűrők vannak használatban, és elfedhetik a fájlok közti " "különbségeket." -#: meld/dirdiff.py:1144 meld/filediff.py:1980 +#: meld/dirdiff.py:1145 meld/filediff.py:1997 msgid "Hide" msgstr "Elrejtés" -#: meld/dirdiff.py:1146 meld/filediff.py:1982 meld/filediff.py:2012 -#: meld/filediff.py:2014 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 +#: meld/dirdiff.py:1147 meld/filediff.py:1999 meld/filediff.py:2029 +#: meld/filediff.py:2031 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 msgid "Hi_de" msgstr "_Elrejtés" -#: meld/dirdiff.py:1155 +#: meld/dirdiff.py:1156 msgid "Multiple errors occurred while scanning this folder" msgstr "Több hiba történt a mappa vizsgálatakor" -#: meld/dirdiff.py:1156 +#: meld/dirdiff.py:1157 msgid "Files with invalid encodings found" msgstr "Érvénytelen kódolású fájlok találhatók" #. TRANSLATORS: This is followed by a list of files -#: meld/dirdiff.py:1158 +#: meld/dirdiff.py:1159 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "Egyes fájlok kódolása érvénytelen. A nevek a következők:" -#: meld/dirdiff.py:1160 +#: meld/dirdiff.py:1161 msgid "Files hidden by case insensitive comparison" msgstr "" "Kis- és nagybetűket meg nem különböztető összehasonlítás által elrejtett " "fájlok" #. TRANSLATORS: This is followed by a list of files -#: meld/dirdiff.py:1162 +#: meld/dirdiff.py:1163 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1782,17 +1796,17 @@ msgstr "" "Kis- és nagybetűkre nem érzékeny összehasonlítást futtat nagybetűérzékeny " "fájlrendszeren. A mappa alábbi fájljai el lettek rejtve:" -#: meld/dirdiff.py:1173 +#: meld/dirdiff.py:1174 #, python-brace-format msgid "“{first_file}” hidden by “{second_file}”" msgstr "„{first_file}” rejtve „{second_file}” által" -#: meld/dirdiff.py:1235 +#: meld/dirdiff.py:1236 #, python-format msgid "Replace folder “%s”?" msgstr "Cseréli ezt a mappát: „%s”?" -#: meld/dirdiff.py:1237 +#: meld/dirdiff.py:1238 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1801,11 +1815,11 @@ msgstr "" "Már létezik ugyanilyen nevű mappa itt: „%s”.\n" "Ha cseréli a meglévő mappát, akkor minden benne lévő fájl elvész." -#: meld/dirdiff.py:1250 +#: meld/dirdiff.py:1251 msgid "Error copying file" msgstr "Hiba a fájl másolásakor" -#: meld/dirdiff.py:1251 +#: meld/dirdiff.py:1252 #, python-brace-format msgid "" "Couldn’t copy {source}\n" @@ -1818,19 +1832,23 @@ msgstr "" "\n" "{error}" -#: meld/dirdiff.py:1276 meld/vcview.py:764 +#: meld/dirdiff.py:1277 meld/vcview.py:768 msgid "Error deleting {}" msgstr "Hiba a(z) {} törlésekor" -#: meld/dirdiff.py:1819 +#: meld/dirdiff.py:1825 msgid "No folder" msgstr "Nincs mappa" -#: meld/filediff.py:1156 +#: meld/dirdiff.py:1838 +msgid "Folder comparison:" +msgstr "Mappa-összehasonlítás:" + +#: meld/filediff.py:1168 msgid "Comparison results will be inaccurate" msgstr "Az összehasonlítás eredményei pontatlanok lesznek" -#: meld/filediff.py:1158 +#: meld/filediff.py:1170 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1838,97 +1856,98 @@ msgstr "" "Egy szűrő megváltoztatta a fájl sorainak számát, ami nem támogatott. Az " "összehasonlítás pontatlan lesz." -#: meld/filediff.py:1230 +#: meld/filediff.py:1242 msgid "Mark conflict as resolved?" msgstr "Megjelöli az ütközést feloldottként?" -#: meld/filediff.py:1232 +#: meld/filediff.py:1244 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "" "Ha az ütközést sikeresen feloldotta, akkor most megjelölheti feloldottként." -#: meld/filediff.py:1235 +#: meld/filediff.py:1247 msgid "Cancel" msgstr "Mégse" -#: meld/filediff.py:1236 +#: meld/filediff.py:1248 msgid "Mark _Resolved" msgstr "Megjelölés _feloldottként" -#: meld/filediff.py:1427 meld/filediff.py:1443 +#: meld/filediff.py:1439 meld/filediff.py:1455 msgid "Add Synchronization Point" msgstr "Szinkronizálási pont hozzáadása" -#: meld/filediff.py:1431 -#| msgid "Add Synchronization Point" +#: meld/filediff.py:1443 msgid "Remove Synchronization Point" msgstr "Szinkronizálási pont eltávolítása" -#: meld/filediff.py:1435 -#| msgid "Add Synchronization Point" +#: meld/filediff.py:1447 msgid "Move Synchronization Point" msgstr "Szinkronizálási pont áthelyezése" -#: meld/filediff.py:1439 -#| msgid "Add Synchronization Point" +#: meld/filediff.py:1451 msgid "Match Synchronization Point" msgstr "Szinkronizálási pont illesztése" -#: meld/filediff.py:1463 +#: meld/filediff.py:1475 msgid "Clear Synchronization Points" msgstr "Szinkronizálási pontok törlése" -#: meld/filediff.py:1654 +#: meld/filediff.py:1535 +msgid "File comparison:" +msgstr "Fájl-összehasonlítás:" + +#: meld/filediff.py:1671 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Hiba történt a fájl („%s”) megnyitásakor." -#: meld/filediff.py:1663 +#: meld/filediff.py:1680 #, python-format msgid "File %s appears to be a binary file." msgstr "%s bináris fájlnak tűnik." -#: meld/filediff.py:1665 +#: meld/filediff.py:1682 msgid "Do you want to open the file using the default application?" msgstr "Meg szeretné nyitni a fájlt az alapértelmezett alkalmazással?" -#: meld/filediff.py:1667 +#: meld/filediff.py:1684 msgid "Open" msgstr "Megnyitás" -#: meld/filediff.py:1689 +#: meld/filediff.py:1706 #, python-format msgid "[%s] Merging files" msgstr "[%s] Fájlok összefésülése" -#: meld/filediff.py:1703 +#: meld/filediff.py:1720 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Eltérések számítása" -#: meld/filediff.py:1763 +#: meld/filediff.py:1780 #, python-format msgid "File %s has changed on disk" msgstr "%s fájl megváltozott a lemezen" -#: meld/filediff.py:1764 +#: meld/filediff.py:1781 msgid "Do you want to reload the file?" msgstr "Újratölti a fájlt?" -#: meld/filediff.py:1766 +#: meld/filediff.py:1783 msgid "_Reload" msgstr "Új_ratöltés" -#: meld/filediff.py:1936 +#: meld/filediff.py:1953 msgid "File {} is being compared to itself" msgstr "A(z) {} fájl saját magával lesz összehasonlítva" -#: meld/filediff.py:1945 +#: meld/filediff.py:1962 msgid "Files are identical" msgstr "A fájlok azonosak" -#: meld/filediff.py:1958 +#: meld/filediff.py:1975 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1936,11 +1955,11 @@ msgstr "" "Szöveges szűrők vannak használatban, és elfedhetik a fájlok közti " "különbségeket. Szeretné a szűretlen fájlokat összehasonlítani?" -#: meld/filediff.py:1963 +#: meld/filediff.py:1980 msgid "Files differ in line endings only" msgstr "A fájlok csak a sorvégekben térnek el" -#: meld/filediff.py:1965 +#: meld/filediff.py:1982 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1949,15 +1968,15 @@ msgstr "" "A fájlok azonosak a sorvégjelektől eltekintve:\n" "%s" -#: meld/filediff.py:1985 +#: meld/filediff.py:2002 msgid "Show without filters" msgstr "Megjelenítés szűrők nélkül" -#: meld/filediff.py:2007 +#: meld/filediff.py:2024 msgid "Change highlighting incomplete" msgstr "Részleges kiemelés módosítása" -#: meld/filediff.py:2008 +#: meld/filediff.py:2025 msgid "" "Some changes were not highlighted because they were too large. You can force " "Meld to take longer to highlight larger changes, though this may be slow." @@ -1965,19 +1984,19 @@ msgstr "" "Egyes változtatások nincsenek kiemelve, mert túl nagyok. A Meld kiemelheti " "ezeket a nagyobb változtatásokat, de lassú lehet." -#: meld/filediff.py:2016 +#: meld/filediff.py:2033 msgid "Keep highlighting" msgstr "Kiemelés továbbra is" -#: meld/filediff.py:2018 +#: meld/filediff.py:2035 msgid "_Keep highlighting" msgstr "_Kiemelés továbbra is" -#: meld/filediff.py:2031 +#: meld/filediff.py:2048 msgid "Saving failed" msgstr "A mentés sikertelen" -#: meld/filediff.py:2032 +#: meld/filediff.py:2049 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." @@ -1985,36 +2004,36 @@ msgstr "" "Fontolja meg a kritikus változtatások átmásolását egy másik programba vagy " "fájlba az adatvesztés elkerülése érdekében." -#: meld/filediff.py:2041 +#: meld/filediff.py:2058 msgid "Save Left Pane As" msgstr "Bal ablaktábla mentése másként" -#: meld/filediff.py:2043 +#: meld/filediff.py:2060 msgid "Save Middle Pane As" msgstr "Középső ablaktábla mentése másként" -#: meld/filediff.py:2045 +#: meld/filediff.py:2062 msgid "Save Right Pane As" msgstr "Jobb ablaktábla mentése másként" -#: meld/filediff.py:2056 +#: meld/filediff.py:2073 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "A(z) %s fájl megváltozott a lemezen a megnyitása óta" -#: meld/filediff.py:2058 +#: meld/filediff.py:2075 msgid "If you save it, any external changes will be lost." msgstr "Ha menti, minden külső változtatás elvész." -#: meld/filediff.py:2061 +#: meld/filediff.py:2078 msgid "Save Anyway" msgstr "Mentés mindenképp" -#: meld/filediff.py:2062 +#: meld/filediff.py:2079 msgid "Don’t Save" msgstr "Ne mentse" -#: meld/filediff.py:2104 +#: meld/filediff.py:2121 msgid "" "File “{}” contains characters that can’t be encoded using its current " "encoding “{}”." @@ -2022,7 +2041,7 @@ msgstr "" "A(z) „{}” fájl olyan karaktereket tartalmaz, amelyek nem kódolhatók a " "jelenlegi „{}” kódolás használatával." -#: meld/filediff.py:2108 meld/patchdialog.py:138 +#: meld/filediff.py:2125 meld/patchdialog.py:138 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -2031,16 +2050,16 @@ msgstr "" "A fájl nem menthető. Ok:\n" "%s" -#: meld/filediff.py:2112 meld/patchdialog.py:137 +#: meld/filediff.py:2129 meld/patchdialog.py:137 #, python-format msgid "Could not save file %s." msgstr "A fájl (%s) nem menthető." -#: meld/filediff.py:2522 +#: meld/filediff.py:2539 msgid "Live comparison updating disabled" msgstr "Az élő összehasonlítás-frissítés kikapcsolva" -#: meld/filediff.py:2523 +#: meld/filediff.py:2540 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2050,6 +2069,24 @@ msgstr "" "pontok aktívak. Saját kezűleg továbbra is frissítheti az összehasonlítást, " "és az élő frissítések folytatódnak a szinkronizálási pontok törlésekor." +#: meld/filediff.py:2568 +msgid "Can't swap unsaved files" +msgstr "Nem lehet felcserélni mentetlen fájlokat" + +#: meld/filediff.py:2570 +msgid "Files must be saved to disk before swapping panes." +msgstr "A fájlokat el kell menteni a lemezre a panelek felcserélése előtt." + +#: meld/filediff.py:2577 +#| msgid "Start a version control comparison" +msgid "Can't swap version control comparisons" +msgstr "Nem lehet felcserélni a verziókövetési összehasonlításokat" + +#: meld/filediff.py:2579 +#| msgid "Mark as resolved in version control" +msgid "Swapping panes is not supported in version control mode." +msgstr "A panelek felcserélése nem támogatott verziókövető módban." + #: meld/iohelpers.py:41 msgid "Deleting remote folders is not supported" msgstr "A távoli mappák törlése nem támogatott" @@ -2102,7 +2139,7 @@ msgstr "mappa" #: meld/meldapp.py:195 msgid "Start a version control comparison" -msgstr "Verziókövető-összehasonlítás indítása" +msgstr "Verziókövetési összehasonlítás indítása" #: meld/meldapp.py:197 msgid "Start a 2- or 3-way file comparison" @@ -2306,51 +2343,51 @@ msgstr "Nincs" msgid "Rev %s" msgstr "%s rev" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Merged" msgstr "Egyesítve" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Base" msgstr "Alap" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Local" msgstr "Helyi" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Remote" msgstr "Távoli" -#: meld/vc/_vc.py:73 +#: meld/vc/_vc.py:74 msgid "Error" msgstr "Hiba" -#: meld/vc/_vc.py:75 +#: meld/vc/_vc.py:76 msgid "Newly added" msgstr "Újonnan hozzáadott" -#: meld/vc/_vc.py:77 +#: meld/vc/_vc.py:78 msgid "Renamed" msgstr "Átnevezve" -#: meld/vc/_vc.py:78 +#: meld/vc/_vc.py:79 msgid "Conflict" msgstr "Ütközés" -#: meld/vc/_vc.py:79 +#: meld/vc/_vc.py:80 msgid "Removed" msgstr "Eltávolítva" -#: meld/vc/_vc.py:80 +#: meld/vc/_vc.py:81 msgid "Missing" msgstr "Hiányzó" -#: meld/vc/_vc.py:81 +#: meld/vc/_vc.py:82 msgid "Not present" msgstr "Nincs jelen" -#: meld/vc/_vc.py:82 +#: meld/vc/_vc.py:83 msgid "Scanning…" msgstr "Átvizsgálás…" @@ -2383,67 +2420,68 @@ msgstr "Nem található használható verziókövető rendszer ebben a mappában msgid "Choose which version control system to use" msgstr "Válassza ki a használandó verziókövető rendszert" -#. TRANSLATORS: This is the location of the directory being viewed -#: meld/vcview.py:412 +#. TRANSLATORS: This is the name of the version control +#. system being used, e.g., "Git" or "Subversion" +#: meld/vcview.py:414 #, python-brace-format -msgid "Location: {path}" -msgstr "Hely: {path}" +msgid "{vc} comparison:" +msgstr "{vc}-összehasonlítás:" #. Initial yield so when we add this to our tasks, we don't #. create iterators that may be invalidated. -#: meld/vcview.py:419 +#: meld/vcview.py:423 msgid "Scanning repository" msgstr "Tároló vizsgálata" -#: meld/vcview.py:448 +#: meld/vcview.py:452 #, python-format msgid "Scanning %s" msgstr "%s vizsgálata" -#: meld/vcview.py:487 +#: meld/vcview.py:491 msgid "(Empty)" msgstr "(Üres)" -#: meld/vcview.py:535 +#: meld/vcview.py:539 #, python-format msgid "%s — local" msgstr "%s – helyi" -#: meld/vcview.py:536 +#: meld/vcview.py:540 #, python-format msgid "%s — remote" msgstr "%s – távoli" -#: meld/vcview.py:544 +#: meld/vcview.py:548 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (helyi, összefésült, távoli)" -#: meld/vcview.py:549 +#: meld/vcview.py:553 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (távoli, összefésült, helyi)" -#: meld/vcview.py:560 +#: meld/vcview.py:564 #, python-format msgid "%s — repository" msgstr "%s – tároló" -#: meld/vcview.py:566 +#: meld/vcview.py:570 #, python-format msgid "%s (working, repository)" msgstr "%s (munka, tároló)" -#: meld/vcview.py:570 +#: meld/vcview.py:574 #, python-format msgid "%s (repository, working)" msgstr "%s (tároló, munka)" -#: meld/vcview.py:735 +#: meld/vcview.py:739 msgid "Remove folder and all its files?" msgstr "Eltávolítja a mappát és benne minden fájlt?" -#: meld/vcview.py:737 +#: meld/vcview.py:741 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2451,6 +2489,6 @@ msgstr "" "Ez eltávolítja az összes kijelölt fájlt és mappát, valamint minden fájlt a " "kijelölt mappákon belül a verziókövetőből." -#: meld/vcview.py:850 +#: meld/vcview.py:854 msgid "Clear" msgstr "Törlés" diff --git a/po/id.po b/po/id.po index 2d05f8f..cd65d21 100644 --- a/po/id.po +++ b/po/id.po @@ -2,24 +2,24 @@ # Copyright (C) 2013 meld's COPYRIGHT HOLDER # This file is distributed under the same license as the meld package. # Andika Triwidada , 2013, 2014, 2016, 2017, 2018. -# +# Kukuh Syafaat , 2017, 2018, 2019, 2022. msgid "" msgstr "" "Project-Id-Version: meld master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2021-05-15 21:16+0000\n" -"PO-Revision-Date: 2021-05-31 18:41+0700\n" -"Last-Translator: Andika Triwidada \n" +"POT-Creation-Date: 2022-10-30 22:10+0000\n" +"PO-Revision-Date: 2022-11-16 13:56+0700\n" +"Last-Translator: Kukuh Syafaat \n" "Language-Team: Indonesian \n" "Language: id\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;\n" -"X-Generator: Poedit 2.4.3\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Poedit 3.2.1\n" #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11 -#: meld/resources/ui/appwindow.ui:9 +#: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17 msgid "Meld" msgstr "Meld" @@ -82,10 +82,22 @@ msgid "Default window fullscreen state" msgstr "Keadaan layar penuh jendela baku" #: data/org.gnome.meld.gschema.xml:58 +msgid "Prefer application-wide dark theme" +msgstr "Lebih suka tema gelap di seluruh aplikasi" + +#: data/org.gnome.meld.gschema.xml:59 +msgid "" +"If true, the GTK dark theme variant will be used, if available. Note that " +"this is separate from the syntax highlighting scheme." +msgstr "" +"Jika tr,ue varian tema gelap GTK akan digunakan, jika tersedia. Perhatikan " +"bahwa ini terpisah dari skema penyorotan sintaks." + +#: data/org.gnome.meld.gschema.xml:65 msgid "Additional automatically detected text encodings" msgstr "Tambahan enkoding teks yang dideteksi secara otomatis" -#: data/org.gnome.meld.gschema.xml:59 +#: data/org.gnome.meld.gschema.xml:66 msgid "" "Meld will use these text encodings to try to decode loaded text files before " "trying any other encodings. In addition to the encodings in this list, UTF-8 " @@ -98,39 +110,39 @@ msgstr "" "selalu dipakai; encoding lain mungkin juga dicoba, bergantung kepada locale " "pengguna." -#: data/org.gnome.meld.gschema.xml:66 +#: data/org.gnome.meld.gschema.xml:73 msgid "Width of an indentation step" msgstr "Lebar langkah indentasi" -#: data/org.gnome.meld.gschema.xml:67 +#: data/org.gnome.meld.gschema.xml:74 msgid "The number of spaces to use for a single indent step" msgstr "Banyaknya spasi yang dipakai untuk langkah indentasi tunggal" -#: data/org.gnome.meld.gschema.xml:71 +#: data/org.gnome.meld.gschema.xml:78 msgid "Whether to indent using spaces or tabs" msgstr "Apakah indentasi memakai spasi atau tab" -#: data/org.gnome.meld.gschema.xml:72 +#: data/org.gnome.meld.gschema.xml:79 msgid "If true, any new indentation will use spaces instead of tabs." msgstr "" "Bila berisi true, sebarang indentasi baru akan memakai spasi sebagai ganti " "tab." -#: data/org.gnome.meld.gschema.xml:76 meld/resources/ui/statusbar-menu.ui:5 +#: data/org.gnome.meld.gschema.xml:83 meld/resources/ui/statusbar-menu.ui:5 msgid "Show line numbers" msgstr "Tampilkan nomor baris" -#: data/org.gnome.meld.gschema.xml:77 +#: data/org.gnome.meld.gschema.xml:84 msgid "If true, line numbers will be shown in the gutter of file comparisons." msgstr "" "Bila berisi true, nomor baris akan ditampilkan dalam parit perbandingan " "berkas." -#: data/org.gnome.meld.gschema.xml:81 +#: data/org.gnome.meld.gschema.xml:88 msgid "Highlight syntax" msgstr "Sorot sintaks" -#: data/org.gnome.meld.gschema.xml:82 +#: data/org.gnome.meld.gschema.xml:89 msgid "" "Whether to highlight syntax in comparisons. Because of Meld’s own color " "highlighting, this is off by default." @@ -138,20 +150,20 @@ msgstr "" "Apakah menyorot sintaks dalam perbandingan. Karena warna penyorotan milik " "Meld, ini secara baku mati." -#: data/org.gnome.meld.gschema.xml:86 +#: data/org.gnome.meld.gschema.xml:93 msgid "Color scheme to use for syntax highlighting" msgstr "Skema warna yang digunakan untuk penyorotan sintaks" -#: data/org.gnome.meld.gschema.xml:87 +#: data/org.gnome.meld.gschema.xml:94 msgid "Used by GtkSourceView to determine colors for syntax highlighting" msgstr "" "Dipakai oleh GtkSourceView untuk menentukan warna bagi penyorotan sintaks" -#: data/org.gnome.meld.gschema.xml:91 +#: data/org.gnome.meld.gschema.xml:98 msgid "Draw whitespace" msgstr "Tampilkan whitespace" -#: data/org.gnome.meld.gschema.xml:92 +#: data/org.gnome.meld.gschema.xml:99 msgid "" "If true, whitespace characters will be drawn in comparisons even if they are " "not in a changed area." @@ -159,11 +171,11 @@ msgstr "" "Jika berisi true, karakter spasi akan digambar dalam perbandingan bahkan " "jika mereka tidak berada di area yang berubah." -#: data/org.gnome.meld.gschema.xml:101 +#: data/org.gnome.meld.gschema.xml:108 msgid "Wrap mode" msgstr "Mode lipat" -#: data/org.gnome.meld.gschema.xml:102 +#: data/org.gnome.meld.gschema.xml:109 msgid "" "Lines in file comparisons will be wrapped according to this setting, either " "not at all ('none'), at any character ('char') or only at the end of words " @@ -173,11 +185,11 @@ msgstr "" "tidak sedikitpun ('none'), pada sebarang karakter ('char'), atau hanya pada " "akhir kata ('word')." -#: data/org.gnome.meld.gschema.xml:109 meld/resources/ui/statusbar-menu.ui:13 +#: data/org.gnome.meld.gschema.xml:116 meld/resources/ui/statusbar-menu.ui:13 msgid "Highlight current line" msgstr "Sorot baris saat ini" -#: data/org.gnome.meld.gschema.xml:110 +#: data/org.gnome.meld.gschema.xml:117 msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." @@ -185,22 +197,22 @@ msgstr "" "Bila berisi true, baris yang memuat kursor akan disorot dalam perbandingan " "berkas." -#: data/org.gnome.meld.gschema.xml:114 +#: data/org.gnome.meld.gschema.xml:121 msgid "Use the system default monospace font" msgstr "Gunakan fonta monospace bawaan sistem" -#: data/org.gnome.meld.gschema.xml:115 +#: data/org.gnome.meld.gschema.xml:122 msgid "" "If false, custom-font will be used instead of the system monospace font." msgstr "" "Bila berisi false, fonta ubahan akan dipakai sebagai ganti fonta monospace " "sistem." -#: data/org.gnome.meld.gschema.xml:119 +#: data/org.gnome.meld.gschema.xml:126 msgid "Custom font" msgstr "Fonta ubahan" -#: data/org.gnome.meld.gschema.xml:120 +#: data/org.gnome.meld.gschema.xml:127 msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." @@ -208,41 +220,41 @@ msgstr "" "Fonta ubahan yang dipakai, disimpan sebagai suatu string dan diurai sebagai " "suatu deskripsi fonta Pango." -#: data/org.gnome.meld.gschema.xml:126 +#: data/org.gnome.meld.gschema.xml:133 msgid "Show overview source map" msgstr "Tampilkan ikhtisar peta sumber" -#: data/org.gnome.meld.gschema.xml:127 +#: data/org.gnome.meld.gschema.xml:134 msgid "" "If true, file comparisons will have paired source maps for compared files." msgstr "" "Jika berisi true, perbandingan berkas akan memiliki peta sumber berpasangan " "untuk berkas-berkas yang dibandingkan." -#: data/org.gnome.meld.gschema.xml:132 +#: data/org.gnome.meld.gschema.xml:139 msgid "Style of overview map" msgstr "Gaya peta ikhtisar" -#: data/org.gnome.meld.gschema.xml:133 +#: data/org.gnome.meld.gschema.xml:140 msgid "Style options for how the overview map is displayed." msgstr "Pilihan gaya untuk bagaimana peta ikhtisar ditampilkan." -#: data/org.gnome.meld.gschema.xml:139 +#: data/org.gnome.meld.gschema.xml:146 msgid "Ignore blank lines when comparing files" msgstr "Abaikan baris kosong ketika membandingkan berkas" -#: data/org.gnome.meld.gschema.xml:140 +#: data/org.gnome.meld.gschema.xml:147 msgid "" "If true, blank lines will be trimmed when highlighting changes between files." msgstr "" "Bila berisi true, baris-baris kosong akan dibuang ketika menyorot perubahan " "antar berkas." -#: data/org.gnome.meld.gschema.xml:147 +#: data/org.gnome.meld.gschema.xml:154 msgid "Use the system default editor" msgstr "Gunakan penyunting bawaan sistem" -#: data/org.gnome.meld.gschema.xml:148 +#: data/org.gnome.meld.gschema.xml:155 msgid "" "If false, custom-editor-command will be used instead of the system editor " "when opening files externally." @@ -250,11 +262,11 @@ msgstr "" "Bila berisi false, perintah penyunting ubahan akan dipakai sebagai ganti " "penyunting sistem ketika membuka berkas secara eksternal." -#: data/org.gnome.meld.gschema.xml:152 +#: data/org.gnome.meld.gschema.xml:159 msgid "The custom editor launch command" msgstr "Perintah peluncuran penyunting ubahan" -#: data/org.gnome.meld.gschema.xml:153 +#: data/org.gnome.meld.gschema.xml:160 msgid "" "The command used to launch a custom editor. Some limited templating is " "supported here; at the moment '{file}' and '{line}' are recognised tokens." @@ -263,11 +275,11 @@ msgstr "" "penemplatan yang terbatas didukung di sini; saat ini '{file}' dan '{line}' " "adalah token yang dikenal." -#: data/org.gnome.meld.gschema.xml:159 +#: data/org.gnome.meld.gschema.xml:166 msgid "Columns to display" msgstr "Kolom yang akan ditampilkan" -#: data/org.gnome.meld.gschema.xml:160 +#: data/org.gnome.meld.gschema.xml:167 msgid "" "List of column names in folder comparison and whether they should be " "displayed." @@ -275,11 +287,11 @@ msgstr "" "Daftar nama kolom dalam perbandingan folder dan apakah mereka mesti " "ditampilkan." -#: data/org.gnome.meld.gschema.xml:164 meld/resources/ui/preferences.ui:935 +#: data/org.gnome.meld.gschema.xml:171 meld/resources/ui/preferences.ui:951 msgid "Ignore symbolic links" msgstr "Abaikan taut simbolik" -#: data/org.gnome.meld.gschema.xml:165 +#: data/org.gnome.meld.gschema.xml:172 msgid "" "If true, folder comparisons do not follow symbolic links when traversing the " "folder tree." @@ -287,11 +299,11 @@ msgstr "" "Bila berisi true, perbandingan folder tidak mengikuti taut simbolik ketika " "menelusuri pohon folder." -#: data/org.gnome.meld.gschema.xml:169 +#: data/org.gnome.meld.gschema.xml:176 msgid "Use shallow comparison" msgstr "Gunakan perbandingan dangkal" -#: data/org.gnome.meld.gschema.xml:170 +#: data/org.gnome.meld.gschema.xml:177 msgid "" "If true, folder comparisons compare files based solely on size and mtime, " "considering files to be identical if their size and mtime match, and " @@ -301,11 +313,11 @@ msgstr "" "pada ukuran dan mtime, menganggap berkas identik bila ukuran dan mtime " "mereka cocok, dan berbeda bila tidak." -#: data/org.gnome.meld.gschema.xml:174 +#: data/org.gnome.meld.gschema.xml:181 msgid "File timestamp resolution" msgstr "Resolusi penanda waktu" -#: data/org.gnome.meld.gschema.xml:175 +#: data/org.gnome.meld.gschema.xml:182 msgid "" "When comparing based on mtime, this is the minimum difference in nanoseconds " "between two files before they’re considered to have different mtimes. This " @@ -317,11 +329,11 @@ msgstr "" "berbeda. Ini berguna ketika membandingkan berkas antar sistem berkas dengan " "resolusi penanda waktu yang berbeda." -#: data/org.gnome.meld.gschema.xml:179 meld/resources/ui/preferences.ui:836 +#: data/org.gnome.meld.gschema.xml:186 meld/resources/ui/preferences.ui:852 msgid "Apply text filters during folder comparisons" msgstr "Terapkan penyaring teks selama perbandingan folder" -#: data/org.gnome.meld.gschema.xml:180 +#: data/org.gnome.meld.gschema.xml:187 msgid "" "If true, folder comparisons that compare file contents also apply active " "text filters and the blank line trimming option, and ignore newline " @@ -331,21 +343,21 @@ msgstr "" "menerapkan penyaring teks aktif dan opsi pemangkasan baris kosong, dan " "mengabaikan perbedaan baris baru." -#: data/org.gnome.meld.gschema.xml:184 +#: data/org.gnome.meld.gschema.xml:191 msgid "File status filters" msgstr "Penyaring status berkas" -#: data/org.gnome.meld.gschema.xml:185 +#: data/org.gnome.meld.gschema.xml:192 msgid "List of statuses used to filter visible files in folder comparison." msgstr "" "Daftar dari status yang dipakai untuk menyaring berkas yang tampak dalam " "perbandingan folder." -#: data/org.gnome.meld.gschema.xml:191 +#: data/org.gnome.meld.gschema.xml:198 msgid "Show the version control console output" msgstr "Tampilkan keluaran konsol kendali versi" -#: data/org.gnome.meld.gschema.xml:192 +#: data/org.gnome.meld.gschema.xml:199 msgid "" "If true, a console output section will be shown in version control views, " "showing the commands run for version control operations." @@ -354,22 +366,22 @@ msgstr "" "kendali versi, menunjukkan perintah yang dijalankan bagi operasi kendali " "versi." -#: data/org.gnome.meld.gschema.xml:196 +#: data/org.gnome.meld.gschema.xml:203 msgid "Version control pane position" msgstr "Posisi panel kendali versi" -#: data/org.gnome.meld.gschema.xml:197 +#: data/org.gnome.meld.gschema.xml:204 msgid "" "This is the height of the main version control tree when the console pane is " "shown." msgstr "" "Ini adalah tinggi phon kendali versi utama ketika panel konsol ditampilkan." -#: data/org.gnome.meld.gschema.xml:201 +#: data/org.gnome.meld.gschema.xml:208 msgid "Present version comparisons as left-local/right-remote" msgstr "Sajikan perbandingan versi sebagai kiri-lokal/kanan-jauh" -#: data/org.gnome.meld.gschema.xml:202 +#: data/org.gnome.meld.gschema.xml:209 msgid "" "If true, version control comparisons will use a left-is-local, right-is-" "remote scheme to determine what order to present files in panes. Otherwise, " @@ -380,11 +392,11 @@ msgstr "" "dalam panel. Bila tidak, skema left-adalah-milik-mereka, kanan-adalah-" "milikku dipakai." -#: data/org.gnome.meld.gschema.xml:206 +#: data/org.gnome.meld.gschema.xml:213 msgid "Order for files in three-way version control merge comparisons" msgstr "Urutan bagi berkas dalam perbandingan merge kendali versi tiga arah" -#: data/org.gnome.meld.gschema.xml:207 +#: data/org.gnome.meld.gschema.xml:214 msgid "" "Choices for file order are remote/merged/local and local/merged/remote. This " "preference only affects three-way comparisons launched from the version " @@ -395,11 +407,11 @@ msgstr "" "diluncurkan dari tilikan kendali versi, sehingga hanya dipakai untuk " "resolusi merge/konflik di dalam Meld." -#: data/org.gnome.meld.gschema.xml:211 +#: data/org.gnome.meld.gschema.xml:218 msgid "Show margin in commit message editor" msgstr "Tampilkan marjin dalam penyunting pesan komit" -#: data/org.gnome.meld.gschema.xml:212 +#: data/org.gnome.meld.gschema.xml:219 msgid "" "If true, a guide will be displayed to show what column the margin is at in " "the version control commit message editor." @@ -407,11 +419,11 @@ msgstr "" "Bila berisi true, suatu panduan akan ditampilkan untuk menunjukkan marjin " "pada kolom mana dalam penyunting pesan komit kendali versi." -#: data/org.gnome.meld.gschema.xml:216 +#: data/org.gnome.meld.gschema.xml:223 msgid "Margin column in commit message editor" msgstr "Marjin kolom dalam penyunting pesan komit" -#: data/org.gnome.meld.gschema.xml:217 +#: data/org.gnome.meld.gschema.xml:224 msgid "" "The column at which to show the margin in the version control commit message " "editor." @@ -419,11 +431,11 @@ msgstr "" "Kolom tempat menunjukkan posisi marjin dalam penyunting pesan komit kendali " "versi." -#: data/org.gnome.meld.gschema.xml:221 +#: data/org.gnome.meld.gschema.xml:228 msgid "Automatically hard-wrap commit messages" msgstr "Secara otomatis melipat isi pesan komit" -#: data/org.gnome.meld.gschema.xml:222 +#: data/org.gnome.meld.gschema.xml:229 msgid "" "If true, the version control commit message editor will hard-wrap (i.e., " "insert line breaks) at the commit margin before commit." @@ -431,22 +443,22 @@ msgstr "" "Bila berisi true, penyunting pesan komit kendali versi akan melipat (yaitu " "menyisipkan pemecah baris) pada marjin komit sebelum komit." -#: data/org.gnome.meld.gschema.xml:226 +#: data/org.gnome.meld.gschema.xml:233 msgid "Version control status filters" msgstr "Penyaring status kendali versi" -#: data/org.gnome.meld.gschema.xml:227 +#: data/org.gnome.meld.gschema.xml:234 msgid "" "List of statuses used to filter visible files in version control comparison." msgstr "" "Daftar status yang dipakai untuk menyaring berkas yang tampak dalam " "perbandingan kendali versi." -#: data/org.gnome.meld.gschema.xml:241 +#: data/org.gnome.meld.gschema.xml:248 msgid "Filename-based filters" msgstr "Penyaring berbasis nama berkas" -#: data/org.gnome.meld.gschema.xml:242 +#: data/org.gnome.meld.gschema.xml:249 msgid "" "List of predefined filename-based filters that, if active, will remove " "matching files from a folder comparison." @@ -454,11 +466,11 @@ msgstr "" "Daftar penyaring berbasis nama berkas yang terpradefinisi, yang bila aktif, " "akan menghapus berkas yang cocok dari perbandingan folder." -#: data/org.gnome.meld.gschema.xml:256 +#: data/org.gnome.meld.gschema.xml:263 msgid "Text-based filters" msgstr "Penyaring berbasis teks" -#: data/org.gnome.meld.gschema.xml:257 +#: data/org.gnome.meld.gschema.xml:264 msgid "" "List of predefined text-based regex filters that, if active, will remove " "text from being used in a file comparison. The text will still be displayed, " @@ -516,405 +528,415 @@ msgstr "Segarkan perbandingan" #: meld/resources/gtk/help-overlay.ui:54 msgctxt "shortcut window" +msgid "Open externally" +msgstr "Buka secara eksternal" + +#: meld/resources/gtk/help-overlay.ui:61 +msgctxt "shortcut window" msgid "Fullscreen" msgstr "Layar Penuh" -#: meld/resources/gtk/help-overlay.ui:63 +#: meld/resources/gtk/help-overlay.ui:68 +msgctxt "shortcut window" +msgid "Swap left and right panes" +msgstr "Menukar panel kiri dan kanan" + +#: meld/resources/gtk/help-overlay.ui:77 msgctxt "shortcut window" msgid "Panes" msgstr "Panel" -#: meld/resources/gtk/help-overlay.ui:68 +#: meld/resources/gtk/help-overlay.ui:82 msgctxt "shortcut window" msgid "Previous comparison pane" msgstr "Panel perbandingan sebelumnya" -#: meld/resources/gtk/help-overlay.ui:75 +#: meld/resources/gtk/help-overlay.ui:89 msgctxt "shortcut window" msgid "Next comparison pane" msgstr "Panel perbandingan selanjutnya" -#: meld/resources/gtk/help-overlay.ui:84 +#: meld/resources/gtk/help-overlay.ui:98 msgctxt "shortcut window" msgid "Changes" msgstr "Perubahan" -#: meld/resources/gtk/help-overlay.ui:89 +#: meld/resources/gtk/help-overlay.ui:103 msgctxt "shortcut window" msgid "Go to previous change" msgstr "Ke perubahan sebelumnya" -#: meld/resources/gtk/help-overlay.ui:96 +#: meld/resources/gtk/help-overlay.ui:110 msgctxt "shortcut window" msgid "Go to next change" msgstr "Ke perubahan selanjutnya" -#: meld/resources/gtk/help-overlay.ui:105 +#: meld/resources/gtk/help-overlay.ui:119 msgctxt "shortcut window" msgid "Tabs" msgstr "Tab" -#: meld/resources/gtk/help-overlay.ui:110 +#: meld/resources/gtk/help-overlay.ui:124 msgctxt "shortcut window" msgid "Go to previous tab" msgstr "Ke tab sebelumnya" -#: meld/resources/gtk/help-overlay.ui:117 +#: meld/resources/gtk/help-overlay.ui:131 msgctxt "shortcut window" msgid "Go to next tab" msgstr "Ke tab selanjutnya" -#: meld/resources/gtk/help-overlay.ui:124 +#: meld/resources/gtk/help-overlay.ui:138 msgctxt "shortcut window" msgid "Switch to tab" msgstr "Tukar ke tab" -#: meld/resources/gtk/help-overlay.ui:131 +#: meld/resources/gtk/help-overlay.ui:145 msgctxt "shortcut window" msgid "Move tab left" msgstr "Pindahkan tab ke kiri" -#: meld/resources/gtk/help-overlay.ui:138 +#: meld/resources/gtk/help-overlay.ui:152 msgctxt "shortcut window" msgid "Move tab right" msgstr "Pindahkan tab ke kanan" -#: meld/resources/gtk/help-overlay.ui:147 +#: meld/resources/gtk/help-overlay.ui:161 msgctxt "shortcut window" msgid "Editing" msgstr "Menyunting" -#: meld/resources/gtk/help-overlay.ui:152 +#: meld/resources/gtk/help-overlay.ui:166 msgctxt "shortcut window" msgid "Undo" msgstr "Tak jadi" -#: meld/resources/gtk/help-overlay.ui:159 +#: meld/resources/gtk/help-overlay.ui:173 msgctxt "shortcut window" msgid "Redo" msgstr "Jadi lagi" -#: meld/resources/gtk/help-overlay.ui:166 +#: meld/resources/gtk/help-overlay.ui:180 msgctxt "shortcut window" msgid "Cut" msgstr "Potong" -#: meld/resources/gtk/help-overlay.ui:173 +#: meld/resources/gtk/help-overlay.ui:187 msgctxt "shortcut window" msgid "Copy" msgstr "Salin" -#: meld/resources/gtk/help-overlay.ui:180 +#: meld/resources/gtk/help-overlay.ui:194 msgctxt "shortcut window" msgid "Paste" msgstr "Tempel" -#: meld/resources/gtk/help-overlay.ui:187 +#: meld/resources/gtk/help-overlay.ui:201 msgctxt "shortcut window" msgid "Find" msgstr "Cari" -#: meld/resources/gtk/help-overlay.ui:194 +#: meld/resources/gtk/help-overlay.ui:208 msgctxt "shortcut window" msgid "Find Next" msgstr "Cari Selanjutnya" -#: meld/resources/gtk/help-overlay.ui:201 +#: meld/resources/gtk/help-overlay.ui:215 msgctxt "shortcut window" msgid "Find Previous" msgstr "Cari Sebelumnya" -#: meld/resources/gtk/help-overlay.ui:208 +#: meld/resources/gtk/help-overlay.ui:222 msgctxt "shortcut window" msgid "Replace" msgstr "Ganti" -#: meld/resources/gtk/help-overlay.ui:217 +#: meld/resources/gtk/help-overlay.ui:231 msgctxt "shortcut window" msgid "File comparison" msgstr "Perbandingan berkas" -#: meld/resources/gtk/help-overlay.ui:222 +#: meld/resources/gtk/help-overlay.ui:236 msgctxt "shortcut window" msgid "Save current file" msgstr "Simpan berkas kini" -#: meld/resources/gtk/help-overlay.ui:229 +#: meld/resources/gtk/help-overlay.ui:243 msgctxt "shortcut window" msgid "Save current file to new path" msgstr "Simpan berkas saat ini ke path baru" -#: meld/resources/gtk/help-overlay.ui:236 +#: meld/resources/gtk/help-overlay.ui:250 msgctxt "shortcut window" msgid "Save all files in comparison" msgstr "Simpan semua berkas dalam perbandingan" -#: meld/resources/gtk/help-overlay.ui:243 +#: meld/resources/gtk/help-overlay.ui:257 msgctxt "shortcut window" msgid "Previous conflict" msgstr "Konflik sebelumnya" -#: meld/resources/gtk/help-overlay.ui:250 +#: meld/resources/gtk/help-overlay.ui:264 msgctxt "shortcut window" msgid "Next conflict" msgstr "Konflik selanjutnya" -#: meld/resources/gtk/help-overlay.ui:257 +#: meld/resources/gtk/help-overlay.ui:271 msgctxt "shortcut window" msgid "Push change to left" msgstr "Push perubahan ke kiri" -#: meld/resources/gtk/help-overlay.ui:264 +#: meld/resources/gtk/help-overlay.ui:278 msgctxt "shortcut window" msgid "Push change to right" msgstr "Push perubahan ke kanan" -#: meld/resources/gtk/help-overlay.ui:271 +#: meld/resources/gtk/help-overlay.ui:285 msgctxt "shortcut window" msgid "Pull change from left" msgstr "Pull perubahan dari kiri" -#: meld/resources/gtk/help-overlay.ui:278 +#: meld/resources/gtk/help-overlay.ui:292 msgctxt "shortcut window" msgid "Pull change from right" msgstr "Pull perubahan dari kanan" -#: meld/resources/gtk/help-overlay.ui:285 +#: meld/resources/gtk/help-overlay.ui:299 msgctxt "shortcut window" msgid "Copy change above left" msgstr "Salin perubahan di atas kiri" -#: meld/resources/gtk/help-overlay.ui:292 +#: meld/resources/gtk/help-overlay.ui:306 msgctxt "shortcut window" msgid "Copy change below left" msgstr "Salin perubahan di bawah kiri" -#: meld/resources/gtk/help-overlay.ui:299 +#: meld/resources/gtk/help-overlay.ui:313 msgctxt "shortcut window" msgid "Copy change above right" msgstr "Salin perubahan di atas kanan" -#: meld/resources/gtk/help-overlay.ui:306 +#: meld/resources/gtk/help-overlay.ui:320 msgctxt "shortcut window" msgid "Copy change below right" msgstr "Salin perubahan di bawah kanan" -#: meld/resources/gtk/help-overlay.ui:313 -#: meld/resources/gtk/help-overlay.ui:341 +#: meld/resources/gtk/help-overlay.ui:327 +#: meld/resources/gtk/help-overlay.ui:355 msgctxt "shortcut window" msgid "Delete change" msgstr "Hapus perubahan" -#: meld/resources/gtk/help-overlay.ui:322 +#: meld/resources/gtk/help-overlay.ui:336 msgctxt "shortcut window" msgid "Folder comparison" msgstr "Perbandingan folder" -#: meld/resources/gtk/help-overlay.ui:327 +#: meld/resources/gtk/help-overlay.ui:341 msgctxt "shortcut window" msgid "Copy to left" msgstr "Salin ke kiri" -#: meld/resources/gtk/help-overlay.ui:334 +#: meld/resources/gtk/help-overlay.ui:348 msgctxt "shortcut window" msgid "Copy to right" msgstr "Salin ke kanan" -#: meld/resources/gtk/help-overlay.ui:350 +#: meld/resources/gtk/help-overlay.ui:364 msgctxt "shortcut window" msgid "Version control comparison" msgstr "Perbandingan kendali versi" -#: meld/resources/gtk/help-overlay.ui:355 +#: meld/resources/gtk/help-overlay.ui:369 msgctxt "shortcut window" msgid "Commit to version control" msgstr "Komit ke kendali versi" -#: meld/resources/gtk/help-overlay.ui:362 +#: meld/resources/gtk/help-overlay.ui:376 msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Tampilkan/sembunyikan keluaran konsol" #: meld/resources/gtk/menus.ui:7 -msgid "Refresh" -msgstr "Segarkan" - -#: meld/resources/gtk/menus.ui:12 -msgid "Stop" -msgstr "Berhenti" - -#: meld/resources/gtk/menus.ui:17 -msgid "Fullscreen" -msgstr "Layar Penuh" - -#: meld/resources/gtk/menus.ui:26 msgid "Save As…" msgstr "Simpan Sebagai…" -#: meld/resources/gtk/menus.ui:30 +#: meld/resources/gtk/menus.ui:11 msgid "Save A_ll" msgstr "Simpan Semu_a" -#: meld/resources/gtk/menus.ui:34 +#: meld/resources/gtk/menus.ui:15 msgid "Revert files…" msgstr "Pulihkan berkas…" -#: meld/resources/gtk/menus.ui:38 +#: meld/resources/gtk/menus.ui:19 msgid "Open Externally" msgstr "Buka Secara Eksternal" -#: meld/resources/gtk/menus.ui:45 +#: meld/resources/gtk/menus.ui:26 +msgid "Refresh Comparison" +msgstr "Segarkan Perbandingan" + +#: meld/resources/gtk/menus.ui:33 msgid "_Find…" msgstr "_Cari…" -#: meld/resources/gtk/menus.ui:49 +#: meld/resources/gtk/menus.ui:37 msgid "_Replace…" msgstr "_Ganti…" -#: meld/resources/gtk/menus.ui:55 +#: meld/resources/gtk/menus.ui:43 msgid "View" msgstr "Tampilan" -#: meld/resources/gtk/menus.ui:59 +#: meld/resources/gtk/menus.ui:47 +msgid "Fullscreen" +msgstr "Layar Penuh" + +#: meld/resources/gtk/menus.ui:52 msgid "Overview Map" msgstr "Peta Ikhtisar" -#: meld/resources/gtk/menus.ui:63 +#: meld/resources/gtk/menus.ui:56 msgid "Version control console" msgstr "Konsol kendali versi" -#: meld/resources/gtk/menus.ui:67 +#: meld/resources/gtk/menus.ui:60 msgid "Lock scrolling" msgstr "Kunci pengguliran" +#: meld/resources/gtk/menus.ui:67 +msgid "Swap left and right panes" +msgstr "Menukar panel kiri dan kanan" + #: meld/resources/gtk/menus.ui:73 msgid "Comparison" msgstr "Perbandingan" -#: meld/resources/gtk/menus.ui:77 +#: meld/resources/gtk/menus.ui:75 +msgid "Stop" +msgstr "Berhenti" + +#: meld/resources/gtk/menus.ui:81 msgid "Merge All from Left" msgstr "Merge Semua dari Kiri" -#: meld/resources/gtk/menus.ui:81 +#: meld/resources/gtk/menus.ui:85 msgid "Merge All from Right" msgstr "Merge Semua dari Kanan" -#: meld/resources/gtk/menus.ui:85 +#: meld/resources/gtk/menus.ui:89 msgid "Merge All" msgstr "Merge Semua" -#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:54 -msgid "Add Synchronization Point" -msgstr "Tambahkan Titik Sinkronisasi" - -#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:58 -msgid "Clear Synchronization Points" -msgstr "Bersihkan Titik Sinkronisasi" - -#: meld/resources/gtk/menus.ui:103 +#: meld/resources/gtk/menus.ui:96 msgid "Format as Patch…" msgstr "Format sebagai Patch…" -#: meld/resources/gtk/menus.ui:112 +#: meld/resources/gtk/menus.ui:105 msgid "_Preferences" msgstr "_Preferensi" -#: meld/resources/gtk/menus.ui:116 +#: meld/resources/gtk/menus.ui:109 msgid "Keyboard Shortcuts" msgstr "Tombol Pintas" -#: meld/resources/gtk/menus.ui:120 +#: meld/resources/gtk/menus.ui:113 msgid "_Help" msgstr "_Bantuan" -#: meld/resources/gtk/menus.ui:125 +#: meld/resources/gtk/menus.ui:118 msgid "_About Meld" msgstr "Tent_ang Meld" -#: meld/resources/gtk/menus.ui:138 +#: meld/resources/gtk/menus.ui:131 msgid "File status" msgstr "Status berkas" -#: meld/resources/gtk/menus.ui:140 +#: meld/resources/gtk/menus.ui:133 msgid "Same" msgstr "Sama" -#: meld/resources/gtk/menus.ui:144 +#: meld/resources/gtk/menus.ui:137 msgid "New" msgstr "Baru" -#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167 -#: meld/vc/_vc.py:76 +#: meld/resources/gtk/menus.ui:141 meld/resources/gtk/menus.ui:164 +#: meld/vc/_vc.py:77 msgid "Modified" msgstr "Diubah" -#: meld/resources/gtk/menus.ui:158 +#: meld/resources/gtk/menus.ui:151 msgid "Ignore filename case" msgstr "Abaikan besar kecil huruf nama berkas" -#: meld/resources/gtk/menus.ui:171 +#: meld/resources/gtk/menus.ui:155 +msgid "Normalize Unicode paths" +msgstr "Menormalkan path Unicode" + +#: meld/resources/gtk/menus.ui:168 msgid "Normal" msgstr "Normal" -#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70 +#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:71 msgid "Unversioned" msgstr "Tanpa versi" -#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69 +#: meld/resources/gtk/menus.ui:176 meld/vc/_vc.py:70 msgid "Ignored" msgstr "Diabaikan" -#: meld/resources/gtk/menus.ui:186 +#: meld/resources/gtk/menus.ui:183 msgid "Flatten folders" msgstr "Ratakan direktori" #: meld/resources/ui/about-dialog.ui:8 msgid "" "Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2019 Kai Willadsen" +"Copyright © 2009-2022 Kai Willadsen" msgstr "" "Hak Cipta © 2002-2009 Stephen Kennedy\n" -"Hak Cipta © 2009-2019 Kai Willadsen" +"Hak Cipta © 2009-2022 Kai Willadsen" #: meld/resources/ui/about-dialog.ui:14 msgid "translator-credits" msgstr "" "Andika Triwidada , 2013, 2014, 2016, 2018, 2020, 2021.\n" -"Kukuh Syafaat , 2017, 2018, 2019." +"Kukuh Syafaat , 2017, 2018, 2019, 2022." -#: meld/resources/ui/appwindow.ui:29 +#: meld/resources/ui/appwindow.ui:30 msgid "Start a new comparison" msgstr "Mulai suatu perbandingan baru" -#: meld/resources/ui/appwindow.ui:45 +#: meld/resources/ui/appwindow.ui:46 msgid "Open a recent comparison" msgstr "Buka perbandingan baru-baru ini" -#: meld/resources/ui/appwindow.ui:73 +#: meld/resources/ui/appwindow.ui:74 msgid "Go to the previous change" msgstr "Pergi ke perubahan sebelumnya" -#: meld/resources/ui/appwindow.ui:93 +#: meld/resources/ui/appwindow.ui:94 msgid "Go to the next change" msgstr "Pergi ke perubahan selanjutnya" -#: meld/resources/ui/appwindow.ui:123 +#: meld/resources/ui/appwindow.ui:124 msgid "Go to the previous conflict" msgstr "Pindah ke konflik sebelumnya" -#: meld/resources/ui/appwindow.ui:143 +#: meld/resources/ui/appwindow.ui:144 msgid "Go to the next conflict" msgstr "Pindah ke konflik selanjutnya" -#: meld/resources/ui/appwindow.ui:192 +#: meld/resources/ui/appwindow.ui:193 msgid "Version Filters" msgstr "Penyaring Versi" -#: meld/resources/ui/appwindow.ui:207 meld/resources/ui/preferences.ui:1456 +#: meld/resources/ui/appwindow.ui:208 meld/resources/ui/preferences.ui:1472 msgid "File Filters" msgstr "Penyaring Berkas" -#: meld/resources/ui/appwindow.ui:222 meld/resources/ui/preferences.ui:1641 +#: meld/resources/ui/appwindow.ui:223 meld/resources/ui/preferences.ui:1657 msgid "Text Filters" msgstr "Penyaring Teks" @@ -927,7 +949,7 @@ msgid "Column Name" msgstr "Nama Kolom" #: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128 -#: meld/resources/ui/vcview-menus.ui:26 meld/vcview.py:736 +#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:745 msgid "_Remove" msgstr "_Hapus" @@ -984,33 +1006,58 @@ msgid "_Compare selected files" msgstr "_Bandingkan berkas-berkas yang dipilih" #: meld/resources/ui/dirdiff-menus.ui:14 +msgid "_Mark selected file" +msgstr "_Tandai berkas-berkas yang dipilih" + +#: meld/resources/ui/dirdiff-menus.ui:18 +msgid "Compare _with marked file" +msgstr "_Bandingkan dengan berkas yang ditandai" + +#: meld/resources/ui/dirdiff-menus.ui:25 msgid "Copy to _left" msgstr "Salin ke k_iri" -#: meld/resources/ui/dirdiff-menus.ui:18 +#: meld/resources/ui/dirdiff-menus.ui:29 msgid "Copy to _right" msgstr "Salin ke k_anan" -#: meld/resources/ui/dirdiff-menus.ui:22 +#: meld/resources/ui/dirdiff-menus.ui:33 msgid "_Delete selected" msgstr "_Hapus yang dipilih" -#: meld/resources/ui/dirdiff-menus.ui:29 +#: meld/resources/ui/dirdiff-menus.ui:40 msgid "Collapse Recursively" msgstr "Ciutkan Secara Rekursif" -#: meld/resources/ui/dirdiff-menus.ui:33 +#: meld/resources/ui/dirdiff-menus.ui:44 msgid "Expand Recursively" msgstr "Perluas Secara Rekursif" -#: meld/resources/ui/dirdiff-menus.ui:40 +#: meld/resources/ui/dirdiff-menus.ui:51 msgid "_Open Externally" msgstr "_Buka Secara Eksternal" -#: meld/resources/ui/dirdiff-menus.ui:44 +#: meld/resources/ui/dirdiff-menus.ui:55 msgid "_Copy File Paths" msgstr "_Salin Path Berkas" +#: meld/resources/ui/dirdiff.ui:35 meld/resources/ui/dirdiff.ui:76 +#: meld/resources/ui/dirdiff.ui:117 +msgid "Select folder to open in this pane" +msgstr "Pilih folder untuk dibuka di panel ini" + +#: meld/resources/ui/dirdiff.ui:43 +msgid "Folder 1" +msgstr "Folder 1" + +#: meld/resources/ui/dirdiff.ui:84 +msgid "Folder 2" +msgstr "Folder 2" + +#: meld/resources/ui/dirdiff.ui:125 +msgid "Folder 3" +msgstr "Folder 3" + #: meld/resources/ui/encoding-selector.ui:31 msgid "Search text encoding…" msgstr "Pengkodean teks pencarian…" @@ -1067,8 +1114,16 @@ msgstr "_Salin" msgid "_Paste" msgstr "Tem_pel" -#: meld/resources/ui/filediff.ui:33 meld/resources/ui/filediff.ui:102 -#: meld/resources/ui/filediff.ui:171 +#: meld/resources/ui/filediff-menus.ui:54 +msgid "Open Containing Folder" +msgstr "Buka Folder Pemuat" + +#: meld/resources/ui/filediff-menus.ui:58 +msgid "Copy Full Path" +msgstr "_Salin Path Lengkap" + +#: meld/resources/ui/filediff.ui:31 meld/resources/ui/filediff.ui:100 +#: meld/resources/ui/filediff.ui:169 msgid "" "This file can not be written to. You may click here to unlock this file and " "make changes anyway, but these changes must be saved to a new file." @@ -1077,31 +1132,31 @@ msgstr "" "kunci berkas dan membuat perubahan, tapi perubahan tersebut mesti disimpan " "ke suatu berkas baru." -#: meld/resources/ui/filediff.ui:47 meld/resources/ui/filediff.ui:116 -#: meld/resources/ui/filediff.ui:185 -msgid "Open file in this pane" -msgstr "Buka berkas di panel ini" - -#: meld/resources/ui/filediff.ui:56 meld/resources/ui/filediff.ui:125 -#: meld/resources/ui/filediff.ui:194 +#: meld/resources/ui/filediff.ui:45 meld/resources/ui/filediff.ui:114 +#: meld/resources/ui/filediff.ui:183 msgid "Save file in this pane" msgstr "Simpan berkas di panel ini" -#: meld/resources/ui/filediff.ui:73 +#: meld/resources/ui/filediff.ui:71 meld/resources/ui/filediff.ui:140 +#: meld/resources/ui/filediff.ui:209 +msgid "Open file in this pane" +msgstr "Buka berkas di panel ini" + +#: meld/resources/ui/filediff.ui:79 msgid "File 3" msgstr "Berkas 3" -#: meld/resources/ui/filediff.ui:142 +#: meld/resources/ui/filediff.ui:148 msgid "File 2" msgstr "Berkas 2" -#: meld/resources/ui/filediff.ui:207 +#: meld/resources/ui/filediff.ui:217 meld/resources/ui/vcview.ui:148 msgid "File 1" msgstr "Berkas 1" #. Create icon and filename CellRenderer -#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:208 -#: meld/dirdiff.py:517 +#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217 +#: meld/dirdiff.py:603 msgid "Name" msgstr "Nama" @@ -1113,7 +1168,7 @@ msgstr "Pola" msgid "Add new filter" msgstr "Tambah penyaring baru" -#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:22 +#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:18 msgid "_Add" msgstr "T_ambah" @@ -1141,7 +1196,7 @@ msgstr "Dilipat" msgid "Replace _All" msgstr "Timp_a Semua" -#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1067 meld/iohelpers.py:113 +#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1231 meld/iohelpers.py:117 msgid "_Replace" msgstr "_Timpa" @@ -1153,7 +1208,7 @@ msgstr "Beralih antara Cari dan Cari-dan-Ganti" msgid "Search highlight mode…" msgstr "Mode sorot pencarian…" -#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:349 +#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:342 #: meld/newdifftab.py:49 msgid "New comparison" msgstr "Perbandingan baru" @@ -1170,43 +1225,43 @@ msgstr "Folder" msgid "Version control" msgstr "Kontrol versi" -#: meld/resources/ui/new-diff-tab.ui:235 meld/resources/ui/new-diff-tab.ui:355 +#: meld/resources/ui/new-diff-tab.ui:236 meld/resources/ui/new-diff-tab.ui:357 msgid "_3-way comparison" msgstr "Perbandingan _3 pihak" -#: meld/resources/ui/new-diff-tab.ui:255 +#: meld/resources/ui/new-diff-tab.ui:256 msgid "Select First File" msgstr "Pilih Berkas Pertama" -#: meld/resources/ui/new-diff-tab.ui:269 +#: meld/resources/ui/new-diff-tab.ui:270 msgid "Select Second File" msgstr "Pilih Berkas Ke Dua" -#: meld/resources/ui/new-diff-tab.ui:284 +#: meld/resources/ui/new-diff-tab.ui:285 msgid "Select Third File" msgstr "Pilih Berkas Ke Tiga" -#: meld/resources/ui/new-diff-tab.ui:319 +#: meld/resources/ui/new-diff-tab.ui:321 msgid "Select First Folder" msgstr "Pilih Folder Pertama" -#: meld/resources/ui/new-diff-tab.ui:332 +#: meld/resources/ui/new-diff-tab.ui:334 msgid "Select Second Folder" msgstr "Pilih Folder Ke Dua" -#: meld/resources/ui/new-diff-tab.ui:346 +#: meld/resources/ui/new-diff-tab.ui:348 msgid "Select Third Folder" msgstr "Pilih Folder Ke Tiga" -#: meld/resources/ui/new-diff-tab.ui:396 +#: meld/resources/ui/new-diff-tab.ui:399 msgid "Select A Version-Controlled Folder" msgstr "Pilih Suatu Folder Versi-Terkendali" -#: meld/resources/ui/new-diff-tab.ui:445 +#: meld/resources/ui/new-diff-tab.ui:448 msgid "_Blank comparison" msgstr "Per_bandingan kosong" -#: meld/resources/ui/new-diff-tab.ui:462 +#: meld/resources/ui/new-diff-tab.ui:466 msgid "C_ompare" msgstr "B_andingkan" @@ -1242,6 +1297,18 @@ msgstr "Panel tengah dan kanan" msgid "_Reverse patch direction" msgstr "Balikkan a_rah patch" +#: meld/resources/ui/path-label.ui:23 +msgid "Path" +msgstr "Path" + +#: meld/resources/ui/path-label.ui:62 +msgid "Copy Path" +msgstr "Salin Path" + +#: meld/resources/ui/path-label.ui:78 +msgid "Open Folder" +msgstr "Buka Folder" + #: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31 msgid "Preferences" msgstr "Preferensi" @@ -1293,104 +1360,108 @@ msgid "Show w_hitespace" msgstr "Tampilkan w_hitespace" #: meld/resources/ui/preferences.ui:381 +msgid "Prefer dark theme" +msgstr "Lebih suka tema gelap" + +#: meld/resources/ui/preferences.ui:397 msgid "Use s_yntax highlighting" msgstr "Gunakan penyorotan s_intaks" -#: meld/resources/ui/preferences.ui:404 +#: meld/resources/ui/preferences.ui:420 msgid "Syntax highlighting color scheme:" msgstr "Skema warna penyorotan sintaks:" -#: meld/resources/ui/preferences.ui:469 +#: meld/resources/ui/preferences.ui:485 msgid "Code Overview" msgstr "Ikhtisar Kode" -#: meld/resources/ui/preferences.ui:506 +#: meld/resources/ui/preferences.ui:522 msgid "Show overview map" msgstr "Tampilkan peta ikhtisar" -#: meld/resources/ui/preferences.ui:529 +#: meld/resources/ui/preferences.ui:545 msgid "Overview map style:" msgstr "Gaya peta ikhtisar:" -#: meld/resources/ui/preferences.ui:596 +#: meld/resources/ui/preferences.ui:612 msgid "External Editor" msgstr "Penyunting Eksternal" -#: meld/resources/ui/preferences.ui:632 +#: meld/resources/ui/preferences.ui:648 msgid "Use _default system editor" msgstr "_Gunakan penyunting bawaan sistem" -#: meld/resources/ui/preferences.ui:655 +#: meld/resources/ui/preferences.ui:671 msgid "Edito_r command:" msgstr "Pe_rintah penyunting:" -#: meld/resources/ui/preferences.ui:711 +#: meld/resources/ui/preferences.ui:727 msgid "Editor" msgstr "Penyunting" -#: meld/resources/ui/preferences.ui:732 +#: meld/resources/ui/preferences.ui:748 msgid "Shallow Comparison" msgstr "Perbandingan Dangkal" -#: meld/resources/ui/preferences.ui:768 +#: meld/resources/ui/preferences.ui:784 msgid "C_ompare files based only on size and timestamp" msgstr "B_andingkan berkas hanya berdasarkan ukuran dan penanda waktu" -#: meld/resources/ui/preferences.ui:791 +#: meld/resources/ui/preferences.ui:807 msgid "_Timestamp resolution:" msgstr "Resolusi penanda wak_tu:" -#: meld/resources/ui/preferences.ui:855 +#: meld/resources/ui/preferences.ui:871 msgid "Note: enabling text filters may make comparing large files much slower" msgstr "" "Catatan: memfungsikan penyaring teks bisa membuat membandingkan berkas-" "berkas besar jauh lebih lambat" -#: meld/resources/ui/preferences.ui:904 +#: meld/resources/ui/preferences.ui:920 msgid "Symbolic Links" msgstr "Taut Simbolik" -#: meld/resources/ui/preferences.ui:972 +#: meld/resources/ui/preferences.ui:988 msgid "Visible Columns" msgstr "Kolom Yang Nampak" -#: meld/resources/ui/preferences.ui:1039 +#: meld/resources/ui/preferences.ui:1055 msgid "Folder Comparisons" msgstr "Perbandingan Folder" -#: meld/resources/ui/preferences.ui:1061 +#: meld/resources/ui/preferences.ui:1077 msgid "Version Comparisons" msgstr "Perbandingan Versi" -#: meld/resources/ui/preferences.ui:1104 +#: meld/resources/ui/preferences.ui:1120 msgid "_Order when comparing file revisions:" msgstr "_Urutan ketika membandingkan revisi berkas:" -#: meld/resources/ui/preferences.ui:1151 +#: meld/resources/ui/preferences.ui:1167 msgid "Order when _merging files:" msgstr "Urutan ketika _merge berkas:" -#: meld/resources/ui/preferences.ui:1219 +#: meld/resources/ui/preferences.ui:1235 msgid "Commit Messages" msgstr "Pesan Komit" -#: meld/resources/ui/preferences.ui:1260 +#: meld/resources/ui/preferences.ui:1276 msgid "Show _right margin at:" msgstr "Tampilkan ma_rjin kanan pada:" -#: meld/resources/ui/preferences.ui:1301 +#: meld/resources/ui/preferences.ui:1317 msgid "Automatically _break lines at right margin on commit" msgstr "Otomatis lipat _baris pada marjin kanan saat komit" -#: meld/resources/ui/preferences.ui:1351 +#: meld/resources/ui/preferences.ui:1367 msgid "Version Control" msgstr "Kendali Versi" -#: meld/resources/ui/preferences.ui:1373 +#: meld/resources/ui/preferences.ui:1389 msgid "Filename filters" msgstr "Penyaring nama berkas" -#: meld/resources/ui/preferences.ui:1411 +#: meld/resources/ui/preferences.ui:1427 msgid "" "When performing directory comparisons, you may filter out files and " "directories by name. Each pattern is a list of shell style wildcards " @@ -1400,19 +1471,19 @@ msgstr "" "direktori menurut namanya. Setiap pola adalah daftar dari wildcard gaya " "shell yang dipisahkan oleh spasi." -#: meld/resources/ui/preferences.ui:1478 +#: meld/resources/ui/preferences.ui:1494 msgid "Change trimming" msgstr "Ubah pemangkasan" -#: meld/resources/ui/preferences.ui:1514 +#: meld/resources/ui/preferences.ui:1530 msgid "Trim blank line differences from the start and end of changes" msgstr "Pangkas perbedaan baris kosong dari awal dan akhir perubahan" -#: meld/resources/ui/preferences.ui:1558 +#: meld/resources/ui/preferences.ui:1574 msgid "Text filters" msgstr "Penyaring teks" -#: meld/resources/ui/preferences.ui:1596 +#: meld/resources/ui/preferences.ui:1612 msgid "" "When performing file comparisons, you may ignore certain types of changes. " "Each pattern here is a python regular expression which replaces matching " @@ -1426,47 +1497,47 @@ msgstr "" "dilakukan. Bila ekspresi memuat grup, hanya grup tersebut yang diganti. " "Lihat manual pengguna untuk rincian lebih lanjut." -#: meld/resources/ui/preferences.ui:1687 +#: meld/resources/ui/preferences.ui:1703 msgid "Left is remote, right is local" msgstr "Kiri remote, kanan lokal" -#: meld/resources/ui/preferences.ui:1691 +#: meld/resources/ui/preferences.ui:1707 msgid "Left is local, right is remote" msgstr "Kiri lokal, kanan remote" -#: meld/resources/ui/preferences.ui:1705 +#: meld/resources/ui/preferences.ui:1721 msgid "Simple change map" msgstr "Peta perubahan sederhana" -#: meld/resources/ui/preferences.ui:1709 +#: meld/resources/ui/preferences.ui:1725 msgid "Compact source map" msgstr "Peta sumber ringkas" -#: meld/resources/ui/preferences.ui:1713 +#: meld/resources/ui/preferences.ui:1729 msgid "Full source map" msgstr "Peta sumber lengkap" -#: meld/resources/ui/preferences.ui:1727 +#: meld/resources/ui/preferences.ui:1743 msgid "Remote, merge, local" msgstr "Remote, merge, lokal" -#: meld/resources/ui/preferences.ui:1731 +#: meld/resources/ui/preferences.ui:1747 msgid "Local, merge, remote" msgstr "Lokal, merge, remote" -#: meld/resources/ui/preferences.ui:1753 +#: meld/resources/ui/preferences.ui:1769 msgid "1ns (ext4)" msgstr "1ns (ext4)" -#: meld/resources/ui/preferences.ui:1757 +#: meld/resources/ui/preferences.ui:1773 msgid "100ns (NTFS)" msgstr "100ns (NTFS)" -#: meld/resources/ui/preferences.ui:1761 +#: meld/resources/ui/preferences.ui:1777 msgid "1s (ext2/ext3)" msgstr "1s (ext2/ext3)" -#: meld/resources/ui/preferences.ui:1765 +#: meld/resources/ui/preferences.ui:1781 msgid "2s (VFAT)" msgstr "2s (VFAT)" @@ -1511,12 +1582,12 @@ msgstr "Bila Anda tak menyimpan, perubahan akan hilang selamanya." msgid "Close _without Saving" msgstr "Tutup _Tanpa Menyimpan" -#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1066 -#: meld/iohelpers.py:55 meld/iohelpers.py:112 +#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1229 +#: meld/iohelpers.py:56 meld/iohelpers.py:116 msgid "_Cancel" msgstr "_Batal" -#: meld/resources/ui/save-confirm-dialog.ui:52 +#: meld/resources/ui/save-confirm-dialog.ui:55 msgid "_Save" msgstr "_Simpan" @@ -1536,103 +1607,75 @@ msgstr "_Bandingkan" msgid "Co_mmit…" msgstr "Ko_mit…" -#: meld/resources/ui/vcview-menus.ui:15 -msgid "_Update" -msgstr "M_utakhirkan" - -#: meld/resources/ui/vcview-menus.ui:30 +#: meld/resources/ui/vcview-menus.ui:26 msgid "Re_vert" msgstr "Re_vert" -#: meld/resources/ui/vcview-menus.ui:34 meld/resources/ui/vcview.ui:164 +#: meld/resources/ui/vcview-menus.ui:30 msgid "Delete" msgstr "Hapus" -#: meld/resources/ui/vcview-menus.ui:41 -msgid "Mar_k as Resolved" -msgstr "Tandai sebagai Terselesai_kan" - -#: meld/resources/ui/vcview.ui:73 -msgid "Commit…" -msgstr "Komit…" +#: meld/resources/ui/vcview-menus.ui:37 +msgid "Resolve Conflict" +msgstr "Selesaikan Konflik" -#: meld/resources/ui/vcview.ui:74 +#: meld/resources/ui/vcview.ui:16 msgid "Commit changes to version control" msgstr "Komit perubahan ke kendali versi" -#: meld/resources/ui/vcview.ui:86 -msgid "Update" -msgstr "Mutakhiran" - -#: meld/resources/ui/vcview.ui:87 -msgid "Update working copy from version control" -msgstr "Mutakhirkan salinan kerja dari kendali versi" +#: meld/resources/ui/vcview.ui:21 +msgid "Commit…" +msgstr "Komit…" -#: meld/resources/ui/vcview.ui:99 -msgid "Push" -msgstr "Push" +#: meld/resources/ui/vcview.ui:38 +msgid "Pull remote changes to the local repository" +msgstr "Tarik perubahan jauh ke repositori lokal" -#: meld/resources/ui/vcview.ui:100 +#: meld/resources/ui/vcview.ui:51 msgid "Push local changes to remote" msgstr "Push perubahan lokal ke remote" -#: meld/resources/ui/vcview.ui:112 -msgid "Add" -msgstr "Tambah" - -#: meld/resources/ui/vcview.ui:113 +#: meld/resources/ui/vcview.ui:74 msgid "Add to version control" msgstr "Tambahkan ke kendali versi" -#: meld/resources/ui/vcview.ui:125 -msgid "Remove" -msgstr "Hapus" - -#: meld/resources/ui/vcview.ui:126 +#: meld/resources/ui/vcview.ui:87 msgid "Remove from version control" msgstr "Hapus dari kendali versi" -#: meld/resources/ui/vcview.ui:138 -msgid "Mark as Resolved" -msgstr "Tandai sebagai Terselesaikan" +#: meld/resources/ui/vcview.ui:100 +msgid "Revert working copy to original state" +msgstr "Kembalikan salinan kerja ke keadaan asli" -#: meld/resources/ui/vcview.ui:139 +#: meld/resources/ui/vcview.ui:113 msgid "Mark as resolved in version control" msgstr "Tandai sebagai terselesaikan dalam kendali versi" -#: meld/resources/ui/vcview.ui:151 -msgid "Revert" -msgstr "Kembalikan" - -#: meld/resources/ui/vcview.ui:152 -msgid "Revert working copy to original state" -msgstr "Kembalikan salinan kerja ke keadaan asli" - -#: meld/resources/ui/vcview.ui:165 -msgid "Delete from working copy" -msgstr "Hapus dari salinan kerja" +#: meld/resources/ui/vcview.ui:140 +msgid "Open version controlled folder in this pane" +msgstr "Buka folder terkontrol versi di panel ini" -#: meld/resources/ui/vcview.ui:220 +#: meld/resources/ui/vcview.ui:229 msgid "Location" msgstr "Lokasi" -#: meld/resources/ui/vcview.ui:229 +#: meld/resources/ui/vcview.ui:238 msgid "Status" msgstr "Status" -#: meld/resources/ui/vcview.ui:238 +#: meld/resources/ui/vcview.ui:247 msgid "Extra" msgstr "Ekstra" -#: meld/resources/ui/vcview.ui:270 +#: meld/resources/ui/vcview.ui:279 msgid "Console output" msgstr "Keluaran konsol" -#: meld/actiongutter.py:247 +#: meld/actiongutter.py:254 msgid "Copy _up" msgstr "Salin _naik" -#: meld/actiongutter.py:248 +#: meld/actiongutter.py:255 msgid "Copy _down" msgstr "Salin _turun" @@ -1649,43 +1692,53 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: meld/dirdiff.py:538 meld/preferences.py:132 +#: meld/dirdiff.py:624 meld/preferences.py:132 msgid "Size" msgstr "Ukuran" #. Create date-time CellRenderer -#: meld/dirdiff.py:546 meld/preferences.py:133 +#: meld/dirdiff.py:632 meld/preferences.py:133 msgid "Modification time" msgstr "Waktu modifikasi" +#. Create ISO-format date-time CellRenderer +#: meld/dirdiff.py:640 meld/preferences.py:134 +msgid "Modification time (ISO)" +msgstr "Waktu modifikasi (ISO)" + #. Create permissions CellRenderer -#: meld/dirdiff.py:554 meld/preferences.py:134 +#: meld/dirdiff.py:648 meld/preferences.py:135 msgid "Permissions" msgstr "Ijin" -#: meld/dirdiff.py:778 meld/dirdiff.py:802 +#: meld/dirdiff.py:901 +#, python-brace-format +msgid "{filename} (scanning…)" +msgstr "{filename} (memindai...)" + +#: meld/dirdiff.py:933 meld/dirdiff.py:965 #, python-brace-format msgid "[{label}] Scanning {folder}" msgstr "[{label}] Memindai {folder}" -#: meld/dirdiff.py:942 +#: meld/dirdiff.py:1101 #, python-brace-format msgid "[{label}] Done" msgstr "[{label}] selesai" -#: meld/dirdiff.py:951 +#: meld/dirdiff.py:1114 msgid "Folder {} is being compared to itself" msgstr "Folder {} sedang dibandingkan dengan dirinya sendiri" -#: meld/dirdiff.py:957 +#: meld/dirdiff.py:1120 msgid "Folders have no differences" msgstr "Folder-folder tak punya perbedaan" -#: meld/dirdiff.py:959 +#: meld/dirdiff.py:1122 msgid "Contents of scanned files in folders are identical." msgstr "Isi berkas yang dipindai dalam folder-folder identik." -#: meld/dirdiff.py:961 +#: meld/dirdiff.py:1124 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." @@ -1693,46 +1746,46 @@ msgstr "" "Berkas-berkas yang dipindai dalam folder-folder tampak identik, tapi isi " "belum dipindai." -#: meld/dirdiff.py:964 +#: meld/dirdiff.py:1127 msgid "File filters are in use, so not all files have been scanned." msgstr "" "Penyaring berkas sedang dipakai, maka tidak semua berkas telah dipindai." -#: meld/dirdiff.py:966 +#: meld/dirdiff.py:1129 msgid "Text filters are in use and may be masking content differences." msgstr "Penyaring teks sedang dipakai dan mungkin menutupi perbedaan isi." -#: meld/dirdiff.py:982 meld/filediff.py:1874 +#: meld/dirdiff.py:1145 meld/filediff.py:1997 msgid "Hide" msgstr "Sembunyikan" -#: meld/dirdiff.py:984 meld/filediff.py:1876 meld/filediff.py:1906 -#: meld/filediff.py:1908 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 +#: meld/dirdiff.py:1147 meld/filediff.py:1999 meld/filediff.py:2029 +#: meld/filediff.py:2031 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 msgid "Hi_de" msgstr "Sem_bunyikan" -#: meld/dirdiff.py:993 +#: meld/dirdiff.py:1156 msgid "Multiple errors occurred while scanning this folder" msgstr "Galat berganda terjadi ketika memindai folder ini" -#: meld/dirdiff.py:994 +#: meld/dirdiff.py:1157 msgid "Files with invalid encodings found" msgstr "Berkas dengan pengkodean tak valid ditemukan" #. TRANSLATORS: This is followed by a list of files -#: meld/dirdiff.py:996 +#: meld/dirdiff.py:1159 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "" "Beberapa berkas memiliki pengkodean yang salah. Namanya kurang lebih seperti:" -#: meld/dirdiff.py:998 +#: meld/dirdiff.py:1161 msgid "Files hidden by case insensitive comparison" msgstr "" "Berkasn yang disembunyikan oleh perbandingan yang tak membedakan huruf besar " "kecil" #. TRANSLATORS: This is followed by a list of files -#: meld/dirdiff.py:1000 +#: meld/dirdiff.py:1163 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1741,17 +1794,17 @@ msgstr "" "sistem berkas yang peka huruf besar kecil. Berkas-berkas berikut dalam " "folder ini tersembunyi:" -#: meld/dirdiff.py:1011 +#: meld/dirdiff.py:1174 #, python-brace-format msgid "“{first_file}” hidden by “{second_file}”" msgstr "\"{first_file}\" disembunyikan oleh \"{second_file}\"" -#: meld/dirdiff.py:1070 +#: meld/dirdiff.py:1236 #, python-format msgid "Replace folder “%s”?" msgstr "Timpa folder “%s”?" -#: meld/dirdiff.py:1072 +#: meld/dirdiff.py:1238 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" @@ -1760,11 +1813,11 @@ msgstr "" "Folder lain dengan nama sama telah ada dalam \"%s\".\n" "Bila Anda menimpa folder yang ada, semua berkas di dalamnya akan hilang." -#: meld/dirdiff.py:1085 +#: meld/dirdiff.py:1251 msgid "Error copying file" msgstr "Galat saat menyalin berkas" -#: meld/dirdiff.py:1086 +#: meld/dirdiff.py:1252 #, python-brace-format msgid "" "Couldn’t copy {source}\n" @@ -1777,19 +1830,23 @@ msgstr "" "\n" "{error}" -#: meld/dirdiff.py:1111 meld/vcview.py:759 +#: meld/dirdiff.py:1277 meld/vcview.py:768 msgid "Error deleting {}" msgstr "Galat saat menghapus {}" -#: meld/dirdiff.py:1604 +#: meld/dirdiff.py:1825 msgid "No folder" msgstr "Tidak ada folder" -#: meld/filediff.py:1144 +#: meld/dirdiff.py:1838 +msgid "Folder comparison:" +msgstr "Perbandingan folder:" + +#: meld/filediff.py:1168 msgid "Comparison results will be inaccurate" msgstr "Hasil perbandingan tidak akan akurat" -#: meld/filediff.py:1146 +#: meld/filediff.py:1170 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1797,75 +1854,99 @@ msgstr "" "Suatu penyaring mengubah cacah baris dalam berkas, yang tidak didukung. " "Perbandingan tidak akan akurat." -#: meld/filediff.py:1218 +#: meld/filediff.py:1242 msgid "Mark conflict as resolved?" msgstr "Tandai konflik sebagai terselesaikan?" -#: meld/filediff.py:1220 +#: meld/filediff.py:1244 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "" "Bila konflik sukses dipecahkan, Anda dapat menandainya sebagai terpecahkan " "sekarang." -#: meld/filediff.py:1222 +#: meld/filediff.py:1247 msgid "Cancel" msgstr "Batal" -#: meld/filediff.py:1223 +#: meld/filediff.py:1248 msgid "Mark _Resolved" msgstr "Tandai Te_rselesaikan" -#: meld/filediff.py:1556 +#: meld/filediff.py:1439 meld/filediff.py:1455 +msgid "Add Synchronization Point" +msgstr "Tambahkan Titik Sinkronisasi" + +#: meld/filediff.py:1443 +msgid "Remove Synchronization Point" +msgstr "Hapus Titik Sinkronisasi" + +#: meld/filediff.py:1447 +msgid "Move Synchronization Point" +msgstr "Pindahkan Titik Sinkronisasi" + +#: meld/filediff.py:1451 +msgid "Match Synchronization Point" +msgstr "Cocokkan Titik Sinkronisasi" + +#: meld/filediff.py:1475 +msgid "Clear Synchronization Points" +msgstr "Bersihkan Titik Sinkronisasi" + +#: meld/filediff.py:1535 +msgid "File comparison:" +msgstr "Perbandingan berkas:" + +#: meld/filediff.py:1671 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Ada masalah saat membuka berkas \"%s\"." -#: meld/filediff.py:1564 +#: meld/filediff.py:1680 #, python-format msgid "File %s appears to be a binary file." msgstr "Berkas %s tampaknya berkas biner." -#: meld/filediff.py:1566 +#: meld/filediff.py:1682 msgid "Do you want to open the file using the default application?" msgstr "Apakah Anda ingin membuka berkas memakai aplikasi baku?" -#: meld/filediff.py:1568 +#: meld/filediff.py:1684 msgid "Open" msgstr "Buka" -#: meld/filediff.py:1582 +#: meld/filediff.py:1706 #, python-format msgid "[%s] Merging files" msgstr "[%s] Sedang merge berkas" -#: meld/filediff.py:1596 +#: meld/filediff.py:1720 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Menghitung perbedaan" -#: meld/filediff.py:1657 +#: meld/filediff.py:1780 #, python-format msgid "File %s has changed on disk" msgstr "Berkas %s telah berubah pada disk" -#: meld/filediff.py:1658 +#: meld/filediff.py:1781 msgid "Do you want to reload the file?" msgstr "Apakah Anda ingin memuat ulang berkas?" -#: meld/filediff.py:1660 +#: meld/filediff.py:1783 msgid "_Reload" msgstr "Muat _Ulang" -#: meld/filediff.py:1830 +#: meld/filediff.py:1953 msgid "File {} is being compared to itself" msgstr "Berkas {} sedang dibandingkan dengan dirinya sendiri" -#: meld/filediff.py:1839 +#: meld/filediff.py:1962 msgid "Files are identical" msgstr "Berkas identik" -#: meld/filediff.py:1852 +#: meld/filediff.py:1975 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1873,11 +1954,11 @@ msgstr "" "Penyaring teks sedang dipakai, dan mungkin menutupi perbedaan antara berkas. " "Apakah Anda ingin membandingkan berkas-berkas yang tak tersaring?" -#: meld/filediff.py:1857 +#: meld/filediff.py:1980 msgid "Files differ in line endings only" msgstr "Berkas berbeda hanya pada akhiran baris" -#: meld/filediff.py:1859 +#: meld/filediff.py:1982 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1886,15 +1967,15 @@ msgstr "" "Berkas-berkas identik kecuali perbedaan akhiran baris:\n" "%s" -#: meld/filediff.py:1879 +#: meld/filediff.py:2002 msgid "Show without filters" msgstr "Tampilkan tanpa penyaring" -#: meld/filediff.py:1901 +#: meld/filediff.py:2024 msgid "Change highlighting incomplete" msgstr "Penyorotan perubahan tak lengkap" -#: meld/filediff.py:1902 +#: meld/filediff.py:2025 msgid "" "Some changes were not highlighted because they were too large. You can force " "Meld to take longer to highlight larger changes, though this may be slow." @@ -1903,19 +1984,19 @@ msgstr "" "untuk lebih panjang sehingga menyorot perubahan yang lebih besar, walaupun " "ini mungkin lambat." -#: meld/filediff.py:1910 +#: meld/filediff.py:2033 msgid "Keep highlighting" msgstr "Tetap menyorot" -#: meld/filediff.py:1912 +#: meld/filediff.py:2035 msgid "_Keep highlighting" msgstr "_Tetap menyorot" -#: meld/filediff.py:1925 +#: meld/filediff.py:2048 msgid "Saving failed" msgstr "Gagal menyimpan" -#: meld/filediff.py:1926 +#: meld/filediff.py:2049 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." @@ -1923,42 +2004,42 @@ msgstr "" "Harap pertimbangkan untuk menyalin perubahan penting apapun ke program atau " "berkas lain untuk menghindari kehilangan data." -#: meld/filediff.py:1935 +#: meld/filediff.py:2058 msgid "Save Left Pane As" msgstr "Simpan Panel Kiri Sebagai" -#: meld/filediff.py:1937 +#: meld/filediff.py:2060 msgid "Save Middle Pane As" msgstr "Simpan Panel Tengah Sebagai" -#: meld/filediff.py:1939 +#: meld/filediff.py:2062 msgid "Save Right Pane As" msgstr "Simpan Panel Kanan Sebagai" -#: meld/filediff.py:1950 +#: meld/filediff.py:2073 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "Berkas %s telah berubah pada disk sejak dibuka" -#: meld/filediff.py:1952 +#: meld/filediff.py:2075 msgid "If you save it, any external changes will be lost." msgstr "Bila Anda menyimpannya, perubahan eksternal akan hilang." -#: meld/filediff.py:1955 +#: meld/filediff.py:2078 msgid "Save Anyway" msgstr "Simpan Saja" -#: meld/filediff.py:1956 +#: meld/filediff.py:2079 msgid "Don’t Save" msgstr "Jangan Simpan" -#: meld/filediff.py:1998 +#: meld/filediff.py:2121 msgid "" "File “{}” contains characters that can’t be encoded using its current " "encoding “{}”." msgstr "Berkas “{}” memuat karakter yang tak bisa dienkode dengan “{}”." -#: meld/filediff.py:2002 meld/patchdialog.py:138 +#: meld/filediff.py:2125 meld/patchdialog.py:138 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -1967,20 +2048,16 @@ msgstr "" "Tidak bisa menyimpan berkas karena:\n" "%s" -#: meld/filediff.py:2006 meld/patchdialog.py:137 +#: meld/filediff.py:2129 meld/patchdialog.py:137 #, python-format msgid "Could not save file %s." msgstr "Tak bisa menyimpan berkas %s." -#: meld/filediff.py:2067 -msgid "Open File" -msgstr "Buka Berkas" - -#: meld/filediff.py:2421 +#: meld/filediff.py:2539 msgid "Live comparison updating disabled" msgstr "Pemutakhiran perbandingan live dinonaktifkan" -#: meld/filediff.py:2422 +#: meld/filediff.py:2540 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -1991,34 +2068,50 @@ msgstr "" "dan pemutakhiran secara live akan dilanjutkan ketika titik penyelarasan " "dibersihkan." -#: meld/iohelpers.py:40 +#: meld/filediff.py:2568 +msgid "Can't swap unsaved files" +msgstr "Tidak dapat menukar berkas yang belum disimpan" + +#: meld/filediff.py:2570 +msgid "Files must be saved to disk before swapping panes." +msgstr "Berkas harus disimpan ke diska sebelum bertukar panel." + +#: meld/filediff.py:2577 +msgid "Can't swap version control comparisons" +msgstr "Tidak dapat menukar perbandingan kontrol versi" + +#: meld/filediff.py:2579 +msgid "Swapping panes is not supported in version control mode." +msgstr "Menukar panel tidak didukung dalam mode kontrol versi." + +#: meld/iohelpers.py:41 msgid "Deleting remote folders is not supported" msgstr "Menghapus folder jauh tidak didukung" -#: meld/iohelpers.py:42 +#: meld/iohelpers.py:43 msgid "Not a file or directory" msgstr "Bukan suatu berkas atau direktori" -#: meld/iohelpers.py:46 +#: meld/iohelpers.py:47 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?" msgstr "" "\"{}\" tak bisa dibuang ke tong sampah. Apakah Anda hendak langsung " "menghapusnya?" -#: meld/iohelpers.py:51 +#: meld/iohelpers.py:52 msgid "This remote location does not support sending items to the trash." msgstr "Lokasi remote ini tidak mendukung pengiriman butir ke tong sampah." -#: meld/iohelpers.py:56 +#: meld/iohelpers.py:58 msgid "_Delete Permanently" msgstr "_Hapus Permanen" -#: meld/iohelpers.py:106 +#: meld/iohelpers.py:110 #, python-format msgid "Replace file “%s”?" msgstr "Timpa berkas “%s”?" -#: meld/iohelpers.py:108 +#: meld/iohelpers.py:112 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -2123,28 +2216,28 @@ msgid "remote folder “{}” not supported" msgstr "folder jauh “{}” tidak didukung" #. TRANSLATORS: This is the label of a new, currently-unnamed file. -#: meld/meldbuffer.py:114 +#: meld/meldbuffer.py:115 msgid "" msgstr "" -#: meld/melddoc.py:61 +#: meld/melddoc.py:124 msgid "untitled" msgstr "tanpa judul" -#: meld/meldwindow.py:155 +#: meld/meldwindow.py:158 msgid "Filename" msgstr "Nama Berkas" -#: meld/meldwindow.py:384 +#: meld/meldwindow.py:381 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "Perlu tiga berkas untuk merge otomatis, mendapat: %r" -#: meld/meldwindow.py:406 +#: meld/meldwindow.py:411 msgid "Cannot compare a mixture of files and directories" msgstr "Tak bisa membandingkan campuran berkas dan direktori" -#: meld/misc.py:150 +#: meld/misc.py:154 msgid "" "{}\n" "\n" @@ -2156,7 +2249,7 @@ msgstr "" "Meld mengalami kesalahan kritis saat menjalankan:\n" "{}" -#: meld/misc.py:201 +#: meld/misc.py:205 msgid "[None]" msgstr "[Nihil]" @@ -2168,7 +2261,7 @@ msgstr "label" msgid "pattern" msgstr "pola" -#: meld/recent.py:104 +#: meld/recent.py:111 msgid "Version control:" msgstr "Kendali versi:" @@ -2186,6 +2279,10 @@ msgstr "{name} ({charset})" msgid "Plain Text" msgstr "Teks Polos" +#: meld/ui/pathlabel.py:36 +msgid "Unnamed file" +msgstr "Berkas tanpa nama" + #. Abbreviation for line, column so that it will fit in the status bar #: meld/ui/statusbar.py:125 #, python-brace-format @@ -2208,32 +2305,28 @@ msgstr "Tak ada berkas yang akan dikomit" msgid "{unpushed_commits} in {unpushed_branches}" msgstr "{unpushed_commits} dalam {unpushed_branches}" -#. Translators: These messages cover the case where there is -#. only one branch, and are not part of another message. -#: meld/vc/git.py:94 meld/vc/git.py:103 +#: meld/vc/git.py:94 meld/vc/git.py:104 #, python-format msgid "%d unpushed commit" msgid_plural "%d unpushed commits" msgstr[0] "%d komit belum didorong" -msgstr[1] "%d komit belum didorong" #: meld/vc/git.py:97 #, python-format msgid "%d branch" msgid_plural "%d branches" msgstr[0] "%d cabang" -msgstr[1] "%d cabang" -#: meld/vc/git.py:344 +#: meld/vc/git.py:345 #, python-brace-format msgid "Mode changed from {old_mode} to {new_mode}" msgstr "Mode berubah dari {old_mode} menjadi {new_mode}" -#: meld/vc/git.py:352 +#: meld/vc/git.py:353 msgid "Partially staged" msgstr "Di-stage sebagian" -#: meld/vc/git.py:352 +#: meld/vc/git.py:353 msgid "Staged" msgstr "Di-stage" @@ -2248,140 +2341,145 @@ msgstr "Nihil" msgid "Rev %s" msgstr "Rev %s" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Merged" msgstr "Di-merge" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Base" msgstr "Basis" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Local" msgstr "Lokal" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Remote" msgstr "Remote" -#: meld/vc/_vc.py:73 +#: meld/vc/_vc.py:74 msgid "Error" msgstr "Galat" -#: meld/vc/_vc.py:75 +#: meld/vc/_vc.py:76 msgid "Newly added" msgstr "Baru ditambahkan" -#: meld/vc/_vc.py:77 +#: meld/vc/_vc.py:78 msgid "Renamed" msgstr "Diubah nama" -#: meld/vc/_vc.py:78 +#: meld/vc/_vc.py:79 msgid "Conflict" msgstr "Konflik" -#: meld/vc/_vc.py:79 +#: meld/vc/_vc.py:80 msgid "Removed" msgstr "Dihapus" -#: meld/vc/_vc.py:80 +#: meld/vc/_vc.py:81 msgid "Missing" msgstr "Kurang" -#: meld/vc/_vc.py:81 +#: meld/vc/_vc.py:82 msgid "Not present" msgstr "Tak ada" +#: meld/vc/_vc.py:83 +msgid "Scanning…" +msgstr "Memindai…" + #. Translators: This error message is shown when no #. repository of this type is found. -#: meld/vcview.py:333 +#: meld/vcview.py:334 #, python-format msgid "%(name)s (not found)" msgstr "%(name)s (tidak ditemukan)" #. Translators: This error message is shown when a version #. control binary isn't installed. -#: meld/vcview.py:337 +#: meld/vcview.py:338 #, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "%(name)s (%(cmd)s tidak terpasang)" #. Translators: This error message is shown when a version #. controlled repository is invalid. -#: meld/vcview.py:341 +#: meld/vcview.py:342 #, python-format msgid "%(name)s (invalid repository)" msgstr "%(name)s (repositori tak valid)" -#: meld/vcview.py:355 +#: meld/vcview.py:356 msgid "No valid version control system found in this folder" msgstr "Tak ada sistem kendali versi yang valid dalam folder ini" -#: meld/vcview.py:357 +#: meld/vcview.py:358 msgid "Choose which version control system to use" msgstr "Pilih sistem kendali mana yang akan dipakai" -#. TRANSLATORS: This is the location of the directory being viewed -#: meld/vcview.py:411 +#. TRANSLATORS: This is the name of the version control +#. system being used, e.g., "Git" or "Subversion" +#: meld/vcview.py:414 #, python-brace-format -msgid "Location: {path}" -msgstr "Lokasi: {path}" +msgid "{vc} comparison:" +msgstr "{vc} perbandingan:" #. Initial yield so when we add this to our tasks, we don't #. create iterators that may be invalidated. -#: meld/vcview.py:418 +#: meld/vcview.py:423 msgid "Scanning repository" msgstr "Memindai repositori" -#: meld/vcview.py:447 +#: meld/vcview.py:452 #, python-format msgid "Scanning %s" msgstr "Memindai %s" -#: meld/vcview.py:486 +#: meld/vcview.py:491 msgid "(Empty)" msgstr "(Kosong)" -#: meld/vcview.py:533 +#: meld/vcview.py:539 #, python-format msgid "%s — local" msgstr "%s — lokal" -#: meld/vcview.py:534 +#: meld/vcview.py:540 #, python-format msgid "%s — remote" msgstr "%s — remote" -#: meld/vcview.py:542 +#: meld/vcview.py:548 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (lokal, merge, remote)" -#: meld/vcview.py:547 +#: meld/vcview.py:553 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (remote, merge, lokal)" -#: meld/vcview.py:558 +#: meld/vcview.py:564 #, python-format msgid "%s — repository" msgstr "%s — repositori" -#: meld/vcview.py:564 +#: meld/vcview.py:570 #, python-format msgid "%s (working, repository)" msgstr "%s (kerja, repositori)" -#: meld/vcview.py:568 +#: meld/vcview.py:574 #, python-format msgid "%s (repository, working)" msgstr "%s (repositori, kerja)" -#: meld/vcview.py:730 +#: meld/vcview.py:739 msgid "Remove folder and all its files?" msgstr "Hapus folder dan semua berkasnya?" -#: meld/vcview.py:732 +#: meld/vcview.py:741 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2389,6 +2487,42 @@ msgstr "" "Ini akan menghapus semua berkas dan folder yang dipilih, dan semua berkas di " "dalam sebarang folder yang dipilih, dari kendali versi." -#: meld/vcview.py:845 +#: meld/vcview.py:854 msgid "Clear" msgstr "Bersihkan" + +#~ msgid "Refresh" +#~ msgstr "Segarkan" + +#~ msgid "_Update" +#~ msgstr "M_utakhirkan" + +#~ msgid "Mar_k as Resolved" +#~ msgstr "Tandai sebagai Terselesai_kan" + +#~ msgid "Update" +#~ msgstr "Mutakhiran" + +#~ msgid "Update working copy from version control" +#~ msgstr "Mutakhirkan salinan kerja dari kendali versi" + +#~ msgid "Push" +#~ msgstr "Push" + +#~ msgid "Add" +#~ msgstr "Tambah" + +#~ msgid "Remove" +#~ msgstr "Hapus" + +#~ msgid "Mark as Resolved" +#~ msgstr "Tandai sebagai Terselesaikan" + +#~ msgid "Revert" +#~ msgstr "Kembalikan" + +#~ msgid "Delete from working copy" +#~ msgstr "Hapus dari salinan kerja" + +#~ msgid "Location: {path}" +#~ msgstr "Lokasi: {path}" diff --git a/po/ka.po b/po/ka.po new file mode 100644 index 0000000..7691d86 --- /dev/null +++ b/po/ka.po @@ -0,0 +1,2347 @@ +# Georgian translation for meld. +# Copyright (C) 2022 meld's COPYRIGHT HOLDER +# This file is distributed under the same license as the meld package. +# Ekaterine Papava , 2022. +# +msgid "" +msgstr "" +"Project-Id-Version: meld meld-3-22\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" +"POT-Creation-Date: 2022-11-20 14:41+0000\n" +"PO-Revision-Date: 2022-12-01 11:55+0100\n" +"Last-Translator: Ekaterine Papava \n" +"Language-Team: Georgian \n" +"Language: ka\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Poedit 3.2\n" + +#: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11 +#: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17 +msgid "Meld" +msgstr "" + +#: data/org.gnome.meld.desktop.in.in:4 +msgid "Diff Viewer" +msgstr "" + +#: data/org.gnome.meld.desktop.in.in:5 data/org.gnome.meld.appdata.xml.in.in:12 +msgid "Compare and merge your files" +msgstr "" + +#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: data/org.gnome.meld.desktop.in.in:7 +msgid "diff;merge;" +msgstr "" + +#: data/org.gnome.meld.appdata.xml.in.in:14 +msgid "" +"Meld is a visual diff and merge tool targeted at developers. Meld helps you " +"compare files, directories, and version controlled projects. It provides " +"two- and three-way comparison of both files and directories, and supports " +"many version control systems including Git, Mercurial, Bazaar and Subversion." +msgstr "" + +#: data/org.gnome.meld.appdata.xml.in.in:21 +msgid "" +"Meld helps you review code changes, understand patches, and makes enormous " +"merge conflicts slightly less painful." +msgstr "" + +#: data/org.gnome.meld.appdata.xml.in.in:51 +msgid "The GNOME Project" +msgstr "პროექტი \"GNOME\"" + +#: data/mime/org.gnome.meld.xml.in:4 +msgid "Meld comparison description" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:37 +msgid "Default window width" +msgstr "ფანჯრის ნაგულისხმები სიგანე" + +#: data/org.gnome.meld.gschema.xml:41 +msgid "Default window height" +msgstr "ფანჯრის ნაგულისხმები სიგრძე" + +#: data/org.gnome.meld.gschema.xml:45 +msgid "Default window maximised state" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:49 +msgid "Default window fullscreen state" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:58 +msgid "Prefer application-wide dark theme" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:59 +msgid "" +"If true, the GTK dark theme variant will be used, if available. Note that " +"this is separate from the syntax highlighting scheme." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:65 +msgid "Additional automatically detected text encodings" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:66 +msgid "" +"Meld will use these text encodings to try to decode loaded text files before " +"trying any other encodings. In addition to the encodings in this list, UTF-8 " +"and the current locale-default encoding will always be used; other encodings " +"may also be tried, depending on the user’s locale." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:73 +msgid "Width of an indentation step" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:74 +msgid "The number of spaces to use for a single indent step" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:78 +msgid "Whether to indent using spaces or tabs" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:79 +msgid "If true, any new indentation will use spaces instead of tabs." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:83 meld/resources/ui/statusbar-menu.ui:5 +msgid "Show line numbers" +msgstr "ხაზის ნომრების ჩვენება" + +#: data/org.gnome.meld.gschema.xml:84 +msgid "If true, line numbers will be shown in the gutter of file comparisons." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:88 +msgid "Highlight syntax" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:89 +msgid "" +"Whether to highlight syntax in comparisons. Because of Meld’s own color " +"highlighting, this is off by default." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:93 +msgid "Color scheme to use for syntax highlighting" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:94 +msgid "Used by GtkSourceView to determine colors for syntax highlighting" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:98 +msgid "Draw whitespace" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:99 +msgid "" +"If true, whitespace characters will be drawn in comparisons even if they are " +"not in a changed area." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:108 +msgid "Wrap mode" +msgstr "გადატანის რეჟიმი" + +#: data/org.gnome.meld.gschema.xml:109 +msgid "" +"Lines in file comparisons will be wrapped according to this setting, either " +"not at all ('none'), at any character ('char') or only at the end of words " +"('word')." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:116 meld/resources/ui/statusbar-menu.ui:13 +msgid "Highlight current line" +msgstr "მიმდინარე ხაზის გამოკვეთა" + +#: data/org.gnome.meld.gschema.xml:117 +msgid "" +"If true, the line containing the cursor will be highlighted in file " +"comparisons." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:121 +msgid "Use the system default monospace font" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:122 +msgid "" +"If false, custom-font will be used instead of the system monospace font." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:126 +msgid "Custom font" +msgstr "ხელით მითითებული ფონტი" + +#: data/org.gnome.meld.gschema.xml:127 +msgid "" +"The custom font to use, stored as a string and parsed as a Pango font " +"description." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:133 +msgid "Show overview source map" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:134 +msgid "" +"If true, file comparisons will have paired source maps for compared files." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:139 +msgid "Style of overview map" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:140 +msgid "Style options for how the overview map is displayed." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:146 +msgid "Ignore blank lines when comparing files" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:147 +msgid "" +"If true, blank lines will be trimmed when highlighting changes between files." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:154 +msgid "Use the system default editor" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:155 +msgid "" +"If false, custom-editor-command will be used instead of the system editor " +"when opening files externally." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:159 +msgid "The custom editor launch command" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:160 +msgid "" +"The command used to launch a custom editor. Some limited templating is " +"supported here; at the moment '{file}' and '{line}' are recognised tokens." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:166 +msgid "Columns to display" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:167 +msgid "" +"List of column names in folder comparison and whether they should be " +"displayed." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:171 meld/resources/ui/preferences.ui:951 +msgid "Ignore symbolic links" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:172 +msgid "" +"If true, folder comparisons do not follow symbolic links when traversing the " +"folder tree." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:176 +msgid "Use shallow comparison" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:177 +msgid "" +"If true, folder comparisons compare files based solely on size and mtime, " +"considering files to be identical if their size and mtime match, and " +"different otherwise." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:181 +msgid "File timestamp resolution" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:182 +msgid "" +"When comparing based on mtime, this is the minimum difference in nanoseconds " +"between two files before they’re considered to have different mtimes. This " +"is useful when comparing files between filesystems with different timestamp " +"resolution." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:186 meld/resources/ui/preferences.ui:852 +msgid "Apply text filters during folder comparisons" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:187 +msgid "" +"If true, folder comparisons that compare file contents also apply active " +"text filters and the blank line trimming option, and ignore newline " +"differences." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:191 +msgid "File status filters" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:192 +msgid "List of statuses used to filter visible files in folder comparison." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:198 +msgid "Show the version control console output" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:199 +msgid "" +"If true, a console output section will be shown in version control views, " +"showing the commands run for version control operations." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:203 +msgid "Version control pane position" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:204 +msgid "" +"This is the height of the main version control tree when the console pane is " +"shown." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:208 +msgid "Present version comparisons as left-local/right-remote" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:209 +msgid "" +"If true, version control comparisons will use a left-is-local, right-is-" +"remote scheme to determine what order to present files in panes. Otherwise, " +"a left-is-theirs, right-is-mine scheme is used." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:213 +msgid "Order for files in three-way version control merge comparisons" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:214 +msgid "" +"Choices for file order are remote/merged/local and local/merged/remote. This " +"preference only affects three-way comparisons launched from the version " +"control view, so is used solely for merges/conflict resolution within Meld." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:218 +msgid "Show margin in commit message editor" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:219 +msgid "" +"If true, a guide will be displayed to show what column the margin is at in " +"the version control commit message editor." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:223 +msgid "Margin column in commit message editor" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:224 +msgid "" +"The column at which to show the margin in the version control commit message " +"editor." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:228 +msgid "Automatically hard-wrap commit messages" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:229 +msgid "" +"If true, the version control commit message editor will hard-wrap (i.e., " +"insert line breaks) at the commit margin before commit." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:233 +msgid "Version control status filters" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:234 +msgid "" +"List of statuses used to filter visible files in version control comparison." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:248 +msgid "Filename-based filters" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:249 +msgid "" +"List of predefined filename-based filters that, if active, will remove " +"matching files from a folder comparison." +msgstr "" + +#: data/org.gnome.meld.gschema.xml:263 +msgid "Text-based filters" +msgstr "" + +#: data/org.gnome.meld.gschema.xml:264 +msgid "" +"List of predefined text-based regex filters that, if active, will remove " +"text from being used in a file comparison. The text will still be displayed, " +"but won’t contribute to the comparison itself." +msgstr "" + +#: data/styles/meld-base.style-scheme.xml.in:1 +msgid "Classic (Meld)" +msgstr "" + +#: data/styles/meld-base.style-scheme.xml.in:3 +msgid "Base color scheme for Meld highlighting" +msgstr "" + +#: data/styles/meld-dark.style-scheme.xml.in:1 +msgid "Meld dark scheme" +msgstr "" + +#: data/styles/meld-dark.style-scheme.xml.in:3 +msgid "Dark color scheme for Meld highlighting" +msgstr "" + +#: meld/resources/gtk/help-overlay.ui:14 +msgctxt "shortcut window" +msgid "General" +msgstr "მთავარი" + +#: meld/resources/gtk/help-overlay.ui:19 +msgctxt "shortcut window" +msgid "New comparison" +msgstr "ახალი შედარება" + +#: meld/resources/gtk/help-overlay.ui:26 +msgctxt "shortcut window" +msgid "Close a comparison" +msgstr "" + +#: meld/resources/gtk/help-overlay.ui:33 +msgctxt "shortcut window" +msgid "Quit Meld" +msgstr "Meld-დან გასვლა" + +#: meld/resources/gtk/help-overlay.ui:40 +msgctxt "shortcut window" +msgid "Stop the current action" +msgstr "მიმდინარე ქმედების გაჩერება" + +#: meld/resources/gtk/help-overlay.ui:47 +msgctxt "shortcut window" +msgid "Refresh comparison" +msgstr "" + +#: meld/resources/gtk/help-overlay.ui:54 +msgctxt "shortcut window" +msgid "Open externally" +msgstr "" + +#: meld/resources/gtk/help-overlay.ui:61 +msgctxt "shortcut window" +msgid "Fullscreen" +msgstr "მთელ ეკრანზე" + +#: meld/resources/gtk/help-overlay.ui:68 +msgctxt "shortcut window" +msgid "Swap left and right panes" +msgstr "" + +#: meld/resources/gtk/help-overlay.ui:77 +msgctxt "shortcut window" +msgid "Panes" +msgstr "" + +#: meld/resources/gtk/help-overlay.ui:82 +msgctxt "shortcut window" +msgid "Previous comparison pane" +msgstr "" + +#: meld/resources/gtk/help-overlay.ui:89 +msgctxt "shortcut window" +msgid "Next comparison pane" +msgstr "" + +#: meld/resources/gtk/help-overlay.ui:98 +msgctxt "shortcut window" +msgid "Changes" +msgstr "ცვლილებები" + +#: meld/resources/gtk/help-overlay.ui:103 +msgctxt "shortcut window" +msgid "Go to previous change" +msgstr "" + +#: meld/resources/gtk/help-overlay.ui:110 +msgctxt "shortcut window" +msgid "Go to next change" +msgstr "" + +#: meld/resources/gtk/help-overlay.ui:119 +msgctxt "shortcut window" +msgid "Tabs" +msgstr "დაფები" + +#: meld/resources/gtk/help-overlay.ui:124 +msgctxt "shortcut window" +msgid "Go to previous tab" +msgstr "წინა ჩანართზე გადასვლა" + +#: meld/resources/gtk/help-overlay.ui:131 +msgctxt "shortcut window" +msgid "Go to next tab" +msgstr "შემდეგი ჩანართზე გადასვლა" + +#: meld/resources/gtk/help-overlay.ui:138 +msgctxt "shortcut window" +msgid "Switch to tab" +msgstr "ჩანართზე გადართვა" + +#: meld/resources/gtk/help-overlay.ui:145 +msgctxt "shortcut window" +msgid "Move tab left" +msgstr "ჩანართის _მარცხნივ გადატანა" + +#: meld/resources/gtk/help-overlay.ui:152 +msgctxt "shortcut window" +msgid "Move tab right" +msgstr "ჩანართის მა_რჯვნივ გადატანა" + +#: meld/resources/gtk/help-overlay.ui:161 +msgctxt "shortcut window" +msgid "Editing" +msgstr "ჩასწორება" + +#: meld/resources/gtk/help-overlay.ui:166 +msgctxt "shortcut window" +msgid "Undo" +msgstr "ბრძანების გაუქმება" + +#: meld/resources/gtk/help-overlay.ui:173 +msgctxt "shortcut window" +msgid "Redo" +msgstr "თავიდან" + +#: meld/resources/gtk/help-overlay.ui:180 +msgctxt "shortcut window" +msgid "Cut" +msgstr "ამოჭრა" + +#: meld/resources/gtk/help-overlay.ui:187 +msgctxt "shortcut window" +msgid "Copy" +msgstr "" + +#: meld/resources/gtk/help-overlay.ui:194 +msgctxt "shortcut window" +msgid "Paste" +msgstr "ჩასმა" + +#: meld/resources/gtk/help-overlay.ui:201 +msgctxt "shortcut window" +msgid "Find" +msgstr "" + +#: meld/resources/gtk/help-overlay.ui:208 +msgctxt "shortcut window" +msgid "Find Next" +msgstr "მომდევნოს მოძებნა" + +#: meld/resources/gtk/help-overlay.ui:215 +msgctxt "shortcut window" +msgid "Find Previous" +msgstr "წინანდელის ძიება" + +#: meld/resources/gtk/help-overlay.ui:222 +msgctxt "shortcut window" +msgid "Replace" +msgstr "გამოცვლა" + +#: meld/resources/gtk/help-overlay.ui:231 +msgctxt "shortcut window" +msgid "File comparison" +msgstr "" + +#: meld/resources/gtk/help-overlay.ui:236 +msgctxt "shortcut window" +msgid "Save current file" +msgstr "მიმდინარე ფაილის შენახვა" + +#: meld/resources/gtk/help-overlay.ui:243 +msgctxt "shortcut window" +msgid "Save current file to new path" +msgstr "მიმდინარე ფაილის ახალ ბილიკზე შენახვა" + +#: meld/resources/gtk/help-overlay.ui:250 +msgctxt "shortcut window" +msgid "Save all files in comparison" +msgstr "" + +#: meld/resources/gtk/help-overlay.ui:257 +msgctxt "shortcut window" +msgid "Previous conflict" +msgstr "წინა კონფლიქტი" + +#: meld/resources/gtk/help-overlay.ui:264 +msgctxt "shortcut window" +msgid "Next conflict" +msgstr "შემდეგი კონფლიქტი" + +#: meld/resources/gtk/help-overlay.ui:271 +msgctxt "shortcut window" +msgid "Push change to left" +msgstr "" + +#: meld/resources/gtk/help-overlay.ui:278 +msgctxt "shortcut window" +msgid "Push change to right" +msgstr "" + +#: meld/resources/gtk/help-overlay.ui:285 +msgctxt "shortcut window" +msgid "Pull change from left" +msgstr "" + +#: meld/resources/gtk/help-overlay.ui:292 +msgctxt "shortcut window" +msgid "Pull change from right" +msgstr "" + +#: meld/resources/gtk/help-overlay.ui:299 +msgctxt "shortcut window" +msgid "Copy change above left" +msgstr "" + +#: meld/resources/gtk/help-overlay.ui:306 +msgctxt "shortcut window" +msgid "Copy change below left" +msgstr "" + +#: meld/resources/gtk/help-overlay.ui:313 +msgctxt "shortcut window" +msgid "Copy change above right" +msgstr "" + +#: meld/resources/gtk/help-overlay.ui:320 +msgctxt "shortcut window" +msgid "Copy change below right" +msgstr "" + +#: meld/resources/gtk/help-overlay.ui:327 +#: meld/resources/gtk/help-overlay.ui:355 +msgctxt "shortcut window" +msgid "Delete change" +msgstr "" + +#: meld/resources/gtk/help-overlay.ui:336 +msgctxt "shortcut window" +msgid "Folder comparison" +msgstr "" + +#: meld/resources/gtk/help-overlay.ui:341 +msgctxt "shortcut window" +msgid "Copy to left" +msgstr "" + +#: meld/resources/gtk/help-overlay.ui:348 +msgctxt "shortcut window" +msgid "Copy to right" +msgstr "" + +#: meld/resources/gtk/help-overlay.ui:364 +msgctxt "shortcut window" +msgid "Version control comparison" +msgstr "" + +#: meld/resources/gtk/help-overlay.ui:369 +msgctxt "shortcut window" +msgid "Commit to version control" +msgstr "" + +#: meld/resources/gtk/help-overlay.ui:376 +msgctxt "shortcut window" +msgid "Show/hide console output" +msgstr "" + +#: meld/resources/gtk/menus.ui:7 +msgid "Save As…" +msgstr "შენახვა, როგორც…" + +#: meld/resources/gtk/menus.ui:11 +msgid "Save A_ll" +msgstr "_ყველას შენახვა" + +#: meld/resources/gtk/menus.ui:15 +msgid "Revert files…" +msgstr "ფაილების რევერსი…" + +#: meld/resources/gtk/menus.ui:19 +msgid "Open Externally" +msgstr "გარეთ გახსნა" + +#: meld/resources/gtk/menus.ui:26 +msgid "Refresh Comparison" +msgstr "შედარების განახლება" + +#: meld/resources/gtk/menus.ui:33 +msgid "_Find…" +msgstr "_მოძებნა…" + +#: meld/resources/gtk/menus.ui:37 +msgid "_Replace…" +msgstr "_ჩანაცვლება…" + +#: meld/resources/gtk/menus.ui:43 +msgid "View" +msgstr "ნახვა" + +#: meld/resources/gtk/menus.ui:47 +msgid "Fullscreen" +msgstr "მთელ ეკრანზე" + +#: meld/resources/gtk/menus.ui:52 +msgid "Overview Map" +msgstr "მიმოხილვის რუკა" + +#: meld/resources/gtk/menus.ui:56 +msgid "Version control console" +msgstr "ვერსიის კონტროლის კონსოლი" + +#: meld/resources/gtk/menus.ui:60 +msgid "Lock scrolling" +msgstr "გადახვევის დაბლოკვა" + +#: meld/resources/gtk/menus.ui:67 +msgid "Swap left and right panes" +msgstr "" + +#: meld/resources/gtk/menus.ui:73 +msgid "Comparison" +msgstr "შედარება" + +#: meld/resources/gtk/menus.ui:75 +msgid "Stop" +msgstr "გაჩერება" + +#: meld/resources/gtk/menus.ui:81 +msgid "Merge All from Left" +msgstr "" + +#: meld/resources/gtk/menus.ui:85 +msgid "Merge All from Right" +msgstr "" + +#: meld/resources/gtk/menus.ui:89 +msgid "Merge All" +msgstr "ყველას შერწყმა" + +#: meld/resources/gtk/menus.ui:96 +msgid "Format as Patch…" +msgstr "" + +#: meld/resources/gtk/menus.ui:105 +msgid "_Preferences" +msgstr "გამართვა" + +#: meld/resources/gtk/menus.ui:109 +msgid "Keyboard Shortcuts" +msgstr "კლავიატურის მალსახმობები" + +#: meld/resources/gtk/menus.ui:113 +msgid "_Help" +msgstr "_დახმარება" + +#: meld/resources/gtk/menus.ui:118 +msgid "_About Meld" +msgstr "Meld-ის შესახებ" + +#: meld/resources/gtk/menus.ui:131 +msgid "File status" +msgstr "ფაილის სტატუსი" + +#: meld/resources/gtk/menus.ui:133 +msgid "Same" +msgstr "იგივე" + +#: meld/resources/gtk/menus.ui:137 +msgid "New" +msgstr "ახალი" + +#: meld/resources/gtk/menus.ui:141 meld/resources/gtk/menus.ui:164 +#: meld/vc/_vc.py:77 +msgid "Modified" +msgstr "შეცვლილია" + +#: meld/resources/gtk/menus.ui:151 +msgid "Ignore filename case" +msgstr "" + +#: meld/resources/gtk/menus.ui:155 +msgid "Normalize Unicode paths" +msgstr "" + +#: meld/resources/gtk/menus.ui:168 +msgid "Normal" +msgstr "ჩვეულებრივი" + +#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:71 +msgid "Unversioned" +msgstr "" + +#: meld/resources/gtk/menus.ui:176 meld/vc/_vc.py:70 +msgid "Ignored" +msgstr "იგნორირებულია" + +#: meld/resources/gtk/menus.ui:183 +msgid "Flatten folders" +msgstr "" + +#: meld/resources/ui/about-dialog.ui:8 +msgid "" +"Copyright © 2002-2009 Stephen Kennedy\n" +"Copyright © 2009-2022 Kai Willadsen" +msgstr "" + +#: meld/resources/ui/about-dialog.ui:14 +msgid "translator-credits" +msgstr "ეკატერინე პაპავა" + +#: meld/resources/ui/appwindow.ui:30 +msgid "Start a new comparison" +msgstr "" + +#: meld/resources/ui/appwindow.ui:46 +msgid "Open a recent comparison" +msgstr "" + +#: meld/resources/ui/appwindow.ui:74 +msgid "Go to the previous change" +msgstr "" + +#: meld/resources/ui/appwindow.ui:94 +msgid "Go to the next change" +msgstr "" + +#: meld/resources/ui/appwindow.ui:124 +msgid "Go to the previous conflict" +msgstr "" + +#: meld/resources/ui/appwindow.ui:144 +msgid "Go to the next conflict" +msgstr "" + +#: meld/resources/ui/appwindow.ui:193 +msgid "Version Filters" +msgstr "ვერსიის ფილტრები" + +#: meld/resources/ui/appwindow.ui:208 meld/resources/ui/preferences.ui:1472 +msgid "File Filters" +msgstr "ფაილის ფილტრები" + +#: meld/resources/ui/appwindow.ui:223 meld/resources/ui/preferences.ui:1657 +msgid "Text Filters" +msgstr "ტექსტის ფილტრები" + +#: meld/resources/ui/column-list.ui:37 meld/resources/ui/filter-list.ui:40 +msgid "Active" +msgstr "აქტიური" + +#: meld/resources/ui/column-list.ui:50 +msgid "Column Name" +msgstr "სვეტისსახელი" + +#: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128 +#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:745 +msgid "_Remove" +msgstr "მოცილება" + +#: meld/resources/ui/column-list.ui:96 meld/resources/ui/filter-list.ui:152 +msgid "Move item up" +msgstr "ჩანაწერის აწევა" + +#: meld/resources/ui/column-list.ui:98 meld/resources/ui/filter-list.ui:154 +msgid "Move _Up" +msgstr "_აწევა" + +#: meld/resources/ui/column-list.ui:112 meld/resources/ui/filter-list.ui:168 +msgid "Move item down" +msgstr "ჩანაწერის ჩამოწევა" + +#: meld/resources/ui/column-list.ui:114 meld/resources/ui/filter-list.ui:170 +msgid "Move _Down" +msgstr "_ჩამოწევა" + +#: meld/resources/ui/commit-dialog.ui:8 +msgid "Commit" +msgstr "გადაცემა" + +#: meld/resources/ui/commit-dialog.ui:36 +msgid "Commit Files" +msgstr "ფაილების გადაცემა" + +#: meld/resources/ui/commit-dialog.ui:117 +msgid "Log Message" +msgstr "ჟურნალის ჩანაწერი" + +#: meld/resources/ui/commit-dialog.ui:181 +msgid "Previous logs:" +msgstr "წინა ჟურნალი:" + +#: meld/resources/ui/commit-dialog.ui:259 +msgid "Co_mmit" +msgstr "_გადაცემა" + +#: meld/resources/ui/dirdiff-actions.ui:20 +msgid "Copy to left" +msgstr "მარცხნივ კოპირება" + +#: meld/resources/ui/dirdiff-actions.ui:42 +msgid "Copy to right" +msgstr "მარჯვნივ კოპირება" + +#: meld/resources/ui/dirdiff-actions.ui:66 +msgid "Delete selected" +msgstr "მონიშნულის წაშლა" + +#: meld/resources/ui/dirdiff-menus.ui:7 +msgid "_Compare selected files" +msgstr "" + +#: meld/resources/ui/dirdiff-menus.ui:14 +msgid "_Mark selected file" +msgstr "" + +#: meld/resources/ui/dirdiff-menus.ui:18 +msgid "Compare _with marked file" +msgstr "" + +#: meld/resources/ui/dirdiff-menus.ui:25 +msgid "Copy to _left" +msgstr "_მარცხნივ კოპირება" + +#: meld/resources/ui/dirdiff-menus.ui:29 +msgid "Copy to _right" +msgstr "_მარჯვნივ კოპირება" + +#: meld/resources/ui/dirdiff-menus.ui:33 +msgid "_Delete selected" +msgstr "მონიშნულის _წაშლა" + +#: meld/resources/ui/dirdiff-menus.ui:40 +msgid "Collapse Recursively" +msgstr "რეკურსიულად ჩაკეცვა" + +#: meld/resources/ui/dirdiff-menus.ui:44 +msgid "Expand Recursively" +msgstr "რეკურსიულად ამოკეცვა" + +#: meld/resources/ui/dirdiff-menus.ui:51 +msgid "_Open Externally" +msgstr "_გარეთ გახსნა" + +#: meld/resources/ui/dirdiff-menus.ui:55 +msgid "_Copy File Paths" +msgstr "ფაილის ბილიკების კოპირება" + +#: meld/resources/ui/dirdiff.ui:35 meld/resources/ui/dirdiff.ui:76 +#: meld/resources/ui/dirdiff.ui:117 +msgid "Select folder to open in this pane" +msgstr "" + +#: meld/resources/ui/dirdiff.ui:43 +msgid "Folder 1" +msgstr "საქაღალდე 1" + +#: meld/resources/ui/dirdiff.ui:84 +msgid "Folder 2" +msgstr "საქაღალდე 2" + +#: meld/resources/ui/dirdiff.ui:125 +msgid "Folder 3" +msgstr "საქაღალდე 3" + +#: meld/resources/ui/encoding-selector.ui:31 +msgid "Search text encoding…" +msgstr "" + +#: meld/resources/ui/filediff-actions.ui:20 +msgid "Push current change to the left" +msgstr "" + +#: meld/resources/ui/filediff-actions.ui:42 +msgid "Push current change to the right" +msgstr "" + +#: meld/resources/ui/filediff-actions.ui:65 +msgid "Copy chunks" +msgstr "" + +#: meld/resources/ui/filediff-actions.ui:87 +msgid "Delete change" +msgstr "" + +#: meld/resources/ui/filediff-menus.ui:7 +msgid "Copy change above the left chunk" +msgstr "" + +#: meld/resources/ui/filediff-menus.ui:11 +msgid "Copy change below the left chunk" +msgstr "" + +#: meld/resources/ui/filediff-menus.ui:15 +msgid "Copy change above the right chunk" +msgstr "" + +#: meld/resources/ui/filediff-menus.ui:19 +msgid "Copy change below the right chunk" +msgstr "" + +#: meld/resources/ui/filediff-menus.ui:28 +msgid "_Undo" +msgstr "გა_უქმება" + +#: meld/resources/ui/filediff-menus.ui:32 +msgid "_Redo" +msgstr "" + +#: meld/resources/ui/filediff-menus.ui:39 +msgid "Cu_t" +msgstr "ამო_ჭრა" + +#: meld/resources/ui/filediff-menus.ui:43 +msgid "_Copy" +msgstr "" + +#: meld/resources/ui/filediff-menus.ui:47 +msgid "_Paste" +msgstr "_ჩასმა" + +#: meld/resources/ui/filediff-menus.ui:54 +msgid "Open Containing Folder" +msgstr "შემცველი საქაღალდის გახსნა" + +#: meld/resources/ui/filediff-menus.ui:58 +msgid "Copy Full Path" +msgstr "" + +#: meld/resources/ui/filediff.ui:31 meld/resources/ui/filediff.ui:100 +#: meld/resources/ui/filediff.ui:169 +msgid "" +"This file can not be written to. You may click here to unlock this file and " +"make changes anyway, but these changes must be saved to a new file." +msgstr "" + +#: meld/resources/ui/filediff.ui:45 meld/resources/ui/filediff.ui:114 +#: meld/resources/ui/filediff.ui:183 +msgid "Save file in this pane" +msgstr "" + +#: meld/resources/ui/filediff.ui:71 meld/resources/ui/filediff.ui:140 +#: meld/resources/ui/filediff.ui:209 +msgid "Open file in this pane" +msgstr "" + +#: meld/resources/ui/filediff.ui:79 +msgid "File 3" +msgstr "ფაილი 3" + +#: meld/resources/ui/filediff.ui:148 +msgid "File 2" +msgstr "ფაილი 2" + +#: meld/resources/ui/filediff.ui:217 meld/resources/ui/vcview.ui:148 +msgid "File 1" +msgstr "ფაილი 1" + +#. Create icon and filename CellRenderer +#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217 +#: meld/dirdiff.py:603 +msgid "Name" +msgstr "სახელი" + +#: meld/resources/ui/filter-list.ui:68 +msgid "Pattern" +msgstr "შაბლონი" + +#: meld/resources/ui/filter-list.ui:110 +msgid "Add new filter" +msgstr "ახალი ფილტრის დამატება" + +#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:18 +msgid "_Add" +msgstr "_დამატება" + +#: meld/resources/ui/filter-list.ui:126 +msgid "Remove selected filter" +msgstr "" + +#: meld/resources/ui/findbar.ui:103 +msgid "_Match case" +msgstr "_დიდი და პატარა ასოების სხვაობა" + +#: meld/resources/ui/findbar.ui:119 +msgid "Who_le word" +msgstr "_სრული სიტყვა" + +#: meld/resources/ui/findbar.ui:135 +msgid "Regular e_xpression" +msgstr "_რეგულარული გამოსახულება" + +#: meld/resources/ui/findbar.ui:175 +msgid "Wrapped" +msgstr "_გადატანილი" + +#: meld/resources/ui/findbar.ui:193 +msgid "Replace _All" +msgstr "ყველ_აფრის ჩანაცვლება" + +#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1231 meld/iohelpers.py:117 +msgid "_Replace" +msgstr "_გამოცვლა" + +#: meld/resources/ui/findbar.ui:226 +msgid "Switch between Find and Find-and-Replace" +msgstr "" + +#: meld/resources/ui/language-selector.ui:31 +msgid "Search highlight mode…" +msgstr "გამოკვე_თის რეჟიმში ძებნა…" + +#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:342 +#: meld/newdifftab.py:49 +msgid "New comparison" +msgstr "ახალი შედარება" + +#: meld/resources/ui/new-diff-tab.ui:72 +msgid "File" +msgstr "ფაილი" + +#: meld/resources/ui/new-diff-tab.ui:121 +msgid "Folder" +msgstr "საქაღალდე" + +#: meld/resources/ui/new-diff-tab.ui:170 +msgid "Version control" +msgstr "ვერსიის კონტროლი" + +#: meld/resources/ui/new-diff-tab.ui:236 meld/resources/ui/new-diff-tab.ui:357 +msgid "_3-way comparison" +msgstr "" + +#: meld/resources/ui/new-diff-tab.ui:256 +msgid "Select First File" +msgstr "" + +#: meld/resources/ui/new-diff-tab.ui:270 +msgid "Select Second File" +msgstr "" + +#: meld/resources/ui/new-diff-tab.ui:285 +msgid "Select Third File" +msgstr "" + +#: meld/resources/ui/new-diff-tab.ui:321 +msgid "Select First Folder" +msgstr "" + +#: meld/resources/ui/new-diff-tab.ui:334 +msgid "Select Second Folder" +msgstr "" + +#: meld/resources/ui/new-diff-tab.ui:348 +msgid "Select Third Folder" +msgstr "" + +#: meld/resources/ui/new-diff-tab.ui:399 +msgid "Select A Version-Controlled Folder" +msgstr "" + +#: meld/resources/ui/new-diff-tab.ui:448 +msgid "_Blank comparison" +msgstr "" + +#: meld/resources/ui/new-diff-tab.ui:466 +msgid "C_ompare" +msgstr "_შედარება" + +#: meld/resources/ui/notebook-label.ui:24 +msgid "Close Tab" +msgstr "ჩანართის დახურვა" + +#: meld/resources/ui/patch-dialog.ui:9 +msgid "Format as Patch" +msgstr "" + +#: meld/resources/ui/patch-dialog.ui:26 +msgid "Copy to Clipboard" +msgstr "გაცვლის ბუფერში კოპირება" + +#: meld/resources/ui/patch-dialog.ui:57 meld/patchdialog.py:159 +msgid "Save Patch" +msgstr "" + +#: meld/resources/ui/patch-dialog.ui:88 +msgid "Use differences between:" +msgstr "" + +#: meld/resources/ui/patch-dialog.ui:105 +msgid "Left and middle panes" +msgstr "" + +#: meld/resources/ui/patch-dialog.ui:123 +msgid "Middle and right panes" +msgstr "" + +#: meld/resources/ui/patch-dialog.ui:149 +msgid "_Reverse patch direction" +msgstr "" + +#: meld/resources/ui/path-label.ui:23 +msgid "Path" +msgstr "ბილიკი" + +#: meld/resources/ui/path-label.ui:62 +msgid "Copy Path" +msgstr "ბილიკის კოპირება" + +#: meld/resources/ui/path-label.ui:78 +msgid "Open Folder" +msgstr "საქაღალდის გახსნა" + +#: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31 +msgid "Preferences" +msgstr "მორგება" + +#: meld/resources/ui/preferences.ui:75 +msgid "Font" +msgstr "შრიფტი" + +#: meld/resources/ui/preferences.ui:112 +msgid "_Use the system fixed width font" +msgstr "" + +#: meld/resources/ui/preferences.ui:136 +msgid "_Editor font:" +msgstr "" + +#. TRANSLATORS: This is the status bar label for a group of settings, +#. such as text wrapping, show line numbers, whitespace, etc. +#: meld/resources/ui/preferences.ui:198 meld/ui/statusbar.py:291 +msgid "Display" +msgstr "ეკრანი" + +#: meld/resources/ui/preferences.ui:241 +msgid "_Tab width:" +msgstr "" + +#: meld/resources/ui/preferences.ui:274 +msgid "_Insert spaces instead of tabs" +msgstr "" + +#: meld/resources/ui/preferences.ui:290 +msgid "Enable text _wrapping" +msgstr "ტექსტის _გადატანის ჩართვა" + +#: meld/resources/ui/preferences.ui:312 +msgid "Do not _split words over two lines" +msgstr "" + +#: meld/resources/ui/preferences.ui:333 +msgid "Highlight _current line" +msgstr "" + +#: meld/resources/ui/preferences.ui:349 +msgid "Show _line numbers" +msgstr "" + +#: meld/resources/ui/preferences.ui:365 +msgid "Show w_hitespace" +msgstr "" + +#: meld/resources/ui/preferences.ui:381 +msgid "Prefer dark theme" +msgstr "" + +#: meld/resources/ui/preferences.ui:397 +msgid "Use s_yntax highlighting" +msgstr "" + +#: meld/resources/ui/preferences.ui:420 +msgid "Syntax highlighting color scheme:" +msgstr "" + +#: meld/resources/ui/preferences.ui:485 +msgid "Code Overview" +msgstr "" + +#: meld/resources/ui/preferences.ui:522 +msgid "Show overview map" +msgstr "" + +#: meld/resources/ui/preferences.ui:545 +msgid "Overview map style:" +msgstr "" + +#: meld/resources/ui/preferences.ui:612 +msgid "External Editor" +msgstr "" + +#: meld/resources/ui/preferences.ui:648 +msgid "Use _default system editor" +msgstr "" + +#: meld/resources/ui/preferences.ui:671 +msgid "Edito_r command:" +msgstr "" + +#: meld/resources/ui/preferences.ui:727 +msgid "Editor" +msgstr "რედაქტორი" + +#: meld/resources/ui/preferences.ui:748 +msgid "Shallow Comparison" +msgstr "" + +#: meld/resources/ui/preferences.ui:784 +msgid "C_ompare files based only on size and timestamp" +msgstr "" + +#: meld/resources/ui/preferences.ui:807 +msgid "_Timestamp resolution:" +msgstr "" + +#: meld/resources/ui/preferences.ui:871 +msgid "Note: enabling text filters may make comparing large files much slower" +msgstr "" + +#: meld/resources/ui/preferences.ui:920 +msgid "Symbolic Links" +msgstr "სიმბმულები" + +#: meld/resources/ui/preferences.ui:988 +msgid "Visible Columns" +msgstr "ხილული სვეტები" + +#: meld/resources/ui/preferences.ui:1055 +msgid "Folder Comparisons" +msgstr "" + +#: meld/resources/ui/preferences.ui:1077 +msgid "Version Comparisons" +msgstr "" + +#: meld/resources/ui/preferences.ui:1120 +msgid "_Order when comparing file revisions:" +msgstr "" + +#: meld/resources/ui/preferences.ui:1167 +msgid "Order when _merging files:" +msgstr "" + +#: meld/resources/ui/preferences.ui:1235 +msgid "Commit Messages" +msgstr "" + +#: meld/resources/ui/preferences.ui:1276 +msgid "Show _right margin at:" +msgstr "" + +#: meld/resources/ui/preferences.ui:1317 +msgid "Automatically _break lines at right margin on commit" +msgstr "" + +#: meld/resources/ui/preferences.ui:1367 +msgid "Version Control" +msgstr "ვერსიის კონტროლი" + +#: meld/resources/ui/preferences.ui:1389 +msgid "Filename filters" +msgstr "" + +#: meld/resources/ui/preferences.ui:1427 +msgid "" +"When performing directory comparisons, you may filter out files and " +"directories by name. Each pattern is a list of shell style wildcards " +"separated by spaces." +msgstr "" + +#: meld/resources/ui/preferences.ui:1494 +msgid "Change trimming" +msgstr "" + +#: meld/resources/ui/preferences.ui:1530 +msgid "Trim blank line differences from the start and end of changes" +msgstr "" + +#: meld/resources/ui/preferences.ui:1574 +msgid "Text filters" +msgstr "" + +#: meld/resources/ui/preferences.ui:1612 +msgid "" +"When performing file comparisons, you may ignore certain types of changes. " +"Each pattern here is a python regular expression which replaces matching " +"text with the empty string before comparison is performed. If the expression " +"contains groups, only the groups are replaced. See the user manual for more " +"details." +msgstr "" + +#: meld/resources/ui/preferences.ui:1703 +msgid "Left is remote, right is local" +msgstr "" + +#: meld/resources/ui/preferences.ui:1707 +msgid "Left is local, right is remote" +msgstr "" + +#: meld/resources/ui/preferences.ui:1721 +msgid "Simple change map" +msgstr "" + +#: meld/resources/ui/preferences.ui:1725 +msgid "Compact source map" +msgstr "" + +#: meld/resources/ui/preferences.ui:1729 +msgid "Full source map" +msgstr "" + +#: meld/resources/ui/preferences.ui:1743 +msgid "Remote, merge, local" +msgstr "" + +#: meld/resources/ui/preferences.ui:1747 +msgid "Local, merge, remote" +msgstr "" + +#: meld/resources/ui/preferences.ui:1769 +msgid "1ns (ext4)" +msgstr "" + +#: meld/resources/ui/preferences.ui:1773 +msgid "100ns (NTFS)" +msgstr "" + +#: meld/resources/ui/preferences.ui:1777 +msgid "1s (ext2/ext3)" +msgstr "" + +#: meld/resources/ui/preferences.ui:1781 +msgid "2s (VFAT)" +msgstr "" + +#: meld/resources/ui/push-dialog.ui:9 +msgid "Push local commits to remote?" +msgstr "" + +#: meld/resources/ui/push-dialog.ui:10 +msgid "The commits to be pushed are determined by your version control system." +msgstr "" + +#: meld/resources/ui/push-dialog.ui:38 +msgid "_Push commits" +msgstr "" + +#: meld/resources/ui/recent-selector.ui:16 +msgid "Search recent comparisons…" +msgstr "" + +#: meld/resources/ui/revert-dialog.ui:9 +msgid "Discard unsaved changes to documents?" +msgstr "" + +#: meld/resources/ui/revert-dialog.ui:10 +msgid "Changes made to the following documents will be permanently lost:" +msgstr "" + +#: meld/resources/ui/revert-dialog.ui:39 +msgid "_Discard" +msgstr "_მოცილება" + +#: meld/resources/ui/save-confirm-dialog.ui:9 +msgid "Save changes to documents before closing?" +msgstr "" + +#: meld/resources/ui/save-confirm-dialog.ui:10 +msgid "If you don’t save, changes will be permanently lost." +msgstr "" + +#: meld/resources/ui/save-confirm-dialog.ui:24 +msgid "Close _without Saving" +msgstr "დახურვა _შენახვის გარეშე" + +#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1229 +#: meld/iohelpers.py:56 meld/iohelpers.py:116 +msgid "_Cancel" +msgstr "_შეწყვეტა" + +#: meld/resources/ui/save-confirm-dialog.ui:55 +msgid "_Save" +msgstr "" + +#: meld/resources/ui/statusbar-menu.ui:9 +msgid "Show whitespace" +msgstr "" + +#: meld/resources/ui/statusbar-menu.ui:17 +msgid "Text wrapping" +msgstr "ტექსტის გადატანა" + +#: meld/resources/ui/vcview-menus.ui:7 +msgid "_Compare" +msgstr "_შედარება" + +#: meld/resources/ui/vcview-menus.ui:11 +msgid "Co_mmit…" +msgstr "_კომიტი…" + +#: meld/resources/ui/vcview-menus.ui:26 +msgid "Re_vert" +msgstr "დაბრუნება" + +#: meld/resources/ui/vcview-menus.ui:30 +msgid "Delete" +msgstr "" + +#: meld/resources/ui/vcview-menus.ui:37 +msgid "Resolve Conflict" +msgstr "კონფლიქტის მოგვარება" + +#: meld/resources/ui/vcview.ui:16 +msgid "Commit changes to version control" +msgstr "" + +#: meld/resources/ui/vcview.ui:21 +msgid "Commit…" +msgstr "კომიტი…" + +#: meld/resources/ui/vcview.ui:38 +msgid "Pull remote changes to the local repository" +msgstr "" + +#: meld/resources/ui/vcview.ui:51 +msgid "Push local changes to remote" +msgstr "" + +#: meld/resources/ui/vcview.ui:74 +msgid "Add to version control" +msgstr "" + +#: meld/resources/ui/vcview.ui:87 +msgid "Remove from version control" +msgstr "" + +#: meld/resources/ui/vcview.ui:100 +msgid "Revert working copy to original state" +msgstr "" + +#: meld/resources/ui/vcview.ui:113 +msgid "Mark as resolved in version control" +msgstr "" + +#: meld/resources/ui/vcview.ui:140 +msgid "Open version controlled folder in this pane" +msgstr "" + +#: meld/resources/ui/vcview.ui:229 +msgid "Location" +msgstr "მდებარეობა" + +#: meld/resources/ui/vcview.ui:238 +msgid "Status" +msgstr "მდგომარეობა" + +#: meld/resources/ui/vcview.ui:247 +msgid "Extra" +msgstr "დამატებით" + +#: meld/resources/ui/vcview.ui:279 +msgid "Console output" +msgstr "კონსოლში გამოტანა" + +#: meld/actiongutter.py:254 +msgid "Copy _up" +msgstr "" + +#: meld/actiongutter.py:255 +msgid "Copy _down" +msgstr "" + +#: meld/const.py:30 +msgid "UNIX (LF)" +msgstr "UNIX (LF)" + +#: meld/const.py:31 +msgid "DOS/Windows (CR-LF)" +msgstr "DOS/Windows (CR-LF)" + +#: meld/const.py:32 +msgid "Mac OS (CR)" +msgstr "Mac OS (CR)" + +#. Create file size CellRenderer +#: meld/dirdiff.py:624 meld/preferences.py:132 +msgid "Size" +msgstr "ზომა" + +#. Create date-time CellRenderer +#: meld/dirdiff.py:632 meld/preferences.py:133 +msgid "Modification time" +msgstr "მოდიფიკაციის დრო" + +#. Create ISO-format date-time CellRenderer +#: meld/dirdiff.py:640 meld/preferences.py:134 +msgid "Modification time (ISO)" +msgstr "" + +#. Create permissions CellRenderer +#: meld/dirdiff.py:648 meld/preferences.py:135 +msgid "Permissions" +msgstr "ნებართვები" + +#: meld/dirdiff.py:901 +#, python-brace-format +msgid "{filename} (scanning…)" +msgstr "" + +#: meld/dirdiff.py:933 meld/dirdiff.py:965 +#, python-brace-format +msgid "[{label}] Scanning {folder}" +msgstr "" + +#: meld/dirdiff.py:1101 +#, python-brace-format +msgid "[{label}] Done" +msgstr "" + +#: meld/dirdiff.py:1114 +msgid "Folder {} is being compared to itself" +msgstr "" + +#: meld/dirdiff.py:1120 +msgid "Folders have no differences" +msgstr "" + +#: meld/dirdiff.py:1122 +msgid "Contents of scanned files in folders are identical." +msgstr "" + +#: meld/dirdiff.py:1124 +msgid "" +"Scanned files in folders appear identical, but contents have not been " +"scanned." +msgstr "" + +#: meld/dirdiff.py:1127 +msgid "File filters are in use, so not all files have been scanned." +msgstr "" + +#: meld/dirdiff.py:1129 +msgid "Text filters are in use and may be masking content differences." +msgstr "" + +#: meld/dirdiff.py:1145 meld/filediff.py:1997 +msgid "Hide" +msgstr "დამალვა" + +#: meld/dirdiff.py:1147 meld/filediff.py:1999 meld/filediff.py:2029 +#: meld/filediff.py:2031 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 +msgid "Hi_de" +msgstr "დამალვა" + +#: meld/dirdiff.py:1156 +msgid "Multiple errors occurred while scanning this folder" +msgstr "" + +#: meld/dirdiff.py:1157 +msgid "Files with invalid encodings found" +msgstr "" + +#. TRANSLATORS: This is followed by a list of files +#: meld/dirdiff.py:1159 +msgid "Some files were in an incorrect encoding. The names are something like:" +msgstr "" + +#: meld/dirdiff.py:1161 +msgid "Files hidden by case insensitive comparison" +msgstr "" + +#. TRANSLATORS: This is followed by a list of files +#: meld/dirdiff.py:1163 +msgid "" +"You are running a case insensitive comparison on a case sensitive " +"filesystem. The following files in this folder are hidden:" +msgstr "" + +#: meld/dirdiff.py:1174 +#, python-brace-format +msgid "“{first_file}” hidden by “{second_file}”" +msgstr "" + +#: meld/dirdiff.py:1236 +#, python-format +msgid "Replace folder “%s”?" +msgstr "ჩავანაცვლო საქაღალდე \"%s\"?" + +#: meld/dirdiff.py:1238 +#, python-format +msgid "" +"Another folder with the same name already exists in “%s”.\n" +"If you replace the existing folder, all files in it will be lost." +msgstr "" + +#: meld/dirdiff.py:1251 +msgid "Error copying file" +msgstr "" + +#: meld/dirdiff.py:1252 +#, python-brace-format +msgid "" +"Couldn’t copy {source}\n" +"to {dest}.\n" +"\n" +"{error}" +msgstr "" + +#: meld/dirdiff.py:1277 meld/vcview.py:768 +msgid "Error deleting {}" +msgstr "" + +#: meld/dirdiff.py:1825 +msgid "No folder" +msgstr "" + +#: meld/dirdiff.py:1838 +msgid "Folder comparison:" +msgstr "" + +#: meld/filediff.py:1168 +msgid "Comparison results will be inaccurate" +msgstr "" + +#: meld/filediff.py:1170 +msgid "" +"A filter changed the number of lines in the file, which is unsupported. The " +"comparison will not be accurate." +msgstr "" + +#: meld/filediff.py:1242 +msgid "Mark conflict as resolved?" +msgstr "" + +#: meld/filediff.py:1244 +msgid "" +"If the conflict was resolved successfully, you may mark it as resolved now." +msgstr "" + +#: meld/filediff.py:1247 +msgid "Cancel" +msgstr "შეწყვეტა" + +#: meld/filediff.py:1248 +msgid "Mark _Resolved" +msgstr "" + +#: meld/filediff.py:1439 meld/filediff.py:1455 +msgid "Add Synchronization Point" +msgstr "" + +#: meld/filediff.py:1443 +msgid "Remove Synchronization Point" +msgstr "" + +#: meld/filediff.py:1447 +msgid "Move Synchronization Point" +msgstr "" + +#: meld/filediff.py:1451 +msgid "Match Synchronization Point" +msgstr "" + +#: meld/filediff.py:1475 +msgid "Clear Synchronization Points" +msgstr "" + +#: meld/filediff.py:1535 +msgid "File comparison:" +msgstr "" + +#: meld/filediff.py:1671 +#, python-format +msgid "There was a problem opening the file “%s”." +msgstr "ფაილის გახსნის შეცდომა: %s." + +#: meld/filediff.py:1680 +#, python-format +msgid "File %s appears to be a binary file." +msgstr "" + +#: meld/filediff.py:1682 +msgid "Do you want to open the file using the default application?" +msgstr "" + +#: meld/filediff.py:1684 +msgid "Open" +msgstr "გახსნა" + +#: meld/filediff.py:1706 +#, python-format +msgid "[%s] Merging files" +msgstr "" + +#: meld/filediff.py:1720 +#, python-format +msgid "[%s] Computing differences" +msgstr "" + +#: meld/filediff.py:1780 +#, python-format +msgid "File %s has changed on disk" +msgstr "" + +#: meld/filediff.py:1781 +msgid "Do you want to reload the file?" +msgstr "" + +#: meld/filediff.py:1783 +msgid "_Reload" +msgstr "_გადატვირთვა" + +#: meld/filediff.py:1953 +msgid "File {} is being compared to itself" +msgstr "" + +#: meld/filediff.py:1962 +msgid "Files are identical" +msgstr "" + +#: meld/filediff.py:1975 +msgid "" +"Text filters are being used, and may be masking differences between files. " +"Would you like to compare the unfiltered files?" +msgstr "" + +#: meld/filediff.py:1980 +msgid "Files differ in line endings only" +msgstr "" + +#: meld/filediff.py:1982 +#, python-format +msgid "" +"Files are identical except for differing line endings:\n" +"%s" +msgstr "" + +#: meld/filediff.py:2002 +msgid "Show without filters" +msgstr "" + +#: meld/filediff.py:2024 +msgid "Change highlighting incomplete" +msgstr "" + +#: meld/filediff.py:2025 +msgid "" +"Some changes were not highlighted because they were too large. You can force " +"Meld to take longer to highlight larger changes, though this may be slow." +msgstr "" + +#: meld/filediff.py:2033 +msgid "Keep highlighting" +msgstr "" + +#: meld/filediff.py:2035 +msgid "_Keep highlighting" +msgstr "" + +#: meld/filediff.py:2048 +msgid "Saving failed" +msgstr "შენახვის შეცდომა" + +#: meld/filediff.py:2049 +msgid "" +"Please consider copying any critical changes to another program or file to " +"avoid data loss." +msgstr "" + +#: meld/filediff.py:2058 +msgid "Save Left Pane As" +msgstr "" + +#: meld/filediff.py:2060 +msgid "Save Middle Pane As" +msgstr "" + +#: meld/filediff.py:2062 +msgid "Save Right Pane As" +msgstr "" + +#: meld/filediff.py:2073 +#, python-format +msgid "File %s has changed on disk since it was opened" +msgstr "" + +#: meld/filediff.py:2075 +msgid "If you save it, any external changes will be lost." +msgstr "" + +#: meld/filediff.py:2078 +msgid "Save Anyway" +msgstr "დაიმახსოვრე ყველაფრის მიუხედავად" + +#: meld/filediff.py:2079 +msgid "Don’t Save" +msgstr "არ შეინახო" + +#: meld/filediff.py:2121 +msgid "" +"File “{}” contains characters that can’t be encoded using its current " +"encoding “{}”." +msgstr "" + +#: meld/filediff.py:2125 meld/patchdialog.py:138 +#, python-format +msgid "" +"Couldn’t save file due to:\n" +"%s" +msgstr "" + +#: meld/filediff.py:2129 meld/patchdialog.py:137 +#, python-format +msgid "Could not save file %s." +msgstr "" + +#: meld/filediff.py:2539 +msgid "Live comparison updating disabled" +msgstr "" + +#: meld/filediff.py:2540 +msgid "" +"Live updating of comparisons is disabled when synchronization points are " +"active. You can still manually refresh the comparison, and live updates will " +"resume when synchronization points are cleared." +msgstr "" + +#: meld/filediff.py:2568 +msgid "Can't swap unsaved files" +msgstr "" + +#: meld/filediff.py:2570 +msgid "Files must be saved to disk before swapping panes." +msgstr "" + +#: meld/filediff.py:2577 +msgid "Can't swap version control comparisons" +msgstr "" + +#: meld/filediff.py:2579 +msgid "Swapping panes is not supported in version control mode." +msgstr "" + +#: meld/iohelpers.py:41 +msgid "Deleting remote folders is not supported" +msgstr "" + +#: meld/iohelpers.py:43 +msgid "Not a file or directory" +msgstr "" + +#: meld/iohelpers.py:47 +msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?" +msgstr "" + +#: meld/iohelpers.py:52 +msgid "This remote location does not support sending items to the trash." +msgstr "" + +#: meld/iohelpers.py:58 +msgid "_Delete Permanently" +msgstr "_სამუდამოდ წაშლა" + +#: meld/iohelpers.py:110 +#, python-format +msgid "Replace file “%s”?" +msgstr "ჩავანაცვლო ფაილი \"%s\"?" + +#: meld/iohelpers.py:112 +#, python-format +msgid "" +"A file with this name already exists in “%s”.\n" +"If you replace the existing file, its contents will be lost." +msgstr "" + +#: meld/meldapp.py:188 +msgid "wrong number of arguments supplied to --diff" +msgstr "" + +#: meld/meldapp.py:193 +msgid "Start with an empty window" +msgstr "" + +#: meld/meldapp.py:194 meld/meldapp.py:196 +msgid "file" +msgstr "" + +#: meld/meldapp.py:194 meld/meldapp.py:198 +msgid "folder" +msgstr "საქაღალდე" + +#: meld/meldapp.py:195 +msgid "Start a version control comparison" +msgstr "" + +#: meld/meldapp.py:197 +msgid "Start a 2- or 3-way file comparison" +msgstr "" + +#: meld/meldapp.py:199 +msgid "Start a 2- or 3-way folder comparison" +msgstr "" + +#: meld/meldapp.py:242 +#, python-format +msgid "Error: %s\n" +msgstr "შეცდომა: %s\n" + +#: meld/meldapp.py:249 +msgid "Meld is a file and directory comparison tool." +msgstr "" + +#: meld/meldapp.py:253 +msgid "Set label to use instead of file name" +msgstr "" + +#: meld/meldapp.py:256 +msgid "Open a new tab in an already running instance" +msgstr "" + +#: meld/meldapp.py:259 +msgid "Automatically compare all differing files on startup" +msgstr "" + +#: meld/meldapp.py:262 +msgid "Ignored for compatibility" +msgstr "" + +#: meld/meldapp.py:266 +msgid "Set the target file for saving a merge result" +msgstr "" + +#: meld/meldapp.py:269 +msgid "Automatically merge files" +msgstr "" + +#: meld/meldapp.py:273 +msgid "Load a saved comparison from a Meld comparison file" +msgstr "" + +#: meld/meldapp.py:277 +msgid "Create a diff tab for the supplied files or folders" +msgstr "" + +#: meld/meldapp.py:297 +#, python-format +msgid "too many arguments (wanted 0-3, got %d)" +msgstr "" + +#: meld/meldapp.py:300 +msgid "can’t auto-merge less than 3 files" +msgstr "" + +#: meld/meldapp.py:302 +msgid "can’t auto-merge directories" +msgstr "" + +#: meld/meldapp.py:317 +msgid "Error reading saved comparison file" +msgstr "" + +#: meld/meldapp.py:334 +#, python-format +msgid "invalid path or URI “%s”" +msgstr "" + +#: meld/meldapp.py:341 +msgid "remote folder “{}” not supported" +msgstr "" + +#. TRANSLATORS: This is the label of a new, currently-unnamed file. +#: meld/meldbuffer.py:115 +msgid "" +msgstr "<უსახელო>" + +#: meld/melddoc.py:124 +msgid "untitled" +msgstr "უსახელო" + +#: meld/meldwindow.py:158 +msgid "Filename" +msgstr "" + +#: meld/meldwindow.py:381 +#, python-format +msgid "Need three files to auto-merge, got: %r" +msgstr "" + +#: meld/meldwindow.py:411 +msgid "Cannot compare a mixture of files and directories" +msgstr "" + +#: meld/misc.py:154 +msgid "" +"{}\n" +"\n" +"Meld encountered a critical error while running:\n" +"{}" +msgstr "" + +#: meld/misc.py:205 +msgid "[None]" +msgstr "" + +#: meld/preferences.py:37 meld/preferences.py:129 +msgid "label" +msgstr "ჭდე" + +#: meld/preferences.py:37 meld/preferences.py:129 +msgid "pattern" +msgstr "შაბლონი" + +#: meld/recent.py:111 +msgid "Version control:" +msgstr "ვერსიის კონტროლი:" + +#: meld/style.py:91 +msgid "Couldn’t find colour scheme details for {}; this is a bad install" +msgstr "" + +#: meld/ui/bufferselectors.py:110 +#, python-brace-format +msgid "{name} ({charset})" +msgstr "" + +#: meld/ui/bufferselectors.py:140 meld/ui/bufferselectors.py:148 +msgid "Plain Text" +msgstr "უბრალო ტექსტი" + +#: meld/ui/pathlabel.py:36 +msgid "Unnamed file" +msgstr "" + +#. Abbreviation for line, column so that it will fit in the status bar +#: meld/ui/statusbar.py:125 +#, python-brace-format +msgid "Ln {line}, Col {column}" +msgstr "" + +#: meld/ui/statusbar.py:185 +msgid "Line you want to move the cursor to" +msgstr "" + +#: meld/ui/vcdialogs.py:50 +msgid "No files will be committed" +msgstr "" + +#. Translators: First element is replaced by translated "%d +#. unpushed commits", second element is replaced by translated +#. "%d branches" +#: meld/vc/git.py:92 +#, python-brace-format +msgid "{unpushed_commits} in {unpushed_branches}" +msgstr "" + +#: meld/vc/git.py:94 meld/vc/git.py:104 +#, python-format +msgid "%d unpushed commit" +msgid_plural "%d unpushed commits" +msgstr[0] "" + +#: meld/vc/git.py:97 +#, python-format +msgid "%d branch" +msgid_plural "%d branches" +msgstr[0] "" + +#: meld/vc/git.py:345 +#, python-brace-format +msgid "Mode changed from {old_mode} to {new_mode}" +msgstr "" + +#: meld/vc/git.py:353 +msgid "Partially staged" +msgstr "" + +#: meld/vc/git.py:353 +msgid "Staged" +msgstr "" + +#. Translators: This is the displayed name of a version control system +#. when no version control system is actually found. +#: meld/vc/_null.py:38 +msgid "None" +msgstr "არაფერი" + +#: meld/vc/svn.py:203 +#, python-format +msgid "Rev %s" +msgstr "" + +#: meld/vc/_vc.py:55 +msgid "Merged" +msgstr "გაერთიანდა" + +#: meld/vc/_vc.py:55 +msgid "Base" +msgstr "საბაზისო" + +#: meld/vc/_vc.py:55 +msgid "Local" +msgstr "ლოკალური" + +#: meld/vc/_vc.py:55 +msgid "Remote" +msgstr "დაშორებული" + +#: meld/vc/_vc.py:74 +msgid "Error" +msgstr "შეცდომა" + +#: meld/vc/_vc.py:76 +msgid "Newly added" +msgstr "" + +#: meld/vc/_vc.py:78 +msgid "Renamed" +msgstr "გადარქმეულია" + +#: meld/vc/_vc.py:79 +msgid "Conflict" +msgstr "კონფლიქტი" + +#: meld/vc/_vc.py:80 +msgid "Removed" +msgstr "ამოღებულია" + +#: meld/vc/_vc.py:81 +msgid "Missing" +msgstr "აკლია" + +#: meld/vc/_vc.py:82 +msgid "Not present" +msgstr "არ არსებობს" + +#: meld/vc/_vc.py:83 +msgid "Scanning…" +msgstr "სკანირება…" + +#. Translators: This error message is shown when no +#. repository of this type is found. +#: meld/vcview.py:334 +#, python-format +msgid "%(name)s (not found)" +msgstr "%(name)s (ვერ ვიპოვე)" + +#. Translators: This error message is shown when a version +#. control binary isn't installed. +#: meld/vcview.py:338 +#, python-format +msgid "%(name)s (%(cmd)s not installed)" +msgstr "%(name)s (%(cmd)s დაყენებული არაა)" + +#. Translators: This error message is shown when a version +#. controlled repository is invalid. +#: meld/vcview.py:342 +#, python-format +msgid "%(name)s (invalid repository)" +msgstr "" + +#: meld/vcview.py:356 +msgid "No valid version control system found in this folder" +msgstr "" + +#: meld/vcview.py:358 +msgid "Choose which version control system to use" +msgstr "" + +#. TRANSLATORS: This is the name of the version control +#. system being used, e.g., "Git" or "Subversion" +#: meld/vcview.py:414 +#, python-brace-format +msgid "{vc} comparison:" +msgstr "" + +#. Initial yield so when we add this to our tasks, we don't +#. create iterators that may be invalidated. +#: meld/vcview.py:423 +msgid "Scanning repository" +msgstr "" + +#: meld/vcview.py:452 +#, python-format +msgid "Scanning %s" +msgstr "" + +#: meld/vcview.py:491 +msgid "(Empty)" +msgstr "" + +#: meld/vcview.py:539 +#, python-format +msgid "%s — local" +msgstr "%s — ლოკალური" + +#: meld/vcview.py:540 +#, python-format +msgid "%s — remote" +msgstr "%s — დაშორებული" + +#: meld/vcview.py:548 +#, python-format +msgid "%s (local, merge, remote)" +msgstr "" + +#: meld/vcview.py:553 +#, python-format +msgid "%s (remote, merge, local)" +msgstr "" + +#: meld/vcview.py:564 +#, python-format +msgid "%s — repository" +msgstr "%s — რეპოზიტორია" + +#: meld/vcview.py:570 +#, python-format +msgid "%s (working, repository)" +msgstr "" + +#: meld/vcview.py:574 +#, python-format +msgid "%s (repository, working)" +msgstr "" + +#: meld/vcview.py:739 +msgid "Remove folder and all its files?" +msgstr "" + +#: meld/vcview.py:741 +msgid "" +"This will remove all selected files and folders, and all files within any " +"selected folders, from version control." +msgstr "" + +#: meld/vcview.py:854 +msgid "Clear" +msgstr "სუფთა ცა" diff --git a/po/pl.po b/po/pl.po index cc171ac..0c7711e 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: meld\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2022-08-12 00:04+0000\n" -"PO-Revision-Date: 2022-08-14 15:58+0200\n" +"POT-Creation-Date: 2022-11-05 23:26+0000\n" +"PO-Revision-Date: 2022-11-06 15:19+0100\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "Language: pl\n" @@ -904,10 +904,10 @@ msgstr "Uprość wyświetlaną strukturę katalogów" #: meld/resources/ui/about-dialog.ui:8 msgid "" "Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2021 Kai Willadsen" +"Copyright © 2009-2022 Kai Willadsen" msgstr "" "Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2021 Kai Willadsen" +"Copyright © 2009-2022 Kai Willadsen" #: meld/resources/ui/about-dialog.ui:14 msgid "translator-credits" @@ -1768,12 +1768,12 @@ msgstr "" msgid "Text filters are in use and may be masking content differences." msgstr "Filtry tekstowe są używane i mogą ukrywać różnice między plikami." -#: meld/dirdiff.py:1145 meld/filediff.py:1989 +#: meld/dirdiff.py:1145 meld/filediff.py:1997 msgid "Hide" msgstr "Ukryj" -#: meld/dirdiff.py:1147 meld/filediff.py:1991 meld/filediff.py:2021 -#: meld/filediff.py:2023 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 +#: meld/dirdiff.py:1147 meld/filediff.py:1999 meld/filediff.py:2029 +#: meld/filediff.py:2031 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 msgid "Hi_de" msgstr "_Ukryj" @@ -1854,11 +1854,11 @@ msgstr "Brak katalogu" msgid "Folder comparison:" msgstr "Porównanie katalogów:" -#: meld/filediff.py:1162 +#: meld/filediff.py:1168 msgid "Comparison results will be inaccurate" msgstr "Wyniki porównania będą niepoprawne" -#: meld/filediff.py:1164 +#: meld/filediff.py:1170 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1866,99 +1866,99 @@ msgstr "" "Filtr zmienił liczbę wierszy w pliku, co nie jest obsługiwane. Porównanie " "będzie niepoprawne." -#: meld/filediff.py:1236 +#: meld/filediff.py:1242 msgid "Mark conflict as resolved?" msgstr "Oznaczyć konflikt jako rozwiązany?" -#: meld/filediff.py:1238 +#: meld/filediff.py:1244 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "" "Jeśli konflikt został pomyślnie rozwiązany, to można go teraz jako taki " "oznaczyć." -#: meld/filediff.py:1241 +#: meld/filediff.py:1247 msgid "Cancel" msgstr "Anuluj" -#: meld/filediff.py:1242 +#: meld/filediff.py:1248 msgid "Mark _Resolved" msgstr "Oznacz jako _rozwiązane" -#: meld/filediff.py:1433 meld/filediff.py:1449 +#: meld/filediff.py:1439 meld/filediff.py:1455 msgid "Add Synchronization Point" msgstr "Dodaj punkt synchronizacji" -#: meld/filediff.py:1437 +#: meld/filediff.py:1443 msgid "Remove Synchronization Point" msgstr "Usuń punkt synchronizacji" -#: meld/filediff.py:1441 +#: meld/filediff.py:1447 msgid "Move Synchronization Point" msgstr "Przenieś punkt synchronizacji" -#: meld/filediff.py:1445 +#: meld/filediff.py:1451 msgid "Match Synchronization Point" msgstr "Dopasuj punkt synchronizacji" -#: meld/filediff.py:1469 +#: meld/filediff.py:1475 msgid "Clear Synchronization Points" msgstr "Wyczyść punkty synchronizacji" -#: meld/filediff.py:1529 +#: meld/filediff.py:1535 msgid "File comparison:" msgstr "Porównanie plików:" -#: meld/filediff.py:1663 +#: meld/filediff.py:1671 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Wystąpił problem podczas otwierania pliku „%s”." -#: meld/filediff.py:1672 +#: meld/filediff.py:1680 #, python-format msgid "File %s appears to be a binary file." msgstr "Plik %s wygląda na plik binarny." -#: meld/filediff.py:1674 +#: meld/filediff.py:1682 msgid "Do you want to open the file using the default application?" msgstr "Otworzyć go w domyślnym programie?" -#: meld/filediff.py:1676 +#: meld/filediff.py:1684 msgid "Open" msgstr "Otwórz" -#: meld/filediff.py:1698 +#: meld/filediff.py:1706 #, python-format msgid "[%s] Merging files" msgstr "[%s] Scalanie plików" -#: meld/filediff.py:1712 +#: meld/filediff.py:1720 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Analizowanie różnic" -#: meld/filediff.py:1772 +#: meld/filediff.py:1780 #, python-format msgid "File %s has changed on disk" msgstr "Plik %s został zmieniony na dysku" -#: meld/filediff.py:1773 +#: meld/filediff.py:1781 msgid "Do you want to reload the file?" msgstr "Ponownie wczytać plik?" -#: meld/filediff.py:1775 +#: meld/filediff.py:1783 msgid "_Reload" msgstr "_Wczytaj ponownie" -#: meld/filediff.py:1945 +#: meld/filediff.py:1953 msgid "File {} is being compared to itself" msgstr "Plik {} jest porównywany z samym sobą" -#: meld/filediff.py:1954 +#: meld/filediff.py:1962 msgid "Files are identical" msgstr "Pliki są identyczne" -#: meld/filediff.py:1967 +#: meld/filediff.py:1975 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1966,11 +1966,11 @@ msgstr "" "Filtry tekstowe są używane i mogą ukrywać różnice między plikami. Porównać " "pliki bez uwzględniania filtrów?" -#: meld/filediff.py:1972 +#: meld/filediff.py:1980 msgid "Files differ in line endings only" msgstr "Pliki różnią się tylko znacznikami końca wierszy" -#: meld/filediff.py:1974 +#: meld/filediff.py:1982 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1979,15 +1979,15 @@ msgstr "" "Pliki są identyczne, z wyjątkiem różnych znaczników końca wierszy:\n" "%s" -#: meld/filediff.py:1994 +#: meld/filediff.py:2002 msgid "Show without filters" msgstr "Wyświetl bez filtrów" -#: meld/filediff.py:2016 +#: meld/filediff.py:2024 msgid "Change highlighting incomplete" msgstr "Wyróżnianie zmian jest niepełne" -#: meld/filediff.py:2017 +#: meld/filediff.py:2025 msgid "" "Some changes were not highlighted because they were too large. You can force " "Meld to take longer to highlight larger changes, though this may be slow." @@ -1995,19 +1995,19 @@ msgstr "" "Niektóre zmiany nie zostały wyróżnione, ponieważ były za duże. Można " "wymusić, aby program Meld wyróżnił większe zmiany, ale może to być wolne." -#: meld/filediff.py:2025 +#: meld/filediff.py:2033 msgid "Keep highlighting" msgstr "Wyróżniaj dalej" -#: meld/filediff.py:2027 +#: meld/filediff.py:2035 msgid "_Keep highlighting" msgstr "_Wyróżniaj dalej" -#: meld/filediff.py:2040 +#: meld/filediff.py:2048 msgid "Saving failed" msgstr "Zapisanie się nie powiodło" -#: meld/filediff.py:2041 +#: meld/filediff.py:2049 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." @@ -2015,38 +2015,38 @@ msgstr "" "Proszę rozważyć skopiowanie wszelkich ważnych zmian w innym programie lub " "pliku, aby uniknąć utraty danych." -#: meld/filediff.py:2050 +#: meld/filediff.py:2058 msgid "Save Left Pane As" msgstr "Zapis lewego panelu jako" -#: meld/filediff.py:2052 +#: meld/filediff.py:2060 msgid "Save Middle Pane As" msgstr "Zapis środkowego panelu jako" -#: meld/filediff.py:2054 +#: meld/filediff.py:2062 msgid "Save Right Pane As" msgstr "Zapis prawego panelu jako" -#: meld/filediff.py:2065 +#: meld/filediff.py:2073 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "Plik %s został zmieniony na dysku od czasu jego otwarcia" -#: meld/filediff.py:2067 +#: meld/filediff.py:2075 msgid "If you save it, any external changes will be lost." msgstr "" "Jeżeli plik zostanie zapisany, to wszystkie zewnętrzne zmiany zostaną " "utracone." -#: meld/filediff.py:2070 +#: meld/filediff.py:2078 msgid "Save Anyway" msgstr "Zapisz mimo to" -#: meld/filediff.py:2071 +#: meld/filediff.py:2079 msgid "Don’t Save" msgstr "Nie zapisuj" -#: meld/filediff.py:2113 +#: meld/filediff.py:2121 msgid "" "File “{}” contains characters that can’t be encoded using its current " "encoding “{}”." @@ -2054,7 +2054,7 @@ msgstr "" "Plik „{}” zawiera znaki, których nie można zakodować za pomocą jego obecnego " "kodowania, „{}”." -#: meld/filediff.py:2117 meld/patchdialog.py:138 +#: meld/filediff.py:2125 meld/patchdialog.py:138 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -2063,16 +2063,16 @@ msgstr "" "Nie można zapisać pliku z powodu:\n" "%s" -#: meld/filediff.py:2121 meld/patchdialog.py:137 +#: meld/filediff.py:2129 meld/patchdialog.py:137 #, python-format msgid "Could not save file %s." msgstr "Nie można zapisać pliku %s." -#: meld/filediff.py:2531 +#: meld/filediff.py:2539 msgid "Live comparison updating disabled" msgstr "Wyłączono aktualizowanie porównań na żywo" -#: meld/filediff.py:2532 +#: meld/filediff.py:2540 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2082,6 +2082,22 @@ msgstr "" "są aktywne. Można ręcznie odświeżać porównanie, a aktualizowanie na żywo " "zostanie wznowione po wyczyszczeniu punktów synchronizacji." +#: meld/filediff.py:2568 +msgid "Can't swap unsaved files" +msgstr "Nie można wymienić niezapisanych plików" + +#: meld/filediff.py:2570 +msgid "Files must be saved to disk before swapping panes." +msgstr "Pliki muszą być zapisane na dysku przed wymianą paneli." + +#: meld/filediff.py:2577 +msgid "Can't swap version control comparisons" +msgstr "Nie można wymienić porównań systemu kontroli wersji" + +#: meld/filediff.py:2579 +msgid "Swapping panes is not supported in version control mode." +msgstr "Wymiana paneli nie jest obsługiwana w trybie kontroli wersji." + #: meld/iohelpers.py:41 msgid "Deleting remote folders is not supported" msgstr "Usuwanie zdalnych katalogów jest nieobsługiwane" diff --git a/po/pt.po b/po/pt.po index f06c4c3..555b53c 100644 --- a/po/pt.po +++ b/po/pt.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: 2.6\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2022-08-12 00:04+0000\n" -"PO-Revision-Date: 2022-08-12 12:54+0100\n" +"POT-Creation-Date: 2022-10-30 22:10+0000\n" +"PO-Revision-Date: 2022-10-31 11:14+0000\n" "Last-Translator: Hugo Carvalho \n" "Language-Team: Português \n" "Language: pt\n" @@ -19,7 +19,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 3.1.1\n" +"X-Generator: Poedit 3.2\n" #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11 #: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17 @@ -273,7 +273,7 @@ msgid "" "supported here; at the moment '{file}' and '{line}' are recognised tokens." msgstr "" "O comando usado para executar o editor personalizado. É suportada a " -"utilização de alguns modelos; no momento file} e {line} são símbolos " +"utilização de alguns modelos; no momento '{file}' e '{line}' são símbolos " "reconhecidos." #: data/org.gnome.meld.gschema.xml:166 @@ -893,14 +893,15 @@ msgstr "Pastas planas" #: meld/resources/ui/about-dialog.ui:8 msgid "" "Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2021 Kai Willadsen" +"Copyright © 2009-2022 Kai Willadsen" msgstr "" "Direitos de autor © 2002-2009 Stephen Kennedy\n" -"Direitos de autor © 2009-2021 Kai Willadsen" +"Direitos de autor © 2009-2022 Kai Willadsen" #: meld/resources/ui/about-dialog.ui:14 msgid "translator-credits" msgstr "" +"Duarte Loreto \n" "Pedro Albuquerque \n" "Tiago Santos \n" "Hugo Carvalho " @@ -1760,12 +1761,12 @@ msgstr "" "Os filtros de texto estão em uso e podem estar a mascarar diferenças de " "conteúdo." -#: meld/dirdiff.py:1145 meld/filediff.py:1989 +#: meld/dirdiff.py:1145 meld/filediff.py:1997 msgid "Hide" msgstr "Ocultar %s" -#: meld/dirdiff.py:1147 meld/filediff.py:1991 meld/filediff.py:2021 -#: meld/filediff.py:2023 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 +#: meld/dirdiff.py:1147 meld/filediff.py:1999 meld/filediff.py:2029 +#: meld/filediff.py:2031 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 msgid "Hi_de" msgstr "_Ocultar" @@ -1846,11 +1847,11 @@ msgstr "Sem pasta" msgid "Folder comparison:" msgstr "Comparação de pastas:" -#: meld/filediff.py:1162 +#: meld/filediff.py:1168 msgid "Comparison results will be inaccurate" msgstr "Os resultados da comparação serão imprecisos" -#: meld/filediff.py:1164 +#: meld/filediff.py:1170 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1858,98 +1859,98 @@ msgstr "" "O filtro alterou o número de linhas no ficheiro, o que não é suportado. A " "comparação será imprecisa." -#: meld/filediff.py:1236 +#: meld/filediff.py:1242 msgid "Mark conflict as resolved?" msgstr "Marcar conflito como resolvido?" -#: meld/filediff.py:1238 +#: meld/filediff.py:1244 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "" "Se o conflito foi resolvido com sucesso, pode agora marcá-lo como resolvido." -#: meld/filediff.py:1241 +#: meld/filediff.py:1247 msgid "Cancel" msgstr "Cancelar" -#: meld/filediff.py:1242 +#: meld/filediff.py:1248 msgid "Mark _Resolved" msgstr "Marcar _resolvido" -#: meld/filediff.py:1433 meld/filediff.py:1449 +#: meld/filediff.py:1439 meld/filediff.py:1455 msgid "Add Synchronization Point" msgstr "Adicionar ponto de sincronização" -#: meld/filediff.py:1437 +#: meld/filediff.py:1443 msgid "Remove Synchronization Point" msgstr "Remover ponto de sincronização" -#: meld/filediff.py:1441 +#: meld/filediff.py:1447 msgid "Move Synchronization Point" msgstr "Mover ponto de sincronização" -#: meld/filediff.py:1445 +#: meld/filediff.py:1451 msgid "Match Synchronization Point" msgstr "Coincidir ponto de sincronização" -#: meld/filediff.py:1469 +#: meld/filediff.py:1475 msgid "Clear Synchronization Points" msgstr "Limpar pontos de sincronização" -#: meld/filediff.py:1529 +#: meld/filediff.py:1535 msgid "File comparison:" msgstr "Comparação de ficheiros:" -#: meld/filediff.py:1663 +#: meld/filediff.py:1671 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Houve um problema ao abrir o ficheiro \"%s\"." -#: meld/filediff.py:1672 +#: meld/filediff.py:1680 #, python-format msgid "File %s appears to be a binary file." msgstr "%s parece ser um ficheiro binário." -#: meld/filediff.py:1674 +#: meld/filediff.py:1682 msgid "Do you want to open the file using the default application?" msgstr "Quer abrir o ficheiro usando a aplicação predefinida?" -#: meld/filediff.py:1676 +#: meld/filediff.py:1684 msgid "Open" msgstr "Abrir" -#: meld/filediff.py:1698 +#: meld/filediff.py:1706 #, python-format msgid "[%s] Merging files" msgstr "[%s] A unir ficheiros" -#: meld/filediff.py:1712 +#: meld/filediff.py:1720 #, python-format msgid "[%s] Computing differences" msgstr "[%s] A calcular diferenças" -#: meld/filediff.py:1772 +#: meld/filediff.py:1780 #, python-format msgid "File %s has changed on disk" msgstr "O ficheiro %s foi alterado no disco" -#: meld/filediff.py:1773 +#: meld/filediff.py:1781 msgid "Do you want to reload the file?" msgstr "Quer recarregar o ficheiro?" -#: meld/filediff.py:1775 +#: meld/filediff.py:1783 msgid "_Reload" msgstr "_Recarregar" -#: meld/filediff.py:1945 +#: meld/filediff.py:1953 msgid "File {} is being compared to itself" msgstr "Arquivo {} sendo comparado consigo próprio" -#: meld/filediff.py:1954 +#: meld/filediff.py:1962 msgid "Files are identical" msgstr "Os ficheiros são idênticos" -#: meld/filediff.py:1967 +#: meld/filediff.py:1975 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1957,11 +1958,11 @@ msgstr "" "Os filtros de texto estão em uso e podem estar a mascarar diferenças entre " "os ficheiros. Quer comparar os ficheiros sem filtragem?" -#: meld/filediff.py:1972 +#: meld/filediff.py:1980 msgid "Files differ in line endings only" msgstr "Os ficheiros só diferem nos fins de linha" -#: meld/filediff.py:1974 +#: meld/filediff.py:1982 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1970,15 +1971,15 @@ msgstr "" "Os ficheiros são idênticos, exceto por diferentes fins de linha:\n" "%s" -#: meld/filediff.py:1994 +#: meld/filediff.py:2002 msgid "Show without filters" msgstr "Mostrar sem filtros" -#: meld/filediff.py:2016 +#: meld/filediff.py:2024 msgid "Change highlighting incomplete" msgstr "Alterar realce incompleto" -#: meld/filediff.py:2017 +#: meld/filediff.py:2025 msgid "" "Some changes were not highlighted because they were too large. You can force " "Meld to take longer to highlight larger changes, though this may be slow." @@ -1987,19 +1988,19 @@ msgstr "" "forçar o Meld para demorar mais a realçar alterações grandes, mas pode ser " "lento." -#: meld/filediff.py:2025 +#: meld/filediff.py:2033 msgid "Keep highlighting" msgstr "Manter realce" -#: meld/filediff.py:2027 +#: meld/filediff.py:2035 msgid "_Keep highlighting" msgstr "_Manter realce" -#: meld/filediff.py:2040 +#: meld/filediff.py:2048 msgid "Saving failed" msgstr "Falha ao guardar" -#: meld/filediff.py:2041 +#: meld/filediff.py:2049 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." @@ -2007,36 +2008,36 @@ msgstr "" "Por favor, considere copiar quaisquer alterações críticas para outro " "programa ou ficheiro para evitar a perda de dados." -#: meld/filediff.py:2050 +#: meld/filediff.py:2058 msgid "Save Left Pane As" msgstr "Guardar painel esquerdo como" -#: meld/filediff.py:2052 +#: meld/filediff.py:2060 msgid "Save Middle Pane As" msgstr "Guardar painel central como" -#: meld/filediff.py:2054 +#: meld/filediff.py:2062 msgid "Save Right Pane As" msgstr "Guardar painel direito como" -#: meld/filediff.py:2065 +#: meld/filediff.py:2073 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "O ficheiro %s foi alterado no disco desde que foi aberto" -#: meld/filediff.py:2067 +#: meld/filediff.py:2075 msgid "If you save it, any external changes will be lost." msgstr "Se o guardar, todas as alterações externas serão perdidas." -#: meld/filediff.py:2070 +#: meld/filediff.py:2078 msgid "Save Anyway" msgstr "Guardar mesmo assim" -#: meld/filediff.py:2071 +#: meld/filediff.py:2079 msgid "Don’t Save" msgstr "Não guardar" -#: meld/filediff.py:2113 +#: meld/filediff.py:2121 msgid "" "File “{}” contains characters that can’t be encoded using its current " "encoding “{}”." @@ -2044,7 +2045,7 @@ msgstr "" "O ficheiro “{}” contém caracteres que não podem ser codificados ao usar a " "sua codificação atual “{}”." -#: meld/filediff.py:2117 meld/patchdialog.py:138 +#: meld/filediff.py:2125 meld/patchdialog.py:138 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -2053,16 +2054,16 @@ msgstr "" "Não foi possível guardar o ficheiro devido a:\n" "%s" -#: meld/filediff.py:2121 meld/patchdialog.py:137 +#: meld/filediff.py:2129 meld/patchdialog.py:137 #, python-format msgid "Could not save file %s." -msgstr "Impossível guardar o ficheiro %s." +msgstr "Não foi possível guardar o ficheiro %s." -#: meld/filediff.py:2531 +#: meld/filediff.py:2539 msgid "Live comparison updating disabled" msgstr "Atualização ao vivo da comparação desativada" -#: meld/filediff.py:2532 +#: meld/filediff.py:2540 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2072,6 +2073,22 @@ msgstr "" "sincronização estão ativos. Ainda pode atualizar manualmente a comparação e " "as atualizações ao vivo retomarão quando limpar os pontos de sincronização." +#: meld/filediff.py:2568 +msgid "Can't swap unsaved files" +msgstr "Não é possível trocar ficheiros não guardados" + +#: meld/filediff.py:2570 +msgid "Files must be saved to disk before swapping panes." +msgstr "Os ficheiros devem ser guardados em disco antes da troca de painéis." + +#: meld/filediff.py:2577 +msgid "Can't swap version control comparisons" +msgstr "Não é possível trocar comparações de controlo de versões" + +#: meld/filediff.py:2579 +msgid "Swapping panes is not supported in version control mode." +msgstr "A troca de painéis não é suportada no modo de controlo de versão." + #: meld/iohelpers.py:41 msgid "Deleting remote folders is not supported" msgstr "A eliminação de pastas remotas não é suportada" diff --git a/po/pt_BR.po b/po/pt_BR.po index aaf1547..ee87ee1 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8,16 +8,16 @@ # Leonardo Ferreira Fontenelle , 2008. # Gabriel Speckhahn , 2011. # Florêncio Neves , 2012. -# Rafael Fontenelle , 2013-2021. -# Enrico Nicoletto , 2013, 2018-2022. # Matheus Barbosa , 2022. +# Rafael Fontenelle , 2013-2022. +# Enrico Nicoletto , 2013, 2018-2022. # msgid "" msgstr "" "Project-Id-Version: meld\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2022-04-10 01:05+0000\n" -"PO-Revision-Date: 2022-04-15 15:07-0300\n" +"POT-Creation-Date: 2022-12-01 10:56+0000\n" +"PO-Revision-Date: 2022-12-28 15:45-0300\n" "Last-Translator: Enrico Nicoletto \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" @@ -25,7 +25,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 3.0.1\n" +"X-Generator: Poedit 3.2.2\n" "X-Project-Style: gnome\n" #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11 @@ -537,372 +537,377 @@ msgstr "Atualiza a comparação" #: meld/resources/gtk/help-overlay.ui:54 msgctxt "shortcut window" +msgid "Open externally" +msgstr "Abre externamente" + +#: meld/resources/gtk/help-overlay.ui:61 +msgctxt "shortcut window" msgid "Fullscreen" msgstr "Tela cheia" -#: meld/resources/gtk/help-overlay.ui:61 +#: meld/resources/gtk/help-overlay.ui:68 msgctxt "shortcut window" msgid "Swap left and right panes" msgstr "Troca os painéis esquerdo e direito" -#: meld/resources/gtk/help-overlay.ui:70 +#: meld/resources/gtk/help-overlay.ui:77 msgctxt "shortcut window" msgid "Panes" msgstr "Painéis" -#: meld/resources/gtk/help-overlay.ui:75 +#: meld/resources/gtk/help-overlay.ui:82 msgctxt "shortcut window" msgid "Previous comparison pane" msgstr "Painel de comparação anterior" -#: meld/resources/gtk/help-overlay.ui:82 +#: meld/resources/gtk/help-overlay.ui:89 msgctxt "shortcut window" msgid "Next comparison pane" msgstr "Próximo painel de comparação" -#: meld/resources/gtk/help-overlay.ui:91 +#: meld/resources/gtk/help-overlay.ui:98 msgctxt "shortcut window" msgid "Changes" msgstr "Alterações" -#: meld/resources/gtk/help-overlay.ui:96 +#: meld/resources/gtk/help-overlay.ui:103 msgctxt "shortcut window" msgid "Go to previous change" msgstr "Vai para a alteração anterior" -#: meld/resources/gtk/help-overlay.ui:103 +#: meld/resources/gtk/help-overlay.ui:110 msgctxt "shortcut window" msgid "Go to next change" msgstr "Vai para a próxima alteração" -#: meld/resources/gtk/help-overlay.ui:112 +#: meld/resources/gtk/help-overlay.ui:119 msgctxt "shortcut window" msgid "Tabs" msgstr "Abas" -#: meld/resources/gtk/help-overlay.ui:117 +#: meld/resources/gtk/help-overlay.ui:124 msgctxt "shortcut window" msgid "Go to previous tab" msgstr "Vai para a aba anterior" -#: meld/resources/gtk/help-overlay.ui:124 +#: meld/resources/gtk/help-overlay.ui:131 msgctxt "shortcut window" msgid "Go to next tab" msgstr "Vai para a próxima aba" -#: meld/resources/gtk/help-overlay.ui:131 +#: meld/resources/gtk/help-overlay.ui:138 msgctxt "shortcut window" msgid "Switch to tab" msgstr "Alterna para aba" -#: meld/resources/gtk/help-overlay.ui:138 +#: meld/resources/gtk/help-overlay.ui:145 msgctxt "shortcut window" msgid "Move tab left" msgstr "Move uma aba para a esquerda" -#: meld/resources/gtk/help-overlay.ui:145 +#: meld/resources/gtk/help-overlay.ui:152 msgctxt "shortcut window" msgid "Move tab right" msgstr "Move uma aba para a direita" -#: meld/resources/gtk/help-overlay.ui:154 +#: meld/resources/gtk/help-overlay.ui:161 msgctxt "shortcut window" msgid "Editing" msgstr "Edição" -#: meld/resources/gtk/help-overlay.ui:159 +#: meld/resources/gtk/help-overlay.ui:166 msgctxt "shortcut window" msgid "Undo" msgstr "Desfaz" -#: meld/resources/gtk/help-overlay.ui:166 +#: meld/resources/gtk/help-overlay.ui:173 msgctxt "shortcut window" msgid "Redo" msgstr "Refaz" -#: meld/resources/gtk/help-overlay.ui:173 +#: meld/resources/gtk/help-overlay.ui:180 msgctxt "shortcut window" msgid "Cut" msgstr "Recorta" -#: meld/resources/gtk/help-overlay.ui:180 +#: meld/resources/gtk/help-overlay.ui:187 msgctxt "shortcut window" msgid "Copy" msgstr "Copia" -#: meld/resources/gtk/help-overlay.ui:187 +#: meld/resources/gtk/help-overlay.ui:194 msgctxt "shortcut window" msgid "Paste" msgstr "Cola" -#: meld/resources/gtk/help-overlay.ui:194 +#: meld/resources/gtk/help-overlay.ui:201 msgctxt "shortcut window" msgid "Find" msgstr "Localiza" -#: meld/resources/gtk/help-overlay.ui:201 +#: meld/resources/gtk/help-overlay.ui:208 msgctxt "shortcut window" msgid "Find Next" msgstr "Localiza próximo" -#: meld/resources/gtk/help-overlay.ui:208 +#: meld/resources/gtk/help-overlay.ui:215 msgctxt "shortcut window" msgid "Find Previous" msgstr "Localiza anterior" -#: meld/resources/gtk/help-overlay.ui:215 +#: meld/resources/gtk/help-overlay.ui:222 msgctxt "shortcut window" msgid "Replace" msgstr "Substituir" -#: meld/resources/gtk/help-overlay.ui:224 +#: meld/resources/gtk/help-overlay.ui:231 msgctxt "shortcut window" msgid "File comparison" msgstr "Comparação de arquivos" -#: meld/resources/gtk/help-overlay.ui:229 +#: meld/resources/gtk/help-overlay.ui:236 msgctxt "shortcut window" msgid "Save current file" msgstr "Salva o arquivo atual" -#: meld/resources/gtk/help-overlay.ui:236 +#: meld/resources/gtk/help-overlay.ui:243 msgctxt "shortcut window" msgid "Save current file to new path" msgstr "Salva o arquivo atual em novo caminho" -#: meld/resources/gtk/help-overlay.ui:243 +#: meld/resources/gtk/help-overlay.ui:250 msgctxt "shortcut window" msgid "Save all files in comparison" msgstr "Salva todos os arquivos na comparação" -#: meld/resources/gtk/help-overlay.ui:250 +#: meld/resources/gtk/help-overlay.ui:257 msgctxt "shortcut window" msgid "Previous conflict" msgstr "Conflito anterior" -#: meld/resources/gtk/help-overlay.ui:257 +#: meld/resources/gtk/help-overlay.ui:264 msgctxt "shortcut window" msgid "Next conflict" msgstr "Próximo conflito" -#: meld/resources/gtk/help-overlay.ui:264 +#: meld/resources/gtk/help-overlay.ui:271 msgctxt "shortcut window" msgid "Push change to left" msgstr "Leva a alteração atual para a esquerda" -#: meld/resources/gtk/help-overlay.ui:271 +#: meld/resources/gtk/help-overlay.ui:278 msgctxt "shortcut window" msgid "Push change to right" msgstr "Leva a alteração atual para a direita" -#: meld/resources/gtk/help-overlay.ui:278 +#: meld/resources/gtk/help-overlay.ui:285 msgctxt "shortcut window" msgid "Pull change from left" msgstr "Traz a alteração da esquerda" -#: meld/resources/gtk/help-overlay.ui:285 +#: meld/resources/gtk/help-overlay.ui:292 msgctxt "shortcut window" msgid "Pull change from right" msgstr "Traz a alteração da direita" -#: meld/resources/gtk/help-overlay.ui:292 +#: meld/resources/gtk/help-overlay.ui:299 msgctxt "shortcut window" msgid "Copy change above left" msgstr "Copia a alteração acima para a esquerda" -#: meld/resources/gtk/help-overlay.ui:299 +#: meld/resources/gtk/help-overlay.ui:306 msgctxt "shortcut window" msgid "Copy change below left" msgstr "Copia a alteração abaixo para a esquerda" -#: meld/resources/gtk/help-overlay.ui:306 +#: meld/resources/gtk/help-overlay.ui:313 msgctxt "shortcut window" msgid "Copy change above right" msgstr "Copia a alteração acima para a direita" -#: meld/resources/gtk/help-overlay.ui:313 +#: meld/resources/gtk/help-overlay.ui:320 msgctxt "shortcut window" msgid "Copy change below right" msgstr "Copia a alteração abaixo para a direita" -#: meld/resources/gtk/help-overlay.ui:320 -#: meld/resources/gtk/help-overlay.ui:348 +#: meld/resources/gtk/help-overlay.ui:327 +#: meld/resources/gtk/help-overlay.ui:355 msgctxt "shortcut window" msgid "Delete change" msgstr "Exclui a alteração" -#: meld/resources/gtk/help-overlay.ui:329 +#: meld/resources/gtk/help-overlay.ui:336 msgctxt "shortcut window" msgid "Folder comparison" msgstr "Comparação de pastas" -#: meld/resources/gtk/help-overlay.ui:334 +#: meld/resources/gtk/help-overlay.ui:341 msgctxt "shortcut window" msgid "Copy to left" msgstr "Copia para a esquerda" -#: meld/resources/gtk/help-overlay.ui:341 +#: meld/resources/gtk/help-overlay.ui:348 msgctxt "shortcut window" msgid "Copy to right" msgstr "Copia para a direita" -#: meld/resources/gtk/help-overlay.ui:357 +#: meld/resources/gtk/help-overlay.ui:364 msgctxt "shortcut window" msgid "Version control comparison" msgstr "Comparação de controle de versão" -#: meld/resources/gtk/help-overlay.ui:362 +#: meld/resources/gtk/help-overlay.ui:369 msgctxt "shortcut window" msgid "Commit to version control" msgstr "Faz commit para um controle de versão" -#: meld/resources/gtk/help-overlay.ui:369 +#: meld/resources/gtk/help-overlay.ui:376 msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Mostra/oculta a saída de console" #: meld/resources/gtk/menus.ui:7 -msgid "Refresh" -msgstr "Atualizar" - -#: meld/resources/gtk/menus.ui:12 -msgid "Stop" -msgstr "Parar" - -#: meld/resources/gtk/menus.ui:17 -msgid "Fullscreen" -msgstr "Tela cheia" - -#: meld/resources/gtk/menus.ui:26 msgid "Save As…" msgstr "Salvar como…" -#: meld/resources/gtk/menus.ui:30 +#: meld/resources/gtk/menus.ui:11 msgid "Save A_ll" msgstr "Salvar _todos" -#: meld/resources/gtk/menus.ui:34 +#: meld/resources/gtk/menus.ui:15 msgid "Revert files…" msgstr "Reverter arquivos…" -#: meld/resources/gtk/menus.ui:38 +#: meld/resources/gtk/menus.ui:19 msgid "Open Externally" msgstr "Abrir externamente" -#: meld/resources/gtk/menus.ui:45 +#: meld/resources/gtk/menus.ui:26 +msgid "Refresh Comparison" +msgstr "Atualizar comparação" + +#: meld/resources/gtk/menus.ui:33 msgid "_Find…" msgstr "_Localizar…" -#: meld/resources/gtk/menus.ui:49 +#: meld/resources/gtk/menus.ui:37 msgid "_Replace…" msgstr "_Substituir…" -#: meld/resources/gtk/menus.ui:55 +#: meld/resources/gtk/menus.ui:43 msgid "View" msgstr "Ver" -#: meld/resources/gtk/menus.ui:59 +#: meld/resources/gtk/menus.ui:47 +msgid "Fullscreen" +msgstr "Tela cheia" + +#: meld/resources/gtk/menus.ui:52 msgid "Overview Map" msgstr "Mapa de visão geral" -#: meld/resources/gtk/menus.ui:63 +#: meld/resources/gtk/menus.ui:56 msgid "Version control console" msgstr "Console de controle de versão" -#: meld/resources/gtk/menus.ui:67 +#: meld/resources/gtk/menus.ui:60 msgid "Lock scrolling" msgstr "Bloquear rolagem" -#: meld/resources/gtk/menus.ui:74 +#: meld/resources/gtk/menus.ui:67 msgid "Swap left and right panes" msgstr "Trocar painéis esquerdo e direito" -#: meld/resources/gtk/menus.ui:80 +#: meld/resources/gtk/menus.ui:73 msgid "Comparison" msgstr "Comparação" +#: meld/resources/gtk/menus.ui:75 +msgid "Stop" +msgstr "Parar" + # todas = alterações -#: meld/resources/gtk/menus.ui:84 +#: meld/resources/gtk/menus.ui:81 msgid "Merge All from Left" msgstr "Mesclar todas da esquerda" -#: meld/resources/gtk/menus.ui:88 +#: meld/resources/gtk/menus.ui:85 msgid "Merge All from Right" msgstr "Mesclar todas da direita" # todas = alterações -#: meld/resources/gtk/menus.ui:92 +#: meld/resources/gtk/menus.ui:89 msgid "Merge All" msgstr "Mesclar todas" -#: meld/resources/gtk/menus.ui:99 +#: meld/resources/gtk/menus.ui:96 msgid "Format as Patch…" msgstr "Formatar como patch…" -#: meld/resources/gtk/menus.ui:108 +#: meld/resources/gtk/menus.ui:105 msgid "_Preferences" msgstr "Preferê_ncias" -#: meld/resources/gtk/menus.ui:112 +#: meld/resources/gtk/menus.ui:109 msgid "Keyboard Shortcuts" msgstr "Atalhos de teclado" -#: meld/resources/gtk/menus.ui:116 +#: meld/resources/gtk/menus.ui:113 msgid "_Help" msgstr "Aj_uda" -#: meld/resources/gtk/menus.ui:121 +#: meld/resources/gtk/menus.ui:118 msgid "_About Meld" msgstr "_Sobre o Meld" -#: meld/resources/gtk/menus.ui:134 +#: meld/resources/gtk/menus.ui:131 msgid "File status" msgstr "Status do arquivo" -#: meld/resources/gtk/menus.ui:136 +#: meld/resources/gtk/menus.ui:133 msgid "Same" msgstr "Iguais" -#: meld/resources/gtk/menus.ui:140 +#: meld/resources/gtk/menus.ui:137 msgid "New" msgstr "Novos" -#: meld/resources/gtk/menus.ui:144 meld/resources/gtk/menus.ui:167 -#: meld/vc/_vc.py:76 +#: meld/resources/gtk/menus.ui:141 meld/resources/gtk/menus.ui:164 +#: meld/vc/_vc.py:77 msgid "Modified" msgstr "Modificados" -#: meld/resources/gtk/menus.ui:154 +#: meld/resources/gtk/menus.ui:151 msgid "Ignore filename case" msgstr "Ignorar maiúsculas/minúsculas em nomes de arquivos" -#: meld/resources/gtk/menus.ui:158 +#: meld/resources/gtk/menus.ui:155 msgid "Normalize Unicode paths" msgstr "Normalizar caminhos Unicode" -#: meld/resources/gtk/menus.ui:171 +#: meld/resources/gtk/menus.ui:168 msgid "Normal" msgstr "Normal" -#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70 +#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:71 msgid "Unversioned" msgstr "Sem controle de versão" -#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69 +#: meld/resources/gtk/menus.ui:176 meld/vc/_vc.py:70 msgid "Ignored" msgstr "Ignorado" -#: meld/resources/gtk/menus.ui:186 +#: meld/resources/gtk/menus.ui:183 msgid "Flatten folders" msgstr "Achata pastas" #: meld/resources/ui/about-dialog.ui:8 msgid "" "Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2021 Kai Willadsen" +"Copyright © 2009-2022 Kai Willadsen" msgstr "" "Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2021 Kai Willadsen" +"Copyright © 2009-2022 Kai Willadsen" #: meld/resources/ui/about-dialog.ui:14 msgid "translator-credits" @@ -964,7 +969,7 @@ msgid "Column Name" msgstr "Nome da coluna" #: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128 -#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:741 +#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:745 msgid "_Remove" msgstr "_Remover" @@ -1688,11 +1693,11 @@ msgstr "Extra" msgid "Console output" msgstr "Saída de console" -#: meld/actiongutter.py:247 +#: meld/actiongutter.py:254 msgid "Copy _up" msgstr "Copiar para ci_ma" -#: meld/actiongutter.py:248 +#: meld/actiongutter.py:255 msgid "Copy _down" msgstr "Copiar para bai_xo" @@ -1775,12 +1780,12 @@ msgstr "" "Filtros de texto estão sendo usados e podem estar escondendo diferenças no " "conteúdo." -#: meld/dirdiff.py:1145 meld/filediff.py:1983 +#: meld/dirdiff.py:1145 meld/filediff.py:1997 msgid "Hide" msgstr "Ocultar" -#: meld/dirdiff.py:1147 meld/filediff.py:1985 meld/filediff.py:2015 -#: meld/filediff.py:2017 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 +#: meld/dirdiff.py:1147 meld/filediff.py:1999 meld/filediff.py:2029 +#: meld/filediff.py:2031 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 msgid "Hi_de" msgstr "Ocu_ltar" @@ -1849,7 +1854,7 @@ msgstr "" "\n" "{error}" -#: meld/dirdiff.py:1277 meld/vcview.py:764 +#: meld/dirdiff.py:1277 meld/vcview.py:768 msgid "Error deleting {}" msgstr "Erro ao excluir {}" @@ -1857,11 +1862,15 @@ msgstr "Erro ao excluir {}" msgid "No folder" msgstr "Nenhum pasta" -#: meld/filediff.py:1158 +#: meld/dirdiff.py:1838 +msgid "Folder comparison:" +msgstr "Comparação de pastas:" + +#: meld/filediff.py:1168 msgid "Comparison results will be inaccurate" msgstr "Resultados da comparação será imprecisa" -#: meld/filediff.py:1160 +#: meld/filediff.py:1170 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1869,95 +1878,99 @@ msgstr "" "Um filtro alterou o número de linhas no arquivo, não havendo suporte a essa " "alteração. A comparação pode não ser precisa." -#: meld/filediff.py:1232 +#: meld/filediff.py:1242 msgid "Mark conflict as resolved?" msgstr "Marcar como resolvido?" -#: meld/filediff.py:1234 +#: meld/filediff.py:1244 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "" "Se o conflito foi resolvido com sucesso, você pode marcá-lo como resolvido " "agora." -#: meld/filediff.py:1237 +#: meld/filediff.py:1247 msgid "Cancel" msgstr "Cancelar" -#: meld/filediff.py:1238 +#: meld/filediff.py:1248 msgid "Mark _Resolved" msgstr "Marcar como _resolvido" -#: meld/filediff.py:1429 meld/filediff.py:1445 +#: meld/filediff.py:1439 meld/filediff.py:1455 msgid "Add Synchronization Point" msgstr "Adicionar ponto de sincronização" -#: meld/filediff.py:1433 +#: meld/filediff.py:1443 msgid "Remove Synchronization Point" msgstr "Remover ponto de sincronização" -#: meld/filediff.py:1437 +#: meld/filediff.py:1447 msgid "Move Synchronization Point" msgstr "Mover ponto de sincronização" -#: meld/filediff.py:1441 +#: meld/filediff.py:1451 msgid "Match Synchronization Point" msgstr "Combinar ponto de sincronização" -#: meld/filediff.py:1465 +#: meld/filediff.py:1475 msgid "Clear Synchronization Points" msgstr "Limpar pontos de sincronização" -#: meld/filediff.py:1657 +#: meld/filediff.py:1535 +msgid "File comparison:" +msgstr "Comparação de arquivos:" + +#: meld/filediff.py:1671 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Ocorreu um problema ao abrir o arquivo “%s”." -#: meld/filediff.py:1666 +#: meld/filediff.py:1680 #, python-format msgid "File %s appears to be a binary file." msgstr "O arquivo %s parece ser um arquivo binário." -#: meld/filediff.py:1668 +#: meld/filediff.py:1682 msgid "Do you want to open the file using the default application?" msgstr "Você gostaria de abrir o arquivo usando o aplicativo padrão?" -#: meld/filediff.py:1670 +#: meld/filediff.py:1684 msgid "Open" msgstr "Abrir" -#: meld/filediff.py:1692 +#: meld/filediff.py:1706 #, python-format msgid "[%s] Merging files" msgstr "[%s] Mesclando arquivos" -#: meld/filediff.py:1706 +#: meld/filediff.py:1720 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Analisando diferenças" -#: meld/filediff.py:1766 +#: meld/filediff.py:1780 #, python-format msgid "File %s has changed on disk" msgstr "O arquivo %s foi alterado em disco" -#: meld/filediff.py:1767 +#: meld/filediff.py:1781 msgid "Do you want to reload the file?" msgstr "Deseja recarregar o arquivo?" -#: meld/filediff.py:1769 +#: meld/filediff.py:1783 msgid "_Reload" msgstr "_Recarregar" -#: meld/filediff.py:1939 +#: meld/filediff.py:1953 msgid "File {} is being compared to itself" msgstr "Arquivo {} sendo comparado consigo próprio" -#: meld/filediff.py:1948 +#: meld/filediff.py:1962 msgid "Files are identical" msgstr "Os arquivos são idênticos" -#: meld/filediff.py:1961 +#: meld/filediff.py:1975 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1965,11 +1978,11 @@ msgstr "" "Filtros de texto estão sendo usados e podem estar escondendo diferenças " "entre os arquivos. Você gostaria de comparar os arquivos sem filtro?" -#: meld/filediff.py:1966 +#: meld/filediff.py:1980 msgid "Files differ in line endings only" msgstr "Arquivos se diferenciam nos fins de linha apenas" -#: meld/filediff.py:1968 +#: meld/filediff.py:1982 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1978,15 +1991,15 @@ msgstr "" "Arquivos são idênticos, exceto pela diferença entre fins de linha:\n" "%s" -#: meld/filediff.py:1988 +#: meld/filediff.py:2002 msgid "Show without filters" msgstr "Mostrar sem filtros" -#: meld/filediff.py:2010 +#: meld/filediff.py:2024 msgid "Change highlighting incomplete" msgstr "Alteração de destaque incompleta" -#: meld/filediff.py:2011 +#: meld/filediff.py:2025 msgid "" "Some changes were not highlighted because they were too large. You can force " "Meld to take longer to highlight larger changes, though this may be slow." @@ -1995,19 +2008,19 @@ msgstr "" "grandes. Você pode forçar o Meld a levar mais tempo para destacar alterações " "longas, porém isso pode ser bem lento." -#: meld/filediff.py:2019 +#: meld/filediff.py:2033 msgid "Keep highlighting" msgstr "Manter destaque" -#: meld/filediff.py:2021 +#: meld/filediff.py:2035 msgid "_Keep highlighting" msgstr "_Manter destaque" -#: meld/filediff.py:2034 +#: meld/filediff.py:2048 msgid "Saving failed" msgstr "Salvamento falhou" -#: meld/filediff.py:2035 +#: meld/filediff.py:2049 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." @@ -2015,36 +2028,36 @@ msgstr "" "Por favor, considere copiar quaisquer alterações críticas para outro " "programa ou arquivo para evita perda de dados." -#: meld/filediff.py:2044 +#: meld/filediff.py:2058 msgid "Save Left Pane As" msgstr "Salvar o painel esquerdo como" -#: meld/filediff.py:2046 +#: meld/filediff.py:2060 msgid "Save Middle Pane As" msgstr "Salvar o painel do meio como" -#: meld/filediff.py:2048 +#: meld/filediff.py:2062 msgid "Save Right Pane As" msgstr "Salvar o painel direito como" -#: meld/filediff.py:2059 +#: meld/filediff.py:2073 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "O arquivo %s foi alterado em disco após ter sido aberto" -#: meld/filediff.py:2061 +#: meld/filediff.py:2075 msgid "If you save it, any external changes will be lost." msgstr "Se você não salvá-lo, quaisquer mudanças externas serão perdidas." -#: meld/filediff.py:2064 +#: meld/filediff.py:2078 msgid "Save Anyway" msgstr "Salvar mesmo assim" -#: meld/filediff.py:2065 +#: meld/filediff.py:2079 msgid "Don’t Save" msgstr "Não salvar" -#: meld/filediff.py:2107 +#: meld/filediff.py:2121 msgid "" "File “{}” contains characters that can’t be encoded using its current " "encoding “{}”." @@ -2052,7 +2065,7 @@ msgstr "" "O arquivo “{}” contém caracteres que não pode ser codificado usando " "codificação “{}”." -#: meld/filediff.py:2111 meld/patchdialog.py:138 +#: meld/filediff.py:2125 meld/patchdialog.py:138 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -2061,16 +2074,16 @@ msgstr "" "Não foi possível salvar o arquivo pois:\n" "%s" -#: meld/filediff.py:2115 meld/patchdialog.py:137 +#: meld/filediff.py:2129 meld/patchdialog.py:137 #, python-format msgid "Could not save file %s." msgstr "Não foi possível salvar o arquivo %s." -#: meld/filediff.py:2525 +#: meld/filediff.py:2539 msgid "Live comparison updating disabled" msgstr "Atualização em tempo real de comparação desabilitada" -#: meld/filediff.py:2526 +#: meld/filediff.py:2540 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2081,6 +2094,22 @@ msgstr "" "e atualizações em tempo real serão resumidas quando os pontos de " "sincronização estiverem limpos." +#: meld/filediff.py:2568 +msgid "Can't swap unsaved files" +msgstr "Não é possível trocar arquivos não salvos." + +#: meld/filediff.py:2570 +msgid "Files must be saved to disk before swapping panes." +msgstr "Os arquivos precisam ser salvos em disco antes de trocar de painéis." + +#: meld/filediff.py:2577 +msgid "Can't swap version control comparisons" +msgstr "Não é possível trocar comparações de controle de versão" + +#: meld/filediff.py:2579 +msgid "Swapping panes is not supported in version control mode." +msgstr "Não há suporte a troca de painéis em modo de controle de versão." + #: meld/iohelpers.py:41 msgid "Deleting remote folders is not supported" msgstr "Não há suporte à exclusão de pastas remotas" @@ -2341,51 +2370,51 @@ msgstr "Nenhum" msgid "Rev %s" msgstr "Rev %s" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Merged" msgstr "Mesclado" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Base" msgstr "Base" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Local" msgstr "Local" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Remote" msgstr "Remoto" -#: meld/vc/_vc.py:73 +#: meld/vc/_vc.py:74 msgid "Error" msgstr "Erro" -#: meld/vc/_vc.py:75 +#: meld/vc/_vc.py:76 msgid "Newly added" msgstr "Recém adicionado" -#: meld/vc/_vc.py:77 +#: meld/vc/_vc.py:78 msgid "Renamed" msgstr "Renomeado" -#: meld/vc/_vc.py:78 +#: meld/vc/_vc.py:79 msgid "Conflict" msgstr "Conflito" -#: meld/vc/_vc.py:79 +#: meld/vc/_vc.py:80 msgid "Removed" msgstr "Removido" -#: meld/vc/_vc.py:80 +#: meld/vc/_vc.py:81 msgid "Missing" msgstr "Faltando" -#: meld/vc/_vc.py:81 +#: meld/vc/_vc.py:82 msgid "Not present" msgstr "Não presente" -#: meld/vc/_vc.py:82 +#: meld/vc/_vc.py:83 msgid "Scanning…" msgstr "Escaneando…" @@ -2418,67 +2447,68 @@ msgstr "Nenhum sistema de controle de versão válido localizado nesta pasta" msgid "Choose which version control system to use" msgstr "Escolha qual sistema de controle de versão a ser usado" -#. TRANSLATORS: This is the location of the directory being viewed -#: meld/vcview.py:412 +#. TRANSLATORS: This is the name of the version control +#. system being used, e.g., "Git" or "Subversion" +#: meld/vcview.py:414 #, python-brace-format -msgid "Location: {path}" -msgstr "Localização: {path}" +msgid "{vc} comparison:" +msgstr "Comparação {vc}" #. Initial yield so when we add this to our tasks, we don't #. create iterators that may be invalidated. -#: meld/vcview.py:419 +#: meld/vcview.py:423 msgid "Scanning repository" msgstr "Escaneando repositório" -#: meld/vcview.py:448 +#: meld/vcview.py:452 #, python-format msgid "Scanning %s" msgstr "Escaneando %s" -#: meld/vcview.py:487 +#: meld/vcview.py:491 msgid "(Empty)" msgstr "(Vazio)" -#: meld/vcview.py:535 +#: meld/vcview.py:539 #, python-format msgid "%s — local" msgstr "%s — local" -#: meld/vcview.py:536 +#: meld/vcview.py:540 #, python-format msgid "%s — remote" msgstr "%s — remoto" -#: meld/vcview.py:544 +#: meld/vcview.py:548 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (local, mesclagem, remoto)" -#: meld/vcview.py:549 +#: meld/vcview.py:553 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (remoto, mesclagem, local)" -#: meld/vcview.py:560 +#: meld/vcview.py:564 #, python-format msgid "%s — repository" msgstr "%s — repositório" -#: meld/vcview.py:566 +#: meld/vcview.py:570 #, python-format msgid "%s (working, repository)" msgstr "%s (em trabalho, repositório)" -#: meld/vcview.py:570 +#: meld/vcview.py:574 #, python-format msgid "%s (repository, working)" msgstr "%s (repositório, em trabalho)" -#: meld/vcview.py:735 +#: meld/vcview.py:739 msgid "Remove folder and all its files?" msgstr "Remover pasta e todos seus arquivos?" -#: meld/vcview.py:737 +#: meld/vcview.py:741 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2486,6 +2516,13 @@ msgstr "" "Isso vai remover todos os arquivos e pastas selecionados, e todos arquivos " "dentro de quaisquer pastas selecionadas, do controle de versão." -#: meld/vcview.py:850 +#: meld/vcview.py:854 msgid "Clear" msgstr "Limpar" + +#~ msgid "Refresh" +#~ msgstr "Atualizar" + +#, python-brace-format +#~ msgid "Location: {path}" +#~ msgstr "Localização: {path}" diff --git a/po/ru.po b/po/ru.po index a91555d..2d58ba6 100644 --- a/po/ru.po +++ b/po/ru.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: Meld 1.4.0\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2022-08-12 00:04+0000\n" -"PO-Revision-Date: 2022-08-12 15:01+1000\n" +"POT-Creation-Date: 2022-11-16 06:57+0000\n" +"PO-Revision-Date: 2022-11-17 20:26+1000\n" "Last-Translator: Ser82-png \n" "Language-Team: Русский \n" "Language: ru\n" @@ -533,7 +533,6 @@ msgid "Refresh comparison" msgstr "Обновить сравнение" #: meld/resources/gtk/help-overlay.ui:54 -#| msgid "Open Externally" msgctxt "shortcut window" msgid "Open externally" msgstr "Открыть во внешнем приложении" @@ -782,8 +781,6 @@ msgid "Open Externally" msgstr "Открыть во внешнем приложении" #: meld/resources/gtk/menus.ui:26 -#| msgctxt "shortcut window" -#| msgid "Refresh comparison" msgid "Refresh Comparison" msgstr "Обновить сравнение" @@ -903,10 +900,10 @@ msgstr "Выровнять каталоги" #: meld/resources/ui/about-dialog.ui:8 msgid "" "Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2021 Kai Willadsen" +"Copyright © 2009-2022 Kai Willadsen" msgstr "" "Авторское право © 2002-2009 Stephen Kennedy\n" -"Авторское право © 2009-2021 Kai Willadsen" +"Авторское право © 2009-2022 Kai Willadsen" #: meld/resources/ui/about-dialog.ui:14 msgid "translator-credits" @@ -1768,12 +1765,12 @@ msgstr "" "Используются текстовые фильтры, которые могут маскировать различия между " "файлами." -#: meld/dirdiff.py:1145 meld/filediff.py:1989 +#: meld/dirdiff.py:1145 meld/filediff.py:1997 msgid "Hide" msgstr "Скрыть" -#: meld/dirdiff.py:1147 meld/filediff.py:1991 meld/filediff.py:2021 -#: meld/filediff.py:2023 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 +#: meld/dirdiff.py:1147 meld/filediff.py:1999 meld/filediff.py:2029 +#: meld/filediff.py:2031 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 msgid "Hi_de" msgstr "С_крыть" @@ -1851,108 +1848,108 @@ msgstr "Нет папки" msgid "Folder comparison:" msgstr "Сравнение папок" -#: meld/filediff.py:1162 +#: meld/filediff.py:1168 msgid "Comparison results will be inaccurate" msgstr "Результаты сравнения будут некорректными" -#: meld/filediff.py:1164 +#: meld/filediff.py:1170 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." msgstr "Фильтр изменил количество строк в файле. Сравнение будет не точным." -#: meld/filediff.py:1236 +#: meld/filediff.py:1242 msgid "Mark conflict as resolved?" msgstr "Отметить конфликт как разрешённый?" -#: meld/filediff.py:1238 +#: meld/filediff.py:1244 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "" "Если конфликт был успешно разрешён, вы можете отметить его как решённый." -#: meld/filediff.py:1241 +#: meld/filediff.py:1247 msgid "Cancel" msgstr "Отменить" -#: meld/filediff.py:1242 +#: meld/filediff.py:1248 msgid "Mark _Resolved" msgstr "Отметить как _разрешённый" -#: meld/filediff.py:1433 meld/filediff.py:1449 +#: meld/filediff.py:1439 meld/filediff.py:1455 msgid "Add Synchronization Point" msgstr "Добавить точку синхронизации" -#: meld/filediff.py:1437 +#: meld/filediff.py:1443 msgid "Remove Synchronization Point" msgstr "Удалить точку синхронизации" -#: meld/filediff.py:1441 +#: meld/filediff.py:1447 msgid "Move Synchronization Point" msgstr "Переместить точку синхронизации" -#: meld/filediff.py:1445 +#: meld/filediff.py:1451 msgid "Match Synchronization Point" msgstr "Установить соответствие точки синхронизации" -#: meld/filediff.py:1469 +#: meld/filediff.py:1475 msgid "Clear Synchronization Points" msgstr "Удалить точки синхронизации" -#: meld/filediff.py:1529 +#: meld/filediff.py:1535 msgid "File comparison:" msgstr "Сравнение файлов:" -#: meld/filediff.py:1663 +#: meld/filediff.py:1671 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Возникла проблема при открытии файла «%s»." -#: meld/filediff.py:1672 +#: meld/filediff.py:1680 #, python-format msgid "File %s appears to be a binary file." msgstr "Файл %s выглядит как двоичный файл." -#: meld/filediff.py:1674 +#: meld/filediff.py:1682 msgid "Do you want to open the file using the default application?" msgstr "Открыть выбранный файл в приложении по умолчанию?" -#: meld/filediff.py:1676 +#: meld/filediff.py:1684 msgid "Open" msgstr "Открыть" -#: meld/filediff.py:1698 +#: meld/filediff.py:1706 #, python-format msgid "[%s] Merging files" msgstr "[%s] Объединение файлов" -#: meld/filediff.py:1712 +#: meld/filediff.py:1720 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Вычисление различий" -#: meld/filediff.py:1772 +#: meld/filediff.py:1780 #, python-format msgid "File %s has changed on disk" msgstr "Файл %s изменился на диске" -#: meld/filediff.py:1773 +#: meld/filediff.py:1781 msgid "Do you want to reload the file?" msgstr "Хотите перезагрузить файл?" -#: meld/filediff.py:1775 +#: meld/filediff.py:1783 msgid "_Reload" msgstr "_Перезагрузить" -#: meld/filediff.py:1945 +#: meld/filediff.py:1953 msgid "File {} is being compared to itself" msgstr "Выполняется сравнение файла {} с самим собой" -#: meld/filediff.py:1954 +#: meld/filediff.py:1962 msgid "Files are identical" msgstr "Файлы идентичны" -#: meld/filediff.py:1967 +#: meld/filediff.py:1975 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1960,11 +1957,11 @@ msgstr "" "Используются текстовые фильтры, которые могут маскировать различия между " "файлами. Хотите сравнить файлы без использования фильтров?" -#: meld/filediff.py:1972 +#: meld/filediff.py:1980 msgid "Files differ in line endings only" msgstr "Файлы различаются только окончаниями строк" -#: meld/filediff.py:1974 +#: meld/filediff.py:1982 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1973,15 +1970,15 @@ msgstr "" "Файлы идентичны, но различаются окончаниями строк:\n" "%s" -#: meld/filediff.py:1994 +#: meld/filediff.py:2002 msgid "Show without filters" msgstr "Показать без фильтров" -#: meld/filediff.py:2016 +#: meld/filediff.py:2024 msgid "Change highlighting incomplete" msgstr "Выделение изменений неполное" -#: meld/filediff.py:2017 +#: meld/filediff.py:2025 msgid "" "Some changes were not highlighted because they were too large. You can force " "Meld to take longer to highlight larger changes, though this may be slow." @@ -1990,19 +1987,19 @@ msgstr "" "можете дать Meld больше времени, чтобы их выделить, возможно это будет " "медленно." -#: meld/filediff.py:2025 +#: meld/filediff.py:2033 msgid "Keep highlighting" msgstr "Сохранить выделение" -#: meld/filediff.py:2027 +#: meld/filediff.py:2035 msgid "_Keep highlighting" msgstr "Сохранить в_ыделение" -#: meld/filediff.py:2040 +#: meld/filediff.py:2048 msgid "Saving failed" msgstr "Сохранение не удалось" -#: meld/filediff.py:2041 +#: meld/filediff.py:2049 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." @@ -2010,42 +2007,42 @@ msgstr "" "Рекомендуется скопировать критичные изменения в другую программу или файл " "для избежания потери данных." -#: meld/filediff.py:2050 +#: meld/filediff.py:2058 msgid "Save Left Pane As" msgstr "Сохранить левую панель как" -#: meld/filediff.py:2052 +#: meld/filediff.py:2060 msgid "Save Middle Pane As" msgstr "Сохранить среднюю панель как" -#: meld/filediff.py:2054 +#: meld/filediff.py:2062 msgid "Save Right Pane As" msgstr "Сохранить правую панель как" -#: meld/filediff.py:2065 +#: meld/filediff.py:2073 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "Файл %s изменился на диске, так как он был открыт" -#: meld/filediff.py:2067 +#: meld/filediff.py:2075 msgid "If you save it, any external changes will be lost." msgstr "Если вы сохраните его, любые внешние изменения будут потеряны." -#: meld/filediff.py:2070 +#: meld/filediff.py:2078 msgid "Save Anyway" msgstr "Всё равно сохранить" -#: meld/filediff.py:2071 +#: meld/filediff.py:2079 msgid "Don’t Save" msgstr "Не сохранять" -#: meld/filediff.py:2113 +#: meld/filediff.py:2121 msgid "" "File “{}” contains characters that can’t be encoded using its current " "encoding “{}”." msgstr "Файл “{}” содержит символы, недопустимые для текущей кодировки “{}”." -#: meld/filediff.py:2117 meld/patchdialog.py:138 +#: meld/filediff.py:2125 meld/patchdialog.py:138 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -2054,16 +2051,16 @@ msgstr "" "Нельзя сохранить файл по следующей причине:\n" "%s" -#: meld/filediff.py:2121 meld/patchdialog.py:137 +#: meld/filediff.py:2129 meld/patchdialog.py:137 #, python-format msgid "Could not save file %s." msgstr "Не удалось сохранить файл %s." -#: meld/filediff.py:2531 +#: meld/filediff.py:2539 msgid "Live comparison updating disabled" msgstr "Обновление Онлайн сравнения отключено" -#: meld/filediff.py:2532 +#: meld/filediff.py:2540 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2073,6 +2070,23 @@ msgstr "" "Вы можете вручную обновить сравнение, онлайн обновления возобновятся, когда " "удалятся точки синхронизации." +#: meld/filediff.py:2568 +msgid "Can't swap unsaved files" +msgstr "Нельзя менять местами несохраненные файлы" + +#: meld/filediff.py:2570 +msgid "Files must be saved to disk before swapping panes." +msgstr "" +"Перед тем, как поменять панели местами, файлы должны быть сохранены на диск." + +#: meld/filediff.py:2577 +msgid "Can't swap version control comparisons" +msgstr "Нельзя менять места сравнения в контроле версий" + +#: meld/filediff.py:2579 +msgid "Swapping panes is not supported in version control mode." +msgstr "В режиме контроля версий не предусмотрен обмен местами панелей." + #: meld/iohelpers.py:41 msgid "Deleting remote folders is not supported" msgstr "Удаление сетевых папок не поддерживается" diff --git a/po/sl.po b/po/sl.po index b83a370..3459bba 100644 --- a/po/sl.po +++ b/po/sl.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: meld master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2022-01-17 21:20+0000\n" -"PO-Revision-Date: 2022-02-07 20:48+0100\n" -"Last-Translator: Matej Urbančič \n" +"POT-Creation-Date: 2023-07-28 18:53+0000\n" +"PO-Revision-Date: 2023-09-03 21:22+0200\n" +"Last-Translator: Martin Srebotnjak \n" "Language-Team: Slovenian GNOME Translation Team \n" "Language: sl_SI\n" "MIME-Version: 1.0\n" @@ -19,7 +19,7 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" "X-Poedit-SourceCharset: utf-8\n" -"X-Generator: Poedit 3.0\n" +"X-Generator: Poedit 2.2.1\n" #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11 #: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17 @@ -53,13 +53,12 @@ msgstr "" "in Subversion." #: data/org.gnome.meld.appdata.xml.in.in:21 -#, fuzzy msgid "" "Meld helps you review code changes, understand patches, and makes enormous " "merge conflicts slightly less painful." msgstr "" -"Meld vam pomaga pregledati spremembe kode, razumeti obliže in naredi ogromne " -"spajanje konfliktov nekoliko manj boleče." +"Meld vam pomaga pregledati spremembe kode, razumeti popravke in naredi spore " +"pri gromozanskem spajanju nekoliko manj boleče." #: data/org.gnome.meld.appdata.xml.in.in:51 msgid "The GNOME Project" @@ -90,30 +89,29 @@ msgid "Prefer application-wide dark theme" msgstr "Prednostno uporabi temno različico programa." #: data/org.gnome.meld.gschema.xml:59 -#, fuzzy msgid "" "If true, the GTK dark theme variant will be used, if available. Note that " "this is separate from the syntax highlighting scheme." msgstr "" -"Če je res, bo uporabljena različica temne teme GTK, če je na voljo. " -"Upoštevajte, da je to ločeno od sheme za označevanje sintakse." +"Če je res, bo uporabljena temna različica teme GTK, če je na voljo. " +"Upoštevajte, da je to ločeno od sheme za poudarjanje skladnje." #: data/org.gnome.meld.gschema.xml:65 msgid "Additional automatically detected text encodings" msgstr "Dodatna samodejno zaznana kodiranja" #: data/org.gnome.meld.gschema.xml:66 -#, fuzzy msgid "" "Meld will use these text encodings to try to decode loaded text files before " "trying any other encodings. In addition to the encodings in this list, UTF-8 " "and the current locale-default encoding will always be used; other encodings " "may also be tried, depending on the user’s locale." msgstr "" -"Meld bo s temi kodiranje besedila poskušal dekodirati naložene besedilne " +"Meld bo s temi kodiranji besedila poskušal odkodirati naložene besedilne " "datoteke, preden poskusite katero koli drugo kodiranje. Poleg kodiranja na " -"tem seznamu bosta vedno uporabljena UTF-8 in trenutno kodiranje na lokalni " -"ravni; lahko tudi druge kodiranje, odvisno od uporabnikovega lokala." +"tem seznamu bosta vedno uporabljena UTF-8 in trenutno kodiranje na krajevni " +"ravni; preizkusi se lahko tudi drugo kodiranje, odvisno od uporabnikovih " +"krajevnih nastavitev." #: data/org.gnome.meld.gschema.xml:73 msgid "Width of an indentation step" @@ -139,22 +137,21 @@ msgid "Show line numbers" msgstr "Pokaži številke vrstic" #: data/org.gnome.meld.gschema.xml:84 -#, fuzzy msgid "If true, line numbers will be shown in the gutter of file comparisons." -msgstr "Če je res, bodo številke vrstice prikazane v čreh primerjave datotek." +msgstr "" +"Če je res, bodo številke vrstic prikazane v vmesnem robu primerjave datotek." #: data/org.gnome.meld.gschema.xml:88 msgid "Highlight syntax" msgstr "Poudarjanje skladnje" #: data/org.gnome.meld.gschema.xml:89 -#, fuzzy msgid "" "Whether to highlight syntax in comparisons. Because of Meld’s own color " "highlighting, this is off by default." msgstr "" -"Ali poudariti sintakso v primerjavah. Zaradi Meld-ovega označevanje barv je " -"to privzeto izklopljeno." +"Ali naj bo skladnja v primerjavah poudarjena. Zaradi Meldovega poudarjanja z " +"barvami je to privzeto izklopljeno." #: data/org.gnome.meld.gschema.xml:93 msgid "Color scheme to use for syntax highlighting" @@ -169,12 +166,11 @@ msgid "Draw whitespace" msgstr "Pokaži presledne znake" #: data/org.gnome.meld.gschema.xml:99 -#, fuzzy msgid "" "If true, whitespace characters will be drawn in comparisons even if they are " "not in a changed area." msgstr "" -"Če je res, bodo znaki belega prostora narisani v primerjavah, tudi če niso v " +"Če je res, bodo znaki za presledek v primerjavah izrisani, tudi če niso v " "spremenjenem območju." #: data/org.gnome.meld.gschema.xml:108 @@ -196,7 +192,6 @@ msgid "Highlight current line" msgstr "Poudari trenutno vrstico" #: data/org.gnome.meld.gschema.xml:117 -#, fuzzy msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." @@ -208,12 +203,10 @@ msgid "Use the system default monospace font" msgstr "Uporabi privzeto sistemsko pisavo stalne širine" #: data/org.gnome.meld.gschema.xml:122 -#, fuzzy msgid "" "If false, custom-font will be used instead of the system monospace font." msgstr "" -"Če je napačna, bo namesto pisave v enoprostornem sistemu uporabljena pisava " -"po meri." +"Če ni res, bo namesto sistemske enoširne pisave uporabljena pisava po meri." #: data/org.gnome.meld.gschema.xml:126 msgid "Custom font" @@ -232,11 +225,10 @@ msgid "Show overview source map" msgstr "Pokaži izvorni predogledni zemljevid" #: data/org.gnome.meld.gschema.xml:134 -#, fuzzy msgid "" "If true, file comparisons will have paired source maps for compared files." msgstr "" -"Če je res, bodo primerjave datotek imele združene izvorne zemljevide za " +"Če je res, bodo imele primerjave datotek združene izvorne zemljevide za " "primerjane datoteke." #: data/org.gnome.meld.gschema.xml:139 @@ -252,25 +244,23 @@ msgid "Ignore blank lines when comparing files" msgstr "Prezri prazne vrstice med primerjavo datotek" #: data/org.gnome.meld.gschema.xml:147 -#, fuzzy msgid "" "If true, blank lines will be trimmed when highlighting changes between files." msgstr "" -"Če je res, bodo prazne vrstice pri označevanje sprememb med datotekami " -"ošiljene." +"Če je res, bodo prazne vrstice pri označevanju sprememb med datotekami " +"obrezane." #: data/org.gnome.meld.gschema.xml:154 msgid "Use the system default editor" msgstr "Uporabi privzet sistemski urejevalnik besedil" #: data/org.gnome.meld.gschema.xml:155 -#, fuzzy msgid "" "If false, custom-editor-command will be used instead of the system editor " "when opening files externally." msgstr "" -"Če je napačno, bo namesto urejevalnika sistema uporabljen ukaz »Urejevalnik " -"po meri« pri zunanjem odpiranju datotek." +"Če ni res, bo namesto urejevalnika sistema uporabljen ukaz »Urejevalnik po " +"meri« pri zunanjem odpiranju datotek." #: data/org.gnome.meld.gschema.xml:159 msgid "The custom editor launch command" @@ -289,24 +279,21 @@ msgid "Columns to display" msgstr "Prikazani stolpci" #: data/org.gnome.meld.gschema.xml:167 -#, fuzzy msgid "" "List of column names in folder comparison and whether they should be " "displayed." -msgstr "" -"Seznam imen stolpcev v primerjavi z mapami in ali jih je treba prikazati." +msgstr "Seznam imen stolpcev v primerjavi map in ali jih je treba prikazati." #: data/org.gnome.meld.gschema.xml:171 meld/resources/ui/preferences.ui:951 msgid "Ignore symbolic links" msgstr "Prezri simbolne povezave" #: data/org.gnome.meld.gschema.xml:172 -#, fuzzy msgid "" "If true, folder comparisons do not follow symbolic links when traversing the " "folder tree." msgstr "" -"Če je res, primerjave map pri prehodu drevesa mape ne sledijo simbolnim " +"Če je res, primerjave map pri prehajanju drevesa map ne sledijo simbolnim " "povezavam." #: data/org.gnome.meld.gschema.xml:176 @@ -314,47 +301,44 @@ msgid "Use shallow comparison" msgstr "Uporabi grobo primerjavo" #: data/org.gnome.meld.gschema.xml:177 -#, fuzzy msgid "" "If true, folder comparisons compare files based solely on size and mtime, " "considering files to be identical if their size and mtime match, and " "different otherwise." msgstr "" "Če je res, primerjave map primerjajo datoteke, ki temeljijo samo na " -"velikosti in mtime, glede na to, da so datoteke enake, če se njihova " -"velikost in mtime ujemata, in drugače." +"velikosti in času mtime, glede na to, da sta datoteki enaki, če se njuna " +"velikost in čas mtime ujemata, sicer pa sta različni." #: data/org.gnome.meld.gschema.xml:181 msgid "File timestamp resolution" msgstr "Ločljivost časovnega žiga" #: data/org.gnome.meld.gschema.xml:182 -#, fuzzy msgid "" "When comparing based on mtime, this is the minimum difference in nanoseconds " "between two files before they’re considered to have different mtimes. This " "is useful when comparing files between filesystems with different timestamp " "resolution." msgstr "" -"Pri primerjavi na podlagi mtime je to najmanjša razlika v nanosekondih med " -"dvema datotekama, preden se šteje, da imajo različne mtimes. To je uporabno " -"pri primerjanju datotek med datotečnimi stemi z različno ločljivostjo " -"časovnega žiga." +"Pri primerjavi na podlagi mtime je to najmanjša razlika v nanosekundah med " +"dvema datotekama, preden velja, da imata različne čase mtimes. To je " +"uporabno pri primerjanju datotek med datotečnimi sistemi z različno " +"ločljivostjo časovnega žiga." #: data/org.gnome.meld.gschema.xml:186 meld/resources/ui/preferences.ui:852 msgid "Apply text filters during folder comparisons" msgstr "Uveljavi besedilne filtre med primerjavo map" #: data/org.gnome.meld.gschema.xml:187 -#, fuzzy msgid "" "If true, folder comparisons that compare file contents also apply active " "text filters and the blank line trimming option, and ignore newline " "differences." msgstr "" -"Če je res, primerjave map, ki primerjajo vsebino datoteke, uporabljajo tudi " -"aktivne filtre besedila in možnost prazna črta za obrezovanje in prezrejo " -"razlike v novi vrstici." +"Če je res, primerjave map, ki primerjajo vsebine datotek, uporabljajo tudi " +"dejavne filtre besedila in možnost obrezave praznih vrstic ter prezrejo " +"razlike v prelomih vrstic." #: data/org.gnome.meld.gschema.xml:191 msgid "File status filters" @@ -374,6 +358,8 @@ msgid "" "If true, a console output section will be shown in version control views, " "showing the commands run for version control operations." msgstr "" +"Če je res, bo v pogledih nadzora različic prikazan izhodni odsek konzole, ki " +"prikazuje ukaze, ki se zaženejo za operacije nadzora različic." #: data/org.gnome.meld.gschema.xml:203 msgid "Version control pane position" @@ -384,6 +370,8 @@ msgid "" "This is the height of the main version control tree when the console pane is " "shown." msgstr "" +"To je višina glavnega drevesa nadzora nad različicami, ko je prikazano " +"podokno konzole." #: data/org.gnome.meld.gschema.xml:208 msgid "Present version comparisons as left-local/right-remote" @@ -397,11 +385,15 @@ msgid "" "remote scheme to determine what order to present files in panes. Otherwise, " "a left-is-theirs, right-is-mine scheme is used." msgstr "" +"Če je res, bo pri primerjavi nadzora različic uporabljena shemo levo-je-" +"krajevna, desno-je-oddaljena za določitev vrstnega reda predstavitve datotek " +"v podoknih. V nasprotnem primeru se uporabi shema leva-je-njihova, desna-je-" +"moja." #: data/org.gnome.meld.gschema.xml:213 -#, fuzzy msgid "Order for files in three-way version control merge comparisons" -msgstr "Zagon primerjave nadzora različic" +msgstr "" +"Vrstni red datotek v tristranih primerjavah spajanja nadzorovanih različic" #: data/org.gnome.meld.gschema.xml:214 msgid "" @@ -409,6 +401,11 @@ msgid "" "preference only affects three-way comparisons launched from the version " "control view, so is used solely for merges/conflict resolution within Meld." msgstr "" +"Izbire za vrstni red datotek so remote/merged/local (oddaljene/združene/" +"krajevne) in local/merged/remote (krajevne/združene/oddaljene). Ta " +"nastavitev vpliva le na tristrane primerjave, ki se začnejo iz pogleda " +"nadzora različic, zato se uporablja samo za združitve/reševanje sporov " +"znotraj Melda." #: data/org.gnome.meld.gschema.xml:218 msgid "Show margin in commit message editor" @@ -419,6 +416,8 @@ msgid "" "If true, a guide will be displayed to show what column the margin is at in " "the version control commit message editor." msgstr "" +"Če je true (res), bo prikazano vodilo, ki prikazuje stolpec, v katerem se " +"nahaja rob v urejevalniku sporočil za pošiljanje v nadzor različic." #: data/org.gnome.meld.gschema.xml:223 msgid "Margin column in commit message editor" @@ -441,6 +440,9 @@ msgid "" "If true, the version control commit message editor will hard-wrap (i.e., " "insert line breaks) at the commit margin before commit." msgstr "" +"Če je true (res), bo urejevalnik sporočil za pošiljanje v nadzor različic " +"pred objavo trdo prelomil vrstice (t.j. vstavil prelome vrstice) na robu za " +"objavo." #: data/org.gnome.meld.gschema.xml:233 msgid "Version control status filters" @@ -462,6 +464,8 @@ msgid "" "List of predefined filename-based filters that, if active, will remove " "matching files from a folder comparison." msgstr "" +"Seznam vnaprej določenih filtrov, ki temeljijo na datotečnih imenih, ki " +"bodo, če so dejavni, odstranili ujemajoče se datoteke iz primerjave map." #: data/org.gnome.meld.gschema.xml:263 msgid "Text-based filters" @@ -473,6 +477,9 @@ msgid "" "text from being used in a file comparison. The text will still be displayed, " "but won’t contribute to the comparison itself." msgstr "" +"Seznam vnaprej določenih filtrov regularnih izrazov, ki bodo, če so dejavni, " +"odstranili uporabo besedila pri primerjavi datotek. Besedilo bo še vedno " +"prikazano, vendar ne bo prispevalo k sami primerjavi." #: data/styles/meld-base.style-scheme.xml.in:1 msgid "Classic (Meld)" @@ -522,365 +529,375 @@ msgstr "Osveži primerjavo" #: meld/resources/gtk/help-overlay.ui:54 msgctxt "shortcut window" +msgid "Open externally" +msgstr "Odpri v zunanjem programu" + +#: meld/resources/gtk/help-overlay.ui:61 +msgctxt "shortcut window" msgid "Fullscreen" msgstr "Omogoči celozaslonski način" -#: meld/resources/gtk/help-overlay.ui:63 +#: meld/resources/gtk/help-overlay.ui:68 +msgctxt "shortcut window" +msgid "Swap left and right panes" +msgstr "Zamenjaj levi in desni pladenj" + +#: meld/resources/gtk/help-overlay.ui:77 msgctxt "shortcut window" msgid "Panes" msgstr "Okna" -#: meld/resources/gtk/help-overlay.ui:68 +#: meld/resources/gtk/help-overlay.ui:82 msgctxt "shortcut window" msgid "Previous comparison pane" msgstr "Skoči na predhodno okno primerjave" -#: meld/resources/gtk/help-overlay.ui:75 +#: meld/resources/gtk/help-overlay.ui:89 msgctxt "shortcut window" msgid "Next comparison pane" msgstr "Skoči na naslednje okno primerjave" -#: meld/resources/gtk/help-overlay.ui:84 +#: meld/resources/gtk/help-overlay.ui:98 msgctxt "shortcut window" msgid "Changes" msgstr "Spremembe" -#: meld/resources/gtk/help-overlay.ui:89 +#: meld/resources/gtk/help-overlay.ui:103 msgctxt "shortcut window" msgid "Go to previous change" msgstr "Skoči na predhodno spremembo" -#: meld/resources/gtk/help-overlay.ui:96 +#: meld/resources/gtk/help-overlay.ui:110 msgctxt "shortcut window" msgid "Go to next change" msgstr "Skoči na naslednjo spremembo" -#: meld/resources/gtk/help-overlay.ui:105 +#: meld/resources/gtk/help-overlay.ui:119 msgctxt "shortcut window" msgid "Tabs" msgstr "Zavihki" -#: meld/resources/gtk/help-overlay.ui:110 +#: meld/resources/gtk/help-overlay.ui:124 msgctxt "shortcut window" msgid "Go to previous tab" msgstr "Skoči na predhodni zavihek" -#: meld/resources/gtk/help-overlay.ui:117 +#: meld/resources/gtk/help-overlay.ui:131 msgctxt "shortcut window" msgid "Go to next tab" msgstr "Skoči na naslednji zavihek" -#: meld/resources/gtk/help-overlay.ui:124 +#: meld/resources/gtk/help-overlay.ui:138 msgctxt "shortcut window" msgid "Switch to tab" msgstr "Preklopi na zavihek" -#: meld/resources/gtk/help-overlay.ui:131 +#: meld/resources/gtk/help-overlay.ui:145 msgctxt "shortcut window" msgid "Move tab left" msgstr "Premakne na zavihek levo" -#: meld/resources/gtk/help-overlay.ui:138 +#: meld/resources/gtk/help-overlay.ui:152 msgctxt "shortcut window" msgid "Move tab right" msgstr "Premakne na zavihek desno" -#: meld/resources/gtk/help-overlay.ui:147 +#: meld/resources/gtk/help-overlay.ui:161 msgctxt "shortcut window" msgid "Editing" msgstr "Urejanje" -#: meld/resources/gtk/help-overlay.ui:152 +#: meld/resources/gtk/help-overlay.ui:166 msgctxt "shortcut window" msgid "Undo" msgstr "Razveljavi dejanje" -#: meld/resources/gtk/help-overlay.ui:159 +#: meld/resources/gtk/help-overlay.ui:173 msgctxt "shortcut window" msgid "Redo" msgstr "Ponovno uveljavi dejanje" -#: meld/resources/gtk/help-overlay.ui:166 +#: meld/resources/gtk/help-overlay.ui:180 msgctxt "shortcut window" msgid "Cut" msgstr "Izreže izbor" -#: meld/resources/gtk/help-overlay.ui:173 +#: meld/resources/gtk/help-overlay.ui:187 msgctxt "shortcut window" msgid "Copy" msgstr "Kopira izbor" -#: meld/resources/gtk/help-overlay.ui:180 +#: meld/resources/gtk/help-overlay.ui:194 msgctxt "shortcut window" msgid "Paste" msgstr "Prilepi izbor" -#: meld/resources/gtk/help-overlay.ui:187 +#: meld/resources/gtk/help-overlay.ui:201 msgctxt "shortcut window" msgid "Find" msgstr "Odpre iskalno polje" -#: meld/resources/gtk/help-overlay.ui:194 +#: meld/resources/gtk/help-overlay.ui:208 msgctxt "shortcut window" msgid "Find Next" msgstr "Najde naslednjo pojavitev" -#: meld/resources/gtk/help-overlay.ui:201 +#: meld/resources/gtk/help-overlay.ui:215 msgctxt "shortcut window" msgid "Find Previous" msgstr "Najde predhodno pojavitev" -#: meld/resources/gtk/help-overlay.ui:208 +#: meld/resources/gtk/help-overlay.ui:222 msgctxt "shortcut window" msgid "Replace" msgstr "Zamenja vsebino" -#: meld/resources/gtk/help-overlay.ui:217 +#: meld/resources/gtk/help-overlay.ui:231 msgctxt "shortcut window" msgid "File comparison" msgstr "Primerjava datotek" -#: meld/resources/gtk/help-overlay.ui:222 +#: meld/resources/gtk/help-overlay.ui:236 msgctxt "shortcut window" msgid "Save current file" msgstr "Shrani trenutno datoteko" -#: meld/resources/gtk/help-overlay.ui:229 +#: meld/resources/gtk/help-overlay.ui:243 msgctxt "shortcut window" msgid "Save current file to new path" msgstr "Shrani trenutno datoteko na novo mesto" -#: meld/resources/gtk/help-overlay.ui:236 +#: meld/resources/gtk/help-overlay.ui:250 msgctxt "shortcut window" msgid "Save all files in comparison" msgstr "Shrani vse datoteke trenutne primerjave" -#: meld/resources/gtk/help-overlay.ui:243 +#: meld/resources/gtk/help-overlay.ui:257 msgctxt "shortcut window" msgid "Previous conflict" msgstr "Skoči na predhodni niz v sporu" -#: meld/resources/gtk/help-overlay.ui:250 +#: meld/resources/gtk/help-overlay.ui:264 msgctxt "shortcut window" msgid "Next conflict" msgstr "Skoči na naslednji niz v sporu" -#: meld/resources/gtk/help-overlay.ui:257 +#: meld/resources/gtk/help-overlay.ui:271 msgctxt "shortcut window" msgid "Push change to left" msgstr "Potisne trenutne spremembe na levo" -#: meld/resources/gtk/help-overlay.ui:264 +#: meld/resources/gtk/help-overlay.ui:278 msgctxt "shortcut window" msgid "Push change to right" msgstr "Potisne trenutne spremembe na desno" -#: meld/resources/gtk/help-overlay.ui:271 +#: meld/resources/gtk/help-overlay.ui:285 msgctxt "shortcut window" msgid "Pull change from left" msgstr "Potegne spremembe z leve" -#: meld/resources/gtk/help-overlay.ui:278 +#: meld/resources/gtk/help-overlay.ui:292 msgctxt "shortcut window" msgid "Pull change from right" msgstr "Potegne spremembe z desne" -#: meld/resources/gtk/help-overlay.ui:285 +#: meld/resources/gtk/help-overlay.ui:299 msgctxt "shortcut window" msgid "Copy change above left" msgstr "Kopira spremembe nad levi del" -#: meld/resources/gtk/help-overlay.ui:292 +#: meld/resources/gtk/help-overlay.ui:306 msgctxt "shortcut window" msgid "Copy change below left" msgstr "Kopira spremembe pod levi del" -#: meld/resources/gtk/help-overlay.ui:299 +#: meld/resources/gtk/help-overlay.ui:313 msgctxt "shortcut window" msgid "Copy change above right" msgstr "Kopira spremembe nad desni del" -#: meld/resources/gtk/help-overlay.ui:306 +#: meld/resources/gtk/help-overlay.ui:320 msgctxt "shortcut window" msgid "Copy change below right" msgstr "Kopira spremembe pod desni del" -#: meld/resources/gtk/help-overlay.ui:313 -#: meld/resources/gtk/help-overlay.ui:341 +#: meld/resources/gtk/help-overlay.ui:327 +#: meld/resources/gtk/help-overlay.ui:355 msgctxt "shortcut window" msgid "Delete change" msgstr "Izbriše spremembo" -#: meld/resources/gtk/help-overlay.ui:322 +#: meld/resources/gtk/help-overlay.ui:336 msgctxt "shortcut window" msgid "Folder comparison" msgstr "Primerjava map" -#: meld/resources/gtk/help-overlay.ui:327 +#: meld/resources/gtk/help-overlay.ui:341 msgctxt "shortcut window" msgid "Copy to left" msgstr "Kopira na levo" -#: meld/resources/gtk/help-overlay.ui:334 +#: meld/resources/gtk/help-overlay.ui:348 msgctxt "shortcut window" msgid "Copy to right" msgstr "Kopira na desno" -#: meld/resources/gtk/help-overlay.ui:350 +#: meld/resources/gtk/help-overlay.ui:364 msgctxt "shortcut window" msgid "Version control comparison" msgstr "Primerjava nadzora različic" -#: meld/resources/gtk/help-overlay.ui:355 +#: meld/resources/gtk/help-overlay.ui:369 msgctxt "shortcut window" msgid "Commit to version control" msgstr "Uveljavi spremembe v sistem za nadzor različic" -#: meld/resources/gtk/help-overlay.ui:362 +#: meld/resources/gtk/help-overlay.ui:376 msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Pokaže/Skrije odvod konzole" #: meld/resources/gtk/menus.ui:7 -msgid "Refresh" -msgstr "Osveži" - -#: meld/resources/gtk/menus.ui:12 -msgid "Stop" -msgstr "Zaustavi" - -#: meld/resources/gtk/menus.ui:17 -msgid "Fullscreen" -msgstr "Celozaslonski način" - -#: meld/resources/gtk/menus.ui:26 msgid "Save As…" msgstr "Shrani kot …" -#: meld/resources/gtk/menus.ui:30 +#: meld/resources/gtk/menus.ui:11 msgid "Save A_ll" msgstr "Shrani _vse" -#: meld/resources/gtk/menus.ui:34 +#: meld/resources/gtk/menus.ui:15 msgid "Revert files…" msgstr "Povrni datoteke …" -#: meld/resources/gtk/menus.ui:38 +#: meld/resources/gtk/menus.ui:19 msgid "Open Externally" msgstr "Odpri v zunanjem programu" -#: meld/resources/gtk/menus.ui:45 +#: meld/resources/gtk/menus.ui:26 +msgid "Refresh Comparison" +msgstr "Osveži primerjavo" + +#: meld/resources/gtk/menus.ui:33 msgid "_Find…" msgstr "_Najdi …" -#: meld/resources/gtk/menus.ui:49 +#: meld/resources/gtk/menus.ui:37 msgid "_Replace…" msgstr "_Zamenjaj …" -#: meld/resources/gtk/menus.ui:55 +#: meld/resources/gtk/menus.ui:43 msgid "View" msgstr "Pogled" -#: meld/resources/gtk/menus.ui:59 +#: meld/resources/gtk/menus.ui:47 +msgid "Fullscreen" +msgstr "Celozaslonski način" + +#: meld/resources/gtk/menus.ui:52 msgid "Overview Map" msgstr "Predogledni zemljevid" -#: meld/resources/gtk/menus.ui:63 +#: meld/resources/gtk/menus.ui:56 msgid "Version control console" msgstr "Konzola nadzora različic" -#: meld/resources/gtk/menus.ui:67 +#: meld/resources/gtk/menus.ui:60 msgid "Lock scrolling" msgstr "Zakleni drsenje" +#: meld/resources/gtk/menus.ui:67 +msgid "Swap left and right panes" +msgstr "Zamenjaj levi in desni pladenj" + #: meld/resources/gtk/menus.ui:73 msgid "Comparison" msgstr "Primerjava" -#: meld/resources/gtk/menus.ui:77 +#: meld/resources/gtk/menus.ui:75 +msgid "Stop" +msgstr "Zaustavi" + +#: meld/resources/gtk/menus.ui:81 msgid "Merge All from Left" msgstr "Združi vse spremembe z leve" -#: meld/resources/gtk/menus.ui:81 +#: meld/resources/gtk/menus.ui:85 msgid "Merge All from Right" msgstr "Združi vse spremembe z desne" -#: meld/resources/gtk/menus.ui:85 +#: meld/resources/gtk/menus.ui:89 msgid "Merge All" msgstr "Združi vse" -#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:65 -msgid "Add Synchronization Point" -msgstr "Dodaj točko usklajevanja" - -#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:69 -msgid "Clear Synchronization Points" -msgstr "Počisti točke usklajevanja" - -#: meld/resources/gtk/menus.ui:103 +#: meld/resources/gtk/menus.ui:96 msgid "Format as Patch…" msgstr "Zapiši kot programski popravek …" -#: meld/resources/gtk/menus.ui:112 +#: meld/resources/gtk/menus.ui:105 msgid "_Preferences" msgstr "_Možnosti" -#: meld/resources/gtk/menus.ui:116 +#: meld/resources/gtk/menus.ui:109 msgid "Keyboard Shortcuts" msgstr "Tipkovne bližnjice" -#: meld/resources/gtk/menus.ui:120 +#: meld/resources/gtk/menus.ui:113 msgid "_Help" msgstr "Pomo_č" -#: meld/resources/gtk/menus.ui:125 +#: meld/resources/gtk/menus.ui:118 msgid "_About Meld" msgstr "_O programu" -#: meld/resources/gtk/menus.ui:138 +#: meld/resources/gtk/menus.ui:131 msgid "File status" msgstr "Stanje datoteke" -#: meld/resources/gtk/menus.ui:140 +#: meld/resources/gtk/menus.ui:133 msgid "Same" msgstr "Enako" -#: meld/resources/gtk/menus.ui:144 +#: meld/resources/gtk/menus.ui:137 msgid "New" msgstr "Novo" -#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167 -#: meld/vc/_vc.py:76 +#: meld/resources/gtk/menus.ui:141 meld/resources/gtk/menus.ui:164 +#: meld/vc/_vc.py:77 msgid "Modified" msgstr "Spremenjeno" -#: meld/resources/gtk/menus.ui:158 +#: meld/resources/gtk/menus.ui:151 msgid "Ignore filename case" msgstr "Prezri velikost črk v imenih datotek" -#: meld/resources/gtk/menus.ui:171 +#: meld/resources/gtk/menus.ui:155 +msgid "Normalize Unicode paths" +msgstr "Normaliziraj poti Unicode" + +#: meld/resources/gtk/menus.ui:168 msgid "Normal" msgstr "Običajno" -#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70 +#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:71 msgid "Unversioned" msgstr "Brez določene različice" -#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69 +#: meld/resources/gtk/menus.ui:176 meld/vc/_vc.py:70 msgid "Ignored" msgstr "Prezrto" -#: meld/resources/gtk/menus.ui:186 +#: meld/resources/gtk/menus.ui:183 msgid "Flatten folders" msgstr "Splošči mape" #: meld/resources/ui/about-dialog.ui:8 msgid "" "Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2021 Kai Willadsen" +"Copyright © 2009-2022 Kai Willadsen" msgstr "" "Avtorske pravice © 2002-2009 Stephen Kennedy\n" -"Avtorske pravice © 2009-2021 Kai Willadsen" +"Avtorske pravice © 2009-2022 Kai Willadsen" #: meld/resources/ui/about-dialog.ui:14 msgid "translator-credits" @@ -931,7 +948,7 @@ msgid "Column Name" msgstr "Ime stolpca" #: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128 -#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:741 +#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:745 msgid "_Remove" msgstr "_Odstrani" @@ -988,30 +1005,38 @@ msgid "_Compare selected files" msgstr "_Primerjaj izbrane datoteke" #: meld/resources/ui/dirdiff-menus.ui:14 +msgid "_Mark selected file" +msgstr "_Označi izbrano datoteko" + +#: meld/resources/ui/dirdiff-menus.ui:18 +msgid "Compare _with marked file" +msgstr "Primerjaj _z označeno datoteko" + +#: meld/resources/ui/dirdiff-menus.ui:25 msgid "Copy to _left" msgstr "Kopiraj na _levo" -#: meld/resources/ui/dirdiff-menus.ui:18 +#: meld/resources/ui/dirdiff-menus.ui:29 msgid "Copy to _right" msgstr "Kopiraj na _desno" -#: meld/resources/ui/dirdiff-menus.ui:22 +#: meld/resources/ui/dirdiff-menus.ui:33 msgid "_Delete selected" msgstr "_Izbriši izbrano" -#: meld/resources/ui/dirdiff-menus.ui:29 +#: meld/resources/ui/dirdiff-menus.ui:40 msgid "Collapse Recursively" msgstr "Zloži" -#: meld/resources/ui/dirdiff-menus.ui:33 +#: meld/resources/ui/dirdiff-menus.ui:44 msgid "Expand Recursively" msgstr "Razširi" -#: meld/resources/ui/dirdiff-menus.ui:40 +#: meld/resources/ui/dirdiff-menus.ui:51 msgid "_Open Externally" msgstr "_Odpri v zunanjem programu" -#: meld/resources/ui/dirdiff-menus.ui:44 +#: meld/resources/ui/dirdiff-menus.ui:55 msgid "_Copy File Paths" msgstr "_Kopiraj poti datoteke" @@ -1045,10 +1070,8 @@ msgid "Push current change to the right" msgstr "Potisni trenutne spremembe na desno" #: meld/resources/ui/filediff-actions.ui:65 -#, fuzzy -#| msgid "Copy _up" msgid "Copy chunks" -msgstr "Kopiraj _navzgor" +msgstr "Kopiraj koščke" #: meld/resources/ui/filediff-actions.ui:87 msgid "Delete change" @@ -1132,7 +1155,7 @@ msgstr "Datoteka 1" #. Create icon and filename CellRenderer #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217 -#: meld/dirdiff.py:537 +#: meld/dirdiff.py:603 msgid "Name" msgstr "Ime" @@ -1172,7 +1195,7 @@ msgstr "Prelomljeno" msgid "Replace _All" msgstr "Zamenjaj _vse" -#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1157 meld/iohelpers.py:114 +#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1231 meld/iohelpers.py:117 msgid "_Replace" msgstr "_Zamenjaj" @@ -1390,6 +1413,8 @@ msgstr "Ločljivost časovnega _žiga:" #: meld/resources/ui/preferences.ui:871 msgid "Note: enabling text filters may make comparing large files much slower" msgstr "" +"Opomba: omogočanje besedilnih filtrov lahko naredi primerjavo velikih " +"datotek precej počasnejšo" #: meld/resources/ui/preferences.ui:920 msgid "Symbolic Links" @@ -1451,7 +1476,7 @@ msgstr "Spremeni obrezovanje" #: meld/resources/ui/preferences.ui:1530 msgid "Trim blank line differences from the start and end of changes" -msgstr "" +msgstr "Obreži spremembe praznih vrstic od začetka in konca sprememb" #: meld/resources/ui/preferences.ui:1574 msgid "Text filters" @@ -1555,12 +1580,12 @@ msgstr "V kolikor sprememb ne shranite, bodo te trajno izgubljene." msgid "Close _without Saving" msgstr "Zapri _brez shranjevanja" -#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1156 -#: meld/iohelpers.py:56 meld/iohelpers.py:113 +#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1229 +#: meld/iohelpers.py:56 meld/iohelpers.py:116 msgid "_Cancel" msgstr "_Prekliči" -#: meld/resources/ui/save-confirm-dialog.ui:52 +#: meld/resources/ui/save-confirm-dialog.ui:55 msgid "_Save" msgstr "_Shrani" @@ -1601,10 +1626,8 @@ msgid "Commit…" msgstr "Uveljavi …" #: meld/resources/ui/vcview.ui:38 -#, fuzzy -#| msgid "Push current change to the left" msgid "Pull remote changes to the local repository" -msgstr "Potisni trenutne spremembe na levo" +msgstr "Potegni oddaljene spremembe v krajevno skladišče" #: meld/resources/ui/vcview.ui:51 msgid "Push local changes to remote" @@ -1646,11 +1669,11 @@ msgstr "Dodatno" msgid "Console output" msgstr "Odvod konzole" -#: meld/actiongutter.py:247 +#: meld/actiongutter.py:254 msgid "Copy _up" msgstr "Kopiraj _navzgor" -#: meld/actiongutter.py:248 +#: meld/actiongutter.py:255 msgid "Copy _down" msgstr "Kopiraj _navzdol" @@ -1667,95 +1690,98 @@ msgid "Mac OS (CR)" msgstr "Mac OS (CR)" #. Create file size CellRenderer -#: meld/dirdiff.py:558 meld/preferences.py:132 +#: meld/dirdiff.py:624 meld/preferences.py:132 msgid "Size" msgstr "Velikost" #. Create date-time CellRenderer -#: meld/dirdiff.py:566 meld/preferences.py:133 +#: meld/dirdiff.py:632 meld/preferences.py:133 msgid "Modification time" msgstr "Čas spremembe" #. Create ISO-format date-time CellRenderer -#: meld/dirdiff.py:574 meld/preferences.py:134 +#: meld/dirdiff.py:640 meld/preferences.py:134 msgid "Modification time (ISO)" msgstr "Čas spremembe (ISO)" #. Create permissions CellRenderer -#: meld/dirdiff.py:582 meld/preferences.py:135 +#: meld/dirdiff.py:648 meld/preferences.py:135 msgid "Permissions" msgstr "Dovoljenja" -#: meld/dirdiff.py:832 +#: meld/dirdiff.py:901 #, python-brace-format msgid "{filename} (scanning…)" msgstr "{filename} (poteka preiskovanje …)" -#: meld/dirdiff.py:864 meld/dirdiff.py:888 +#: meld/dirdiff.py:933 meld/dirdiff.py:965 #, python-brace-format msgid "[{label}] Scanning {folder}" msgstr "[{label}] Prebiranje mape {folder}" -#: meld/dirdiff.py:1028 +#: meld/dirdiff.py:1101 #, python-brace-format msgid "[{label}] Done" msgstr "[{label}] končano" -#: meld/dirdiff.py:1041 +#: meld/dirdiff.py:1114 msgid "Folder {} is being compared to itself" msgstr "Mapo {} primerjate samo s seboj" -#: meld/dirdiff.py:1047 +#: meld/dirdiff.py:1120 msgid "Folders have no differences" msgstr "V mapah ni razlik" -#: meld/dirdiff.py:1049 +#: meld/dirdiff.py:1122 msgid "Contents of scanned files in folders are identical." msgstr "Vsebina preiskanih datotek v mapah je enaka." -#: meld/dirdiff.py:1051 +#: meld/dirdiff.py:1124 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." msgstr "" +"Optično prebrane datoteke v mapah se zdijo enake, vendar vsebina ni bila " +"optično prebrana." -#: meld/dirdiff.py:1054 +#: meld/dirdiff.py:1127 msgid "File filters are in use, so not all files have been scanned." msgstr "" +"Filtri datotek so v uporabi, zato niso bile optično prebrane vse datoteke." -#: meld/dirdiff.py:1056 +#: meld/dirdiff.py:1129 msgid "Text filters are in use and may be masking content differences." -msgstr "" +msgstr "Filtri za besedilo so v uporabi in lahko prikrijejo razlike v vsebini." -#: meld/dirdiff.py:1072 meld/filediff.py:1917 +#: meld/dirdiff.py:1145 meld/filediff.py:2000 msgid "Hide" msgstr "Skrij" -#: meld/dirdiff.py:1074 meld/filediff.py:1919 meld/filediff.py:1949 -#: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 +#: meld/dirdiff.py:1147 meld/filediff.py:2002 meld/filediff.py:2032 +#: meld/filediff.py:2034 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 msgid "Hi_de" msgstr "S_krij" -#: meld/dirdiff.py:1083 +#: meld/dirdiff.py:1156 msgid "Multiple errors occurred while scanning this folder" msgstr "Med preiskovanjem mape je prišlo do več napak." -#: meld/dirdiff.py:1084 +#: meld/dirdiff.py:1157 msgid "Files with invalid encodings found" msgstr "Zaznane so datoteke z neveljavnim znakovnim naborom" #. TRANSLATORS: This is followed by a list of files -#: meld/dirdiff.py:1086 +#: meld/dirdiff.py:1159 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "" "Zaznane so datoteke z neveljavnim znakovnim naborom. Imena so na primer:" -#: meld/dirdiff.py:1088 +#: meld/dirdiff.py:1161 msgid "Files hidden by case insensitive comparison" msgstr "Datoteke skrite zaradi primerjave brez upoštevanja velikosti črk" #. TRANSLATORS: This is followed by a list of files -#: meld/dirdiff.py:1090 +#: meld/dirdiff.py:1163 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" @@ -1763,29 +1789,30 @@ msgstr "" "Zagnan je način primerjave brez upoštevanja velikosti črk na sistemu, ki " "razlike velikosti upošteva. Nekatere datoteke so skrite:" -#: meld/dirdiff.py:1101 -#, fuzzy, python-brace-format -#| msgid "'%s' hidden by '%s'" +#: meld/dirdiff.py:1174 +#, python-brace-format msgid "“{first_file}” hidden by “{second_file}”" -msgstr "'%s' je skrit; '%s'" +msgstr "»{first_file}« skrito s »{second_file}«" -#: meld/dirdiff.py:1160 +#: meld/dirdiff.py:1236 #, python-format msgid "Replace folder “%s”?" msgstr "Ali želite zamenjati mapo »%s«?" -#: meld/dirdiff.py:1162 +#: meld/dirdiff.py:1238 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" "If you replace the existing folder, all files in it will be lost." msgstr "" +"Druga mapa z istim imenom že obstaja v »%s«.\n" +"Če zamenjate obstoječo mapo, bodo vse datoteke v tej mapi izgubljene." -#: meld/dirdiff.py:1175 +#: meld/dirdiff.py:1251 msgid "Error copying file" msgstr "Napaka kopiranja datoteke" -#: meld/dirdiff.py:1176 +#: meld/dirdiff.py:1252 #, python-brace-format msgid "" "Couldn’t copy {source}\n" @@ -1798,91 +1825,121 @@ msgstr "" "\n" "{error}" -#: meld/dirdiff.py:1201 meld/vcview.py:764 +#: meld/dirdiff.py:1277 meld/vcview.py:768 msgid "Error deleting {}" msgstr "Napaka med brisanjem {}" -#: meld/dirdiff.py:1692 +#: meld/dirdiff.py:1825 msgid "No folder" msgstr "Ni mape" -#: meld/filediff.py:1149 +#: meld/dirdiff.py:1838 +msgid "Folder comparison:" +msgstr "Primerjava map:" + +#: meld/filediff.py:1171 msgid "Comparison results will be inaccurate" msgstr "Rezultati primerjave ne bodo natančni" -#: meld/filediff.py:1151 +#: meld/filediff.py:1173 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." msgstr "" +"Filter je spremenil število vrstic v datoteki, ki ni podprta. Primerjava ne " +"bo natančna." -#: meld/filediff.py:1223 +#: meld/filediff.py:1245 msgid "Mark conflict as resolved?" msgstr "Ali naj se spor označi kot razrešen?" -#: meld/filediff.py:1225 +#: meld/filediff.py:1247 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." -msgstr "" +msgstr "Če je bil spor uspešno rešen, ga lahko označite kot razrešenega." -#: meld/filediff.py:1227 +#: meld/filediff.py:1250 msgid "Cancel" msgstr "Prekliči" -#: meld/filediff.py:1228 +#: meld/filediff.py:1251 msgid "Mark _Resolved" msgstr "Označi kot _razrešeno" -#: meld/filediff.py:1591 +#: meld/filediff.py:1442 meld/filediff.py:1458 +msgid "Add Synchronization Point" +msgstr "Dodaj točko usklajevanja" + +#: meld/filediff.py:1446 +msgid "Remove Synchronization Point" +msgstr "Odstrani točko usklajevanja" + +#: meld/filediff.py:1450 +msgid "Move Synchronization Point" +msgstr "Premakni točko usklajevanja" + +#: meld/filediff.py:1454 +msgid "Match Synchronization Point" +msgstr "Ujemi točko usklajevanja" + +#: meld/filediff.py:1478 +msgid "Clear Synchronization Points" +msgstr "Počisti točke usklajevanja" + +#: meld/filediff.py:1538 +msgid "File comparison:" +msgstr "Primerjava datotek:" + +#: meld/filediff.py:1674 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Prišlo je do napake med odpiranjem datoteke “%s”." -#: meld/filediff.py:1600 +#: meld/filediff.py:1683 #, python-format msgid "File %s appears to be a binary file." msgstr "Datoteka %s je videti kot dvojiška datoteka." -#: meld/filediff.py:1602 +#: meld/filediff.py:1685 msgid "Do you want to open the file using the default application?" msgstr "Ali želite odpreti datoteko z uporabo privzetega programa?" -#: meld/filediff.py:1604 +#: meld/filediff.py:1687 msgid "Open" msgstr "Odpri" -#: meld/filediff.py:1626 +#: meld/filediff.py:1709 #, python-format msgid "[%s] Merging files" msgstr "[%s] Združevanje datotek" -#: meld/filediff.py:1640 +#: meld/filediff.py:1723 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Računanje razlik" -#: meld/filediff.py:1700 +#: meld/filediff.py:1783 #, python-format msgid "File %s has changed on disk" msgstr "Datoteka %s je bila na disku spremenjena." -#: meld/filediff.py:1701 +#: meld/filediff.py:1784 msgid "Do you want to reload the file?" msgstr "Ali želite ponovno naložiti datoteko?" -#: meld/filediff.py:1703 +#: meld/filediff.py:1786 msgid "_Reload" msgstr "_Ponovno naloži" -#: meld/filediff.py:1873 +#: meld/filediff.py:1956 msgid "File {} is being compared to itself" msgstr "Datoteko {} primerjate samo s seboj" -#: meld/filediff.py:1882 +#: meld/filediff.py:1965 msgid "Files are identical" msgstr "Datoteki sta enaki" -#: meld/filediff.py:1895 +#: meld/filediff.py:1978 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1890,11 +1947,11 @@ msgstr "" "Uporabljani so filtri besedila, zato so lahko razlike med datotekami skrite. " "Ali naj se primerja vsebina brez dejavnih filtrov?" -#: meld/filediff.py:1900 +#: meld/filediff.py:1983 msgid "Files differ in line endings only" msgstr "Datoteki se razlikujeta le v končnih vrstičnih oznakah" -#: meld/filediff.py:1902 +#: meld/filediff.py:1985 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1903,15 +1960,15 @@ msgstr "" "Datoteki sta enaki, razlikujeta se le v končnih vrstičnih oznakah:\n" "%s" -#: meld/filediff.py:1922 +#: meld/filediff.py:2005 msgid "Show without filters" msgstr "Pokaži brez filtrov" -#: meld/filediff.py:1944 +#: meld/filediff.py:2027 msgid "Change highlighting incomplete" msgstr "Spremeni označevanje kot nedokončano" -#: meld/filediff.py:1945 +#: meld/filediff.py:2028 msgid "" "Some changes were not highlighted because they were too large. You can force " "Meld to take longer to highlight larger changes, though this may be slow." @@ -1919,60 +1976,62 @@ msgstr "" "Nekaterih sprememb ni mogoče poudariti, ker so prevelike. Označevanje je " "mogoče vsiliti, vendar je postopek lahko zelo dolgotrajen." -#: meld/filediff.py:1953 +#: meld/filediff.py:2036 msgid "Keep highlighting" msgstr "Poudarjanje skladnje" -#: meld/filediff.py:1955 +#: meld/filediff.py:2038 msgid "_Keep highlighting" msgstr "_Poudarjanje skladnje" -#: meld/filediff.py:1968 +#: meld/filediff.py:2051 msgid "Saving failed" msgstr "Shranjevanje je spodletelo." -#: meld/filediff.py:1969 +#: meld/filediff.py:2052 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." msgstr "" +"Razmislite o kopiranju kritičnih sprememb v drug program ali datoteko, da se " +"izognete izgubi podatkov." -#: meld/filediff.py:1978 +#: meld/filediff.py:2061 msgid "Save Left Pane As" msgstr "Shrani levi pladenj kot" -#: meld/filediff.py:1980 +#: meld/filediff.py:2063 msgid "Save Middle Pane As" msgstr "Shrani srednji pladenj kot" -#: meld/filediff.py:1982 +#: meld/filediff.py:2065 msgid "Save Right Pane As" msgstr "Shrani desni pladenj kot" -#: meld/filediff.py:1993 +#: meld/filediff.py:2076 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "Datoteka %s je bila po odpiranju na disku spremenjena." -#: meld/filediff.py:1995 +#: meld/filediff.py:2078 msgid "If you save it, any external changes will be lost." msgstr "Če datoteko shranite, bodo vse zunanje spremembe izgubljene." -#: meld/filediff.py:1998 +#: meld/filediff.py:2081 msgid "Save Anyway" msgstr "Vseeno shrani" -#: meld/filediff.py:1999 +#: meld/filediff.py:2082 msgid "Don’t Save" msgstr "Ne shrani" -#: meld/filediff.py:2041 +#: meld/filediff.py:2124 msgid "" "File “{}” contains characters that can’t be encoded using its current " "encoding “{}”." msgstr "Datoteka »{}« vsebuje znake, ki jih ni mogoče kodirati v naboru »{}«." -#: meld/filediff.py:2045 meld/patchdialog.py:138 +#: meld/filediff.py:2128 meld/patchdialog.py:138 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -1981,16 +2040,16 @@ msgstr "" "Ni mogoče shraniti datoteko zaradi:\n" "%s" -#: meld/filediff.py:2049 meld/patchdialog.py:137 +#: meld/filediff.py:2132 meld/patchdialog.py:137 #, python-format msgid "Could not save file %s." msgstr "Ni mogoče shraniti datoteke %s." -#: meld/filediff.py:2450 +#: meld/filediff.py:2542 msgid "Live comparison updating disabled" msgstr "Živo posodabljanje ob primerjavi je onemogočeno" -#: meld/filediff.py:2451 +#: meld/filediff.py:2543 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2000,6 +2059,22 @@ msgstr "" "Še vedno je mogoče ročno osvežiti primerjavo, živo posodabljanje pa bo spet " "na voljo, ko bo usklajevanje končano." +#: meld/filediff.py:2571 +msgid "Can't swap unsaved files" +msgstr "Neshranjenih datotek ni mogoče zamenjati" + +#: meld/filediff.py:2573 +msgid "Files must be saved to disk before swapping panes." +msgstr "Preden zamenjate podokna, morate datoteke shraniti na disk." + +#: meld/filediff.py:2580 +msgid "Can't swap version control comparisons" +msgstr "Ni mogoče zamenjati primerjav nadzora različic" + +#: meld/filediff.py:2582 +msgid "Swapping panes is not supported in version control mode." +msgstr "Zamenjava podoken v načinu nadzora različic ni podprta." + #: meld/iohelpers.py:41 msgid "Deleting remote folders is not supported" msgstr "Brisanje oddaljenih map ni podprto" @@ -2010,22 +2085,22 @@ msgstr "Predmet ni ne datoteka ne mapa" #: meld/iohelpers.py:47 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?" -msgstr "" +msgstr "»{}« ni mogoče postaviti v smeti. Ali ga želite takoj izbrisati?" #: meld/iohelpers.py:52 msgid "This remote location does not support sending items to the trash." -msgstr "" +msgstr "To oddaljeno mesto ne podpira pošiljanja elementov v smeti." -#: meld/iohelpers.py:57 +#: meld/iohelpers.py:58 msgid "_Delete Permanently" msgstr "_Trajno izbriši" -#: meld/iohelpers.py:107 +#: meld/iohelpers.py:110 #, python-format msgid "Replace file “%s”?" msgstr "Ali želite zamenjati datoteko »%s«?" -#: meld/iohelpers.py:109 +#: meld/iohelpers.py:112 #, python-format msgid "" "A file with this name already exists in “%s”.\n" @@ -2151,15 +2226,19 @@ msgstr "Za samodejno združevanje morajo biti navedene tri datoteke (ne %r)" msgid "Cannot compare a mixture of files and directories" msgstr "Ni mogoče sočasno primerjati datotek in map" -#: meld/misc.py:150 +#: meld/misc.py:154 msgid "" "{}\n" "\n" "Meld encountered a critical error while running:\n" "{}" msgstr "" +"{}\n" +"\n" +"Meld je med delovanjem naletel na kritično napako:\n" +"{}" -#: meld/misc.py:201 +#: meld/misc.py:205 msgid "[None]" msgstr "[noben]" @@ -2175,7 +2254,7 @@ msgstr "vzorec" msgid "Version control:" msgstr "Nadzor različic:" -#: meld/style.py:91 +#: meld/style.py:96 msgid "Couldn’t find colour scheme details for {}; this is a bad install" msgstr "" "Podrobnosti barvne sheme za {} ni mogoče najti! Namestitev je okvarjena." @@ -2257,51 +2336,51 @@ msgstr "Brez" msgid "Rev %s" msgstr "Predelava %s" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Merged" msgstr "Združeno" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Base" msgstr "Osnova" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Local" msgstr "Krajevno" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Remote" msgstr "Oddaljeno" -#: meld/vc/_vc.py:73 +#: meld/vc/_vc.py:74 msgid "Error" msgstr "Napaka" -#: meld/vc/_vc.py:75 +#: meld/vc/_vc.py:76 msgid "Newly added" msgstr "Nedavno dodano" -#: meld/vc/_vc.py:77 +#: meld/vc/_vc.py:78 msgid "Renamed" msgstr "Preimenovano" -#: meld/vc/_vc.py:78 +#: meld/vc/_vc.py:79 msgid "Conflict" msgstr "V sporu" -#: meld/vc/_vc.py:79 +#: meld/vc/_vc.py:80 msgid "Removed" msgstr "Odstranjeno" -#: meld/vc/_vc.py:80 +#: meld/vc/_vc.py:81 msgid "Missing" msgstr "Manjkajoče" -#: meld/vc/_vc.py:81 +#: meld/vc/_vc.py:82 msgid "Not present" msgstr "Ni na voljo" -#: meld/vc/_vc.py:82 +#: meld/vc/_vc.py:83 msgid "Scanning…" msgstr "Poteka preiskovanje …" @@ -2334,67 +2413,68 @@ msgstr "Ni veljavnega sistema za nadzor različic v tej mapi" msgid "Choose which version control system to use" msgstr "Izbor različice sistema za nadzor različic za uporabo" -#. TRANSLATORS: This is the location of the directory being viewed -#: meld/vcview.py:412 +#. TRANSLATORS: This is the name of the version control +#. system being used, e.g., "Git" or "Subversion" +#: meld/vcview.py:414 #, python-brace-format -msgid "Location: {path}" -msgstr "Mesto: {path}" +msgid "{vc} comparison:" +msgstr "Primerjava {vc}:" #. Initial yield so when we add this to our tasks, we don't #. create iterators that may be invalidated. -#: meld/vcview.py:419 +#: meld/vcview.py:423 msgid "Scanning repository" msgstr "Poteka preiskovanje skladišča" -#: meld/vcview.py:448 +#: meld/vcview.py:452 #, python-format msgid "Scanning %s" msgstr "Preiskovanje %s" -#: meld/vcview.py:487 +#: meld/vcview.py:491 msgid "(Empty)" msgstr "(Prazno)" -#: meld/vcview.py:535 +#: meld/vcview.py:539 #, python-format msgid "%s — local" msgstr "%s — krajevno" -#: meld/vcview.py:536 +#: meld/vcview.py:540 #, python-format msgid "%s — remote" msgstr "%s — oddaljeno" -#: meld/vcview.py:544 +#: meld/vcview.py:548 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (krajevno, združi, oddaljeno)" -#: meld/vcview.py:549 +#: meld/vcview.py:553 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (oddaljeno, združi, krajevno)" -#: meld/vcview.py:560 +#: meld/vcview.py:564 #, python-format msgid "%s — repository" msgstr "%s — skladišče" -#: meld/vcview.py:566 +#: meld/vcview.py:570 #, python-format msgid "%s (working, repository)" msgstr "%s (delovno, skladišče)" -#: meld/vcview.py:570 +#: meld/vcview.py:574 #, python-format msgid "%s (repository, working)" msgstr "%s (skladišče, delovno)" -#: meld/vcview.py:735 +#: meld/vcview.py:739 msgid "Remove folder and all its files?" msgstr "Ali želite izbrisati mapo in vse njene datoteke?" -#: meld/vcview.py:737 +#: meld/vcview.py:741 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2402,748 +2482,6 @@ msgstr "" "S tem dejanjem bodo odstranjene vse izbrane datoteke in mape in vse " "podrejene datoteke iz sistema za nadzor različic" -#: meld/vcview.py:850 +#: meld/vcview.py:854 msgid "Clear" msgstr "Počisti" - -#~ msgid "_Update" -#~ msgstr "_Posodobi" - -#~ msgid "Mar_k as Resolved" -#~ msgstr "Označi kot _razrešeno" - -#~ msgid "Update" -#~ msgstr "Posodobi" - -#~ msgid "Update working copy from version control" -#~ msgstr "Posodobi delovno kopijo preko nadzora različic" - -#~ msgid "Push" -#~ msgstr "Objavi" - -#~ msgid "Add" -#~ msgstr "Dodaj" - -#~ msgid "Remove" -#~ msgstr "Odstrani" - -#~ msgid "Mark as Resolved" -#~ msgstr "Označi kot razrešeno" - -#~ msgid "Revert" -#~ msgstr "Povrni" - -#~ msgid "Delete from working copy" -#~ msgstr "Izbriši iz delovne kopije" - -#, python-format -#~ msgid "[%s] Scanning %s" -#~ msgstr "[%s] Preiskovanje %s" - -#, python-format -#~ msgid "Ln %i, Col %i" -#~ msgstr "Vr. %i, St. %i" - -#, python-format -#~ msgid "%s in %s" -#~ msgstr "%s v %s" - -#, python-format -#~ msgid "%s: %s" -#~ msgstr "%s: %s" - -#~ msgid "Autodetect Encoding" -#~ msgstr "Samodejno zaznaj zapis" - -#~ msgid "Current Locale ({})" -#~ msgstr "Trenutne jezikovne nastavitve ({})" - -#~ msgid "Cannot import: " -#~ msgstr "Ni mogoče uvoziti:" - -#~ msgid "Meld requires %s or higher." -#~ msgstr "Program Meld zahteva najmanj različico %s." - -#~ msgid "" -#~ "Couldn’t load Meld-specific CSS (%s)\n" -#~ "%s" -#~ msgstr "" -#~ "Ni mogoče naložiti posebnega oblikovanja CSS za Meld (%s)\n" -#~ "%s" - -#~ msgid "Meld Diff Viewer" -#~ msgstr "Meld pregledovalnik različic" - -#~ msgid "Show toolbar" -#~ msgstr "Pokaži orodno vrstico" - -#, fuzzy -#~ msgid "If true, the window toolbar is visible." -#~ msgstr "Ali naj bo orodna vrstica vidna." - -#~ msgid "Show statusbar" -#~ msgstr "Pokaži vrstico stanja" - -#, fuzzy -#~ msgid "If true, the window statusbar is visible." -#~ msgstr "Vrstica stanja je vidna" - -#~ msgid "Displayed whitespace" -#~ msgstr "Vidni presledni znaki" - -#~ msgid "Meld base scheme" -#~ msgstr "Osnovna shema" - -#~ msgid "Website" -#~ msgstr "Spletišče" - -#~ msgid "_About" -#~ msgstr "_O programu" - -#~ msgid "_Quit" -#~ msgstr "_Končaj" - -#, fuzzy -#~| msgid "Remove folder and all its files?" -#~ msgid "Collapse selected folder and all subfolders" -#~ msgstr "Ali želite izbrisati mapo in vse njene datoteke?" - -#, fuzzy -#~| msgid "Remove folder and all its files?" -#~ msgid "Expand selected folder and all subfolders" -#~ msgstr "Ali želite izbrisati mapo in vse njene datoteke?" - -#~ msgid "Copy to _Left" -#~ msgstr "Kopiraj na _levo" - -#~ msgid "Copy to _Right" -#~ msgstr "Kopiraj na _desno" - -#~ msgid "Hide selected" -#~ msgstr "Skrij izbrano" - -#~ msgid "" -#~ "Consider differently-cased filenames that are otherwise-identical to be " -#~ "the same" -#~ msgstr "" -#~ "Obravnavaj datoteke, ki imajo v imenu črke različne velikosti, vendar so " -#~ "sicer enake, kot da so enake." - -#~ msgid "Show identical" -#~ msgstr "Pokaži enako" - -#~ msgid "Show new" -#~ msgstr "Pokaži novejše" - -#~ msgid "Show modified" -#~ msgstr "Pokaži spremenjeno" - -#~ msgid "Filters" -#~ msgstr "Filtri" - -#~ msgid "Set active filters" -#~ msgstr "Določi dejavne filtre" - -#~ msgid "Editable List" -#~ msgstr "Uredljiv seznam" - -#~ msgid "Create a patch using differences between files" -#~ msgstr "Ustvari popravek z razlikovanjem med datotekami" - -#~ msgid "Save all files in the current comparison" -#~ msgstr "Shrani vse datoteke trenutne primerjave" - -#~ msgid "Revert files to their saved versions" -#~ msgstr "Povrni datoteke na shranjene različice" - -#~ msgid "Previous Conflict" -#~ msgstr "Predhodni spor" - -#~ msgid "Push to Left" -#~ msgstr "Potisni levo" - -#~ msgid "Push to Right" -#~ msgstr "Potisni desno" - -#~ msgid "Pull from Left" -#~ msgstr "Potegni z leve" - -#~ msgid "Pull change from the left" -#~ msgstr "Potegni spremembe z leve" - -#~ msgid "Pull from Right" -#~ msgstr "Potegni z desne" - -#~ msgid "Pull change from the right" -#~ msgstr "Potegni spremembe z desne" - -#~ msgid "Copy Above Left" -#~ msgstr "Kopiraj nad levo" - -#~ msgid "Copy Below Left" -#~ msgstr "Kopiraj pod levo" - -#~ msgid "Copy Above Right" -#~ msgstr "Kopiraj nad desno" - -#~ msgid "Copy Below Right" -#~ msgstr "Kopiraj pod desno" - -#~ msgid "Merge all non-conflicting changes from the left" -#~ msgstr "Združi vse spremembe brez sporov z leve" - -#~ msgid "Merge all non-conflicting changes from the right" -#~ msgstr "Združi vse spremembe brez sporov z desne" - -#~ msgid "Merge all non-conflicting changes from left and right panes" -#~ msgstr "Združi vse spremembe brez sporov z leve in z desne" - -#~ msgid "Previous Pane" -#~ msgstr "Predhodno okno" - -#~ msgid "Move keyboard focus to the previous document in this comparison" -#~ msgstr "Premakne žarišče tipkovnice na naslednji dokument primerjave" - -#~ msgid "Next Pane" -#~ msgstr "Naslednje okno" - -#~ msgid "Move keyboard focus to the next document in this comparison" -#~ msgstr "Premakni dejavnost tipkovnice na naslednji dokument primerjave" - -#~ msgid "Lock scrolling of all panes" -#~ msgstr "Zakleni drsenje vseh pladnjev" - -#~ msgid "_Previous" -#~ msgstr "_Predhodni" - -#~ msgid "_Next" -#~ msgstr "_Naslednji" - -#~ msgid "Find:" -#~ msgstr "Najdi:" - -#~ msgid "Replace _with:" -#~ msgstr "Zamenjaj _z:" - -#~ msgid "Meld Preferences" -#~ msgstr "Možnosti Meld" - -#~ msgid "File comparison" -#~ msgstr "Primerjava datotek" - -#~ msgid "Directory comparison" -#~ msgstr "Primerjava vsebine map" - -#~ msgid "Version control view" -#~ msgstr "Pogled nadzora različic" - -#~ msgid "Console" -#~ msgstr "Konzola" - -#, fuzzy -#~ msgid "Show or hide the version control console output pane" -#~ msgstr "Izbor različice sistema za nadzor različic za uporabo" - -#~ msgid "_Flatten" -#~ msgstr "_Razpni" - -#~ msgid "_Modified" -#~ msgstr "_Spremenjeno" - -#~ msgid "Show modified files" -#~ msgstr "Pokaži spremenjene datoteke" - -#~ msgid "Show normal files" -#~ msgstr "Pokaži običajne datoteke" - -#~ msgid "Un_versioned" -#~ msgstr "Brez določene _različice" - -#~ msgid "Show unversioned files" -#~ msgstr "Pokaži datoteke z nedoločenimi različicami" - -#~ msgid "Show ignored files" -#~ msgstr "Pokaži prezrte datoteke" - -#~ msgid "Hide %s" -#~ msgstr "Skrij %s" - -#~ msgid "_New Comparison…" -#~ msgstr "_Nova primerjava ..." - -#~ msgid "Save the current file" -#~ msgstr "Shrani trenutno datoteko" - -#~ msgid "Save the current file with a different name" -#~ msgstr "Shrani trenutno datoteko z drugim imenom" - -#~ msgid "Close the current file" -#~ msgstr "Zapri trenutno datoteko" - -#~ msgid "_Edit" -#~ msgstr "_Uredi" - -#~ msgid "Undo the last action" -#~ msgstr "Razveljavi zadnje dejanje" - -#~ msgid "Redo the last undone action" -#~ msgstr "Obnovi zadnje razveljavljeno dejanje" - -#~ msgid "Cut the selection" -#~ msgstr "Izreži izbrano" - -#~ msgid "Copy the selection" -#~ msgstr "Kopiraj izbrano" - -#~ msgid "Paste the clipboard" -#~ msgstr "Prilepi iz odložišča" - -#~ msgid "Search for text" -#~ msgstr "Poišči besedilo" - -#~ msgid "Find Ne_xt" -#~ msgstr "Najdi _naslednje" - -#~ msgid "Search forwards for the same text" -#~ msgstr "Poišči niz naprej po besedilu" - -#~ msgid "Find _Previous" -#~ msgstr "Najdi _predhodne" - -#~ msgid "Search backwards for the same text" -#~ msgstr "Besedilo najdi nazaj po besedilu" - -#~ msgid "Find and replace text" -#~ msgstr "Poišči in zamenjaj besedilo" - -#~ msgid "Go to _Line" -#~ msgstr "Skoči v _vrstico" - -#~ msgid "_Changes" -#~ msgstr "_Spremembe" - -#~ msgid "Next Change" -#~ msgstr "Naslednja sprememba" - -#~ msgid "Previous Change" -#~ msgstr "Predhodna sprememba" - -#~ msgid "Open selected file or directory in the default external application" -#~ msgstr "Odpri zbrano datoteko ali mapo v privzetem zunanjem programu" - -#~ msgid "Stop the current action" -#~ msgstr "Ustavi trenutno dejanje" - -#~ msgid "View the comparison in fullscreen" -#~ msgstr "Pokaži primerjavo v celozaslonskem načinu" - -#~ msgid "_Toolbar" -#~ msgstr "_Orodna vrstica" - -#~ msgid "Show or hide the toolbar" -#~ msgstr "Pokaži ali skrij orodno vrstico" - -#~ msgid "Open Recent" -#~ msgstr "Odpri nedavno" - -#~ msgid "_Meld" -#~ msgstr "_Meld" - -#~ msgid "Quit the program" -#~ msgstr "Končaj program" - -#~ msgid "Prefere_nces" -#~ msgstr "Mož_nosti" - -#~ msgid "Configure the application" -#~ msgstr "Spremeni nastavitve programa" - -#~ msgid "_Contents" -#~ msgstr "_Vsebina" - -#~ msgid "Open the Meld manual" -#~ msgstr "Odpri priročnik Meld" - -#~ msgid "About this application" -#~ msgstr "O programu" - -#~ msgid "_Save as UTF-8" -#~ msgstr "_Shrani kot UTF-8" - -#, fuzzy -#~ msgid "Couldn’t encode text as “%s”" -#~ msgstr "Ni mogoče zagnati zalednega programa »%s«." - -#~ msgid "INS" -#~ msgstr "VST" - -#~ msgid "OVR" -#~ msgstr "PRE" - -#~ msgid "Error removing %s" -#~ msgstr "Napaka med odstranjevanjem %s" - -#~ msgid "Format as Patch..." -#~ msgstr "Oblikuj kot popravek ..." - -#~ msgid "Co_mmit..." -#~ msgstr "U_veljavi ..." - -#~ msgid "Find..." -#~ msgstr "Najdi ..." - -#~ msgid "_Replace..." -#~ msgstr "_Zamenjaj ..." - -#~ msgid "Meld does not support Python 3." -#~ msgstr "Program Meld ne podpira okolja Python 3." - -#~ msgid "Copy _Left" -#~ msgstr "Kopiraj _levo" - -#~ msgid "Copy _Right" -#~ msgstr "Kopiraj _desno" - -#~ msgid "" -#~ "'%s' exists.\n" -#~ "Overwrite?" -#~ msgstr "" -#~ "'%s' že obstaja.\n" -#~ "Ali naj bo prepisana?" - -#~ msgid "Add a manual point for synchronization of changes between files" -#~ msgstr "Dodaj ročno točko usklajevanja sprememb med datotekami" - -#~ msgid "Clear manual change sychronization points" -#~ msgstr "Počisti ročno spremenjene točke usklajevanja" - -#~ msgid "Cycle Through Documents" -#~ msgstr "Preklopi med dokumenti" - -#~ msgid "" -#~ "Filter '%s' changed the number of lines in the file. Comparison will be " -#~ "incorrect. See the user manual for more details." -#~ msgstr "" -#~ "Po uporabi filtra '%s' se je spremenilo število vrstic v datoteki, zato " -#~ "primerjava ne bo natančna. Za več podrobnosti si oglejte priročnik." - -#~ msgid "[%s] Set num panes" -#~ msgstr "[%s] Določi okna" - -#~ msgid "[%s] Opening files" -#~ msgstr "[%s] Odpiranje datotek" - -#~ msgid "Could not read file" -#~ msgstr "Ni mogoče prebrati datoteke" - -#~ msgid "[%s] Reading files" -#~ msgstr "[%s] Branje datotek" - -#~ msgid "%s appears to be a binary file." -#~ msgstr "%s je videti kot dvojiška datoteka." - -#~ msgid "%s is not in encodings: %s" -#~ msgstr "%s ni zapisan v naboru: %s" - -#~ msgid "" -#~ "\"%s\" exists!\n" -#~ "Overwrite?" -#~ msgstr "" -#~ "\"%s\" že obstaja!\n" -#~ "Ali naj bo datoteka prepisana?" - -#~ msgid "" -#~ "Error writing to %s\n" -#~ "\n" -#~ "%s." -#~ msgstr "" -#~ "Napaka med pisanjem na %s\n" -#~ "\n" -#~ "%s." - -#~ msgid "" -#~ "This file '%s' contains a mixture of line endings.\n" -#~ "\n" -#~ "Which format would you like to use?" -#~ msgstr "" -#~ "Datoteka '%s' vsebuje različne zaključne znake vrstic.\n" -#~ "\n" -#~ "Kateri zapis želite uporabiti?" - -#~ msgid "_Tabs" -#~ msgstr "_Zavihki" - -#~ msgid "_Previous Tab" -#~ msgstr "_Predhodni zavihek" - -#~ msgid "Activate previous tab" -#~ msgstr "Pokaži predhodni zavihek" - -#~ msgid "_Next Tab" -#~ msgstr "_Naslednji zavihek" - -#~ msgid "Activate next tab" -#~ msgstr "Pokaži naslednji zavihek" - -#~ msgid "Move Tab _Left" -#~ msgstr "Premakni zavihek _levo" - -#~ msgid "Move current tab to left" -#~ msgstr "Premakni trenutni zavihek na levo" - -#~ msgid "Move Tab _Right" -#~ msgstr "Premakni zavihek _desno" - -#~ msgid "Move current tab to right" -#~ msgstr "Premakni trenutni zavihek na desno" - -#~ msgid "Switch to this tab" -#~ msgstr "Preklopi na ta zavihek" - -#~ msgid "Regular expression error" -#~ msgstr "Napaka v logičnem izrazu" - -#~ msgid "Revision" -#~ msgstr "Predelava" - -#~ msgid "Options" -#~ msgstr "Možnosti" - -#~ msgid "%s not installed" -#~ msgstr "Program %s ni nameščen" - -#~ msgid "%s (%s)" -#~ msgstr "%s (%s)" - -#~ msgid "Ignore changes which insert or delete blank lines" -#~ msgstr "" -#~ "Prezri spremembe, s katerimi se vstavijo ali izbrišejo prazne vrstice" - -#~ msgid "%i second" -#~ msgid_plural "%i seconds" -#~ msgstr[0] "%i sekund" -#~ msgstr[1] "%i sekunda" -#~ msgstr[2] "%i sekundi" -#~ msgstr[3] "%i sekunde" - -#~ msgid "%i minute" -#~ msgid_plural "%i minutes" -#~ msgstr[0] "%i minut" -#~ msgstr[1] "%i minuta" -#~ msgstr[2] "%i minuti" -#~ msgstr[3] "%i minute" - -#~ msgid "%i hour" -#~ msgid_plural "%i hours" -#~ msgstr[0] "%i ur" -#~ msgstr[1] "%i ura" -#~ msgstr[2] "%i uri" -#~ msgstr[3] "%i ure" - -#~ msgid "%i day" -#~ msgid_plural "%i days" -#~ msgstr[0] "%i dni" -#~ msgstr[1] "%i dan" -#~ msgstr[2] "%i dni" -#~ msgstr[3] "%i dni" - -#~ msgid "%i week" -#~ msgid_plural "%i weeks" -#~ msgstr[0] "%i tednov" -#~ msgstr[1] "%i teden" -#~ msgstr[2] "%i tedna" -#~ msgstr[3] "%i tedni" - -#~ msgid "%i month" -#~ msgid_plural "%i months" -#~ msgstr[0] "%i mesecev" -#~ msgstr[1] "%i mesec" -#~ msgstr[2] "%i meseca" -#~ msgstr[3] "%i meseci" - -#~ msgid "%i year" -#~ msgid_plural "%i years" -#~ msgstr[0] "%i let" -#~ msgstr[1] "%i leto" -#~ msgstr[2] "%i leti" -#~ msgstr[3] "%i leta" - -#~ msgid "dir" -#~ msgstr "mapa" - -#~ msgid "Start a 2- or 3-way directory comparison" -#~ msgstr "Zagon z dvojno ali trojno primerjavo map" - -#~ msgid "_Statusbar" -#~ msgstr "_Vrstica stanja" - -#~ msgid "Show or hide the statusbar" -#~ msgstr "Pokaži ali skrij vrstico stanja" - -#~ msgid "" -#~ "Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:" -#~ "Missing:Not present" -#~ msgstr "" -#~ "Prezrto:Nedoločeno:::Napaka::Novo dodano:Spremenjeno:V sporu:Odstranjeno:" -#~ "Manjkajoče:Nedostopno" - -#~ msgid "http://meldmerge.org/" -#~ msgstr "http://meldmerge.org/" - -#~ msgid "Loading" -#~ msgstr "Nalaganje" - -#~ msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)" -#~ msgstr "" -#~ "Med nalaganjem naj bodo preverjeni nabori v vrsti (na primer: utf8, " -#~ "iso1250)" - -#~ msgid "Encoding" -#~ msgstr "Nabor znakov" - -#~ msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n" -#~ msgstr "Varnostne kopije\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n" - -#~ msgid "" -#~ "OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db " -#~ "Desktop.ini\n" -#~ msgstr "" -#~ "Značilni metapodatki OS\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs." -#~ "db Desktop.ini\n" - -#~ msgid "Version Control\t1\t%s\n" -#~ msgstr "Nadzor različic\t1\t%s\n" - -#~ msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n" -#~ msgstr "Binarne datoteke\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n" - -#~ msgid "Media\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}" -#~ msgstr "" -#~ "Predstavne datoteke\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf," -#~ "xpm}" - -#~ msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n" -#~ msgstr "Ključne besede CVS\t0\t\\$\\w+(:[^\\n$]+)?\\$\n" - -#~ msgid "C++ comment\t0\t//.*\n" -#~ msgstr "C++ opombe\t0\t//.*\n" - -#~ msgid "C comment\t0\t/\\*.*?\\*/\n" -#~ msgstr "C opombe\t0\t/\\*.*?\\*/\n" - -#~ msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n" -#~ msgstr "Vsi presledni znaki\t0\t[ \\t\\r\\f\\v]*\n" - -#~ msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n" -#~ msgstr "Začetni presledni znaki\t0\t^[ \\t\\r\\f\\v]*\n" - -#~ msgid "Script comment\t0\t#.*" -#~ msgstr "Opomba skripta\t0\t#.*" - -#~ msgid "" -#~ "Meld is free software: you can redistribute it and/or modify it under the " -#~ "terms of the GNU General Public License as published by the Free Software " -#~ "Foundation, either version 2 of the License, or (at your option) any " -#~ "later version.\n" -#~ "\n" -#~ "Meld is distributed in the hope that it will be useful, but WITHOUT ANY " -#~ "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " -#~ "FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " -#~ "details. \n" -#~ "\n" -#~ "You should have received a copy of the GNU General Public License along " -#~ "with this program. If not, see ." -#~ msgstr "" -#~ "Meld je prosta programska oprema; lahko jo razširjate in/ali spreminjate " -#~ "pod pogoji Splošnega javnega dovoljenja GNU (GNU General Public License), " -#~ "kot ga je objavila ustanova Free Software Foundation; bodisi različice 2 " -#~ "ali (po vaši izbiri) katerekoli poznejše različice.\n" -#~ "\n" -#~ "Program Meld se razširja v upanju, da bo uporaben, vendar BREZ VSAKRŠNEGA " -#~ "JAMSTVA; tudi brez posredne zagotovitve CENOVNE VREDNOSTI ali PRIMERNOSTI " -#~ "ZA DOLOČEN NAMEN. Za podrobnosti glejte besedilo Javnega dovoljenja GNU.\n" -#~ "\n" -#~ "Skupaj s programom bi morali prejeti izvod splošnega javnega dovoljenja " -#~ "GNU (GNU General Public License); če ga niste si oglejte spletno stran " -#~ "." - -#~ msgid "Start a comparison between file and dir/file" -#~ msgstr "Zagon primerjave med datoteko in mapo/datoteko" - -#~ msgid "D-Bus error; comparisons will open in a new window." -#~ msgstr "Napaka vodila D-Bus; primerjave se odprejo v novem oknu." - -#~ msgid "Report _Bug" -#~ msgstr "Pošlji poročilo o _hrošču" - -#~ msgid "Report a bug in Meld" -#~ msgstr "Poročilo o hrošču programa Meld" - -#~ msgid "About this program" -#~ msgstr "O programu" - -#~ msgid "Only available if you have PyGtkSourceView 2 installed" -#~ msgstr "Na voljo le, če je nameščen paket PyGtkSourceView" - -#~ msgid "_Browse..." -#~ msgstr "_Prebrskaj ..." - -#~ msgid "Path to file" -#~ msgstr "Pot do datoteke" - -#~ msgid "Pop up a file selector to choose a file" -#~ msgstr "Pokaži izbirnik za izbor datoteke" - -#~ msgid "Compare selected" -#~ msgstr "Primerjaj izbrano" - -#~ msgid "" -#~ "'%s' is a directory.\n" -#~ "Remove recursively?" -#~ msgstr "" -#~ "'%s' je mapa.\n" -#~ "Ali naj bo odstranjena vsa vsebina?" - -#~ msgid "" -#~ "Error converting to a regular expression\n" -#~ "The pattern was '%s'\n" -#~ "The error was '%s'" -#~ msgstr "" -#~ "Napaka med pretvarjanjem logičnega izraza\n" -#~ "Določen je bil vzorec '%s'\n" -#~ "Javljena napaka je '%s'" - -#~ msgid "[%s] Fetching differences" -#~ msgstr "[%s] Iskanje razlik" - -#~ msgid "[%s] Applying patch" -#~ msgstr "[%s] Pripenjanje popravka" - -#~ msgid "Patch tool not found" -#~ msgstr "Orodja za uveljavljanje popravkov ni mogoče najti" - -#~ msgid "" -#~ "Meld needs the patch tool to be installed to perform comparisons " -#~ "in %s repositories. Please install patch and try again." -#~ msgstr "" -#~ "Program Meld zahteva namestitev orodja patch za uveljavljanje " -#~ "popravkov pri izvajanju primerjav v skladiščih %s. Namestite orodje " -#~ "patch in poskusite znova." - -#~ msgid "Error fetching original comparison file" -#~ msgstr "Napaka pridobivanja izvorne datoteke za primerjavo" - -#~ msgid "" -#~ "Meld couldn't obtain the original version of your comparison file. If you " -#~ "are using the most recent version of Meld, please report a bug, including " -#~ "as many details as possible." -#~ msgstr "" -#~ "Ni mogoče pridobiti izvorne različice datoteke za primerjavo. V primeru, " -#~ "da uporabljate najnovejšo različico programa, pošljite poročilo o hrošču " -#~ "s čim več podrobnostmi." - -#~ msgid "Report a bug" -#~ msgstr "Pošlji poročilo o hrošču" - -#~ msgid "Tag" -#~ msgstr "Oznaka" diff --git a/po/sr.po b/po/sr.po index c715602..48fba3b 100644 --- a/po/sr.po +++ b/po/sr.po @@ -4,20 +4,21 @@ # Translators: # Данило Шеган # Мирослав Николић , 2011–2022. +# msgid "" msgstr "" "Project-Id-Version: meld\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2022-05-05 13:00+0000\n" -"PO-Revision-Date: 2022-06-13 06:07+0200\n" +"POT-Creation-Date: 2022-11-16 06:57+0000\n" +"PO-Revision-Date: 2022-11-20 14:39+0100\n" "Last-Translator: Мирослав Николић \n" -"Language-Team: Serbian <(nothing)>\n" +"Language-Team: Serbian <српски >\n" "Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n" -"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" "X-Project-Style: gnome\n" #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11 @@ -522,372 +523,375 @@ msgstr "Освежава поређење" #: meld/resources/gtk/help-overlay.ui:54 msgctxt "shortcut window" +msgid "Open externally" +msgstr "Отвара спољним" + +#: meld/resources/gtk/help-overlay.ui:61 +msgctxt "shortcut window" msgid "Fullscreen" msgstr "Преко целог екрана" -#: meld/resources/gtk/help-overlay.ui:61 -#| msgid "Middle and right panes" +#: meld/resources/gtk/help-overlay.ui:68 msgctxt "shortcut window" msgid "Swap left and right panes" msgstr "Размењује леву и десну површ" -#: meld/resources/gtk/help-overlay.ui:70 +#: meld/resources/gtk/help-overlay.ui:77 msgctxt "shortcut window" msgid "Panes" msgstr "Окна" -#: meld/resources/gtk/help-overlay.ui:75 +#: meld/resources/gtk/help-overlay.ui:82 msgctxt "shortcut window" msgid "Previous comparison pane" msgstr "Претходно окно поређења" -#: meld/resources/gtk/help-overlay.ui:82 +#: meld/resources/gtk/help-overlay.ui:89 msgctxt "shortcut window" msgid "Next comparison pane" msgstr "Следеће окно поређења" -#: meld/resources/gtk/help-overlay.ui:91 +#: meld/resources/gtk/help-overlay.ui:98 msgctxt "shortcut window" msgid "Changes" msgstr "Измене" -#: meld/resources/gtk/help-overlay.ui:96 +#: meld/resources/gtk/help-overlay.ui:103 msgctxt "shortcut window" msgid "Go to previous change" msgstr "Иде на претходну измену" -#: meld/resources/gtk/help-overlay.ui:103 +#: meld/resources/gtk/help-overlay.ui:110 msgctxt "shortcut window" msgid "Go to next change" msgstr "Иде на следећу измену" -#: meld/resources/gtk/help-overlay.ui:112 +#: meld/resources/gtk/help-overlay.ui:119 msgctxt "shortcut window" msgid "Tabs" msgstr "Језичци" -#: meld/resources/gtk/help-overlay.ui:117 +#: meld/resources/gtk/help-overlay.ui:124 msgctxt "shortcut window" msgid "Go to previous tab" msgstr "Иде на претходни језичак" -#: meld/resources/gtk/help-overlay.ui:124 +#: meld/resources/gtk/help-overlay.ui:131 msgctxt "shortcut window" msgid "Go to next tab" msgstr "Иде на следећи језичак" -#: meld/resources/gtk/help-overlay.ui:131 +#: meld/resources/gtk/help-overlay.ui:138 msgctxt "shortcut window" msgid "Switch to tab" msgstr "Пребацује се на језичак" -#: meld/resources/gtk/help-overlay.ui:138 +#: meld/resources/gtk/help-overlay.ui:145 msgctxt "shortcut window" msgid "Move tab left" msgstr "Премешта језичак лево" -#: meld/resources/gtk/help-overlay.ui:145 +#: meld/resources/gtk/help-overlay.ui:152 msgctxt "shortcut window" msgid "Move tab right" msgstr "Премешта језичак десно" -#: meld/resources/gtk/help-overlay.ui:154 +#: meld/resources/gtk/help-overlay.ui:161 msgctxt "shortcut window" msgid "Editing" msgstr "Уређивање" -#: meld/resources/gtk/help-overlay.ui:159 +#: meld/resources/gtk/help-overlay.ui:166 msgctxt "shortcut window" msgid "Undo" msgstr "Поништава" -#: meld/resources/gtk/help-overlay.ui:166 +#: meld/resources/gtk/help-overlay.ui:173 msgctxt "shortcut window" msgid "Redo" msgstr "Враћа" -#: meld/resources/gtk/help-overlay.ui:173 +#: meld/resources/gtk/help-overlay.ui:180 msgctxt "shortcut window" msgid "Cut" msgstr "Исеца" -#: meld/resources/gtk/help-overlay.ui:180 +#: meld/resources/gtk/help-overlay.ui:187 msgctxt "shortcut window" msgid "Copy" msgstr "Умножава" -#: meld/resources/gtk/help-overlay.ui:187 +#: meld/resources/gtk/help-overlay.ui:194 msgctxt "shortcut window" msgid "Paste" msgstr "Убацује" -#: meld/resources/gtk/help-overlay.ui:194 +#: meld/resources/gtk/help-overlay.ui:201 msgctxt "shortcut window" msgid "Find" msgstr "Налази" -#: meld/resources/gtk/help-overlay.ui:201 +#: meld/resources/gtk/help-overlay.ui:208 msgctxt "shortcut window" msgid "Find Next" msgstr "Налази следећи" -#: meld/resources/gtk/help-overlay.ui:208 +#: meld/resources/gtk/help-overlay.ui:215 msgctxt "shortcut window" msgid "Find Previous" msgstr "Налази претходно" -#: meld/resources/gtk/help-overlay.ui:215 +#: meld/resources/gtk/help-overlay.ui:222 msgctxt "shortcut window" msgid "Replace" msgstr "Замењује" -#: meld/resources/gtk/help-overlay.ui:224 +#: meld/resources/gtk/help-overlay.ui:231 msgctxt "shortcut window" msgid "File comparison" msgstr "Поређење датотека" -#: meld/resources/gtk/help-overlay.ui:229 +#: meld/resources/gtk/help-overlay.ui:236 msgctxt "shortcut window" msgid "Save current file" msgstr "Чува тренутну датотеку" -#: meld/resources/gtk/help-overlay.ui:236 +#: meld/resources/gtk/help-overlay.ui:243 msgctxt "shortcut window" msgid "Save current file to new path" msgstr "Чува тренутну датотеку на новој путањи" -#: meld/resources/gtk/help-overlay.ui:243 +#: meld/resources/gtk/help-overlay.ui:250 msgctxt "shortcut window" msgid "Save all files in comparison" msgstr "Чува све датотеке у поређењу" -#: meld/resources/gtk/help-overlay.ui:250 +#: meld/resources/gtk/help-overlay.ui:257 msgctxt "shortcut window" msgid "Previous conflict" msgstr "Претходни сукоб" -#: meld/resources/gtk/help-overlay.ui:257 +#: meld/resources/gtk/help-overlay.ui:264 msgctxt "shortcut window" msgid "Next conflict" msgstr "Следећи сукоб" -#: meld/resources/gtk/help-overlay.ui:264 +#: meld/resources/gtk/help-overlay.ui:271 msgctxt "shortcut window" msgid "Push change to left" msgstr "Гура измену улево" -#: meld/resources/gtk/help-overlay.ui:271 +#: meld/resources/gtk/help-overlay.ui:278 msgctxt "shortcut window" msgid "Push change to right" msgstr "Гура измену удесно" -#: meld/resources/gtk/help-overlay.ui:278 +#: meld/resources/gtk/help-overlay.ui:285 msgctxt "shortcut window" msgid "Pull change from left" msgstr "Вуче измену с лева" -#: meld/resources/gtk/help-overlay.ui:285 +#: meld/resources/gtk/help-overlay.ui:292 msgctxt "shortcut window" msgid "Pull change from right" msgstr "Вуче измену с десна" -#: meld/resources/gtk/help-overlay.ui:292 +#: meld/resources/gtk/help-overlay.ui:299 msgctxt "shortcut window" msgid "Copy change above left" msgstr "Умножава измену изнад леве" -#: meld/resources/gtk/help-overlay.ui:299 +#: meld/resources/gtk/help-overlay.ui:306 msgctxt "shortcut window" msgid "Copy change below left" msgstr "Умножава измену испод леве" -#: meld/resources/gtk/help-overlay.ui:306 +#: meld/resources/gtk/help-overlay.ui:313 msgctxt "shortcut window" msgid "Copy change above right" msgstr "Умножава измену изнад десне" -#: meld/resources/gtk/help-overlay.ui:313 +#: meld/resources/gtk/help-overlay.ui:320 msgctxt "shortcut window" msgid "Copy change below right" msgstr "Умножава измену испод десне" -#: meld/resources/gtk/help-overlay.ui:320 -#: meld/resources/gtk/help-overlay.ui:348 +#: meld/resources/gtk/help-overlay.ui:327 +#: meld/resources/gtk/help-overlay.ui:355 msgctxt "shortcut window" msgid "Delete change" msgstr "Брише измену" -#: meld/resources/gtk/help-overlay.ui:329 +#: meld/resources/gtk/help-overlay.ui:336 msgctxt "shortcut window" msgid "Folder comparison" msgstr "Поређење фасцикли" -#: meld/resources/gtk/help-overlay.ui:334 +#: meld/resources/gtk/help-overlay.ui:341 msgctxt "shortcut window" msgid "Copy to left" msgstr "Умножава на лево" -#: meld/resources/gtk/help-overlay.ui:341 +#: meld/resources/gtk/help-overlay.ui:348 msgctxt "shortcut window" msgid "Copy to right" msgstr "Умножава на десно" -#: meld/resources/gtk/help-overlay.ui:357 +#: meld/resources/gtk/help-overlay.ui:364 msgctxt "shortcut window" msgid "Version control comparison" msgstr "Поређење управљања издањем" -#: meld/resources/gtk/help-overlay.ui:362 +#: meld/resources/gtk/help-overlay.ui:369 msgctxt "shortcut window" msgid "Commit to version control" msgstr "Уграђује измене у управљање издањем" -#: meld/resources/gtk/help-overlay.ui:369 +#: meld/resources/gtk/help-overlay.ui:376 msgctxt "shortcut window" msgid "Show/hide console output" msgstr "Приказује/скрива излаз конзоле" #: meld/resources/gtk/menus.ui:7 -msgid "Refresh" -msgstr "Освежи" - -#: meld/resources/gtk/menus.ui:12 -msgid "Stop" -msgstr "Заустави" - -#: meld/resources/gtk/menus.ui:17 -msgid "Fullscreen" -msgstr "Преко целог екрана" - -#: meld/resources/gtk/menus.ui:26 msgid "Save As…" msgstr "Сачувај као…" -#: meld/resources/gtk/menus.ui:30 +#: meld/resources/gtk/menus.ui:11 msgid "Save A_ll" msgstr "Сачувај _све" -#: meld/resources/gtk/menus.ui:34 +#: meld/resources/gtk/menus.ui:15 msgid "Revert files…" msgstr "Поврати датотеке…" -#: meld/resources/gtk/menus.ui:38 +#: meld/resources/gtk/menus.ui:19 msgid "Open Externally" msgstr "Отвори спољним" -#: meld/resources/gtk/menus.ui:45 +#: meld/resources/gtk/menus.ui:26 +msgid "Refresh Comparison" +msgstr "Освежи поређење" + +#: meld/resources/gtk/menus.ui:33 msgid "_Find…" msgstr "_Нађи…" -#: meld/resources/gtk/menus.ui:49 +#: meld/resources/gtk/menus.ui:37 msgid "_Replace…" msgstr "_Замени…" -#: meld/resources/gtk/menus.ui:55 +#: meld/resources/gtk/menus.ui:43 msgid "View" msgstr "Преглед" -#: meld/resources/gtk/menus.ui:59 +#: meld/resources/gtk/menus.ui:47 +msgid "Fullscreen" +msgstr "Преко целог екрана" + +#: meld/resources/gtk/menus.ui:52 msgid "Overview Map" msgstr "Мапа прегледа" -#: meld/resources/gtk/menus.ui:63 +#: meld/resources/gtk/menus.ui:56 msgid "Version control console" msgstr "Конзола управљања издањем" -#: meld/resources/gtk/menus.ui:67 +#: meld/resources/gtk/menus.ui:60 msgid "Lock scrolling" msgstr "Закључај клизање" -#: meld/resources/gtk/menus.ui:74 -#| msgid "Middle and right panes" +#: meld/resources/gtk/menus.ui:67 msgid "Swap left and right panes" msgstr "Размењује леву и десну површ" -#: meld/resources/gtk/menus.ui:80 +#: meld/resources/gtk/menus.ui:73 msgid "Comparison" msgstr "Поређење" -#: meld/resources/gtk/menus.ui:84 +#: meld/resources/gtk/menus.ui:75 +msgid "Stop" +msgstr "Заустави" + +#: meld/resources/gtk/menus.ui:81 msgid "Merge All from Left" msgstr "Обједини све с лева" -#: meld/resources/gtk/menus.ui:88 +#: meld/resources/gtk/menus.ui:85 msgid "Merge All from Right" msgstr "Обједини све с десна" -#: meld/resources/gtk/menus.ui:92 +#: meld/resources/gtk/menus.ui:89 msgid "Merge All" msgstr "Стопи све" -#: meld/resources/gtk/menus.ui:99 +#: meld/resources/gtk/menus.ui:96 msgid "Format as Patch…" msgstr "Обликуј као исправку…" -#: meld/resources/gtk/menus.ui:108 +#: meld/resources/gtk/menus.ui:105 msgid "_Preferences" msgstr "_Поставке" -#: meld/resources/gtk/menus.ui:112 +#: meld/resources/gtk/menus.ui:109 msgid "Keyboard Shortcuts" msgstr "Пречице тастатуре" -#: meld/resources/gtk/menus.ui:116 +#: meld/resources/gtk/menus.ui:113 msgid "_Help" msgstr "По_моћ" -#: meld/resources/gtk/menus.ui:121 +#: meld/resources/gtk/menus.ui:118 msgid "_About Meld" msgstr "_О Мелду" -#: meld/resources/gtk/menus.ui:134 +#: meld/resources/gtk/menus.ui:131 msgid "File status" msgstr "Стање датотеке" -#: meld/resources/gtk/menus.ui:136 +#: meld/resources/gtk/menus.ui:133 msgid "Same" msgstr "Исто" -#: meld/resources/gtk/menus.ui:140 +#: meld/resources/gtk/menus.ui:137 msgid "New" msgstr "Нови" -#: meld/resources/gtk/menus.ui:144 meld/resources/gtk/menus.ui:167 -#: meld/vc/_vc.py:76 +#: meld/resources/gtk/menus.ui:141 meld/resources/gtk/menus.ui:164 +#: meld/vc/_vc.py:77 msgid "Modified" msgstr "Измењени" -#: meld/resources/gtk/menus.ui:154 +#: meld/resources/gtk/menus.ui:151 msgid "Ignore filename case" msgstr "Занемари величину слова назива датотеке" -#: meld/resources/gtk/menus.ui:158 +#: meld/resources/gtk/menus.ui:155 msgid "Normalize Unicode paths" msgstr "Нормализуј Јуникод путање" -#: meld/resources/gtk/menus.ui:171 +#: meld/resources/gtk/menus.ui:168 msgid "Normal" msgstr "Обично" -#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70 +#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:71 msgid "Unversioned" msgstr "Необрађено" -#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69 +#: meld/resources/gtk/menus.ui:176 meld/vc/_vc.py:70 msgid "Ignored" msgstr "Занемарене" -#: meld/resources/gtk/menus.ui:186 +#: meld/resources/gtk/menus.ui:183 msgid "Flatten folders" msgstr "Поравнате фасцикле" #: meld/resources/ui/about-dialog.ui:8 msgid "" "Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2021 Kai Willadsen" +"Copyright © 2009-2022 Kai Willadsen" msgstr "" "Ауторска права © 2002-2009 Стефен Кенеди\n" -"Ауторска права © 2009-2021 Кај Виладсен" +"Ауторска права © 2009-2022 Кај Виладсен" #: meld/resources/ui/about-dialog.ui:14 msgid "translator-credits" @@ -942,7 +946,7 @@ msgid "Column Name" msgstr "Назив колоне" #: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128 -#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:741 +#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:745 msgid "_Remove" msgstr "_Уклони" @@ -1663,11 +1667,11 @@ msgstr "Посебно" msgid "Console output" msgstr "Излаз конзоле" -#: meld/actiongutter.py:247 +#: meld/actiongutter.py:254 msgid "Copy _up" msgstr "Умножи _горе" -#: meld/actiongutter.py:248 +#: meld/actiongutter.py:255 msgid "Copy _down" msgstr "Умножи _доле" @@ -1746,12 +1750,12 @@ msgstr "Филтери датотека су у употреби, тако да msgid "Text filters are in use and may be masking content differences." msgstr "Филтери текста су у употреби и можда су замаскирали разлике садржаја." -#: meld/dirdiff.py:1145 meld/filediff.py:1983 +#: meld/dirdiff.py:1145 meld/filediff.py:1997 msgid "Hide" msgstr "Сакриј" -#: meld/dirdiff.py:1147 meld/filediff.py:1985 meld/filediff.py:2015 -#: meld/filediff.py:2017 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 +#: meld/dirdiff.py:1147 meld/filediff.py:1999 meld/filediff.py:2029 +#: meld/filediff.py:2031 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 msgid "Hi_de" msgstr "_Сакриј" @@ -1817,7 +1821,7 @@ msgstr "" "\n" "{error}" -#: meld/dirdiff.py:1277 meld/vcview.py:764 +#: meld/dirdiff.py:1277 meld/vcview.py:768 msgid "Error deleting {}" msgstr "Грешка брисања {}" @@ -1825,11 +1829,15 @@ msgstr "Грешка брисања {}" msgid "No folder" msgstr "Нема фасцикле" -#: meld/filediff.py:1158 +#: meld/dirdiff.py:1838 +msgid "Folder comparison:" +msgstr "Поређење фасцикли:" + +#: meld/filediff.py:1168 msgid "Comparison results will be inaccurate" msgstr "Резултати поређења биће нетачни" -#: meld/filediff.py:1160 +#: meld/filediff.py:1170 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1837,96 +1845,97 @@ msgstr "" "Филтер је изменио број редова у датотеци, а то није подржано. Поређење неће " "бити тачно." -#: meld/filediff.py:1232 +#: meld/filediff.py:1242 msgid "Mark conflict as resolved?" msgstr "Да означим сукоб решеним?" -#: meld/filediff.py:1234 +#: meld/filediff.py:1244 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "Ако је сукоб успешно решен, сада га можете означити решеним." -#: meld/filediff.py:1237 +#: meld/filediff.py:1247 msgid "Cancel" msgstr "Откажи" -#: meld/filediff.py:1238 +#: meld/filediff.py:1248 msgid "Mark _Resolved" msgstr "Означи _решеним" -#: meld/filediff.py:1429 meld/filediff.py:1445 +#: meld/filediff.py:1439 meld/filediff.py:1455 msgid "Add Synchronization Point" msgstr "Додај тачку усклађивања" -#: meld/filediff.py:1433 -#| msgid "Add Synchronization Point" +#: meld/filediff.py:1443 msgid "Remove Synchronization Point" msgstr "У тачку усклађивања" -#: meld/filediff.py:1437 -#| msgid "Add Synchronization Point" +#: meld/filediff.py:1447 msgid "Move Synchronization Point" msgstr "П тачку усклађивања" -#: meld/filediff.py:1441 -#| msgid "Add Synchronization Point" +#: meld/filediff.py:1451 msgid "Match Synchronization Point" msgstr "П тачку усклађивања" -#: meld/filediff.py:1465 +#: meld/filediff.py:1475 msgid "Clear Synchronization Points" msgstr "Очисти тачке усклађивања" -#: meld/filediff.py:1657 +#: meld/filediff.py:1535 +msgid "File comparison:" +msgstr "Поређење датотека:" + +#: meld/filediff.py:1671 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Дошло је до проблема отварања датотеке „%s“." -#: meld/filediff.py:1666 +#: meld/filediff.py:1680 #, python-format msgid "File %s appears to be a binary file." msgstr "Изгледа да је „%s“ извршна датотека." -#: meld/filediff.py:1668 +#: meld/filediff.py:1682 msgid "Do you want to open the file using the default application?" msgstr "Да ли желите да отворите датотеку користећи основни програм?" -#: meld/filediff.py:1670 +#: meld/filediff.py:1684 msgid "Open" msgstr "Отвори" -#: meld/filediff.py:1692 +#: meld/filediff.py:1706 #, python-format msgid "[%s] Merging files" msgstr "Обједињујем датотеке [%s]" -#: meld/filediff.py:1706 +#: meld/filediff.py:1720 #, python-format msgid "[%s] Computing differences" msgstr "Срачунавам разлике [%s]" -#: meld/filediff.py:1766 +#: meld/filediff.py:1780 #, python-format msgid "File %s has changed on disk" msgstr "Датотека „%s“ је измењена на диску" -#: meld/filediff.py:1767 +#: meld/filediff.py:1781 msgid "Do you want to reload the file?" msgstr "Да ли желите поново да учитате датотеку?" -#: meld/filediff.py:1769 +#: meld/filediff.py:1783 msgid "_Reload" msgstr "_Учитај поново" -#: meld/filediff.py:1939 +#: meld/filediff.py:1953 msgid "File {} is being compared to itself" msgstr "Датотека „{}“ је упоређена са самом собом" -#: meld/filediff.py:1948 +#: meld/filediff.py:1962 msgid "Files are identical" msgstr "Датотеке су истоветне" -#: meld/filediff.py:1961 +#: meld/filediff.py:1975 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1934,11 +1943,11 @@ msgstr "" "Коришћени су филтери текста, а могу постојати и замаскиране разлике између " "датотека. Да ли желите да поредите неиздвојене датотеке?" -#: meld/filediff.py:1966 +#: meld/filediff.py:1980 msgid "Files differ in line endings only" msgstr "Датотеке се разликују само по завршецима редова" -#: meld/filediff.py:1968 +#: meld/filediff.py:1982 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1947,15 +1956,15 @@ msgstr "" "Датотеке су истоветне али се разликују само по завршецима редова:\n" "%s" -#: meld/filediff.py:1988 +#: meld/filediff.py:2002 msgid "Show without filters" msgstr "Приказује без филтера" -#: meld/filediff.py:2010 +#: meld/filediff.py:2024 msgid "Change highlighting incomplete" msgstr "Истицање измена није довршено" -#: meld/filediff.py:2011 +#: meld/filediff.py:2025 msgid "" "Some changes were not highlighted because they were too large. You can force " "Meld to take longer to highlight larger changes, though this may be slow." @@ -1963,19 +1972,19 @@ msgstr "" "Неке измене нису истакнуте зато што су превелике. Можете да приморате Мелд " "да продужи са истицањем већих измена, иако то може бити споро." -#: meld/filediff.py:2019 +#: meld/filediff.py:2033 msgid "Keep highlighting" msgstr "Задржите истицање" -#: meld/filediff.py:2021 +#: meld/filediff.py:2035 msgid "_Keep highlighting" msgstr "_Задржи истицање" -#: meld/filediff.py:2034 +#: meld/filediff.py:2048 msgid "Saving failed" msgstr "Чување није успело" -#: meld/filediff.py:2035 +#: meld/filediff.py:2049 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." @@ -1983,36 +1992,36 @@ msgstr "" "Размотрите умножавање свих ризичних измена у други програм или датотеку да " "избегнете губитак података." -#: meld/filediff.py:2044 +#: meld/filediff.py:2058 msgid "Save Left Pane As" msgstr "Сачувај леву површ као" -#: meld/filediff.py:2046 +#: meld/filediff.py:2060 msgid "Save Middle Pane As" msgstr "Сачувај средњу површ као" -#: meld/filediff.py:2048 +#: meld/filediff.py:2062 msgid "Save Right Pane As" msgstr "Сачувај десну површ као" -#: meld/filediff.py:2059 +#: meld/filediff.py:2073 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "Датотека „%s“ је измењена на диску након отварања" -#: meld/filediff.py:2061 +#: meld/filediff.py:2075 msgid "If you save it, any external changes will be lost." msgstr "Ако је сачувате, све спољне измене ће бити изгубљене." -#: meld/filediff.py:2064 +#: meld/filediff.py:2078 msgid "Save Anyway" msgstr "Ипак сачувај" -#: meld/filediff.py:2065 +#: meld/filediff.py:2079 msgid "Don’t Save" msgstr "Немој чувати" -#: meld/filediff.py:2107 +#: meld/filediff.py:2121 msgid "" "File “{}” contains characters that can’t be encoded using its current " "encoding “{}”." @@ -2020,7 +2029,7 @@ msgstr "" "Датотека „{}“ садржи знакове који се не могу кодирати употребом њеног " "тренутног кодирања „{}“." -#: meld/filediff.py:2111 meld/patchdialog.py:138 +#: meld/filediff.py:2125 meld/patchdialog.py:138 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -2029,16 +2038,16 @@ msgstr "" "Не могу да сачувам датотеку због следећег:\n" "%s" -#: meld/filediff.py:2115 meld/patchdialog.py:137 +#: meld/filediff.py:2129 meld/patchdialog.py:137 #, python-format msgid "Could not save file %s." msgstr "Не могу да сачувам датотеку „%s“." -#: meld/filediff.py:2525 +#: meld/filediff.py:2539 msgid "Live comparison updating disabled" msgstr "Искључено је живо ажурирање поређења" -#: meld/filediff.py:2526 +#: meld/filediff.py:2540 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2048,6 +2057,24 @@ msgstr "" "увек можете ручно да освежите поређење, а жива ажурирања ће наставити са " "радом након чишћења тачака усклађивања." +#: meld/filediff.py:2568 +msgid "Can't swap unsaved files" +msgstr "Не могу да заменим несачуване датотеке" + +#: meld/filediff.py:2570 +msgid "Files must be saved to disk before swapping panes." +msgstr "Датотеке се морају сачувати на диск пре замене окана." + +#: meld/filediff.py:2577 +#| msgid "Start a version control comparison" +msgid "Can't swap version control comparisons" +msgstr "Не могу да заменим поређења контроле верзије" + +#: meld/filediff.py:2579 +#| msgid "Mark as resolved in version control" +msgid "Swapping panes is not supported in version control mode." +msgstr "Размена окана није подржана у режиму управљања издањем." + #: meld/iohelpers.py:41 msgid "Deleting remote folders is not supported" msgstr "Брисање удаљених фасцикли није подржано" @@ -2310,51 +2337,51 @@ msgstr "Ништа" msgid "Rev %s" msgstr "Рев %s" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Merged" msgstr "Стопљено" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Base" msgstr "Основа" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Local" msgstr "Месно" -#: meld/vc/_vc.py:54 +#: meld/vc/_vc.py:55 msgid "Remote" msgstr "Удаљено" -#: meld/vc/_vc.py:73 +#: meld/vc/_vc.py:74 msgid "Error" msgstr "Грeшкa" -#: meld/vc/_vc.py:75 +#: meld/vc/_vc.py:76 msgid "Newly added" msgstr "Ново додата" -#: meld/vc/_vc.py:77 +#: meld/vc/_vc.py:78 msgid "Renamed" msgstr "Преименована" -#: meld/vc/_vc.py:78 +#: meld/vc/_vc.py:79 msgid "Conflict" msgstr "Сукоб" -#: meld/vc/_vc.py:79 +#: meld/vc/_vc.py:80 msgid "Removed" msgstr "Уклоњено" -#: meld/vc/_vc.py:80 +#: meld/vc/_vc.py:81 msgid "Missing" msgstr "Недостаје" -#: meld/vc/_vc.py:81 +#: meld/vc/_vc.py:82 msgid "Not present" msgstr "Није присутно" -#: meld/vc/_vc.py:82 +#: meld/vc/_vc.py:83 msgid "Scanning…" msgstr "Прегледам…" @@ -2387,67 +2414,68 @@ msgstr "У овој фасцикли није пронађен исправан msgid "Choose which version control system to use" msgstr "Изаберите који систем управљања издањем ће бити коришћен" -#. TRANSLATORS: This is the location of the directory being viewed -#: meld/vcview.py:412 +#. TRANSLATORS: This is the name of the version control +#. system being used, e.g., "Git" or "Subversion" +#: meld/vcview.py:414 #, python-brace-format -msgid "Location: {path}" -msgstr "Путања: {path}" +msgid "{vc} comparison:" +msgstr "„{vc}“ поређење:" #. Initial yield so when we add this to our tasks, we don't #. create iterators that may be invalidated. -#: meld/vcview.py:419 +#: meld/vcview.py:423 msgid "Scanning repository" msgstr "Прегледам ризницу" -#: meld/vcview.py:448 +#: meld/vcview.py:452 #, python-format msgid "Scanning %s" msgstr "Прегледам „%s“" -#: meld/vcview.py:487 +#: meld/vcview.py:491 msgid "(Empty)" msgstr "(Празно)" -#: meld/vcview.py:535 +#: meld/vcview.py:539 #, python-format msgid "%s — local" msgstr "%s — месна" -#: meld/vcview.py:536 +#: meld/vcview.py:540 #, python-format msgid "%s — remote" msgstr "%s — удаљена" -#: meld/vcview.py:544 +#: meld/vcview.py:548 #, python-format msgid "%s (local, merge, remote)" msgstr "%s (месна, спојена, удаљена)" -#: meld/vcview.py:549 +#: meld/vcview.py:553 #, python-format msgid "%s (remote, merge, local)" msgstr "%s (удаљена, спојена, месна)" -#: meld/vcview.py:560 +#: meld/vcview.py:564 #, python-format msgid "%s — repository" msgstr "%s — ризница" -#: meld/vcview.py:566 +#: meld/vcview.py:570 #, python-format msgid "%s (working, repository)" msgstr "%s (радна, ризница)" -#: meld/vcview.py:570 +#: meld/vcview.py:574 #, python-format msgid "%s (repository, working)" msgstr "%s (ризница, радна)" -#: meld/vcview.py:735 +#: meld/vcview.py:739 msgid "Remove folder and all its files?" msgstr "Да уклоним фасциклу и све њене датотеке?" -#: meld/vcview.py:737 +#: meld/vcview.py:741 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." @@ -2455,10 +2483,16 @@ msgstr "" "Ово ће уклонити све изабране датотеке и фасцикле, и све датотеке унутар свих " "изабраних фасцикли, из управљања издањем." -#: meld/vcview.py:850 +#: meld/vcview.py:854 msgid "Clear" msgstr "Очисти" +#~ msgid "Refresh" +#~ msgstr "Освежи" + +#~ msgid "Location: {path}" +#~ msgstr "Путања: {path}" + #~ msgid "_Update" #~ msgstr "_Ажурирај" @@ -2682,9 +2716,6 @@ msgstr "Очисти" #~ msgid "Meld Preferences" #~ msgstr "Поставке Мелда" -#~ msgid "File comparison" -#~ msgstr "Поређење датотека" - #~ msgid "Directory comparison" #~ msgstr "Поређење фасцикли" diff --git a/po/sv.po b/po/sv.po index 4aa4a0f..0049378 100644 --- a/po/sv.po +++ b/po/sv.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: meld\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2022-08-12 00:04+0000\n" -"PO-Revision-Date: 2022-08-12 07:03+0200\n" +"POT-Creation-Date: 2022-10-31 11:15+0000\n" +"PO-Revision-Date: 2022-10-31 16:17+0100\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -888,10 +888,10 @@ msgstr "Platta till mappar" #: meld/resources/ui/about-dialog.ui:8 msgid "" "Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2021 Kai Willadsen" +"Copyright © 2009-2022 Kai Willadsen" msgstr "" "Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2021 Kai Willadsen" +"Copyright © 2009-2022 Kai Willadsen" #: meld/resources/ui/about-dialog.ui:14 msgid "translator-credits" @@ -1753,12 +1753,12 @@ msgstr "Filfilter används, och därför har inte alla filer genomsökts." msgid "Text filters are in use and may be masking content differences." msgstr "Textfilter används och kan dölja skillnader i innehåll." -#: meld/dirdiff.py:1145 meld/filediff.py:1989 +#: meld/dirdiff.py:1145 meld/filediff.py:1997 msgid "Hide" msgstr "Dölj" -#: meld/dirdiff.py:1147 meld/filediff.py:1991 meld/filediff.py:2021 -#: meld/filediff.py:2023 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 +#: meld/dirdiff.py:1147 meld/filediff.py:1999 meld/filediff.py:2029 +#: meld/filediff.py:2031 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 msgid "Hi_de" msgstr "_Dölj" @@ -1836,11 +1836,11 @@ msgstr "Ingen mapp" msgid "Folder comparison:" msgstr "Mappjämförelse:" -#: meld/filediff.py:1162 +#: meld/filediff.py:1168 msgid "Comparison results will be inaccurate" msgstr "Jämförelseresultat kommer att bli osäkra" -#: meld/filediff.py:1164 +#: meld/filediff.py:1170 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1848,97 +1848,97 @@ msgstr "" "Ett filter ändrade antalet rader i filen vilket inte stöds. Jämförelsen " "kommer att vara osäker." -#: meld/filediff.py:1236 +#: meld/filediff.py:1242 msgid "Mark conflict as resolved?" msgstr "Markera konflikten som löst?" -#: meld/filediff.py:1238 +#: meld/filediff.py:1244 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "Om konflikten gick att lösa kan du markera den som löst nu." -#: meld/filediff.py:1241 +#: meld/filediff.py:1247 msgid "Cancel" msgstr "Avbryt" -#: meld/filediff.py:1242 +#: meld/filediff.py:1248 msgid "Mark _Resolved" msgstr "Markera som _löst" -#: meld/filediff.py:1433 meld/filediff.py:1449 +#: meld/filediff.py:1439 meld/filediff.py:1455 msgid "Add Synchronization Point" msgstr "Lägg till synkroniseringspunkt" -#: meld/filediff.py:1437 +#: meld/filediff.py:1443 msgid "Remove Synchronization Point" msgstr "Ta bort synkroniseringspunkt" -#: meld/filediff.py:1441 +#: meld/filediff.py:1447 msgid "Move Synchronization Point" msgstr "Flytta synkroniseringspunkt" -#: meld/filediff.py:1445 +#: meld/filediff.py:1451 msgid "Match Synchronization Point" msgstr "Matcha synkroniseringspunkt" -#: meld/filediff.py:1469 +#: meld/filediff.py:1475 msgid "Clear Synchronization Points" msgstr "Rensa synkroniseringspunkter" -#: meld/filediff.py:1529 +#: meld/filediff.py:1535 msgid "File comparison:" msgstr "Filjämförelse:" -#: meld/filediff.py:1663 +#: meld/filediff.py:1671 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Det uppstod ett problem vid öppnandet av filen ”%s”." -#: meld/filediff.py:1672 +#: meld/filediff.py:1680 #, python-format msgid "File %s appears to be a binary file." msgstr "Filen %s verkar vara en binärfil." -#: meld/filediff.py:1674 +#: meld/filediff.py:1682 msgid "Do you want to open the file using the default application?" msgstr "Vill du öppna filen med standardprogrammet?" -#: meld/filediff.py:1676 +#: meld/filediff.py:1684 msgid "Open" msgstr "Öppna" -#: meld/filediff.py:1698 +#: meld/filediff.py:1706 #, python-format msgid "[%s] Merging files" msgstr "[%s] Sammanfogar filer" -#: meld/filediff.py:1712 +#: meld/filediff.py:1720 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Beräknar skillnader" -#: meld/filediff.py:1772 +#: meld/filediff.py:1780 #, python-format msgid "File %s has changed on disk" msgstr "Filen %s har ändrats på disk" -#: meld/filediff.py:1773 +#: meld/filediff.py:1781 msgid "Do you want to reload the file?" msgstr "Vill du läsa om filen?" -#: meld/filediff.py:1775 +#: meld/filediff.py:1783 msgid "_Reload" msgstr "_Läs om" -#: meld/filediff.py:1945 +#: meld/filediff.py:1953 msgid "File {} is being compared to itself" msgstr "Filen {} jämförs med sig själv" -#: meld/filediff.py:1954 +#: meld/filediff.py:1962 msgid "Files are identical" msgstr "Filerna är identiska" -#: meld/filediff.py:1967 +#: meld/filediff.py:1975 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1946,11 +1946,11 @@ msgstr "" "Textfilter används och kan dölja skillnader mellan filer. Vill du jämföra de " "ofiltrerade filerna?" -#: meld/filediff.py:1972 +#: meld/filediff.py:1980 msgid "Files differ in line endings only" msgstr "Filer skiljer sig endast vad gäller radslut" -#: meld/filediff.py:1974 +#: meld/filediff.py:1982 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1959,15 +1959,15 @@ msgstr "" "Filerna är identiska förutom radavsluten:\n" "%s" -#: meld/filediff.py:1994 +#: meld/filediff.py:2002 msgid "Show without filters" msgstr "Visa utan filer" -#: meld/filediff.py:2016 +#: meld/filediff.py:2024 msgid "Change highlighting incomplete" msgstr "Ändra markering av ofärdiga" -#: meld/filediff.py:2017 +#: meld/filediff.py:2025 msgid "" "Some changes were not highlighted because they were too large. You can force " "Meld to take longer to highlight larger changes, though this may be slow." @@ -1976,19 +1976,19 @@ msgstr "" "Meld till att längre tid på sig att markera större ändringar, men det kan " "bli långsamt." -#: meld/filediff.py:2025 +#: meld/filediff.py:2033 msgid "Keep highlighting" msgstr "Använd markering" -#: meld/filediff.py:2027 +#: meld/filediff.py:2035 msgid "_Keep highlighting" msgstr "_Använd markering" -#: meld/filediff.py:2040 +#: meld/filediff.py:2048 msgid "Saving failed" msgstr "Misslyckades med att spara" -#: meld/filediff.py:2041 +#: meld/filediff.py:2049 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." @@ -1996,36 +1996,36 @@ msgstr "" "Överväg att kopiera kritiska ändringar till ett annat program eller en annan " "fil för att undvika förlust av data." -#: meld/filediff.py:2050 +#: meld/filediff.py:2058 msgid "Save Left Pane As" msgstr "Spara vänsterpanel som" -#: meld/filediff.py:2052 +#: meld/filediff.py:2060 msgid "Save Middle Pane As" msgstr "Spara mittenpanel som" -#: meld/filediff.py:2054 +#: meld/filediff.py:2062 msgid "Save Right Pane As" msgstr "Spara högerpanel som" -#: meld/filediff.py:2065 +#: meld/filediff.py:2073 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "Filen %s har ändrats på disk sedan den öppnades" -#: meld/filediff.py:2067 +#: meld/filediff.py:2075 msgid "If you save it, any external changes will be lost." msgstr "Om du sparar den kommer alla externa ändringar att gå förlorade." -#: meld/filediff.py:2070 +#: meld/filediff.py:2078 msgid "Save Anyway" msgstr "Spara ändå" -#: meld/filediff.py:2071 +#: meld/filediff.py:2079 msgid "Don’t Save" msgstr "Spara inte" -#: meld/filediff.py:2113 +#: meld/filediff.py:2121 msgid "" "File “{}” contains characters that can’t be encoded using its current " "encoding “{}”." @@ -2033,7 +2033,7 @@ msgstr "" "Filen ”{}” innehåller tecken som inte kan kodas med dess aktuella kodning " "”{}”." -#: meld/filediff.py:2117 meld/patchdialog.py:138 +#: meld/filediff.py:2125 meld/patchdialog.py:138 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -2042,16 +2042,16 @@ msgstr "" "Kunde in spara fil beroende på:\n" "%s" -#: meld/filediff.py:2121 meld/patchdialog.py:137 +#: meld/filediff.py:2129 meld/patchdialog.py:137 #, python-format msgid "Could not save file %s." msgstr "Kunde inte spara filen %s." -#: meld/filediff.py:2531 +#: meld/filediff.py:2539 msgid "Live comparison updating disabled" msgstr "Inaktivera realtidsuppdateringar av jämförelser" -#: meld/filediff.py:2532 +#: meld/filediff.py:2540 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2062,6 +2062,22 @@ msgstr "" "manuellt, och uppdateringar i realtid kommer att fortsätta när " "synkroniseringspunkterna är rensade." +#: meld/filediff.py:2568 +msgid "Can't swap unsaved files" +msgstr "Kan inte växla osparade filer" + +#: meld/filediff.py:2570 +msgid "Files must be saved to disk before swapping panes." +msgstr "Filer måste sparas till disk innan paneler växlas." + +#: meld/filediff.py:2577 +msgid "Can't swap version control comparisons" +msgstr "Kan inte växla versionshanterade jämförelser" + +#: meld/filediff.py:2579 +msgid "Swapping panes is not supported in version control mode." +msgstr "Växlande av paneler stöds inte i versionshanteringsläge." + #: meld/iohelpers.py:41 msgid "Deleting remote folders is not supported" msgstr "Att ta bort fjärrmappar stöds ej" diff --git a/po/tr.po b/po/tr.po index f2a6cd4..5464c5b 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: meld master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2022-08-12 00:04+0000\n" -"PO-Revision-Date: 2022-08-21 21:15+0300\n" +"POT-Creation-Date: 2022-09-04 02:49+0000\n" +"PO-Revision-Date: 2022-09-04 12:54+0300\n" "Last-Translator: Emin Tufan Çetin \n" "Language-Team: Turkish \n" "Language: tr\n" @@ -22,12 +22,6 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 3.0.1\n" -"X-POOTLE-MTIME: 1428188634.000000\n" -"X-DL-Team: tr\n" -"X-DL-Module: meld\n" -"X-DL-Branch: master\n" -"X-DL-Domain: po\n" -"X-DL-State: Translating\n" #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11 #: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17 @@ -903,10 +897,10 @@ msgstr "Klasörleri düzleştir" #: meld/resources/ui/about-dialog.ui:8 msgid "" "Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2021 Kai Willadsen" +"Copyright © 2009-2022 Kai Willadsen" msgstr "" "Telif Hakkı © 2002-2009 Stephen Kennedy\n" -"Telif Hakkı © 2009-2021 Kai Willadsen" +"Telif Hakkı © 2009-2022 Kai Willadsen" # Header bilgileriyle eşitlemeyi ihmal etmeyin. #: meld/resources/ui/about-dialog.ui:14 @@ -1767,12 +1761,12 @@ msgstr "Dosya süzgeçleri kullanımda, bu yüzden tüm dosyalar taranamamış." msgid "Text filters are in use and may be masking content differences." msgstr "Metin süzgeçleri kullanımda ve içerik farklılıklarını maskeleyebilir." -#: meld/dirdiff.py:1145 meld/filediff.py:1989 +#: meld/dirdiff.py:1145 meld/filediff.py:1997 msgid "Hide" msgstr "Gizle" -#: meld/dirdiff.py:1147 meld/filediff.py:1991 meld/filediff.py:2021 -#: meld/filediff.py:2023 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 +#: meld/dirdiff.py:1147 meld/filediff.py:1999 meld/filediff.py:2029 +#: meld/filediff.py:2031 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 msgid "Hi_de" msgstr "Gi_zle" @@ -1850,11 +1844,11 @@ msgstr "Klasör yok" msgid "Folder comparison:" msgstr "Klasör karşılaştırma:" -#: meld/filediff.py:1162 +#: meld/filediff.py:1168 msgid "Comparison results will be inaccurate" msgstr "Karşılaştırma sonuçları hatalı olacak" -#: meld/filediff.py:1164 +#: meld/filediff.py:1170 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1862,99 +1856,99 @@ msgstr "" "Bir süzgeç dosyadaki satır numaralarını desteklenmeyen biçimde değiştirdi. " "Karşılaştırma doğru olmayacaktır." -#: meld/filediff.py:1236 +#: meld/filediff.py:1242 msgid "Mark conflict as resolved?" msgstr "Çakışma çözüldü olarak işaretlensin mi?" -#: meld/filediff.py:1238 +#: meld/filediff.py:1244 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "" "Eğer çakışma başarıyla çözüldüyse, o zaman çözüldü olarak " "işaretleyebilirsiniz." -#: meld/filediff.py:1241 +#: meld/filediff.py:1247 msgid "Cancel" msgstr "İptal Et" -#: meld/filediff.py:1242 +#: meld/filediff.py:1248 msgid "Mark _Resolved" msgstr "_Çözümlendi olarak işaretle" -#: meld/filediff.py:1433 meld/filediff.py:1449 +#: meld/filediff.py:1439 meld/filediff.py:1455 msgid "Add Synchronization Point" msgstr "Eşzamanlama Noktası Ekle" -#: meld/filediff.py:1437 +#: meld/filediff.py:1443 msgid "Remove Synchronization Point" msgstr "Eşzamanlama Noktasını Kaldır" -#: meld/filediff.py:1441 +#: meld/filediff.py:1447 msgid "Move Synchronization Point" msgstr "Eşzamanlama Noktasını Taşı" -#: meld/filediff.py:1445 +#: meld/filediff.py:1451 msgid "Match Synchronization Point" msgstr "Eşzamanlama Noktasını Eşleştir" -#: meld/filediff.py:1469 +#: meld/filediff.py:1475 msgid "Clear Synchronization Points" msgstr "Eşzamanlama Noktalarını Temizle" -#: meld/filediff.py:1529 +#: meld/filediff.py:1535 msgid "File comparison:" msgstr "Dosya karşılaştırma:" -#: meld/filediff.py:1663 +#: meld/filediff.py:1671 #, python-format msgid "There was a problem opening the file “%s”." msgstr "“%s” dosyası açılırken sorun var." -#: meld/filediff.py:1672 +#: meld/filediff.py:1680 #, python-format msgid "File %s appears to be a binary file." msgstr "%s dosyası ikili dosya olarak görünüyor." -#: meld/filediff.py:1674 +#: meld/filediff.py:1682 msgid "Do you want to open the file using the default application?" msgstr "Dosyayı öntanımlı uygulamayı kullanarak açmak istiyor musunuz?" -#: meld/filediff.py:1676 +#: meld/filediff.py:1684 msgid "Open" msgstr "Aç" -#: meld/filediff.py:1698 +#: meld/filediff.py:1706 #, python-format msgid "[%s] Merging files" msgstr "[%s] Dosyalar birleştiriliyor" -#: meld/filediff.py:1712 +#: meld/filediff.py:1720 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Farklılıklar hesaplanıyor" -#: meld/filediff.py:1772 +#: meld/filediff.py:1780 #, python-format msgid "File %s has changed on disk" msgstr "Disk üzerindeki %s dosyası değiştirildi" -#: meld/filediff.py:1773 +#: meld/filediff.py:1781 msgid "Do you want to reload the file?" msgstr "Dosyayı yeniden yüklemek istiyor musunuz?" -#: meld/filediff.py:1775 +#: meld/filediff.py:1783 msgid "_Reload" msgstr "_Yeniden yükle" -#: meld/filediff.py:1945 +#: meld/filediff.py:1953 msgid "File {} is being compared to itself" msgstr "{} dosyası kendiyle karşılaştırılıyor" -#: meld/filediff.py:1954 +#: meld/filediff.py:1962 msgid "Files are identical" msgstr "Dosyalar özdeş" -#: meld/filediff.py:1967 +#: meld/filediff.py:1975 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1962,11 +1956,11 @@ msgstr "" "Metin süzgeçleri kullanılmakta ve dosyalar arasındaki farklılıkları " "maskeliyor olabilir. Süzülmemiş dosyaları karşılaştırmak ister misiniz?" -#: meld/filediff.py:1972 +#: meld/filediff.py:1980 msgid "Files differ in line endings only" msgstr "Dosyalar yalnızca satır sonlarında farklılaşıyor" -#: meld/filediff.py:1974 +#: meld/filediff.py:1982 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1975,15 +1969,15 @@ msgstr "" "Dosyalar satır sonları dışında özdeş:\n" "%s" -#: meld/filediff.py:1994 +#: meld/filediff.py:2002 msgid "Show without filters" msgstr "Süzgeçsiz göster" -#: meld/filediff.py:2016 +#: meld/filediff.py:2024 msgid "Change highlighting incomplete" msgstr "Vurgulama değişikliği tamamlanamadı" -#: meld/filediff.py:2017 +#: meld/filediff.py:2025 msgid "" "Some changes were not highlighted because they were too large. You can force " "Meld to take longer to highlight larger changes, though this may be slow." @@ -1992,19 +1986,19 @@ msgstr "" "daha büyük değişiklikleri daha uzun sürede ve daha yavaş olmasına rağmen " "vurgulaması için zorlayabilirsiniz." -#: meld/filediff.py:2025 +#: meld/filediff.py:2033 msgid "Keep highlighting" msgstr "Vurgulamayı koru" -#: meld/filediff.py:2027 +#: meld/filediff.py:2035 msgid "_Keep highlighting" msgstr "Vurgulamayı _koru" -#: meld/filediff.py:2040 +#: meld/filediff.py:2048 msgid "Saving failed" msgstr "Kaydetme başarısız" -#: meld/filediff.py:2041 +#: meld/filediff.py:2049 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." @@ -2012,36 +2006,36 @@ msgstr "" "Veri yitimini önlemek için lütfen önemli değişiklikleri başka programa veya " "dosyaya kopyalayın." -#: meld/filediff.py:2050 +#: meld/filediff.py:2058 msgid "Save Left Pane As" msgstr "Sol Bölme Olarak Kaydet" -#: meld/filediff.py:2052 +#: meld/filediff.py:2060 msgid "Save Middle Pane As" msgstr "Orta Bölme Olarak Kaydet" -#: meld/filediff.py:2054 +#: meld/filediff.py:2062 msgid "Save Right Pane As" msgstr "Sağ Bölme Olarak Kaydet" -#: meld/filediff.py:2065 +#: meld/filediff.py:2073 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "%s dosyası açıldığından beri diskte değişti" -#: meld/filediff.py:2067 +#: meld/filediff.py:2075 msgid "If you save it, any external changes will be lost." msgstr "Eğer kaydederseniz, dış değişiklikler yitecektir." -#: meld/filediff.py:2070 +#: meld/filediff.py:2078 msgid "Save Anyway" msgstr "Yine De Kaydet" -#: meld/filediff.py:2071 +#: meld/filediff.py:2079 msgid "Don’t Save" msgstr "Kaydetme" -#: meld/filediff.py:2113 +#: meld/filediff.py:2121 msgid "" "File “{}” contains characters that can’t be encoded using its current " "encoding “{}”." @@ -2049,7 +2043,7 @@ msgstr "" "“{}” dosyası, kendisinin şu anki “{}” kodlaması kullanılarak kodlanamayacak " "karakterler içeriyor." -#: meld/filediff.py:2117 meld/patchdialog.py:138 +#: meld/filediff.py:2125 meld/patchdialog.py:138 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -2058,16 +2052,16 @@ msgstr "" "Şu nedenle dosya kaydedilemedi:\n" "%s" -#: meld/filediff.py:2121 meld/patchdialog.py:137 +#: meld/filediff.py:2129 meld/patchdialog.py:137 #, python-format msgid "Could not save file %s." msgstr "%s dosyası kaydedilemedi." -#: meld/filediff.py:2531 +#: meld/filediff.py:2539 msgid "Live comparison updating disabled" msgstr "Canlı karşılaştırma güncellemesi devre dışı bırakıldı" -#: meld/filediff.py:2532 +#: meld/filediff.py:2540 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2480,4 +2474,4 @@ msgstr "" #: meld/vcview.py:854 msgid "Clear" -msgstr "Temizle" \ No newline at end of file +msgstr "Temizle" diff --git a/po/uk.po b/po/uk.po index 67354fa..91100d5 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n" -"POT-Creation-Date: 2022-08-12 00:04+0000\n" -"PO-Revision-Date: 2022-08-12 23:39+0300\n" +"POT-Creation-Date: 2022-10-31 11:15+0000\n" +"PO-Revision-Date: 2022-11-01 22:46+0200\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -789,8 +789,6 @@ msgid "Open Externally" msgstr "Відкрити у сторонній програмі" #: meld/resources/gtk/menus.ui:26 -#| msgctxt "shortcut window" -#| msgid "Refresh comparison" msgid "Refresh Comparison" msgstr "Освіжити порівняння" @@ -910,10 +908,10 @@ msgstr "Сплощувати теки" #: meld/resources/ui/about-dialog.ui:8 msgid "" "Copyright © 2002-2009 Stephen Kennedy\n" -"Copyright © 2009-2021 Kai Willadsen" +"Copyright © 2009-2022 Kai Willadsen" msgstr "" "© Stephen Kennedy, 2002–2009\n" -"© 2009-2019 Kai Willadsen, 2009-2021" +"© 2009-2019 Kai Willadsen, 2009-2022" #: meld/resources/ui/about-dialog.ui:14 msgid "translator-credits" @@ -1773,12 +1771,12 @@ msgstr "" "Використано текстові фільтри, що могли замаскувати відмінності у вмісті " "файлів." -#: meld/dirdiff.py:1145 meld/filediff.py:1989 +#: meld/dirdiff.py:1145 meld/filediff.py:1997 msgid "Hide" msgstr "Приховати" -#: meld/dirdiff.py:1147 meld/filediff.py:1991 meld/filediff.py:2021 -#: meld/filediff.py:2023 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 +#: meld/dirdiff.py:1147 meld/filediff.py:1999 meld/filediff.py:2029 +#: meld/filediff.py:2031 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127 msgid "Hi_de" msgstr "_Сховати" @@ -1856,11 +1854,11 @@ msgstr "Немає теки" msgid "Folder comparison:" msgstr "Порівняння тек:" -#: meld/filediff.py:1162 +#: meld/filediff.py:1168 msgid "Comparison results will be inaccurate" msgstr "Результати порівняння не будуть точними" -#: meld/filediff.py:1164 +#: meld/filediff.py:1170 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." @@ -1868,98 +1866,98 @@ msgstr "" "Фільтром змінено кількість рядків у файлі. Підтримку обробки таких змін не " "реалізовано. Порівняння може бути неточним." -#: meld/filediff.py:1236 +#: meld/filediff.py:1242 msgid "Mark conflict as resolved?" msgstr "Позначити конфлікт як розв'язаний?" -#: meld/filediff.py:1238 +#: meld/filediff.py:1244 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "" "Якщо конфлікт успішно розв'язано, ви можете позначити його як розв'язаний." -#: meld/filediff.py:1241 +#: meld/filediff.py:1247 msgid "Cancel" msgstr "Скасувати" -#: meld/filediff.py:1242 +#: meld/filediff.py:1248 msgid "Mark _Resolved" msgstr "Позначити як _розв'язаний" -#: meld/filediff.py:1433 meld/filediff.py:1449 +#: meld/filediff.py:1439 meld/filediff.py:1455 msgid "Add Synchronization Point" msgstr "Додати точку синхронізації" -#: meld/filediff.py:1437 +#: meld/filediff.py:1443 msgid "Remove Synchronization Point" msgstr "Вилучити точку синхронізації" -#: meld/filediff.py:1441 +#: meld/filediff.py:1447 msgid "Move Synchronization Point" msgstr "Пересунути точку синхронізації" -#: meld/filediff.py:1445 +#: meld/filediff.py:1451 msgid "Match Synchronization Point" msgstr "Встановити відповідність точки синхронізації" -#: meld/filediff.py:1469 +#: meld/filediff.py:1475 msgid "Clear Synchronization Points" msgstr "Вилучити точки синхронізації" -#: meld/filediff.py:1529 +#: meld/filediff.py:1535 msgid "File comparison:" msgstr "Порівняння файлів:" -#: meld/filediff.py:1663 +#: meld/filediff.py:1671 #, python-format msgid "There was a problem opening the file “%s”." msgstr "Помилка відкриття файла «%s»." -#: meld/filediff.py:1672 +#: meld/filediff.py:1680 #, python-format msgid "File %s appears to be a binary file." msgstr "Здається, файл %s є файлом двійкових даних." -#: meld/filediff.py:1674 +#: meld/filediff.py:1682 msgid "Do you want to open the file using the default application?" msgstr "Хочете відкрити файл за допомогою типової програми?" -#: meld/filediff.py:1676 +#: meld/filediff.py:1684 msgid "Open" msgstr "Відкрити" -#: meld/filediff.py:1698 +#: meld/filediff.py:1706 #, python-format msgid "[%s] Merging files" msgstr "[%s] Об'єднання файлів" -#: meld/filediff.py:1712 +#: meld/filediff.py:1720 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Обчислення відмінностей" -#: meld/filediff.py:1772 +#: meld/filediff.py:1780 #, python-format msgid "File %s has changed on disk" msgstr "До файла %s було внесено зміни на диску" -#: meld/filediff.py:1773 +#: meld/filediff.py:1781 msgid "Do you want to reload the file?" msgstr "Хочете перезавантажити файл?" -#: meld/filediff.py:1775 +#: meld/filediff.py:1783 msgid "_Reload" msgstr "Перезаванта_жити" -#: meld/filediff.py:1945 +#: meld/filediff.py:1953 msgid "File {} is being compared to itself" msgstr "Виконуємо порівняння файла {} із самим собою" -#: meld/filediff.py:1954 +#: meld/filediff.py:1962 msgid "Files are identical" msgstr "Файли є однаковими" -#: meld/filediff.py:1967 +#: meld/filediff.py:1975 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" @@ -1967,11 +1965,11 @@ msgstr "" "Використано текстові фільтри, які могли замаскувати відмінності між файлами. " "Хочете виконати порівняння файлів без фільтрування?" -#: meld/filediff.py:1972 +#: meld/filediff.py:1980 msgid "Files differ in line endings only" msgstr "Файли відрізняються лише символами завершення рядків" -#: meld/filediff.py:1974 +#: meld/filediff.py:1982 #, python-format msgid "" "Files are identical except for differing line endings:\n" @@ -1980,15 +1978,15 @@ msgstr "" "Файли є однаковими, окрім різних символів завершення рядків:\n" "%s" -#: meld/filediff.py:1994 +#: meld/filediff.py:2002 msgid "Show without filters" msgstr "Показати без фільтрів" -#: meld/filediff.py:2016 +#: meld/filediff.py:2024 msgid "Change highlighting incomplete" msgstr "Неповна зміна підсвічування" -#: meld/filediff.py:2017 +#: meld/filediff.py:2025 msgid "" "Some changes were not highlighted because they were too large. You can force " "Meld to take longer to highlight larger changes, though this may be slow." @@ -1997,19 +1995,19 @@ msgstr "" "наказати Meld підсвітити більші зміни, але вам доведеться почекати, доки " "програма виконає ваш наказ." -#: meld/filediff.py:2025 +#: meld/filediff.py:2033 msgid "Keep highlighting" msgstr "Зберігати підсвічування" -#: meld/filediff.py:2027 +#: meld/filediff.py:2035 msgid "_Keep highlighting" msgstr "З_берігати підсвічування" -#: meld/filediff.py:2040 +#: meld/filediff.py:2048 msgid "Saving failed" msgstr "Не вдалося зберегти" -#: meld/filediff.py:2041 +#: meld/filediff.py:2049 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." @@ -2017,37 +2015,37 @@ msgstr "" "Вам варто скопіювати критичні зміни до вікна іншої програми або файла, щоб " "уникнути втрати даних." -#: meld/filediff.py:2050 +#: meld/filediff.py:2058 msgid "Save Left Pane As" msgstr "Зберегти ліву панель як" -#: meld/filediff.py:2052 +#: meld/filediff.py:2060 msgid "Save Middle Pane As" msgstr "Зберегти середню панель як" -#: meld/filediff.py:2054 +#: meld/filediff.py:2062 msgid "Save Right Pane As" msgstr "Зберегти праву панель як" -#: meld/filediff.py:2065 +#: meld/filediff.py:2073 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "З часу відкриття до файла %s було внесено зміни на диску" -#: meld/filediff.py:2067 +#: meld/filediff.py:2075 msgid "If you save it, any external changes will be lost." msgstr "" "Якщо ви збережете файл, внесені сторонніми програмами зміни буде втрачено." -#: meld/filediff.py:2070 +#: meld/filediff.py:2078 msgid "Save Anyway" msgstr "Зберегти попри це" -#: meld/filediff.py:2071 +#: meld/filediff.py:2079 msgid "Don’t Save" msgstr "Не зберігати" -#: meld/filediff.py:2113 +#: meld/filediff.py:2121 msgid "" "File “{}” contains characters that can’t be encoded using its current " "encoding “{}”." @@ -2055,7 +2053,7 @@ msgstr "" "У файлі «{}» містяться символи, які не входять до його поточного кодування " "«{}»." -#: meld/filediff.py:2117 meld/patchdialog.py:138 +#: meld/filediff.py:2125 meld/patchdialog.py:138 #, python-format msgid "" "Couldn’t save file due to:\n" @@ -2064,16 +2062,16 @@ msgstr "" "Не вдалося зберегти файл. Причина:\n" "%s" -#: meld/filediff.py:2121 meld/patchdialog.py:137 +#: meld/filediff.py:2129 meld/patchdialog.py:137 #, python-format msgid "Could not save file %s." msgstr "Не вдалося зберегти файл %s." -#: meld/filediff.py:2531 +#: meld/filediff.py:2539 msgid "Live comparison updating disabled" msgstr "Інтерактивне оновлення порівняння вимкнено" -#: meld/filediff.py:2532 +#: meld/filediff.py:2540 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " @@ -2083,6 +2081,26 @@ msgstr "" "вимкнено. Ви можете оновити вміст об'єктів порівняння вручну. Інтерактивне " "оновлення буде увімкнено після вилучення усіх точок синхронізації." +#: meld/filediff.py:2568 +msgid "Can't swap unsaved files" +msgstr "Не можна міняти місцями незбережені файли" + +#: meld/filediff.py:2570 +msgid "Files must be saved to disk before swapping panes." +msgstr "До обміну місцями панелями файли має бути збережено на диск." + +#: meld/filediff.py:2577 +#| msgid "Start a version control comparison" +msgid "Can't swap version control comparisons" +msgstr "Не можна міняти місцями порівняння керування версіями" + +#: meld/filediff.py:2579 +#| msgid "Mark as resolved in version control" +msgid "Swapping panes is not supported in version control mode." +msgstr "" +"У режимі керування версіями не передбачено можливості обміну місцями для" +" панелей." + #: meld/iohelpers.py:41 msgid "Deleting remote folders is not supported" msgstr "Підтримки вилучення віддалених тек не передбачено" diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..7ef92a7 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,18 @@ + +[tool.ruff] +exclude = [ + "meld/ui/gladesupport.py", + "setup_win32.py", +] + +select = ["E4", "E7", "E9", "F", "I"] +ignore = ["E741"] + +[tool.ruff.isort] +known-first-party = [ + "meld", +] +no-lines-before = [ + "local-folder", +] +order-by-type = true diff --git a/setup_win32.py b/setup_win32.py index 010b1b5..c7c5591 100755 --- a/setup_win32.py +++ b/setup_win32.py @@ -72,6 +72,46 @@ def get_non_python_libs(): "libgdk_pixbuf-2.0-0.dll": os.path.join(sys.prefix, 'bin'), # librsvg is needed for SVG loading in gdkpixbuf "librsvg-2-2.dll": os.path.join(sys.prefix, 'bin'), + # Workarounds for an new not-understood cx-freeze issue + "libatk-1.0-0.dll": os.path.join(sys.prefix, "bin"), + "libbrotlicommon.dll": os.path.join(sys.prefix, "bin"), + "libbrotlidec.dll": os.path.join(sys.prefix, "bin"), + "libbz2-1.dll": os.path.join(sys.prefix, "bin"), + "libcairo-2.dll": os.path.join(sys.prefix, "bin"), + "libcairo-gobject-2.dll": os.path.join(sys.prefix, "bin"), + "libcrypto-3-x64.dll": os.path.join(sys.prefix, "bin"), + "libdatrie-1.dll": os.path.join(sys.prefix, "bin"), + "libepoxy-0.dll": os.path.join(sys.prefix, "bin"), + "libexpat-1.dll": os.path.join(sys.prefix, "bin"), + "libffi-8.dll": os.path.join(sys.prefix, "bin"), + "libfontconfig-1.dll": os.path.join(sys.prefix, "bin"), + "libfreetype-6.dll": os.path.join(sys.prefix, "bin"), + "libfribidi-0.dll": os.path.join(sys.prefix, "bin"), + "libgdk-3-0.dll": os.path.join(sys.prefix, "bin"), + "libgio-2.0-0.dll": os.path.join(sys.prefix, "bin"), + "libgirepository-1.0-1.dll": os.path.join(sys.prefix, "bin"), + "libglib-2.0-0.dll": os.path.join(sys.prefix, "bin"), + "libgmodule-2.0-0.dll": os.path.join(sys.prefix, "bin"), + "libgobject-2.0-0.dll": os.path.join(sys.prefix, "bin"), + "libgraphite2.dll": os.path.join(sys.prefix, "bin"), + "libgtk-3-0.dll": os.path.join(sys.prefix, "bin"), + "libharfbuzz-0.dll": os.path.join(sys.prefix, "bin"), + "libiconv-2.dll": os.path.join(sys.prefix, "bin"), + "libintl-8.dll": os.path.join(sys.prefix, "bin"), + "liblzma-5.dll": os.path.join(sys.prefix, "bin"), + "libmpdec-4.dll": os.path.join(sys.prefix, "bin"), + "libpango-1.0-0.dll": os.path.join(sys.prefix, "bin"), + "libpangocairo-1.0-0.dll": os.path.join(sys.prefix, "bin"), + "libpangoft2-1.0-0.dll": os.path.join(sys.prefix, "bin"), + "libpangowin32-1.0-0.dll": os.path.join(sys.prefix, "bin"), + "libpcre2-8-0.dll": os.path.join(sys.prefix, "bin"), + "libpixman-1-0.dll": os.path.join(sys.prefix, "bin"), + "libpng16-16.dll": os.path.join(sys.prefix, "bin"), + "libssl-3-x64.dll": os.path.join(sys.prefix, "bin"), + "libstdc++-6.dll": os.path.join(sys.prefix, "bin"), + "libthai-0.dll": os.path.join(sys.prefix, "bin"), + "libxml2-2.dll": os.path.join(sys.prefix, "bin"), + "zlib1.dll": os.path.join(sys.prefix, "bin"), } for lib, possible_path in manually_added_libs.items(): diff --git a/test/test_accelerators.py b/test/test_accelerators.py new file mode 100644 index 0000000..839e189 --- /dev/null +++ b/test/test_accelerators.py @@ -0,0 +1,38 @@ +from gi.repository import Gtk + +from meld.accelerators import VIEW_ACCELERATORS + + +def test_accelerator_parse(): + for accel_strings in VIEW_ACCELERATORS.values(): + if isinstance(accel_strings, str): + accel_strings = [accel_strings] + + for accel_string in accel_strings: + key, mods = Gtk.accelerator_parse(accel_string) + assert key + + +def test_accelerator_duplication(): + accels = set() + + allowed_duplicates = { + # Allowed because they're different copy actions across views + Gtk.accelerator_parse("Left"), + Gtk.accelerator_parse("Right"), + # Allowed because they're different panel show/hide across views + Gtk.accelerator_parse("F9"), + } + + for accel_strings in VIEW_ACCELERATORS.values(): + if isinstance(accel_strings, str): + accel_strings = [accel_strings] + + for accel_string in accel_strings: + accel = Gtk.accelerator_parse(accel_string) + + if accel not in allowed_duplicates: + assert ( + accel not in accels + ), f"Duplicate accelerator {accel_string}" + accels.add(accel)